diff --git a/.depcheckrc b/.depcheckrc
index e9383a7985d..f4b84072048 100644
--- a/.depcheckrc
+++ b/.depcheckrc
@@ -14,5 +14,4 @@ ignores: [
     "@yarnpkg/plugin-git",
     "semver",
     "typanion",
-    "turbo-ignore",
   ]
diff --git a/.yarn/patches/@gorhom-bottom-sheet-npm-4.5.1-d8ef5d483d.patch b/.yarn/patches/@gorhom-bottom-sheet-npm-4.5.1-d8ef5d483d.patch
deleted file mode 100644
index 0cc14f3652c..00000000000
--- a/.yarn/patches/@gorhom-bottom-sheet-npm-4.5.1-d8ef5d483d.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/lib/typescript/hooks/useBottomSheetDynamicSnapPoints.d.ts b/lib/typescript/hooks/useBottomSheetDynamicSnapPoints.d.ts
-index 36db692d081b037cbe450ca31d186f8cc4c8410f..12d62711d3214f264bfb8bd4ce586f189dd5cece 100644
---- a/lib/typescript/hooks/useBottomSheetDynamicSnapPoints.d.ts
-+++ b/lib/typescript/hooks/useBottomSheetDynamicSnapPoints.d.ts
-@@ -14,9 +14,7 @@
-  * @deprecated will be deprecated in the next major release! please use the new introduce prop `enableDynamicSizing`.
-  */
- export declare const useBottomSheetDynamicSnapPoints: (initialSnapPoints: Array<string | number>) => {
--    animatedSnapPoints: Readonly<{
--        value: (string | number)[];
--    }>;
-+    animatedSnapPoints: import("react-native-reanimated").SharedValue<(string | number)[]>;
-     animatedHandleHeight: import("react-native-reanimated").SharedValue<number>;
-     animatedContentHeight: import("react-native-reanimated").SharedValue<number>;
-     handleContentLayout: ({ nativeEvent: { layout: { height }, }, }: {
diff --git a/.yarn/patches/react-native-wagmi-charts-npm-2.3.0-8e836a8f3c.patch b/.yarn/patches/react-native-wagmi-charts-npm-2.3.0-8e836a8f3c.patch
index ffce467dbdd..bc7e38bdc42 100644
--- a/.yarn/patches/react-native-wagmi-charts-npm-2.3.0-8e836a8f3c.patch
+++ b/.yarn/patches/react-native-wagmi-charts-npm-2.3.0-8e836a8f3c.patch
@@ -1,26 +1,5 @@
-diff --git a/lib/typescript/src/charts/line/useDatetime.d.ts b/lib/typescript/src/charts/line/useDatetime.d.ts
-index c6f73dd8b31294d0e4c0597519dd998ccd84ad30..9f9eb03e25d1e020de37c706e8f8803d0b9dcefa 100644
---- a/lib/typescript/src/charts/line/useDatetime.d.ts
-+++ b/lib/typescript/src/charts/line/useDatetime.d.ts
-@@ -1,13 +1,10 @@
- import type { TFormatterFn } from '../candle/types';
-+import { SharedValue } from 'react-native-reanimated';
- export declare function useLineChartDatetime({ format, locale, options, }?: {
-     format?: TFormatterFn<number>;
-     locale?: string;
-     options?: Intl.DateTimeFormatOptions;
- }): {
--    value: Readonly<{
--        value: string;
--    }>;
--    formatted: Readonly<{
--        value: string;
--    }>;
-+    value: SharedValue<string>;
-+    formatted: SharedValue<string>;
- };
 diff --git a/src/charts/line/ChartPath.tsx b/src/charts/line/ChartPath.tsx
-index 3807c185c9456d2976c305df94574ff7d948b32a..7b49281318da294617ec25c1a2c04d3e231bb298 100644
+index 3807c185c9456d2976c305df94574ff7d948b32a..5cf985422cf49120f943c98084b08c16faf452d9 100644
 --- a/src/charts/line/ChartPath.tsx
 +++ b/src/charts/line/ChartPath.tsx
 @@ -18,7 +18,6 @@ const BACKGROUND_COMPONENTS = [
@@ -31,12 +10,13 @@ index 3807c185c9456d2976c305df94574ff7d948b32a..7b49281318da294617ec25c1a2c04d3e
    'LineChartTooltip',
  ];
  const FOREGROUND_COMPONENTS = ['LineChartHighlight', 'LineChartDot'];
-@@ -166,6 +165,18 @@ export function LineChartPathWrapper({
+@@ -166,10 +165,25 @@ export function LineChartPathWrapper({
          <View style={StyleSheet.absoluteFill}>
            <AnimatedSVG animatedProps={svgProps} height={height}>
              <LineChartPath color={color} width={strokeWidth} {...pathProps} />
 +          </AnimatedSVG>
 +        </View>
++        
 +      </LineChartPathContext.Provider>
 +      <LineChartPathContext.Provider
 +        value={{
@@ -50,116 +30,9 @@ index 3807c185c9456d2976c305df94574ff7d948b32a..7b49281318da294617ec25c1a2c04d3e
              {foregroundChildren}
            </AnimatedSVG>
          </View>
-diff --git a/src/charts/line/Dot.tsx b/src/charts/line/Dot.tsx
-index dd49d3e49231a5e4f56138bbf3ec51013515f7b0..dfdaa349e9a25dca297234120cc6bd9f5915ed0d 100644
---- a/src/charts/line/Dot.tsx
-+++ b/src/charts/line/Dot.tsx
-@@ -2,13 +2,12 @@ import * as React from 'react';
- import Animated, {
-   Easing,
-   useAnimatedProps,
--  useDerivedValue,
-   withRepeat,
-   withSequence,
-   withTiming,
- } from 'react-native-reanimated';
--import { Circle, CircleProps } from 'react-native-svg';
- import { getYForX } from 'react-native-redash';
-+import { Circle, CircleProps } from 'react-native-svg';
- 
- import { LineChartDimensionsContext } from './Chart';
- import { LineChartPathContext } from './LineChartPathContext';
-@@ -72,29 +71,13 @@ export function LineChartDot({
- 
-   ////////////////////////////////////////////////////////////
- 
--  const x = useDerivedValue(
--    () => withTiming(pointWidth * at),
--    [at, pointWidth]
--  );
--  const y = useDerivedValue(
--    () => withTiming(getYForX(parsedPath!, x.value) || 0),
--    [parsedPath, x]
--  );
-+  const x = pointWidth * at;
-+  const y = getYForX(parsedPath!, x) ?? 0;
- 
-   ////////////////////////////////////////////////////////////
- 
--  const animatedDotProps = useAnimatedProps(
--    () => ({
--      cx: x.value,
--      cy: y.value,
--    }),
--    [x, y]
--  );
--
-   const animatedOuterDotProps = useAnimatedProps(() => {
-     let defaultProps = {
--      cx: x.value,
--      cy: y.value,
-       opacity: 0.1,
-       r: outerSize,
-     };
-@@ -113,25 +96,27 @@ export function LineChartDot({
-     const easing = Easing.out(Easing.sin);
-     const animatedOpacity = withRepeat(
-       withSequence(
--        withTiming(0.8),
-+        withTiming(0.8, {
-+          duration: 0,
-+        }),
-         withTiming(0, {
-           duration: pulseDurationMs,
-           easing,
-         })
-       ),
--      -1,
--      false
-+      -1
-     );
-     const scale = withRepeat(
-       withSequence(
--        withTiming(0),
-+        withTiming(0, {
-+          duration: 0,
-+        }),
-         withTiming(outerSize, {
-           duration: pulseDurationMs,
-           easing,
-         })
-       ),
--      -1,
--      false
-+      -1
-     );
- 
-     if (pulseBehaviour === 'while-inactive') {
-@@ -146,15 +131,16 @@ export function LineChartDot({
-       opacity: animatedOpacity,
-       r: scale,
-     };
--  }, [hasPulse, isActive, outerSize, pulseBehaviour, pulseDurationMs, x, y]);
-+  }, [hasPulse, isActive, outerSize, pulseBehaviour, pulseDurationMs]);
- 
-   ////////////////////////////////////////////////////////////
- 
-   return (
-     <>
-       <AnimatedCircle
--        animatedProps={animatedDotProps}
-         r={size}
-+        cx={x}
-+        cy={y}
-         fill={color}
-         opacity={opacity}
-         {...dotProps}
-@@ -163,6 +149,8 @@ export function LineChartDot({
-         <AnimatedCircle
-           animatedProps={animatedOuterDotProps}
-           fill={color}
-+          cx={x}
-+          cy={y}
-           {...outerDotProps}
-         />
-       )}
++        
+       </LineChartPathContext.Provider>
++
+     </>
+   );
+ }
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/RELEASE b/RELEASE
index b39db7f46e6..807bd93c566 100644
--- a/RELEASE
+++ b/RELEASE
@@ -1,24 +1,14 @@
-IPFS hash of the deployment:
-- CIDv0: `QmciGvhbiSVjSu6u9JwRzFp5uBRnawnd5M8NMk8d9XNACT`
-- CIDv1: `bafybeigvrxb4vjhzc3k7xqtwa4dijoev545kpjmo4anikgsbckku45k4qq`
+Another week, another update. Check out whats new below:
 
-The latest release is always mirrored at [app.uniswap.org](https://app.uniswap.org).
+Settings Polish — We switched spam and low balance settings to universal settings. In addition, we added an opt out for anonymous analytics within the app.
 
-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://bafybeigvrxb4vjhzc3k7xqtwa4dijoev545kpjmo4anikgsbckku45k4qq.ipfs.dweb.link/
-- https://bafybeigvrxb4vjhzc3k7xqtwa4dijoev545kpjmo4anikgsbckku45k4qq.ipfs.cf-ipfs.com/
-- [ipfs://QmciGvhbiSVjSu6u9JwRzFp5uBRnawnd5M8NMk8d9XNACT/](ipfs://QmciGvhbiSVjSu6u9JwRzFp5uBRnawnd5M8NMk8d9XNACT/)
-
-## 5.8.0 (2024-02-09)
-
-
-### Features
-
-* **web:** outage banner for arbitrum, optimism, polygon (#6218) e57ca63
+Quick Copy Contract Addresses — We added the ability quickly copy any token address! Simply press and hold on any token to bring up the option to swap or copy a contract address.
 
+Other notable changes:
 
+- View-only wallet polish
+- Activity bug fixes
+- Receive QR polish
+- Import wallet polish
+- Token details page bug fixes
+- Updated treatment for tokens with no logos
diff --git a/VERSION b/VERSION
index cec32518076..bfe1c075ef5 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-web/5.8.0
\ No newline at end of file
+mobile/1.19.2
\ No newline at end of file
diff --git a/apps/mobile/.depcheckrc b/apps/mobile/.depcheckrc
index 55aadbc01ae..70278cd3b92 100644
--- a/apps/mobile/.depcheckrc
+++ b/apps/mobile/.depcheckrc
@@ -19,6 +19,7 @@ ignores: [
     "src",
     "ui",
     "tsconfig",
+    "eslint-config-custom",
     ## Subpackages of installed packages
     "@redux-saga/core",
     "@ethersproject/constants",
diff --git a/apps/mobile/.eslintrc.js b/apps/mobile/.eslintrc.js
index a8f1fdf1029..ee1952fe87e 100644
--- a/apps/mobile/.eslintrc.js
+++ b/apps/mobile/.eslintrc.js
@@ -1,6 +1,6 @@
 module.exports = {
   root: true,
-  extends: ['@uniswap/eslint-config/native'],
+  extends: ['custom'],
   parserOptions: {
     project: 'tsconfig.json',
     tsconfigRootDir: __dirname,
diff --git a/apps/mobile/android/app/build.gradle b/apps/mobile/android/app/build.gradle
index 83278c886b4..974e42e49d0 100644
--- a/apps/mobile/android/app/build.gradle
+++ b/apps/mobile/android/app/build.gradle
@@ -125,17 +125,17 @@ android {
       dev {
         isDefault(true)
         applicationIdSuffix ".dev"
-        versionName "1.21"
+        versionName "1.19.2"
         dimension "variant"
       }
       beta {
         applicationIdSuffix ".beta"
-        versionName "1.21"
+        versionName "1.19.2"
         dimension "variant"
       }
       prod {
         dimension "variant"
-        versionName "1.21"
+        versionName "1.19.2"
       }
     }
 
diff --git a/apps/mobile/android/app/src/main/AndroidManifest.xml b/apps/mobile/android/app/src/main/AndroidManifest.xml
index 98a145ca799..eb4dc689106 100644
--- a/apps/mobile/android/app/src/main/AndroidManifest.xml
+++ b/apps/mobile/android/app/src/main/AndroidManifest.xml
@@ -7,7 +7,6 @@
   <uses-permission android:name="android.permission.USE_BIOMETRIC" />
   <uses-permission android:name="android.permission.USE_FINGERPRINT" />
   <uses-permission android:name="android.permission.VIBRATE" />
-  <uses-permission android:name="com.google.android.gms.permission.AD_ID"/>
 
   <application
     android:name=".MainApplication"
diff --git a/apps/mobile/android/app/src/main/java/com/uniswap/MainActivity.kt b/apps/mobile/android/app/src/main/java/com/uniswap/MainActivity.kt
index 013d8f2d5e3..d5b35c60b4b 100644
--- a/apps/mobile/android/app/src/main/java/com/uniswap/MainActivity.kt
+++ b/apps/mobile/android/app/src/main/java/com/uniswap/MainActivity.kt
@@ -32,7 +32,7 @@ class MainActivity : ReactActivity() {
       window.isNavigationBarContrastEnforced = false
     }
     val sharedI18nUtilInstance = I18nUtil.getInstance()
-    sharedI18nUtilInstance.allowRTL(applicationContext, false)
+    sharedI18nUtilInstance.allowRTL(applicationContext, true)
   }
 
   /**
diff --git a/apps/mobile/e2e/usecases/Create.js b/apps/mobile/e2e/usecases/Create.js
index e5be207e3f5..8f0d8102719 100644
--- a/apps/mobile/e2e/usecases/Create.js
+++ b/apps/mobile/e2e/usecases/Create.js
@@ -1,7 +1,7 @@
 import { by, device, element, expect } from 'detox'
 import { Accounts } from 'src/e2e/utils/fixtures'
+import { ElementName } from 'src/features/telemetry/constants'
 import { sleep } from 'utilities/src/time/timing'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 export function Create() {
   it('onboards a new account', async () => {
diff --git a/apps/mobile/e2e/usecases/ImportAccounts.js b/apps/mobile/e2e/usecases/ImportAccounts.js
index 059f77ad4a5..cec1cdb1777 100644
--- a/apps/mobile/e2e/usecases/ImportAccounts.js
+++ b/apps/mobile/e2e/usecases/ImportAccounts.js
@@ -1,7 +1,7 @@
 import { by, device, element, expect } from 'detox'
 import { Accounts } from 'src/e2e/utils/fixtures'
+import { ElementName } from 'src/features/telemetry/constants'
 import { sleep } from 'utilities/src/time/timing'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 export function ImportAccounts() {
   it('creates a readonly account', async () => {
diff --git a/apps/mobile/e2e/usecases/Swap.js b/apps/mobile/e2e/usecases/Swap.js
index d9eaeb77235..77a905d1248 100644
--- a/apps/mobile/e2e/usecases/Swap.js
+++ b/apps/mobile/e2e/usecases/Swap.js
@@ -1,5 +1,5 @@
 import { by, device, element, expect } from 'detox'
-import { ElementName } from 'wallet/src/telemetry/constants'
+import { ElementName } from 'src/features/telemetry/constants'
 
 export function Swap() {
   it('saves the original amount on usd toggle', async () => {
diff --git a/apps/mobile/e2e/utils/utils.js b/apps/mobile/e2e/utils/utils.js
index 8a0cfe317e4..14da6e0e17f 100644
--- a/apps/mobile/e2e/utils/utils.js
+++ b/apps/mobile/e2e/utils/utils.js
@@ -1,7 +1,7 @@
 import { by, device, element } from 'detox'
 import { Accounts } from 'src/e2e/utils/fixtures'
+import { ElementName } from 'src/features/telemetry/constants'
 import { sleep } from 'utilities/src/time/timing'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 /** Opens Account page and imports a managed account */
 export async function quickOnboarding() {
diff --git a/apps/mobile/ios/Podfile b/apps/mobile/ios/Podfile
index 5a14f7ce24a..12023c4fe3c 100644
--- a/apps/mobile/ios/Podfile
+++ b/apps/mobile/ios/Podfile
@@ -50,6 +50,10 @@ target 'Uniswap' do
 
     installer.pods_project.targets.each do |target|
       target.build_configurations.each do |config|
+        if config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'].to_f < '9.0'.to_f
+          config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.0'
+        end
+
         config.build_settings['CODE_SIGNING_ALLOWED'] = 'NO'
         config.build_settings['APPLICATION_EXTENSION_API_ONLY'] = 'No'
       end
diff --git a/apps/mobile/ios/Podfile.lock b/apps/mobile/ios/Podfile.lock
index 635c2a14b09..03c7bdfa574 100644
--- a/apps/mobile/ios/Podfile.lock
+++ b/apps/mobile/ios/Podfile.lock
@@ -1282,10 +1282,35 @@ PODS:
     - React-Core
   - RNPermissions (3.6.0):
     - React-Core
-  - RNReanimated (3.6.2):
-    - RCT-Folly (= 2021.07.22.00)
+  - RNReanimated (3.3.0):
+    - DoubleConversion
+    - FBLazyVector
+    - FBReactNativeSpec
+    - glog
+    - hermes-engine
+    - RCT-Folly
+    - RCTRequired
+    - RCTTypeSafety
+    - React-callinvoker
     - React-Core
+    - React-Core/DevSupport
+    - React-Core/RCTWebSocket
+    - React-CoreModules
+    - React-cxxreact
+    - React-hermes
+    - React-jsi
+    - React-jsiexecutor
+    - React-jsinspector
+    - React-RCTActionSheet
+    - React-RCTAnimation
+    - React-RCTBlob
+    - React-RCTImage
+    - React-RCTLinking
+    - React-RCTNetwork
+    - React-RCTSettings
+    - React-RCTText
     - ReactCommon/turbomodule/core
+    - Yoga
   - RNScreens (3.24.0):
     - React-Core
     - React-RCTImage
@@ -1635,7 +1660,7 @@ SPEC CHECKSUMS:
   Apollo: fe380f40e55e501a2499dd5885fab0cdf082b2bb
   AppsFlyerFramework: 88a6eed37ad52bcee4ad74232efa8e22809d06c9
   Argon2Swift: 99482c1b8122a03524b61e41c4903a9548e7c33b
-  boost: 0a937fbcfdd646fca221c4f1d9750d7ccfdfc2dc
+  boost: 57d2868c099736d80fcd648bf211b4431e51a558
   BoringSSL-GRPC: 3175b25143e648463a56daeaaa499c6cb86dad33
   Burnt: 708556f6283e1b81767e6642e088819d85d1ea08
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
@@ -1740,7 +1765,7 @@ SPEC CHECKSUMS:
   RNImageColors: 9ac05083b52d5c350e6972650ae3ba0e556466c1
   RNLocalize: d4b8af4e442d4bcca54e68fc687a2129b4d71a81
   RNPermissions: de7b7c3fe1680d974ac7a85e3e97aa539c0e68ea
-  RNReanimated: 807546b6fc06d978ef0edc0ebc54db5741c6e432
+  RNReanimated: d6b4b867b6d1ee0798f5fb372708fa4bb8d66029
   RNScreens: b21dc57dfa2b710c30ec600786a3fc223b1b92e7
   RNSentry: 4fb2cd7d2d6cb94423c24884488206ef881da136
   RNSVG: c1e76b81c76cdcd34b4e1188852892dc280eb902
@@ -1754,6 +1779,6 @@ SPEC CHECKSUMS:
   Yoga: 135109c9b8c5d1a8af3a58d21cd4c7aa7f3bf555
   ZXingObjC: fdbb269f25dd2032da343e06f10224d62f537bdb
 
-PODFILE CHECKSUM: 22ab4b87e0bceeaa9e245c485c36fca595139568
+PODFILE CHECKSUM: 632909767e5e0022317f148f858c5b6f587e5900
 
 COCOAPODS: 1.14.3
diff --git a/apps/mobile/ios/Uniswap.xcodeproj/project.pbxproj b/apps/mobile/ios/Uniswap.xcodeproj/project.pbxproj
index 8e7a7f16f4e..455c55e5ae2 100644
--- a/apps/mobile/ios/Uniswap.xcodeproj/project.pbxproj
+++ b/apps/mobile/ios/Uniswap.xcodeproj/project.pbxproj
@@ -140,9 +140,6 @@
 		681301B22A3726EE00A5BF43 /* pending_send.riv in Resources */ = {isa = PBXBuildFile; fileRef = 681301AE2A3726EE00A5BF43 /* pending_send.riv */; };
 		681301B32A3726EE00A5BF43 /* onboarding_light.riv in Resources */ = {isa = PBXBuildFile; fileRef = 681301AF2A3726EE00A5BF43 /* onboarding_light.riv */; };
 		681301B42A3726EE00A5BF43 /* pending_swap.riv in Resources */ = {isa = PBXBuildFile; fileRef = 681301B02A3726EE00A5BF43 /* pending_swap.riv */; };
-		6BC7D07E2B5FF02400617C95 /* ScantasticEncryption.m in Sources */ = {isa = PBXBuildFile; fileRef = 6BC7D07B2B5FF02400617C95 /* ScantasticEncryption.m */; };
-		6BC7D07F2B5FF02400617C95 /* ScantasticEncryption.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BC7D07C2B5FF02400617C95 /* ScantasticEncryption.swift */; };
-		6BC7D0802B5FF02400617C95 /* EncryptionUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BC7D07D2B5FF02400617C95 /* EncryptionUtils.swift */; };
 		6C8EFC2D2891B99100FBD8EB /* EncryptionHelperTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6C8EFC2C2891B99100FBD8EB /* EncryptionHelperTests.swift */; };
 		6CA91BDB2A95223C00C4063E /* RNEthersRS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6CA91BD92A95223C00C4063E /* RNEthersRS.swift */; };
 		6CA91BDC2A95223C00C4063E /* RnEthersRS.m in Sources */ = {isa = PBXBuildFile; fileRef = 6CA91BDA2A95223C00C4063E /* RnEthersRS.m */; };
@@ -439,9 +436,6 @@
 		681301AF2A3726EE00A5BF43 /* onboarding_light.riv */ = {isa = PBXFileReference; lastKnownFileType = file; path = onboarding_light.riv; sourceTree = "<group>"; };
 		681301B02A3726EE00A5BF43 /* pending_swap.riv */ = {isa = PBXFileReference; lastKnownFileType = file; path = pending_swap.riv; sourceTree = "<group>"; };
 		68FD07BE7700B63D569EB256 /* Pods-WidgetIntentExtension.dev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-WidgetIntentExtension.dev.xcconfig"; path = "Target Support Files/Pods-WidgetIntentExtension/Pods-WidgetIntentExtension.dev.xcconfig"; sourceTree = "<group>"; };
-		6BC7D07B2B5FF02400617C95 /* ScantasticEncryption.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScantasticEncryption.m; sourceTree = "<group>"; };
-		6BC7D07C2B5FF02400617C95 /* ScantasticEncryption.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ScantasticEncryption.swift; sourceTree = "<group>"; };
-		6BC7D07D2B5FF02400617C95 /* EncryptionUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = EncryptionUtils.swift; sourceTree = "<group>"; };
 		6C8EFC2C2891B99100FBD8EB /* EncryptionHelperTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EncryptionHelperTests.swift; sourceTree = "<group>"; };
 		6CA91BD82A95223C00C4063E /* RNEthersRS-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "RNEthersRS-Bridging-Header.h"; sourceTree = "<group>"; };
 		6CA91BD92A95223C00C4063E /* RNEthersRS.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RNEthersRS.swift; sourceTree = "<group>"; };
@@ -940,21 +934,9 @@
 			name = ExpoModulesProviders;
 			sourceTree = "<group>";
 		};
-		6BC7D07A2B5FF02400617C95 /* Scantastic */ = {
-			isa = PBXGroup;
-			children = (
-				6BC7D07B2B5FF02400617C95 /* ScantasticEncryption.m */,
-				6BC7D07C2B5FF02400617C95 /* ScantasticEncryption.swift */,
-				6BC7D07D2B5FF02400617C95 /* EncryptionUtils.swift */,
-			);
-			name = Scantastic;
-			path = Uniswap/Onboarding/Scantastic;
-			sourceTree = "<group>";
-		};
 		6C84F055283D83CF0071FA2E /* Onboarding */ = {
 			isa = PBXGroup;
 			children = (
-				6BC7D07A2B5FF02400617C95 /* Scantastic */,
 				8E89C3A52AB8AAA400C84DE5 /* Backup */,
 				8EA8AB2F2AB7ED3C004E7EF3 /* Import */,
 			);
@@ -1923,7 +1905,6 @@
 				FD7304D028A3650A0085BDEA /* Colors.swift in Sources */,
 				8E89C3AF2AB8AAA400C84DE5 /* MnemonicDisplayView.swift in Sources */,
 				9FEC9B8B2A858CF1003CD019 /* AppDelegate.m in Sources */,
-				6BC7D0802B5FF02400617C95 /* EncryptionUtils.swift in Sources */,
 				8EA8AB3B2AB7ED3C004E7EF3 /* SeedPhraseInputManager.m in Sources */,
 				6CA91BDB2A95223C00C4063E /* RNEthersRS.swift in Sources */,
 				8EA8AB3C2AB7ED3C004E7EF3 /* SeedPhraseInputViewModel.swift in Sources */,
@@ -1931,7 +1912,6 @@
 				8E89C3B12AB8AAA400C84DE5 /* MnemonicConfirmationWordBankView.swift in Sources */,
 				07B0676D2A7D6EC8001DD9B9 /* RNWidgets.m in Sources */,
 				8EBFB1552ABA6AA6006B32A8 /* PasteIcon.swift in Sources */,
-				6BC7D07F2B5FF02400617C95 /* ScantasticEncryption.swift in Sources */,
 				8E89C3B02AB8AAA400C84DE5 /* MnemonicWordView.swift in Sources */,
 				07B0676C2A7D6EC8001DD9B9 /* RNWidgets.swift in Sources */,
 				8E89C3AE2AB8AAA400C84DE5 /* MnemonicConfirmationView.swift in Sources */,
@@ -1944,7 +1924,6 @@
 				9FCEBF012A95A8E00079EDDB /* RNWalletConnect.swift in Sources */,
 				6CA91BDC2A95223C00C4063E /* RnEthersRS.m in Sources */,
 				6CA91BE12A95226200C4063E /* RNCloudStorageBackupsManager.m in Sources */,
-				6BC7D07E2B5FF02400617C95 /* ScantasticEncryption.m in Sources */,
 				A3F0A5B1272B1DFA00895B25 /* KeychainSwiftDistrib.swift in Sources */,
 				8E89C3B42AB8AAA400C84DE5 /* MnemonicConfirmationManager.m in Sources */,
 				1440B371A1C9A42F3E91DAAE /* ExpoModulesProvider.swift in Sources */,
@@ -2450,7 +2429,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2496,7 +2475,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.widgets;
@@ -2542,7 +2521,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.widgets;
@@ -2588,7 +2567,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.widgets;
@@ -2630,7 +2609,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -2673,7 +2652,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.WidgetIntentExtension;
@@ -2716,7 +2695,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.WidgetIntentExtension;
@@ -2759,7 +2738,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.WidgetIntentExtension;
@@ -2795,7 +2774,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -2833,7 +2812,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -3003,7 +2982,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_DEBUG";
@@ -3047,7 +3026,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.OneSignalNotificationServiceExtension;
@@ -3143,7 +3122,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -3214,7 +3193,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.beta.OneSignalNotificationServiceExtension;
@@ -3310,7 +3289,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -3381,7 +3360,7 @@
 					"@executable_path/Frameworks",
 					"@executable_path/../../Frameworks",
 				);
-				MARKETING_VERSION = 1.21;
+				MARKETING_VERSION = 1.19.2;
 				MTL_FAST_MATH = YES;
 				OTHER_SWIFT_FLAGS = "$(inherited) -D EXPO_CONFIGURATION_RELEASE";
 				PRODUCT_BUNDLE_IDENTIFIER = com.uniswap.mobile.dev.OneSignalNotificationServiceExtension;
diff --git a/apps/mobile/ios/Uniswap.xcodeproj/xcshareddata/xcschemes/Uniswap.xcscheme b/apps/mobile/ios/Uniswap.xcodeproj/xcshareddata/xcschemes/Uniswap.xcscheme
index c5e27e3a5eb..0d6918c5b84 100644
--- a/apps/mobile/ios/Uniswap.xcodeproj/xcshareddata/xcschemes/Uniswap.xcscheme
+++ b/apps/mobile/ios/Uniswap.xcodeproj/xcshareddata/xcschemes/Uniswap.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1520"
+   LastUpgradeVersion = "1210"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/apps/mobile/ios/Uniswap/AppDelegate.m b/apps/mobile/ios/Uniswap/AppDelegate.m
index 3f62c6d64ba..d7e0142a59d 100644
--- a/apps/mobile/ios/Uniswap/AppDelegate.m
+++ b/apps/mobile/ios/Uniswap/AppDelegate.m
@@ -47,7 +47,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
   
   [RNSplashScreen show];
   
-  [[RCTI18nUtil sharedInstance] allowRTL:NO];
+  [[RCTI18nUtil sharedInstance] allowRTL:YES];
 
   return YES;
 }
diff --git a/apps/mobile/ios/Uniswap/Onboarding/Scantastic/EncryptionUtils.swift b/apps/mobile/ios/Uniswap/Onboarding/Scantastic/EncryptionUtils.swift
deleted file mode 100644
index 716cadc9c60..00000000000
--- a/apps/mobile/ios/Uniswap/Onboarding/Scantastic/EncryptionUtils.swift
+++ /dev/null
@@ -1,139 +0,0 @@
-//	
-//  EncryptionUtils.swift
-//  Uniswap
-//	
-//  Created by Christine Legge on 1/23/24.
-//
-
-import CryptoKit
-import Foundation
-
-enum EncryptionError: Error {
-    case invalidModulus
-    case invalidExponent
-    case invalidPublicKey
-    case unknown
-}
-
-// Convert Base64URL to Base64 and add padding if necessary
-func Base64URLToBase64(base64url: String) -> String {
-    var base64 = base64url
-        .replacingOccurrences(of: "-", with: "+")
-        .replacingOccurrences(of: "_", with: "/")
-    if base64.count % 4 != 0 {
-        base64.append(String(repeating: "=", count: 4 - base64.count % 4))
-    }
-    return base64
-}
-
-// Calculate the length field for an ASN.1 sequence.
-func lengthField(of valueField: [UInt8]) throws -> [UInt8] {
-    var count = valueField.count
-
-    if count < 128 {
-        return [ UInt8(count) ]
-    }
-
-    // The number of bytes needed to encode count.
-    let lengthBytesCount = Int((log2(Double(count)) / 8) + 1)
-
-    // The first byte in the length field encoding the number of remaining bytes.
-    let firstLengthFieldByte = UInt8(128 + lengthBytesCount)
-
-    var lengthField: [UInt8] = []
-    for _ in 0..<lengthBytesCount {
-        // Take the last 8 bits of count.
-        let lengthByte = UInt8(count & 0xff)
-        // Add them to the length field.
-        lengthField.insert(lengthByte, at: 0)
-        // Delete the last 8 bits of count.
-        count = count >> 8
-    }
-
-    // Include the first byte.
-    lengthField.insert(firstLengthFieldByte, at: 0)
-
-    return lengthField
-}
-
-func generatePublicRSAKey(modulus: String, exponent: String) throws -> SecKey {
-    // Lets encode them from b64 url to b64 
-    let encodedModulus = Base64URLToBase64(base64url: modulus)
-    let encodedExponent = Base64URLToBase64(base64url: exponent)
-
-    // First we need to get our modulus and exponent into UInt8 arrays
-    // We can do this by decoding the Base64 strings (URL safe) into Data 
-    // and then converting the Data into UInt8 arrays
-    guard let modulusData = Data(base64Encoded: encodedModulus) else {
-        throw EncryptionError.invalidModulus
-    }
-
-    guard let exponentData = Data(base64Encoded: encodedExponent) else {
-        throw EncryptionError.invalidExponent
-    }
-
-    var modulus = modulusData.withUnsafeBytes { Data(Array($0)).withUnsafeBytes { Array($0) } }
-    let exponent = exponentData.withUnsafeBytes { Data(Array($0)).withUnsafeBytes { Array($0) } }
-
-    // Lets add 0x00 at the front of the modulus
-    modulus.insert(0x00, at: 0)
-
-    var sequenceEncoded: [UInt8] = []
-    do {
-      // encode as integers
-      var modulusEncoded: [UInt8] = []
-      modulusEncoded.append(0x02)
-      modulusEncoded.append(contentsOf: try lengthField(of: modulus))
-      modulusEncoded.append(contentsOf: modulus)
-
-      var exponentEncoded: [UInt8] = []
-      exponentEncoded.append(0x02)
-      exponentEncoded.append(contentsOf: try lengthField(of: exponent))
-      exponentEncoded.append(contentsOf: exponent)
-
-      sequenceEncoded.append(0x30)
-      sequenceEncoded.append(contentsOf: try lengthField(of: (modulusEncoded + exponentEncoded)))
-      sequenceEncoded.append(contentsOf: (modulusEncoded + exponentEncoded))
-    } catch {
-        throw EncryptionError.invalidPublicKey
-    }
-
-    let keyData = Data(sequenceEncoded)
-
-    // RSA key size is the number of bits of the modulus.
-    let keySize = (modulus.count * 8)
-
-    let attributes: [String: Any] = [
-        kSecAttrKeyType as String: kSecAttrKeyTypeRSA,
-        kSecAttrKeyClass as String: kSecAttrKeyClassPublic,
-        kSecAttrKeySizeInBits as String: keySize
-    ]
-
-    guard let publicKey = SecKeyCreateWithData(keyData as CFData, attributes as CFDictionary, nil) else {
-        throw EncryptionError.invalidPublicKey
-    }
-
-    return publicKey
-}
-
-func encryptForStorage(plaintext: String, publicKey: SecKey) throws -> Data
-{
-    // Encrypt the plaintext
-    let plaintextData = Data(plaintext.utf8)
-    let algorithm: SecKeyAlgorithm = .rsaEncryptionOAEPSHA256
-
-    guard SecKeyIsAlgorithmSupported(publicKey, .encrypt, algorithm) else {
-        throw EncryptionError.invalidPublicKey
-    }
-
-    var error: Unmanaged<CFError>?
-    guard let ciphertextData = SecKeyCreateEncryptedData(publicKey, algorithm, plaintextData as CFData, &error) else {
-        if let error = error {
-          throw error.takeRetainedValue() as Error
-        } else {
-          throw EncryptionError.unknown
-        }
-    }
-
-    return ciphertextData as Data
-}
diff --git a/apps/mobile/ios/Uniswap/Onboarding/Scantastic/ScantasticEncryption.m b/apps/mobile/ios/Uniswap/Onboarding/Scantastic/ScantasticEncryption.m
deleted file mode 100644
index 2612b52312a..00000000000
--- a/apps/mobile/ios/Uniswap/Onboarding/Scantastic/ScantasticEncryption.m
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-//  ScantasticEncryption.m
-//  Uniswap
-//
-//  Created by Christine Legge on 1/23/24.
-//
-
-#import <React/RCTBridgeModule.h>
-#import <React/RCTEventEmitter.h>
-
-@interface RCT_EXTERN_MODULE(ScantasticEncryption, RCTEventEmitter)
-
-RCT_EXTERN_METHOD(getEncryptedMnemonic: (NSString *)mnemonicId
-                  n: (NSString *)n
-                  e: (NSString *)e
-                  resolve: (RCTPromiseResolveBlock)resolve
-                  reject: (RCTPromiseRejectBlock)reject)
-
-@end
diff --git a/apps/mobile/ios/Uniswap/Onboarding/Scantastic/ScantasticEncryption.swift b/apps/mobile/ios/Uniswap/Onboarding/Scantastic/ScantasticEncryption.swift
deleted file mode 100644
index edabb1f32cd..00000000000
--- a/apps/mobile/ios/Uniswap/Onboarding/Scantastic/ScantasticEncryption.swift
+++ /dev/null
@@ -1,62 +0,0 @@
-//
-//  ScantasticEncryption.swift
-//  Uniswap
-//
-//  Created by Christine Legge on 1/23/24.
-//
-
-import Foundation
-import CryptoKit
-
-enum ScantasticError: String, Error {
-  case publicKeyError = "publicKeyError"
-  case cipherTextError = "cipherTextError"
-}
-
-@objc(ScantasticEncryption)
-class ScantasticEncryption: RCTEventEmitter {
-  let rnEthersRS = RNEthersRS()
-  
-  @objc override static func requiresMainQueueSetup() -> Bool {
-    return false
-  }
-
-  override func supportedEvents() -> [String]! {
-    return []
-  }
-
-  /**
-  Retrieves encrypted mnemonic
-  
-  - parameter mnemonicId: key string associated with mnemonic to backup
-  - parameter n: base64encoded value
-  - parameter e: base64encoded value
-  */
-  @objc(getEncryptedMnemonic:n:e:resolve:reject:)
-  func getEncryptedMnemonic(
-    mnemonicId: String, n: String, e: String, resolve: RCTPromiseResolveBlock,
-    reject: RCTPromiseRejectBlock
-  ) {
-
-    guard let mnemonic = rnEthersRS.retrieveMnemonic(mnemonicId: mnemonicId) else {
-      return reject(RNEthersRSError.retrieveMnemonicError.rawValue, "Failed to retrieve mnemonic", RNEthersRSError.retrieveMnemonicError)
-    }
-
-    let publicKey: SecKey 
-    do {
-      publicKey = try generatePublicRSAKey(modulus: n, exponent: e)
-    } catch {
-      return reject(ScantasticError.publicKeyError.rawValue, "Failed to generate public Key ", ScantasticError.publicKeyError)
-    }
-
-    let encodedCiphertext: Data
-    do {
-      encodedCiphertext = try encryptForStorage(plaintext:mnemonic,publicKey:publicKey)
-    } catch { 
-      return reject(ScantasticError.cipherTextError.rawValue, "Failed to encrypt the mnemonic", ScantasticError.cipherTextError)
-    }
-
-    let b64encodedCiphertext = encodedCiphertext.base64EncodedString()
-    return resolve(b64encodedCiphertext)
-  }
-}
diff --git a/apps/mobile/ios/apollo-codegen-config.json b/apps/mobile/ios/apollo-codegen-config.json
index 33d9500677f..3c001d4bdd3 100644
--- a/apps/mobile/ios/apollo-codegen-config.json
+++ b/apps/mobile/ios/apollo-codegen-config.json
@@ -1,32 +1,34 @@
 {
-  "schemaNamespace": "MobileSchema",
-  "options": {
-    "cocoapodsCompatibleImportStatements": true
+  "schemaNamespace" : "MobileSchema",
+  "options" : {
+    "cocoapodsCompatibleImportStatements" : true
   },
-  "input": {
-    "operationSearchPaths": [
+  "input" : {
+    "operationSearchPaths" : [
       "../../../apps/mobile/src/components/PriceExplorer/TokenPriceHistory.graphql",
       "../../../apps/mobile/src/components/explore/search/SearchPopularTokens.graphql",
       "../../../packages/wallet/src/data/queries.graphql"
     ],
-    "schemaSearchPaths": [
-      "../../../packages/wallet/src/data/schema.graphql"
+    "schemaSearchPaths" : [
+      "../../../packages/wallet/src/data/__generated__/schema.graphql"
     ]
   },
-  "output": {
-    "testMocks": {
-      "none": {}
+  "output" : {
+    "testMocks" : {
+      "none" : {
+      }
     },
-    "schemaTypes": {
-      "path": "./WidgetsCore/MobileSchema",
-      "moduleType": {
-        "embeddedInTarget": {
-          "name": "WidgetsCore"
+    "schemaTypes" : {
+      "path" : "./WidgetsCore/MobileSchema",
+      "moduleType" : {
+        "embeddedInTarget" : {
+          "name" : "WidgetsCore"
         }
       }
     },
-    "operations": {
-      "inSchemaModule": {}
+    "operations" : {
+      "inSchemaModule" : {
+      }
     }
   }
 }
diff --git a/apps/mobile/jest-setup.js b/apps/mobile/jest-setup.js
index 2f566d98f4e..c323dbe131b 100644
--- a/apps/mobile/jest-setup.js
+++ b/apps/mobile/jest-setup.js
@@ -4,7 +4,6 @@
 import mockRNCNetInfo from '@react-native-community/netinfo/jest/netinfo-mock.js'
 import 'core-js' // necessary so setImmediate works in tests
 import { localizeMock as mockRNLocalize } from 'react-native-localize/mock'
-import { AppearanceSettingType } from 'wallet/src/features/appearance/slice'
 import { MockLocalizationContext } from 'wallet/src/test/utils'
 
 // avoids polluting console in test runs, while keeping important log levels
@@ -118,16 +117,3 @@ jest.mock('react-i18next', () => ({
     init: jest.fn(),
   },
 }))
-
-// Mock the appearance hook for all tests
-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/mobile/jest.config.js b/apps/mobile/jest.config.js
index 285f047fb4a..a2ff060e49e 100644
--- a/apps/mobile/jest.config.js
+++ b/apps/mobile/jest.config.js
@@ -1,6 +1,5 @@
 const preset = require('../../config/jest-presets/jest/jest-preset')
 
-/** @type {import('jest').Config} */
 module.exports = {
   ...preset,
   preset: 'jest-expo',
diff --git a/apps/mobile/package.json b/apps/mobile/package.json
index f07964409a2..a6e3f1eef40 100644
--- a/apps/mobile/package.json
+++ b/apps/mobile/package.json
@@ -25,7 +25,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 8",
+    "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)\"",
@@ -77,14 +77,16 @@
     "@uniswap/analytics": "1.7.0",
     "@uniswap/analytics-events": "2.29.0",
     "@uniswap/ethers-rs-mobile": "0.0.5",
+    "@uniswap/permit2-sdk": "1.2.0",
+    "@uniswap/router-sdk": "1.7.1",
     "@uniswap/sdk-core": "4.0.7",
-    "@uniswap/v3-sdk": "3.10.2",
+    "@uniswap/universal-router-sdk": "1.5.8",
+    "@uniswap/v3-sdk": "3.10.0",
     "@walletconnect/core": "2.10.1",
     "@walletconnect/react-native-compat": "2.10.1",
     "@walletconnect/utils": "2.10.1",
     "@walletconnect/web3wallet": "1.9.1",
     "apollo3-cache-persist": "0.14.1",
-    "axios": "1.6.5",
     "babel-plugin-transform-inline-environment-variables": "0.4.4",
     "babel-plugin-transform-remove-console": "6.9.4",
     "cross-fetch": "3.1.5",
@@ -94,6 +96,7 @@
     "expo-av": "13.4.1",
     "expo-barcode-scanner": "12.7.0",
     "expo-blur": "12.2.2",
+    "expo-clipboard": "4.1.2",
     "expo-haptics": "12.0.1",
     "expo-linear-gradient": "12.3.0",
     "expo-linking": "4.0.1",
@@ -102,7 +105,9 @@
     "expo-modules-core": "1.5.8",
     "expo-screen-capture": "4.2.0",
     "expo-store-review": "~6.2.1",
+    "expo-web-browser": "12.0.0",
     "fuse.js": "6.5.3",
+    "jsbi": "3.2.5",
     "lodash": "4.17.21",
     "no-yolo-signatures": "0.0.2",
     "qrcode": "1.5.1",
@@ -124,7 +129,7 @@
     "react-native-onesignal": "4.5.2",
     "react-native-pager-view": "6.0.1",
     "react-native-permissions": "3.6.0",
-    "react-native-reanimated": "3.6.2",
+    "react-native-reanimated": "3.3.0",
     "react-native-restart": "0.0.27",
     "react-native-safe-area-context": "4.5.0",
     "react-native-screens": "3.24.0",
@@ -147,7 +152,7 @@
     "wallet": "workspace:^"
   },
   "devDependencies": {
-    "@babel/core": "^7.20.5",
+    "@babel/core": "7.12.9",
     "@babel/plugin-proposal-export-namespace-from": "7.18.9",
     "@babel/plugin-proposal-logical-assignment-operators": "7.16.7",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
@@ -160,7 +165,6 @@
     "@testing-library/react-native": "11.5.0",
     "@types/react-native": "0.71.3",
     "@types/redux-mock-store": "1.0.6",
-    "@uniswap/eslint-config": "workspace:^",
     "@walletconnect/types": "2.8.6",
     "@welldone-software/why-did-you-render": "7.0.1",
     "babel-jest": "29.6.1",
@@ -191,7 +195,7 @@
     "react-test-renderer": "18.2.0",
     "redux-flipper": "2.0.2",
     "redux-saga-test-plan": "4.0.4",
-    "typescript": "5.3.3",
+    "typescript": "4.9.4",
     "yarn-deduplicate": "6.0.0"
   },
   "expo": {
diff --git a/apps/mobile/scripts/podinstall.sh b/apps/mobile/scripts/podinstall.sh
index e6b5f42feaa..fccd389c4f5 100755
--- a/apps/mobile/scripts/podinstall.sh
+++ b/apps/mobile/scripts/podinstall.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-cd ios/ && bundle install && bundle exec pod install && cd ..
+cd ios/ && bundle exec pod install && cd ..
diff --git a/apps/mobile/src/app/App.tsx b/apps/mobile/src/app/App.tsx
index 1aba9b58c46..d379daa3479 100644
--- a/apps/mobile/src/app/App.tsx
+++ b/apps/mobile/src/app/App.tsx
@@ -2,7 +2,7 @@ import { ApolloProvider } from '@apollo/client'
 import { BottomSheetModalProvider } from '@gorhom/bottom-sheet'
 import * as Sentry from '@sentry/react-native'
 import { PerformanceProfiler, RenderPassReport } from '@shopify/react-native-performance'
-import { PropsWithChildren, default as React, StrictMode, useCallback, useEffect } from 'react'
+import { default as React, PropsWithChildren, StrictMode, useCallback, useEffect } from 'react'
 import { NativeModules, StatusBar } from 'react-native'
 import appsFlyer from 'react-native-appsflyer'
 import { getUniqueId } from 'react-native-device-info'
@@ -11,16 +11,15 @@ import { SafeAreaProvider } from 'react-native-safe-area-context'
 import { enableFreeze } from 'react-native-screens'
 import { PersistGate } from 'redux-persist/integration/react'
 import { ErrorBoundary } from 'src/app/ErrorBoundary'
-import { MobileWalletNavigationProvider } from 'src/app/MobileWalletNavigationProvider'
 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'
 import { AppStackNavigator } from 'src/app/navigation/navigation'
+import { NavigationContainer } from 'src/app/navigation/NavigationContainer'
 import { persistor, store } from 'src/app/store'
+import { OfflineBanner } from 'src/components/banners/OfflineBanner'
 import Trace from 'src/components/Trace/Trace'
 import { TraceUserProperties } from 'src/components/Trace/TraceUserProperties'
-import { OfflineBanner } from 'src/components/banners/OfflineBanner'
 import { usePersistedApolloClient } from 'src/data/usePersistedApolloClient'
 import { initAppsFlyer } from 'src/features/analytics/appsflyer'
 import { LockScreenContextProvider } from 'src/features/authentication/lockScreenContext'
@@ -31,6 +30,7 @@ import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
 import { MobileEventName } from 'src/features/telemetry/constants'
 import { shouldLogScreen } from 'src/features/telemetry/directLogScreens'
 import { selectAllowAnalytics } from 'src/features/telemetry/selectors'
+import { TransactionHistoryUpdater } from 'src/features/transactions/TransactionHistoryUpdater'
 import {
   processWidgetEvents,
   setAccountAddressesUserDefaults,
@@ -40,22 +40,20 @@ import {
 import { useAppStateTrigger } from 'src/utils/useAppStateTrigger'
 import { getSentryEnvironment, getStatsigEnvironmentTier } from 'src/utils/version'
 import { Statsig, StatsigProvider } from 'statsig-react-native'
-import { flexStyles, useIsDarkMode } from 'ui/src'
+import { flexStyles } from 'ui/src'
 import { registerConsoleOverrides } from 'utilities/src/logger/console'
 import { logger } from 'utilities/src/logger/logger'
 import { useAsyncData } from 'utilities/src/react/hooks'
 import { AnalyticsNavigationContextProvider } from 'utilities/src/telemetry/trace/AnalyticsNavigationContext'
 import { config } from 'wallet/src/config'
 import { uniswapUrls } from 'wallet/src/constants/urls'
-import { useCurrentAppearanceSetting } from 'wallet/src/features/appearance/hooks'
+import { useCurrentAppearanceSetting, useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { EXPERIMENT_NAMES, FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
 import { selectFavoriteTokens } from 'wallet/src/features/favorites/selectors'
 import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
-import { LocalizationContextProvider } from 'wallet/src/features/language/LocalizationContext'
 import { useCurrentLanguageInfo } from 'wallet/src/features/language/hooks'
+import { LocalizationContextProvider } from 'wallet/src/features/language/LocalizationContext'
 import { updateLanguage } from 'wallet/src/features/language/slice'
-import { TransactionHistoryUpdater } from 'wallet/src/features/transactions/TransactionHistoryUpdater'
-import { UnitagUpdaterContextProvider } from 'wallet/src/features/unitags/context'
 import { Account } from 'wallet/src/features/wallet/accounts/types'
 import { WalletContextProvider } from 'wallet/src/features/wallet/context'
 import { useAccounts } from 'wallet/src/features/wallet/hooks'
@@ -187,29 +185,25 @@ function AppOuter(): JSX.Element | null {
           <LocalizationContextProvider>
             <GestureHandlerRootView style={flexStyles.fill}>
               <WalletContextProvider>
-                <UnitagUpdaterContextProvider>
-                  <BiometricContextProvider>
-                    <LockScreenContextProvider>
-                      <Sentry.TouchEventBoundary>
-                        <DataUpdaters />
-                        <NavigationContainer
-                          onReady={(navigationRef): void => {
-                            routingInstrumentation.registerNavigationContainer(navigationRef)
-                          }}>
-                          <MobileWalletNavigationProvider>
-                            <BottomSheetModalProvider>
-                              <AppModals />
-                              <PerformanceProfiler onReportPrepared={onReportPrepared}>
-                                <AppInner />
-                              </PerformanceProfiler>
-                            </BottomSheetModalProvider>
-                            <NotificationToastWrapper />
-                          </MobileWalletNavigationProvider>
-                        </NavigationContainer>
-                      </Sentry.TouchEventBoundary>
-                    </LockScreenContextProvider>
-                  </BiometricContextProvider>
-                </UnitagUpdaterContextProvider>
+                <BiometricContextProvider>
+                  <LockScreenContextProvider>
+                    <Sentry.TouchEventBoundary>
+                      <DataUpdaters />
+                      <NavigationContainer
+                        onReady={(navigationRef): void => {
+                          routingInstrumentation.registerNavigationContainer(navigationRef)
+                        }}>
+                        <BottomSheetModalProvider>
+                          <AppModals />
+                          <PerformanceProfiler onReportPrepared={onReportPrepared}>
+                            <AppInner />
+                          </PerformanceProfiler>
+                        </BottomSheetModalProvider>
+                        <NotificationToastWrapper />
+                      </NavigationContainer>
+                    </Sentry.TouchEventBoundary>
+                  </LockScreenContextProvider>
+                </BiometricContextProvider>
               </WalletContextProvider>
             </GestureHandlerRootView>
           </LocalizationContextProvider>
diff --git a/apps/mobile/src/app/MobileWalletNavigationProvider.tsx b/apps/mobile/src/app/MobileWalletNavigationProvider.tsx
deleted file mode 100644
index 5fa97542348..00000000000
--- a/apps/mobile/src/app/MobileWalletNavigationProvider.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import { PropsWithChildren, useCallback } from 'react'
-import { useAppDispatch } from 'src/app/hooks'
-import { useAppStackNavigation } from 'src/app/navigation/types'
-import { closeModal, openModal } from 'src/features/modals/modalSlice'
-import { HomeScreenTabIndex } from 'src/screens/HomeScreenTabIndex'
-import { Screens } from 'src/screens/Screens'
-import {
-  NavigateToSwapFlowArgs,
-  WalletNavigationProvider,
-} from 'wallet/src/contexts/WalletNavigationContext'
-import { ModalName } from 'wallet/src/telemetry/constants'
-
-export function MobileWalletNavigationProvider({ children }: PropsWithChildren): JSX.Element {
-  const navigateToAccountTokenList = useNavigateToHomepageTab(HomeScreenTabIndex.Tokens)
-  const navigateToAccountActivityList = useNavigateToHomepageTab(HomeScreenTabIndex.Activity)
-  const navigateToSwapFlow = useNavigateToSwapFlow()
-  const navigateToTokenDetails = useNavigateToTokenDetails()
-
-  return (
-    <WalletNavigationProvider
-      navigateToAccountActivityList={navigateToAccountActivityList}
-      navigateToAccountTokenList={navigateToAccountTokenList}
-      navigateToSwapFlow={navigateToSwapFlow}
-      navigateToTokenDetails={navigateToTokenDetails}>
-      {children}
-    </WalletNavigationProvider>
-  )
-}
-
-function useNavigateToHomepageTab(tab: HomeScreenTabIndex): () => void {
-  const { navigate } = useAppStackNavigation()
-
-  return useCallback((): void => {
-    navigate(Screens.Home, { tab })
-  }, [navigate, tab])
-}
-
-function useNavigateToSwapFlow(): (args: NavigateToSwapFlowArgs) => void {
-  const dispatch = useAppDispatch()
-
-  return useCallback(
-    (args: NavigateToSwapFlowArgs): void => {
-      const initialState = args?.initialState
-
-      dispatch(closeModal({ name: ModalName.Swap }))
-      dispatch(openModal({ name: ModalName.Swap, initialState }))
-    },
-    [dispatch]
-  )
-}
-
-function useNavigateToTokenDetails(): (currencyId: string) => void {
-  const navigation = useAppStackNavigation()
-
-  return useCallback(
-    (currencyId: string): void => {
-      navigation.navigate(Screens.TokenDetails, { currencyId })
-    },
-    [navigation]
-  )
-}
diff --git a/apps/mobile/src/app/hooks.test.ts b/apps/mobile/src/app/hooks.test.ts
index c6eaa5616de..51553933924 100644
--- a/apps/mobile/src/app/hooks.test.ts
+++ b/apps/mobile/src/app/hooks.test.ts
@@ -1,7 +1,7 @@
 import { renderHook } from '@testing-library/react-hooks'
 import { LayoutChangeEvent } from 'react-native'
 import { act } from 'react-test-renderer'
-import { useShouldShowNativeKeyboard } from './hooks'
+import { useDynamicFontSizing, useShouldShowNativeKeyboard } from './hooks'
 
 describe(useShouldShowNativeKeyboard, () => {
   it('returns false if layout calculation is pending', () => {
@@ -50,3 +50,58 @@ describe(useShouldShowNativeKeyboard, () => {
     expect(result.current.isLayoutPending).toBe(false)
   })
 })
+
+const MAX_INPUT_FONT_SIZE = 42
+const MIN_INPUT_FONT_SIZE = 28
+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)
+    )
+
+    expect(result.current.fontSize).toBe(MAX_INPUT_FONT_SIZE)
+  })
+
+  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)
+    )
+
+    await act(() => {
+      result.current.onLayout({ nativeEvent: { layout: { width: 100 } } } as LayoutChangeEvent)
+      result.current.onSetFontSize('aaaa')
+    })
+
+    // 100 / 23 = 4.34 - 4 letters should fit in the container
+    expect(result.current.fontSize).toBe(MAX_INPUT_FONT_SIZE)
+  })
+
+  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)
+    )
+
+    await act(() => {
+      result.current.onLayout({ nativeEvent: { layout: { width: 100 } } } as LayoutChangeEvent)
+      result.current.onSetFontSize('aaaaa')
+    })
+
+    // 100 / 23 = 4.34 - 5 letters should not fit in the container
+    expect(result.current.fontSize).toBeLessThan(MAX_INPUT_FONT_SIZE)
+  })
+
+  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)
+    )
+
+    await act(() => {
+      result.current.onLayout({ nativeEvent: { layout: { width: 100 } } } as LayoutChangeEvent)
+      result.current.onSetFontSize('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    })
+
+    expect(result.current.fontSize).toBe(MIN_INPUT_FONT_SIZE)
+  })
+})
diff --git a/apps/mobile/src/app/hooks.ts b/apps/mobile/src/app/hooks.ts
index b7b14968c6c..5106a0ac454 100644
--- a/apps/mobile/src/app/hooks.ts
+++ b/apps/mobile/src/app/hooks.ts
@@ -1,5 +1,5 @@
 import { ThunkDispatch } from '@reduxjs/toolkit'
-import { useState } from 'react'
+import { useCallback, useRef, useState } from 'react'
 import { LayoutChangeEvent } from 'react-native'
 import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux'
 import type { AppDispatch } from 'src/app/store'
@@ -59,3 +59,48 @@ export function useShouldShowNativeKeyboard(): {
       isLayoutPending || showNativeKeyboard ? undefined : decimalPadY - MIN_INPUT_DECIMAL_PAD_GAP,
   }
 }
+
+export function useDynamicFontSizing(
+  maxCharWidthAtMaxFontSize: number,
+  maxFontSize: number,
+  minFontSize: number
+): {
+  onLayout: (event: LayoutChangeEvent) => void
+  fontSize: number
+  onSetFontSize: (amount: string) => void
+} {
+  const [fontSize, setFontSize] = useState(maxFontSize)
+  const textInputElementWidthRef = useRef(0)
+
+  const onLayout = useCallback((event: LayoutChangeEvent) => {
+    if (textInputElementWidthRef.current) {
+      return
+    }
+
+    const width = event.nativeEvent.layout.width
+    textInputElementWidthRef.current = width
+  }, [])
+
+  const onSetFontSize = useCallback(
+    (amount: string) => {
+      const stringWidth = getStringWidth(amount, maxCharWidthAtMaxFontSize, fontSize, maxFontSize)
+      const scaledSize = fontSize * (textInputElementWidthRef.current / stringWidth)
+      const scaledSizeWithMin = Math.max(scaledSize, minFontSize)
+      const newFontSize = Math.round(Math.min(maxFontSize, scaledSizeWithMin))
+      setFontSize(newFontSize)
+    },
+    [fontSize, maxFontSize, minFontSize, maxCharWidthAtMaxFontSize]
+  )
+
+  return { onLayout, fontSize, onSetFontSize }
+}
+
+const getStringWidth = (
+  value: string,
+  maxCharWidthAtMaxFontSize: number,
+  currentFontSize: number,
+  maxFontSize: number
+): number => {
+  const widthAtMaxFontSize = value.length * maxCharWidthAtMaxFontSize
+  return widthAtMaxFontSize * (currentFontSize / maxFontSize)
+}
diff --git a/apps/mobile/src/app/migrations.test.ts b/apps/mobile/src/app/migrations.test.ts
index 4e5500d58cb..e9528c35a80 100644
--- a/apps/mobile/src/app/migrations.test.ts
+++ b/apps/mobile/src/app/migrations.test.ts
@@ -64,21 +64,22 @@ import {
 } from 'src/app/schema'
 import { persistConfig } from 'src/app/store'
 import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
+import { initialBehaviorHistoryState } from 'src/features/behaviorHistory/slice'
 import { initialBiometricsSettingsState } from 'src/features/biometrics/slice'
 import { initialCloudBackupState } from 'src/features/CloudBackup/cloudBackupSlice'
 import { initialPasswordLockoutState } from 'src/features/CloudBackup/passwordLockoutSlice'
+import { initialSearchHistoryState } from 'src/features/explore/searchHistorySlice'
 import { initialModalState } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { initialTelemetryState } from 'src/features/telemetry/slice'
+import { initialTokensState } from 'src/features/tokens/tokensSlice'
 import { initialTweaksState } from 'src/features/tweaks/slice'
 import { initialWalletConnectState } from 'src/features/walletConnect/walletConnectSlice'
 import { ChainId } from 'wallet/src/constants/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,
   TransactionStateMap,
@@ -94,7 +95,6 @@ import {
   SignerMnemonicAccount,
 } from 'wallet/src/features/wallet/accounts/types'
 import { initialWalletState, SwapProtectionSetting } from 'wallet/src/features/wallet/slice'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { account, fiatOnRampTxDetailsFailed, txDetailsConfirmed } from 'wallet/src/test/fixtures'
 
 // helps with object assignment
diff --git a/apps/mobile/src/app/migrations.ts b/apps/mobile/src/app/migrations.ts
index b6daca9dbf8..fe3b81f4842 100644
--- a/apps/mobile/src/app/migrations.ts
+++ b/apps/mobile/src/app/migrations.ts
@@ -4,6 +4,7 @@
 /* eslint-disable max-lines */
 
 import dayjs from 'dayjs'
+import { ModalName } from 'src/features/telemetry/constants'
 import { ChainId } from 'wallet/src/constants/chains'
 import { toSupportedChainId } from 'wallet/src/features/chains/utils'
 import { AccountToNftData } from 'wallet/src/features/favorites/slice'
@@ -18,7 +19,6 @@ import {
 } from 'wallet/src/features/transactions/types'
 import { Account, AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { SwapProtectionSetting } from 'wallet/src/features/wallet/slice'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export const OLD_DEMO_ACCOUNT_ADDRESS = '0xdd0E380579dF30E38524F9477808d9eE37E2dEa6'
 
diff --git a/apps/mobile/src/app/modals/AccountSwitcherModal.test.tsx b/apps/mobile/src/app/modals/AccountSwitcherModal.test.tsx
index 163656e96a9..a04e9f1f8b6 100644
--- a/apps/mobile/src/app/modals/AccountSwitcherModal.test.tsx
+++ b/apps/mobile/src/app/modals/AccountSwitcherModal.test.tsx
@@ -4,8 +4,8 @@ import { PreloadedState } from 'redux'
 import { AccountSwitcher } from 'src/app/modals/AccountSwitcherModal'
 import { MobileState } from 'src/app/reducer'
 import { initialModalState } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { render } from 'src/test/test-utils'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { mockWalletPreloadedState } from 'wallet/src/test/fixtures'
 import { noOpFunction } from 'wallet/src/test/utils'
 
diff --git a/apps/mobile/src/app/modals/AccountSwitcherModal.tsx b/apps/mobile/src/app/modals/AccountSwitcherModal.tsx
index 2d36d7ce790..67bba85f982 100644
--- a/apps/mobile/src/app/modals/AccountSwitcherModal.tsx
+++ b/apps/mobile/src/app/modals/AccountSwitcherModal.tsx
@@ -1,14 +1,19 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react'
+import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Alert } from 'react-native'
 import { Action } from 'redux'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { AccountList } from 'src/components/accounts/AccountList'
+import { AddressDisplay } from 'src/components/AddressDisplay'
+import { ActionSheetModal, MenuItemProp } from 'src/components/modals/ActionSheetModal'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { isCloudStorageAvailable } from 'src/features/CloudBackup/RNCloudStorageBackupsManager'
 import { closeModal, openModal } from 'src/features/modals/modalSlice'
 import { selectModalState } from 'src/features/modals/selectModalState'
-import { OnboardingScreens, Screens, UnitagScreens } from 'src/screens/Screens'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
+import { OnboardingScreens, Screens } from 'src/screens/Screens'
+import { openSettings } from 'src/utils/linking'
 import {
   Button,
   Flex,
@@ -20,12 +25,7 @@ import {
   useSporeColors,
 } from 'ui/src'
 import { spacing } from 'ui/src/theme'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
-import { ActionSheetModal, MenuItemProp } from 'wallet/src/components/modals/ActionSheetModal'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
 import { ImportType, OnboardingEntryPoint } from 'wallet/src/features/onboarding/types'
-import { useUnitagUpdater } from 'wallet/src/features/unitags/context'
-import { useCanAddressClaimUnitag } from 'wallet/src/features/unitags/hooks'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { createAccountActions } from 'wallet/src/features/wallet/create/createAccountSaga'
 import {
@@ -35,8 +35,6 @@ import {
 import { useActiveAccountAddress, useNativeAccountExists } from 'wallet/src/features/wallet/hooks'
 import { selectAllAccountsSorted } from 'wallet/src/features/wallet/selectors'
 import { setAccountAsActive } from 'wallet/src/features/wallet/slice'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
-import { openSettings } from 'wallet/src/utils/linking'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 export function AccountSwitcherModal(): JSX.Element {
@@ -71,18 +69,11 @@ export function AccountSwitcher({ onClose }: { onClose: () => void }): JSX.Eleme
   const dispatch = useAppDispatch()
   const hasImportedSeedPhrase = useNativeAccountExists()
   const modalState = useAppSelector(selectModalState(ModalName.AccountSwitcher))
-  const { refetchUnitagsCounter } = useUnitagUpdater()
-  const { canClaimUnitag, refetch: refetchCanAddressClaimUnitag } = useCanAddressClaimUnitag()
 
   const [showAddWalletModal, setShowAddWalletModal] = useState(false)
 
   const accounts = useAppSelector(selectAllAccountsSorted)
 
-  // Force refetch of canClaimUnitag if refetchUnitagsCounter changes
-  useEffect(() => {
-    refetchCanAddressClaimUnitag?.()
-  }, [refetchUnitagsCounter, refetchCanAddressClaimUnitag])
-
   const onPressAccount = useCallback(
     (address: Address) => {
       onClose()
@@ -121,13 +112,12 @@ export function AccountSwitcher({ onClose }: { onClose: () => void }): JSX.Eleme
       dispatch(createAccountActions.trigger())
 
       navigate(Screens.OnboardingStack, {
-        screen: canClaimUnitag ? UnitagScreens.ClaimUnitag : OnboardingScreens.EditName,
+        screen: OnboardingScreens.EditName,
         params: {
-          entryPoint: OnboardingEntryPoint.Sidebar,
           importType: hasImportedSeedPhrase ? ImportType.CreateAdditional : ImportType.CreateNew,
+          entryPoint: OnboardingEntryPoint.Sidebar,
         },
       })
-
       setShowAddWalletModal(false)
       onClose()
     }
@@ -187,7 +177,7 @@ export function AccountSwitcher({ onClose }: { onClose: () => void }): JSX.Eleme
       onClose()
     }
 
-    const options: MenuItemProp[] = [
+    const options = [
       {
         key: ElementName.CreateAccount,
         onPress: onPressCreateNewWallet,
@@ -236,7 +226,7 @@ export function AccountSwitcher({ onClose }: { onClose: () => void }): JSX.Eleme
     }
 
     return options
-  }, [activeAccountAddress, canClaimUnitag, dispatch, hasImportedSeedPhrase, onClose, t])
+  }, [activeAccountAddress, dispatch, hasImportedSeedPhrase, onClose, t])
 
   const accountsWithoutActive = accounts.filter((a) => a.address !== activeAccountAddress)
 
diff --git a/apps/mobile/src/app/modals/AppModals.tsx b/apps/mobile/src/app/modals/AppModals.tsx
index 59a0888f4a5..66a11eac62c 100644
--- a/apps/mobile/src/app/modals/AppModals.tsx
+++ b/apps/mobile/src/app/modals/AppModals.tsx
@@ -2,7 +2,6 @@ import React from 'react'
 import { AccountSwitcherModal } from 'src/app/modals/AccountSwitcherModal'
 import { ExperimentsModal } from 'src/app/modals/ExperimentsModal'
 import { ExploreModal } from 'src/app/modals/ExploreModal'
-import { FiatOnRampAggregatorModal } from 'src/app/modals/FiatOnRampModalAggregator'
 import { SwapModal } from 'src/app/modals/SwapModal'
 import { TransferTokenModal } from 'src/app/modals/TransferTokenModal'
 import { LazyModalRenderer } from 'src/app/modals/utils'
@@ -13,11 +12,11 @@ import { RestoreWalletModal } from 'src/components/RestoreWalletModal/RestoreWal
 import { UnitagsIntroModal } from 'src/components/unitags/UnitagsIntroModal'
 import { WalletConnectModals } from 'src/components/WalletConnect/WalletConnectModals'
 import { LockScreenModal } from 'src/features/authentication/LockScreenModal'
+import { FiatOnRampAggregatorModal } from 'src/features/fiatOnRamp/FiatOnRampAggregatorModal'
 import { FiatOnRampModal } from 'src/features/fiatOnRamp/FiatOnRampModal'
-import { ScantasticModal } from 'src/features/scantastic/ScantasticModal'
+import { ModalName } from 'src/features/telemetry/constants'
 import { SettingsFiatCurrencyModal } from 'src/screens/SettingsFiatCurrencyModal'
 import { SettingsLanguageModal } from 'src/screens/SettingsLanguageModal'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export function AppModals(): JSX.Element {
   return (
@@ -42,10 +41,6 @@ export function AppModals(): JSX.Element {
 
       <LockScreenModal />
 
-      <LazyModalRenderer name={ModalName.Scantastic}>
-        <ScantasticModal />
-      </LazyModalRenderer>
-
       <LazyModalRenderer name={ModalName.Swap}>
         <SwapModal />
       </LazyModalRenderer>
diff --git a/apps/mobile/src/app/modals/ExperimentsModal.tsx b/apps/mobile/src/app/modals/ExperimentsModal.tsx
index ca79561fd3d..93d32ae386a 100644
--- a/apps/mobile/src/app/modals/ExperimentsModal.tsx
+++ b/apps/mobile/src/app/modals/ExperimentsModal.tsx
@@ -3,7 +3,11 @@ import React, { useState } from 'react'
 import { ScrollView } from 'react-native-gesture-handler'
 import { Action } from 'redux'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { Switch } from 'src/components/buttons/Switch'
+import { TextInput } from 'src/components/input/TextInput'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { closeModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { selectCustomEndpoint } from 'src/features/tweaks/selectors'
 import { setCustomEndpoint } from 'src/features/tweaks/slice'
 import {
@@ -22,16 +26,12 @@ import {
   useSporeColors,
 } from 'ui/src'
 import { spacing } from 'ui/src/theme'
-import { Switch } from 'wallet/src/components/buttons/Switch'
-import { TextInput } from 'wallet/src/components/input/TextInput'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
 import {
   EXPERIMENT_NAMES,
   EXPERIMENT_VALUES_BY_EXPERIMENT,
   FEATURE_FLAGS,
 } from 'wallet/src/features/experiments/constants'
 import { useFeatureFlagWithExposureLoggingDisabled } from 'wallet/src/features/experiments/hooks'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export function ExperimentsModal(): JSX.Element {
   const insets = useDeviceInsets()
@@ -193,7 +193,6 @@ function ExperimentRow({ name }: { name: string }): JSX.Element {
 
   const params = Object.entries(experiment.config.value).map(([key, value]) => (
     <Flex
-      key={key}
       row
       alignItems="center"
       gap="$spacing16"
diff --git a/apps/mobile/src/app/modals/ExploreModal.tsx b/apps/mobile/src/app/modals/ExploreModal.tsx
index b588ac0c592..654d613e8f4 100644
--- a/apps/mobile/src/app/modals/ExploreModal.tsx
+++ b/apps/mobile/src/app/modals/ExploreModal.tsx
@@ -1,10 +1,10 @@
 import React from 'react'
 import { useAppDispatch } from 'src/app/hooks'
 import { ExploreStackNavigator } from 'src/app/navigation/navigation'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { closeModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { useSporeColors } from 'ui/src'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export function ExploreModal(): JSX.Element {
   const colors = useSporeColors()
diff --git a/apps/mobile/src/app/modals/FiatOnRampModalAggregator.tsx b/apps/mobile/src/app/modals/FiatOnRampModalAggregator.tsx
deleted file mode 100644
index a5f70080157..00000000000
--- a/apps/mobile/src/app/modals/FiatOnRampModalAggregator.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import React, { useCallback } from 'react'
-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'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { ModalName } from 'wallet/src/telemetry/constants'
-
-export function FiatOnRampAggregatorModal(): JSX.Element {
-  const colors = useSporeColors()
-
-  const dispatch = useAppDispatch()
-  const onClose = useCallback((): void => {
-    dispatch(closeModal({ name: ModalName.FiatOnRampAggregator }))
-  }, [dispatch])
-
-  return (
-    <BottomSheetModal
-      fullScreen
-      hideHandlebar
-      hideKeyboardOnDismiss
-      renderBehindTopInset
-      backgroundColor={colors.surface1.get()}
-      // Don't dismiss on back press, as this modal is used for the FiatOnRampStack navigation.
-      // (the modal should be dismissed only when the user navigates to the initial FiatOnRamp screen)
-      dismissOnBackPress={false}
-      name={ModalName.FiatOnRampAggregator}
-      onClose={onClose}>
-      <FiatOnRampStackNavigator />
-    </BottomSheetModal>
-  )
-}
diff --git a/apps/mobile/src/app/modals/SwapModal.tsx b/apps/mobile/src/app/modals/SwapModal.tsx
index 54391180964..fa68a38234b 100644
--- a/apps/mobile/src/app/modals/SwapModal.tsx
+++ b/apps/mobile/src/app/modals/SwapModal.tsx
@@ -1,28 +1,19 @@
-import React, { useCallback, useEffect, useMemo } from 'react'
+import React, { useCallback, useEffect } from 'react'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
-import { BiometricsIcon } from 'src/components/icons/BiometricsIcon'
-import {
-  useBiometricAppSettings,
-  useBiometricPrompt,
-  useOsBiometricAuthEnabled,
-} from 'src/features/biometrics/hooks'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { selectModalState } from 'src/features/modals/selectModalState'
+import { ModalName } from 'src/features/telemetry/constants'
+import { updateSwapStartTimestamp } from 'src/features/telemetry/timing/slice'
 import { SwapFlow } from 'src/features/transactions/swap/SwapFlow'
-import { getFocusOnCurrencyFieldFromInitialState } from 'src/features/transactions/swapRewrite/utils'
-import { useWalletRestore } from 'src/features/wallet/hooks'
+import { SwapFlow as SwapFlowRewrite } from 'src/features/transactions/swapRewrite/SwapFlow'
 import { useSporeColors } from 'ui/src'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
 import { useSwapRewriteEnabled } from 'wallet/src/features/experiments/hooks'
-import { SwapFormState } from 'wallet/src/features/transactions/contexts/SwapFormContext'
-import { SwapFlow as SwapFlowRewrite } from 'wallet/src/features/transactions/swap/SwapFlow'
-import { ModalName } from 'wallet/src/telemetry/constants'
-import { updateSwapStartTimestamp } from 'wallet/src/telemetry/timing/slice'
 
 export function SwapModal(): JSX.Element {
   const colors = useSporeColors()
   const appDispatch = useAppDispatch()
-  const { initialState } = useAppSelector(selectModalState(ModalName.Swap))
+  const modalState = useAppSelector(selectModalState(ModalName.Swap))
 
   const shouldShowSwapRewrite = useSwapRewriteEnabled()
 
@@ -35,40 +26,8 @@ export function SwapModal(): JSX.Element {
     appDispatch(updateSwapStartTimestamp({ timestamp: Date.now() }))
   }, [appDispatch])
 
-  const { openWalletRestoreModal, walletNeedsRestore } = useWalletRestore()
-
-  const swapRewritePrefilledState = useMemo(
-    (): SwapFormState | undefined =>
-      initialState
-        ? {
-            customSlippageTolerance: initialState.customSlippageTolerance,
-            exactAmountFiat: initialState.exactAmountFiat,
-            exactAmountToken: initialState.exactAmountToken,
-            exactCurrencyField: initialState.exactCurrencyField,
-            focusOnCurrencyField: getFocusOnCurrencyFieldFromInitialState(initialState),
-            input: initialState.input ?? undefined,
-            output: initialState.output ?? undefined,
-            selectingCurrencyField: initialState.selectingCurrencyField,
-            txId: initialState.txId,
-            isFiatMode: false,
-            isSubmitting: false,
-          }
-        : undefined,
-    [initialState]
-  )
-
-  const { requiredForTransactions: requiresBiometrics } = useBiometricAppSettings()
-  const { trigger: biometricsTrigger } = useBiometricPrompt()
-
   return shouldShowSwapRewrite ? (
-    <SwapFlowRewrite
-      BiometricsIcon={<SwapBiometricsIcon />}
-      authTrigger={requiresBiometrics ? biometricsTrigger : undefined}
-      openWalletRestoreModal={openWalletRestoreModal}
-      prefilledState={swapRewritePrefilledState}
-      walletNeedsRestore={Boolean(walletNeedsRestore)}
-      onClose={onClose}
-    />
+    <SwapFlowRewrite />
   ) : (
     <BottomSheetModal
       fullScreen
@@ -78,14 +37,7 @@ export function SwapModal(): JSX.Element {
       backgroundColor={colors.surface1.get()}
       name={ModalName.Swap}
       onClose={onClose}>
-      <SwapFlow prefilledState={initialState} onClose={onClose} />
+      <SwapFlow prefilledState={modalState.initialState} onClose={onClose} />
     </BottomSheetModal>
   )
 }
-
-function SwapBiometricsIcon(): JSX.Element | null {
-  const isBiometricAuthEnabled = useOsBiometricAuthEnabled()
-  const { requiredForTransactions } = useBiometricAppSettings()
-
-  return isBiometricAuthEnabled && requiredForTransactions ? <BiometricsIcon /> : null
-}
diff --git a/apps/mobile/src/app/modals/TransferTokenModal.tsx b/apps/mobile/src/app/modals/TransferTokenModal.tsx
index c6b07f9a73e..1a42da7bd7d 100644
--- a/apps/mobile/src/app/modals/TransferTokenModal.tsx
+++ b/apps/mobile/src/app/modals/TransferTokenModal.tsx
@@ -1,14 +1,14 @@
 import React, { useCallback } from 'react'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { selectModalState } from 'src/features/modals/selectModalState'
+import { ModalName } from 'src/features/telemetry/constants'
 import { TransferFlow as TransferFlowRewrite } from 'src/features/transactions/swapRewrite/transfer/TransferFlow'
 import { TransferFlow } from 'src/features/transactions/transfer/TransferFlow'
 import { useSporeColors } from 'ui/src'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
 import { FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
 import { useFeatureFlag } from 'wallet/src/features/experiments/hooks'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export function TransferTokenModal(): JSX.Element {
   const colors = useSporeColors()
diff --git a/apps/mobile/src/app/modals/ViewOnlyExplainerModal.tsx b/apps/mobile/src/app/modals/ViewOnlyExplainerModal.tsx
index 5ca15a28a93..0824b03d119 100644
--- a/apps/mobile/src/app/modals/ViewOnlyExplainerModal.tsx
+++ b/apps/mobile/src/app/modals/ViewOnlyExplainerModal.tsx
@@ -1,15 +1,16 @@
 import { useTranslation } from 'react-i18next'
 import { navigate } from 'src/app/navigation/rootNavigation'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { closeModal, openModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { OnboardingScreens, Screens } from 'src/screens/Screens'
-import { Button, Flex, Text, useIsDarkMode } from 'ui/src'
+import { Button, Flex, Text } from 'ui/src'
 import ViewOnlyWalletDark from 'ui/src/assets/graphics/view-only-wallet-dark.svg'
 import ViewOnlyWalletLight from 'ui/src/assets/graphics/view-only-wallet-light.svg'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { ImportType, OnboardingEntryPoint } from 'wallet/src/features/onboarding/types'
 import { useActiveAccountAddress, useNativeAccountExists } from 'wallet/src/features/wallet/hooks'
 import { useAppDispatch } from 'wallet/src/state'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 const WALLET_IMAGE_ASPECT_RATIO = 327 / 215
 
diff --git a/apps/mobile/src/app/modals/__snapshots__/AccountSwitcherModal.test.tsx.snap b/apps/mobile/src/app/modals/__snapshots__/AccountSwitcherModal.test.tsx.snap
index e7d65e4630b..e600b1d6b62 100644
--- a/apps/mobile/src/app/modals/__snapshots__/AccountSwitcherModal.test.tsx.snap
+++ b/apps/mobile/src/app/modals/__snapshots__/AccountSwitcherModal.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`AccountSwitcher renders correctly 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "flexDirection": "column",
       "maxHeight": NaN,
       "paddingBottom": 12,
@@ -13,6 +14,7 @@ exports[`AccountSwitcher renders correctly 1`] = `
   <View
     style={
       {
+        "alignItems": "stretch",
         "flexDirection": "column",
         "gap": 16,
         "paddingBottom": 16,
@@ -32,20 +34,12 @@ exports[`AccountSwitcher renders correctly 1`] = `
       <View
         style={
           {
+            "alignItems": "stretch",
             "backgroundColor": "transparent",
-            "borderBottomColor": "transparent",
             "borderBottomLeftRadius": 999999,
             "borderBottomRightRadius": 999999,
-            "borderBottomWidth": 0,
-            "borderLeftColor": "transparent",
-            "borderLeftWidth": 0,
-            "borderRightColor": "transparent",
-            "borderRightWidth": 0,
-            "borderStyle": "solid",
-            "borderTopColor": "transparent",
             "borderTopLeftRadius": 999999,
             "borderTopRightRadius": 999999,
-            "borderTopWidth": 0,
             "flexDirection": "column",
             "position": "relative",
           }
@@ -73,6 +67,7 @@ exports[`AccountSwitcher renders correctly 1`] = `
           <View
             style={
               {
+                "alignItems": "stretch",
                 "flexDirection": "column",
                 "height": 56,
                 "width": 56,
@@ -82,6 +77,7 @@ exports[`AccountSwitcher renders correctly 1`] = `
             <View
               style={
                 {
+                  "alignItems": "stretch",
                   "flexDirection": "column",
                   "height": 56,
                   "width": 56,
@@ -238,36 +234,24 @@ exports[`AccountSwitcher renders correctly 1`] = `
             }
           }
         >
-          <View
+          <Text
+            adjustsFontSizeToFit={true}
+            allowFontScaling={true}
+            maxFontSizeMultiplier={1.4}
+            numberOfLines={1}
             style={
               {
-                "alignItems": "center",
-                "flexDirection": "row",
-                "gap": 2,
-                "justifyContent": "center",
+                "color": "#222222",
+                "fontFamily": "Basel-Book",
+                "fontSize": 19,
+                "lineHeight": 24,
               }
             }
+            suppressHighlighting={true}
+            testID="address-display/name/Test Account"
           >
-            <Text
-              adjustsFontSizeToFit={true}
-              allowFontScaling={true}
-              maxFontSizeMultiplier={1.4}
-              numberOfLines={1}
-              style={
-                {
-                  "color": "#222222",
-                  "flexShrink": 1,
-                  "fontFamily": "Basel-Book",
-                  "fontSize": 19,
-                  "lineHeight": 24,
-                }
-              }
-              suppressHighlighting={true}
-              testID="address-display/name/Test Account"
-            >
-              Test Account
-            </Text>
-          </View>
+            Test Account
+          </Text>
         </View>
         <View
           accessibilityState={
@@ -404,6 +388,7 @@ exports[`AccountSwitcher renders correctly 1`] = `
     <View
       style={
         {
+          "alignItems": "stretch",
           "flexDirection": "column",
           "paddingLeft": 24,
           "paddingRight": 24,
@@ -472,6 +457,7 @@ exports[`AccountSwitcher renders correctly 1`] = `
   <View
     style={
       {
+        "alignItems": "stretch",
         "flexDirection": "column",
         "flexShrink": 1,
       }
@@ -574,6 +560,7 @@ exports[`AccountSwitcher renders correctly 1`] = `
       <View
         style={
           {
+            "alignItems": "stretch",
             "borderBottomColor": "#2222220D",
             "borderBottomLeftRadius": 999999,
             "borderBottomRightRadius": 999999,
diff --git a/apps/mobile/src/app/modals/utils.test.tsx b/apps/mobile/src/app/modals/utils.test.tsx
index 2ab8728c5d1..e9885e88fc2 100644
--- a/apps/mobile/src/app/modals/utils.test.tsx
+++ b/apps/mobile/src/app/modals/utils.test.tsx
@@ -4,8 +4,8 @@ import { Text } from 'react-native'
 import { LazyModalRenderer } from 'src/app/modals/utils'
 import { MobileState } from 'src/app/reducer'
 import { initialModalState } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { renderWithProviders } from 'src/test/render'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { mockWalletPreloadedState } from 'wallet/src/test/fixtures'
 
 const preloadedState = {
diff --git a/apps/mobile/src/app/navigation/NavBar.tsx b/apps/mobile/src/app/navigation/NavBar.tsx
index 7902366364f..53d7c68100d 100644
--- a/apps/mobile/src/app/navigation/NavBar.tsx
+++ b/apps/mobile/src/app/navigation/NavBar.tsx
@@ -16,6 +16,8 @@ import { useAppDispatch } from 'src/app/hooks'
 import { pulseAnimation } from 'src/components/buttons/utils'
 import { openModal } from 'src/features/modals/modalSlice'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
+import { prepareSwapFormState } from 'src/features/transactions/swap/utils'
 import { Screens } from 'src/screens/Screens'
 import {
   AnimatedFlex,
@@ -26,14 +28,12 @@ import {
   Text,
   TouchableArea,
   useDeviceInsets,
-  useIsDarkMode,
   useSporeColors,
 } from 'ui/src'
 import { borderRadii, fonts } from 'ui/src/theme'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 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 { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 import { opacify } from 'wallet/src/utils/colors'
 import { isAndroid, isIOS } from 'wallet/src/utils/platform'
 
diff --git a/apps/mobile/src/app/navigation/navigation.tsx b/apps/mobile/src/app/navigation/navigation.tsx
index 584dc320ea9..3103893c53c 100644
--- a/apps/mobile/src/app/navigation/navigation.tsx
+++ b/apps/mobile/src/app/navigation/navigation.tsx
@@ -7,25 +7,20 @@ import {
   AppStackParamList,
   AppStackScreenProp,
   ExploreStackParamList,
-  FiatOnRampStackParamList,
   OnboardingStackParamList,
   SettingsStackParamList,
   UnitagStackParamList,
 } from 'src/app/navigation/types'
 import { HorizontalEdgeGestureTarget } from 'src/components/layout/screens/EdgeGestureTarget'
 import { useBiometricCheck } from 'src/features/biometrics/useBiometricCheck'
-import { FiatOnRampProvider } from 'src/features/fiatOnRamp/FiatOnRampContext'
 import { ChooseProfilePictureScreen } from 'src/features/unitags/ChooseProfilePictureScreen'
 import { ClaimUnitagScreen } from 'src/features/unitags/ClaimUnitagScreen'
-import { EditUnitagProfileScreen } from 'src/features/unitags/EditUnitagProfileScreen'
+import { EditProfileScreen } from 'src/features/unitags/EditProfileScreen'
 import { UnitagConfirmationScreen } from 'src/features/unitags/UnitagConfirmationScreen'
 import { DevScreen } from 'src/screens/DevScreen'
 import { EducationScreen } from 'src/screens/EducationScreen'
 import { ExploreScreen } from 'src/screens/ExploreScreen'
 import { ExternalProfileScreen } from 'src/screens/ExternalProfileScreen'
-import { FiatOnRampConnectingScreen } from 'src/screens/FiatOnRampConnecting'
-import { FiatOnRampScreen } from 'src/screens/FiatOnRampScreen'
-import { FiatOnRampServiceProvidersScreen } from 'src/screens/FiatOnRampServiceProviders'
 import { HomeScreen } from 'src/screens/HomeScreen'
 import { ImportMethodScreen } from 'src/screens/Import/ImportMethodScreen'
 import { RestoreCloudBackupLoadingScreen } from 'src/screens/Import/RestoreCloudBackupLoadingScreen'
@@ -45,9 +40,9 @@ import { EditNameScreen } from 'src/screens/Onboarding/EditNameScreen'
 import { LandingScreen } from 'src/screens/Onboarding/LandingScreen'
 import { ManualBackupScreen } from 'src/screens/Onboarding/ManualBackupScreen'
 import { NotificationsSetupScreen } from 'src/screens/Onboarding/NotificationsSetupScreen'
+import { QRAnimationScreen } from 'src/screens/Onboarding/QRAnimationScreen'
 import { SecuritySetupScreen } from 'src/screens/Onboarding/SecuritySetupScreen'
-import { WelcomeWalletScreen } from 'src/screens/Onboarding/WelcomeWalletScreen'
-import { FiatOnRampScreens, OnboardingScreens, Screens, UnitagScreens } from 'src/screens/Screens'
+import { OnboardingScreens, Screens, UnitagScreens } from 'src/screens/Screens'
 import { SettingsAppearanceScreen } from 'src/screens/SettingsAppearanceScreen'
 import { SettingsBiometricAuthScreen } from 'src/screens/SettingsBiometricAuthScreen'
 import { SettingsCloudBackupPasswordConfirmScreen } from 'src/screens/SettingsCloudBackupPasswordConfirmScreen'
@@ -73,9 +68,8 @@ import { selectFinishedOnboarding } from 'wallet/src/features/wallet/selectors'
 const OnboardingStack = createStackNavigator<OnboardingStackParamList>()
 const AppStack = createNativeStackNavigator<AppStackParamList>()
 const ExploreStack = createNativeStackNavigator<ExploreStackParamList>()
-const FiatOnRampStack = createNativeStackNavigator<FiatOnRampStackParamList>()
 const SettingsStack = createNativeStackNavigator<SettingsStackParamList>()
-const UnitagStack = createStackNavigator<UnitagStackParamList>()
+const UnitagStack = createNativeStackNavigator<UnitagStackParamList>()
 
 function SettingsStackGroup(): JSX.Element {
   return (
@@ -177,41 +171,7 @@ export function ExploreStackNavigator(): JSX.Element {
   )
 }
 
-export function FiatOnRampStackNavigator(): JSX.Element {
-  return (
-    <NavigationContainer independent={true}>
-      <HorizontalEdgeGestureTarget />
-      <FiatOnRampProvider>
-        <FiatOnRampStack.Navigator
-          initialRouteName={FiatOnRampScreens.AmountInput}
-          screenOptions={{
-            ...navOptions.noHeader,
-            fullScreenGestureEnabled: true,
-            gestureEnabled: true,
-            animation: 'slide_from_right',
-          }}>
-          <FiatOnRampStack.Screen
-            component={FiatOnRampScreen}
-            name={FiatOnRampScreens.AmountInput}
-          />
-          <FiatOnRampStack.Screen
-            component={FiatOnRampServiceProvidersScreen}
-            name={FiatOnRampScreens.ServiceProviders}
-          />
-          <FiatOnRampStack.Screen
-            component={FiatOnRampConnectingScreen}
-            name={FiatOnRampScreens.Connecting}
-          />
-        </FiatOnRampStack.Navigator>
-      </FiatOnRampProvider>
-    </NavigationContainer>
-  )
-}
-
 const renderEmptyBackImage = (): JSX.Element => <></>
-const renderHeaderBackImage = (): JSX.Element => (
-  <Icons.RotatableChevron color="$neutral2" height={28} width={28} />
-)
 
 export function OnboardingStackNavigator(): JSX.Element {
   const colors = useSporeColors()
@@ -221,6 +181,10 @@ export function OnboardingStackNavigator(): JSX.Element {
     ? SeedPhraseInputScreenV2
     : SeedPhraseInputScreen
 
+  const renderHeaderBackImage = (): JSX.Element => (
+    <Icons.RotatableChevron color="$neutral2" height={28} width={28} />
+  )
+
   return (
     <OnboardingStack.Navigator>
       <OnboardingStack.Group
@@ -241,12 +205,6 @@ export function OnboardingStackNavigator(): JSX.Element {
           name={OnboardingScreens.Landing}
           options={navOptions.noHeader}
         />
-        <OnboardingStack.Screen component={ClaimUnitagScreen} name={UnitagScreens.ClaimUnitag} />
-        <OnboardingStack.Screen
-          component={ChooseProfilePictureScreen}
-          name={UnitagScreens.ChooseProfilePicture}
-          options={{ ...TransitionPresets.ModalFadeTransition }}
-        />
         <OnboardingStack.Screen component={EditNameScreen} name={OnboardingScreens.EditName} />
         <OnboardingStack.Screen component={BackupScreen} name={OnboardingScreens.Backup} />
         <OnboardingStack.Screen
@@ -259,8 +217,8 @@ export function OnboardingStackNavigator(): JSX.Element {
           name={OnboardingScreens.BackupManual}
         />
         <OnboardingStack.Screen
-          component={WelcomeWalletScreen}
-          name={OnboardingScreens.WelcomeWallet}
+          component={QRAnimationScreen}
+          name={OnboardingScreens.QRAnimation}
           // There should be no header shown on this screen but if headerShown: false and the user is adding a wallet from the
           // sidebar then when this screen is navigated away from the header will reappear on the home screen on top of the account
           // header.
@@ -318,36 +276,24 @@ export function OnboardingStackNavigator(): JSX.Element {
 }
 
 export function UnitagStackNavigator(): JSX.Element {
-  const colors = useSporeColors()
-  const insets = useDeviceInsets()
-
   return (
     <UnitagStack.Navigator>
       <UnitagStack.Group
         screenOptions={{
-          headerMode: 'float',
-          headerTitle: '',
-          headerBackTitleVisible: false,
-          headerBackImage: renderHeaderBackImage,
-          headerStatusBarHeight: insets.top + spacing.spacing8,
-          headerTransparent: true,
-          headerTintColor: colors.neutral2.val,
-          headerLeftContainerStyle: { paddingLeft: spacing.spacing16 },
-          headerRightContainerStyle: { paddingRight: spacing.spacing16 },
-          ...TransitionPresets.SlideFromRightIOS,
+          ...navOptions.noHeader,
+          fullScreenGestureEnabled: true,
+          animation: 'slide_from_right',
         }}>
         <UnitagStack.Screen component={ClaimUnitagScreen} name={UnitagScreens.ClaimUnitag} />
         <UnitagStack.Screen
           component={ChooseProfilePictureScreen}
           name={UnitagScreens.ChooseProfilePicture}
-          options={{ ...TransitionPresets.ModalFadeTransition }}
         />
         <UnitagStack.Screen
           component={UnitagConfirmationScreen}
           name={UnitagScreens.UnitagConfirmation}
-          options={{ ...navOptions.noHeader, gestureEnabled: false }}
         />
-        <UnitagStack.Screen component={EditUnitagProfileScreen} name={UnitagScreens.EditProfile} />
+        <UnitagStack.Screen component={EditProfileScreen} name={UnitagScreens.EditProfile} />
       </UnitagStack.Group>
     </UnitagStack.Navigator>
   )
diff --git a/apps/mobile/src/app/navigation/rootNavigation.ts b/apps/mobile/src/app/navigation/rootNavigation.ts
index 2bcb36af098..a43a3d60a2f 100644
--- a/apps/mobile/src/app/navigation/rootNavigation.ts
+++ b/apps/mobile/src/app/navigation/rootNavigation.ts
@@ -10,7 +10,7 @@ export type RootNavigationArgs<RouteName extends keyof RootParamList> =
 
 function isNavigationRefReady(): boolean {
   if (!navigationRef.isReady()) {
-    logger.error(new Error('Navigator was called before it was initialized'), {
+    logger.error('Navigator was called before it was initialized', {
       tags: { file: 'rootNavigation', function: 'navigate' },
     })
     return false
diff --git a/apps/mobile/src/app/navigation/types.ts b/apps/mobile/src/app/navigation/types.ts
index fd5e203d235..dde08810850 100644
--- a/apps/mobile/src/app/navigation/types.ts
+++ b/apps/mobile/src/app/navigation/types.ts
@@ -7,7 +7,7 @@ import {
 import { NativeStackNavigationProp, NativeStackScreenProps } from '@react-navigation/native-stack'
 import { EducationContentType } from 'src/components/education'
 import { HomeScreenTabIndex } from 'src/screens/HomeScreenTabIndex'
-import { FiatOnRampScreens, OnboardingScreens, Screens, UnitagScreens } from 'src/screens/Screens'
+import { OnboardingScreens, Screens, UnitagScreens } from 'src/screens/Screens'
 import { NFTItem } from 'wallet/src/features/nfts/types'
 import { ImportType, OnboardingEntryPoint } from 'wallet/src/features/onboarding/types'
 
@@ -36,12 +36,6 @@ export type ExploreStackParamList = {
   }
 }
 
-export type FiatOnRampStackParamList = {
-  [FiatOnRampScreens.AmountInput]: undefined
-  [FiatOnRampScreens.ServiceProviders]: undefined
-  [FiatOnRampScreens.Connecting]: undefined
-}
-
 export type SettingsStackParamList = {
   [Screens.Dev]: undefined
   [Screens.Settings]: undefined
@@ -66,18 +60,6 @@ export type OnboardingStackBaseParams = {
   entryPoint: OnboardingEntryPoint
 }
 
-export type SharedUnitagScreenParams = {
-  [UnitagScreens.ClaimUnitag]: {
-    entryPoint: OnboardingScreens.Landing | OnboardingEntryPoint.Sidebar | Screens.Home
-    importType: ImportType.CreateNew | ImportType.CreateAdditional
-  }
-  [UnitagScreens.ChooseProfilePicture]: {
-    entryPoint: OnboardingScreens.Landing | OnboardingEntryPoint.Sidebar | Screens.Home
-    importType: ImportType.CreateNew | ImportType.CreateAdditional
-    unitag: string
-  }
-}
-
 export type OnboardingStackParamList = {
   [OnboardingScreens.BackupManual]: OnboardingStackBaseParams
   [OnboardingScreens.BackupCloudPasswordCreate]: {
@@ -89,7 +71,7 @@ export type OnboardingStackParamList = {
   [OnboardingScreens.Landing]: OnboardingStackBaseParams
   [OnboardingScreens.EditName]: OnboardingStackBaseParams
   [OnboardingScreens.Notifications]: OnboardingStackBaseParams
-  [OnboardingScreens.WelcomeWallet]: OnboardingStackBaseParams
+  [OnboardingScreens.QRAnimation]: OnboardingStackBaseParams
   [OnboardingScreens.Security]: OnboardingStackBaseParams
 
   // import
@@ -102,9 +84,14 @@ export type OnboardingStackParamList = {
   [OnboardingScreens.SeedPhraseInput]: OnboardingStackBaseParams
   [OnboardingScreens.SelectWallet]: OnboardingStackBaseParams
   [OnboardingScreens.WatchWallet]: OnboardingStackBaseParams
-} & SharedUnitagScreenParams
+}
 
-export type UnitagStackParamList = SharedUnitagScreenParams & {
+export type UnitagStackParamList = {
+  [UnitagScreens.ClaimUnitag]: { entryPoint: OnboardingScreens.Landing | Screens.Home }
+  [UnitagScreens.ChooseProfilePicture]: {
+    entryPoint: OnboardingScreens.Landing | Screens.Home
+    unitag: string
+  }
   [UnitagScreens.UnitagConfirmation]: {
     unitag: string
     address: Address
@@ -112,8 +99,6 @@ export type UnitagStackParamList = SharedUnitagScreenParams & {
   }
   [UnitagScreens.EditProfile]: {
     address: Address
-    unitag: string
-    entryPoint: UnitagScreens.UnitagConfirmation | Screens.SettingsWallet
   }
 }
 
@@ -168,8 +153,7 @@ export type RootParamList = AppStackParamList &
   ExploreStackParamList &
   OnboardingStackParamList &
   SettingsStackParamList &
-  UnitagStackParamList &
-  FiatOnRampStackParamList
+  UnitagStackParamList
 
 export const useAppStackNavigation = (): AppStackNavigationProp =>
   useNavigation<AppStackNavigationProp>()
diff --git a/apps/mobile/src/app/reducer.ts b/apps/mobile/src/app/reducer.ts
index c5ab1edbe9e..21ba77b1be1 100644
--- a/apps/mobile/src/app/reducer.ts
+++ b/apps/mobile/src/app/reducer.ts
@@ -1,9 +1,13 @@
 import { combineReducers } from '@reduxjs/toolkit'
+import { behaviorHistoryReducer } from 'src/features/behaviorHistory/slice'
+import { biometricSettingsReducer } from 'src/features/biometrics/slice'
 import { cloudBackupReducer } from 'src/features/CloudBackup/cloudBackupSlice'
 import { passwordLockoutReducer } from 'src/features/CloudBackup/passwordLockoutSlice'
-import { biometricSettingsReducer } from 'src/features/biometrics/slice'
+import { searchHistoryReducer } from 'src/features/explore/searchHistorySlice'
 import { modalsReducer } from 'src/features/modals/modalSlice'
 import { telemetryReducer } from 'src/features/telemetry/slice'
+import { timingReducer } from 'src/features/telemetry/timing/slice'
+import { tokensReducer } from 'src/features/tokens/tokensSlice'
 import { tweaksReducer } from 'src/features/tweaks/slice'
 import { walletConnectReducer } from 'src/features/walletConnect/walletConnectSlice'
 import { sharedReducers } from 'wallet/src/state/reducer'
@@ -11,12 +15,16 @@ import { monitoredSagaReducers } from './saga'
 
 const reducers = {
   ...sharedReducers,
+  behaviorHistory: behaviorHistoryReducer,
   biometricSettings: biometricSettingsReducer,
   cloudBackup: cloudBackupReducer,
   modals: modalsReducer,
   passwordLockout: passwordLockoutReducer,
   saga: monitoredSagaReducers,
+  searchHistory: searchHistoryReducer,
   telemetry: telemetryReducer,
+  timing: timingReducer,
+  tokens: tokensReducer,
   tweaks: tweaksReducer,
   walletConnect: walletConnectReducer,
 } as const
diff --git a/apps/mobile/src/app/saga.ts b/apps/mobile/src/app/saga.ts
index 459c8e9cd05..4e5095a466e 100644
--- a/apps/mobile/src/app/saga.ts
+++ b/apps/mobile/src/app/saga.ts
@@ -4,24 +4,25 @@ import { cloudBackupsManagerSaga } from 'src/features/CloudBackup/saga'
 import { deepLinkWatcher } from 'src/features/deepLinking/handleDeepLinkSaga'
 import { firebaseDataWatcher } from 'src/features/firebase/firebaseDataSaga'
 import { modalWatcher } from 'src/features/modals/saga'
+import { notificationWatcher } from 'src/features/notifications/notificationWatcherSaga'
 import { telemetrySaga } from 'src/features/telemetry/saga'
-import { restoreMnemonicCompleteWatcher } from 'src/features/wallet/saga'
-import { walletConnectSaga } from 'src/features/walletConnect/saga'
-import { signWcRequestSaga } from 'src/features/walletConnect/signWcRequestSaga'
-import { spawn } from 'typed-redux-saga'
-import { appLanguageWatcherSaga } from 'wallet/src/features/language/saga'
 import {
   swapActions,
   swapReducer,
   swapSaga,
   swapSagaName,
-} from 'wallet/src/features/transactions/swap/swapSaga'
+} from 'src/features/transactions/swap/swapSaga'
 import {
   tokenWrapActions,
   tokenWrapReducer,
   tokenWrapSaga,
   tokenWrapSagaName,
-} from 'wallet/src/features/transactions/swap/wrapSaga'
+} from 'src/features/transactions/swap/wrapSaga'
+import { restoreMnemonicCompleteWatcher } from 'src/features/wallet/saga'
+import { walletConnectSaga } from 'src/features/walletConnect/saga'
+import { signWcRequestSaga } from 'src/features/walletConnect/signWcRequestSaga'
+import { spawn } from 'typed-redux-saga'
+import { appLanguageWatcherSaga } from 'wallet/src/features/language/saga'
 import { transactionWatcher } from 'wallet/src/features/transactions/transactionWatcherSaga'
 import {
   editAccountActions,
@@ -52,6 +53,7 @@ const sagas = [
   deepLinkWatcher,
   firebaseDataWatcher,
   modalWatcher,
+  notificationWatcher,
   pendingAccountSaga,
   restoreMnemonicCompleteWatcher,
   signWcRequestSaga,
diff --git a/apps/mobile/src/app/schema.ts b/apps/mobile/src/app/schema.ts
index fb12b080295..2b801044a4f 100644
--- a/apps/mobile/src/app/schema.ts
+++ b/apps/mobile/src/app/schema.ts
@@ -1,7 +1,7 @@
+import { ModalName } from 'src/features/telemetry/constants'
 import { initialFiatCurrencyState } from 'wallet/src/features/fiatCurrency/slice'
 import { initialLanguageState } from 'wallet/src/features/language/slice'
 import { SwapProtectionSetting } from 'wallet/src/features/wallet/slice'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 // only add fields that are persisted
 export const initialSchema = {
diff --git a/apps/mobile/src/app/store.ts b/apps/mobile/src/app/store.ts
index babe004c92e..13fe71dd7f3 100644
--- a/apps/mobile/src/app/store.ts
+++ b/apps/mobile/src/app/store.ts
@@ -2,7 +2,7 @@ import type { Middleware, PayloadAction, PreloadedState } from '@reduxjs/toolkit
 import { isRejectedWithValue } from '@reduxjs/toolkit'
 import * as Sentry from '@sentry/react'
 import { MMKV } from 'react-native-mmkv'
-import { Storage, persistReducer, persistStore } from 'redux-persist'
+import { persistReducer, persistStore, Storage } from 'redux-persist'
 import createMigrate from 'src/app/createMigrate'
 import { migrations } from 'src/app/migrations'
 import { isNonJestDev } from 'utilities/src/environment'
@@ -11,7 +11,7 @@ import { fiatOnRampAggregatorApi, fiatOnRampApi } from 'wallet/src/features/fiat
 import { importAccountSagaName } from 'wallet/src/features/wallet/import/importAccountSaga'
 import { createStore } from 'wallet/src/state'
 import { RootReducerNames } from 'wallet/src/state/reducer'
-import { MobileState, ReducerNames, mobileReducer } from './reducer'
+import { mobileReducer, MobileState, ReducerNames } from './reducer'
 import { mobileSaga } from './saga'
 
 const storage = new MMKV()
@@ -107,9 +107,9 @@ if (isNonJestDev) {
   middlewares.push(createDebugger())
 }
 
+// eslint-disable-next-line prettier/prettier, @typescript-eslint/explicit-function-return-type
 export const setupStore = (
   preloadedState?: PreloadedState<MobileState>
-  // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
 ) => {
   return createStore({
     reducer: persistedReducer,
diff --git a/packages/wallet/src/components/accounts/AccountIcon.tsx b/apps/mobile/src/components/AccountIcon.tsx
similarity index 91%
rename from packages/wallet/src/components/accounts/AccountIcon.tsx
rename to apps/mobile/src/components/AccountIcon.tsx
index 3d27c4acd06..95af95be01b 100644
--- a/packages/wallet/src/components/accounts/AccountIcon.tsx
+++ b/apps/mobile/src/components/AccountIcon.tsx
@@ -1,6 +1,9 @@
+import React from 'react'
 import { StyleSheet } from 'react-native'
 import Svg, { Defs, RadialGradient as RadialGradientSVG, Rect, Stop } from 'react-native-svg'
-import { Flex, Icons, Unicon, useUniconColors } from 'ui/src'
+import { Unicon } from 'src/components/unicons/Unicon'
+import { useUniconColors } from 'src/components/unicons/utils'
+import { Flex, Icons } from 'ui/src'
 import { spacing } from 'ui/src/theme'
 import { RemoteImage } from 'wallet/src/features/images/RemoteImage'
 
@@ -13,7 +16,6 @@ export interface AccountIconProps {
   address: string
   avatarUri?: string | null
   showBackground?: boolean // Display images with solid background.
-  showBorder?: boolean // Display border stroke around image
   backgroundPadding?: number
 }
 
@@ -23,7 +25,6 @@ export function AccountIcon({
   address,
   avatarUri,
   showBackground,
-  showBorder,
   backgroundPadding = spacing.spacing12,
 }: AccountIconProps): JSX.Element {
   // add padding to unicon if background is displayed
@@ -48,16 +49,13 @@ export function AccountIcon({
   return (
     <Flex
       backgroundColor={showBackground ? '$surface1' : '$transparent'}
-      borderColor={showBorder ? '$surface1' : '$transparent'}
       borderRadius="$roundedFull"
-      borderWidth={showBorder ? 2 : 0}
       position="relative">
       {avatarUri ? (
         <RemoteImage
           borderRadius={size}
           fallback={uniconImage}
           height={size}
-          resizeMode="cover"
           uri={avatarUri}
           width={size}
         />
diff --git a/packages/wallet/src/components/accounts/AddressDisplay.tsx b/apps/mobile/src/components/AddressDisplay.tsx
similarity index 57%
rename from packages/wallet/src/components/accounts/AddressDisplay.tsx
rename to apps/mobile/src/components/AddressDisplay.tsx
index dad3132bb78..6895985963c 100644
--- a/packages/wallet/src/components/accounts/AddressDisplay.tsx
+++ b/apps/mobile/src/components/AddressDisplay.tsx
@@ -1,18 +1,18 @@
 import { impactAsync } from 'expo-haptics'
-import { PropsWithChildren, useMemo } from 'react'
+import { default as React, PropsWithChildren, useMemo } from 'react'
 import { FlexAlignType } from 'react-native'
+import { useAppDispatch } from 'src/app/hooks'
+import { AccountIcon, AccountIconProps } from 'src/components/AccountIcon'
+import { NotificationBadge } from 'src/components/notifications/Badge'
+import { ElementName } from 'src/features/telemetry/constants'
+import { setClipboard } from 'src/utils/clipboard'
 import { ColorTokens, Flex, Icons, SpaceTokens, Text, TextProps, TouchableArea } from 'ui/src'
 import { fonts } from 'ui/src/theme'
-import { AccountIcon, AccountIconProps } from 'wallet/src/components/accounts/AccountIcon'
-import { DisplayNameText } from 'wallet/src/components/accounts/DisplayNameText'
+import { useENSAvatar } from 'wallet/src/features/ens/api'
 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 { ElementName } from 'wallet/src/telemetry/constants'
+import { useDisplayName } from 'wallet/src/features/wallet/hooks'
 import { sanitizeAddressText, shortenAddress } from 'wallet/src/utils/addresses'
-import { setClipboard } from 'wallet/src/utils/clipboard'
 
 type AddressDisplayProps = {
   address: string
@@ -29,17 +29,9 @@ type AddressDisplayProps = {
   showAccountIcon?: boolean
   contentAlign?: FlexAlignType
   showIconBackground?: boolean
-  showIconBorder?: boolean
-  includeUnitagSuffix?: boolean
   textAlign?: FlexAlignType
   horizontalGap?: SpaceTokens
-  notificationsBadgeContainer?: ({
-    children,
-    address,
-  }: {
-    children: JSX.Element
-    address: string
-  }) => JSX.Element
+  showNotificationsBadge?: boolean
   gapBetweenLines?: SpaceTokens
 } & Pick<AccountIconProps, 'showViewOnlyBadge'>
 
@@ -73,7 +65,6 @@ function getLineHeightForAdjustedFontSize(nameLength: number): number {
 }
 
 /** Helper component to display identicon and formatted address */
-
 export function AddressDisplay({
   allowFontScaling = true,
   address,
@@ -90,19 +81,16 @@ export function AddressDisplay({
   textAlign,
   contentAlign = 'center', // vertical alignment of all items
   showIconBackground,
-  showIconBorder,
   horizontalGap = '$spacing12',
   showViewOnlyBadge = false,
-  notificationsBadgeContainer,
-  includeUnitagSuffix = false,
+  showNotificationsBadge = false,
   gapBetweenLines = '$none',
 }: AddressDisplayProps): JSX.Element {
   const dispatch = useAppDispatch()
-  const displayName = useDisplayName(address, { includeUnitagSuffix })
-  const { avatar } = useAvatar(address)
+  const displayName = useDisplayName(address)
+  const { data: avatar } = useENSAvatar(address)
 
-  const showAddressAsSubtitle =
-    !hideAddressInSubtitle && displayName?.type !== DisplayNameType.Address
+  const showAddressAsSubtitle = !hideAddressInSubtitle && displayName?.type !== 'address'
 
   const onPressCopyAddress = async (): Promise<void> => {
     if (!address) {
@@ -130,14 +118,13 @@ export function AddressDisplay({
         address={address}
         avatarUri={avatar}
         showBackground={showIconBackground}
-        showBorder={showIconBorder}
         showViewOnlyBadge={showViewOnlyBadge}
         size={size}
       />
     )
-  }, [address, avatar, showIconBackground, showIconBorder, showViewOnlyBadge, size])
+  }, [address, avatar, showIconBackground, showViewOnlyBadge, size])
 
-  const name = displayName?.name ?? ''
+  const name = displayName?.name || ''
 
   // since adjustsFontSizeToFit doesnt really work adjusting line height properly
   // manually adjust lineHeight things to keep vertical center
@@ -154,75 +141,51 @@ export function AddressDisplay({
   return (
     <Flex alignItems={contentAlign} flexDirection={direction} gap={horizontalGap}>
       {showAccountIcon &&
-        (notificationsBadgeContainer
-          ? notificationsBadgeContainer({ children: icon, address })
-          : icon)}
+        (showNotificationsBadge ? (
+          <NotificationBadge address={address}>{icon}</NotificationBadge>
+        ) : (
+          icon
+        ))}
       <Flex shrink alignItems={itemAlignment} gap={gapBetweenLines}>
         <CopyButtonWrapper
           onPress={showCopy && !showAddressAsSubtitle ? onPressCopyAddress : undefined}>
           <Flex centered row gap="$spacing12">
-            <DisplayNameText
-              displayName={displayName}
-              textProps={{
-                adjustsFontSizeToFit: true,
-                allowFontScaling,
-                color: textColor,
-                ellipsizeMode: 'tail',
-                fontFamily: '$heading',
-                fontSize: mainSize,
-                numberOfLines: 1,
-                testID: `address-display/name/${displayName?.name}`,
-                ...dynamicSizedTextVerticalStyles,
-              }}
-              unitagIconSize={mainSize}
-            />
+            <Text
+              adjustsFontSizeToFit
+              allowFontScaling={allowFontScaling}
+              color={textColor}
+              ellipsizeMode="tail"
+              fontFamily="$heading"
+              fontSize={mainSize}
+              numberOfLines={1}
+              testID={`address-display/name/${displayName?.name}`}
+              {...dynamicSizedTextVerticalStyles}>
+              {name}
+            </Text>
             {showCopy && !showAddressAsSubtitle && (
               <Icons.CopySheets color="$neutral1" size={mainSize} />
             )}
           </Flex>
         </CopyButtonWrapper>
         {showAddressAsSubtitle && (
-          <AddressSubtitle
-            address={address}
-            captionSize={captionSize}
-            captionTextColor={captionTextColor}
-            captionVariant={captionVariant}
-            showCopy={showCopy}
-            showCopyWrapperButton={showCopyWrapperButton}
-            onPressCopyAddress={onPressCopyAddress}
-          />
+          <CopyButtonWrapper onPress={showCopy ? onPressCopyAddress : undefined}>
+            <Flex
+              centered
+              row
+              backgroundColor={showCopyWrapperButton ? '$DEP_backgroundOverlay' : '$transparent'}
+              borderRadius="$roundedFull"
+              gap="$spacing4"
+              mt={showCopyWrapperButton ? '$spacing8' : '$none'}
+              px={showCopyWrapperButton ? '$spacing8' : '$none'}
+              py={showCopyWrapperButton ? '$spacing4' : '$none'}>
+              <Text color={captionTextColor} variant={captionVariant}>
+                {sanitizeAddressText(shortenAddress(address))}
+              </Text>
+              {showCopy && <Icons.CopySheets color={captionTextColor} size={captionSize} />}
+            </Flex>
+          </CopyButtonWrapper>
         )}
       </Flex>
     </Flex>
   )
 }
-
-const AddressSubtitle = ({
-  address,
-  captionTextColor,
-  captionVariant,
-  captionSize,
-  showCopy,
-  showCopyWrapperButton,
-  onPressCopyAddress,
-}: { captionSize: number; onPressCopyAddress: () => Promise<void> } & Pick<
-  AddressDisplayProps,
-  'address' | 'captionTextColor' | 'captionVariant' | 'showCopy' | 'showCopyWrapperButton'
->): JSX.Element => (
-  <CopyButtonWrapper onPress={showCopy ? onPressCopyAddress : undefined}>
-    <Flex
-      centered
-      row
-      backgroundColor={showCopyWrapperButton ? '$DEP_backgroundOverlay' : '$transparent'}
-      borderRadius="$roundedFull"
-      gap="$spacing4"
-      mt={showCopyWrapperButton ? '$spacing8' : '$none'}
-      px={showCopyWrapperButton ? '$spacing8' : '$none'}
-      py={showCopyWrapperButton ? '$spacing4' : '$none'}>
-      <Text color={captionTextColor} variant={captionVariant}>
-        {sanitizeAddressText(shortenAddress(address))}
-      </Text>
-      {showCopy && <Icons.CopySheets color={captionTextColor} size={captionSize} />}
-    </Flex>
-  </CopyButtonWrapper>
-)
diff --git a/packages/wallet/src/components/NFT/NFTTransfer.tsx b/apps/mobile/src/components/NFT/NFTTransfer.tsx
similarity index 97%
rename from packages/wallet/src/components/NFT/NFTTransfer.tsx
rename to apps/mobile/src/components/NFT/NFTTransfer.tsx
index 9af8464a4ea..b913e6b4ea9 100644
--- a/packages/wallet/src/components/NFT/NFTTransfer.tsx
+++ b/apps/mobile/src/components/NFT/NFTTransfer.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import { Flex, Text } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { NFTViewer } from 'wallet/src/features/images/NFTViewer'
diff --git a/packages/wallet/src/components/network/NetworkFee.test.tsx b/apps/mobile/src/components/Network/NetworkFee.test.tsx
similarity index 89%
rename from packages/wallet/src/components/network/NetworkFee.test.tsx
rename to apps/mobile/src/components/Network/NetworkFee.test.tsx
index ebc40b8ab51..6260d39183e 100644
--- a/packages/wallet/src/components/network/NetworkFee.test.tsx
+++ b/apps/mobile/src/components/Network/NetworkFee.test.tsx
@@ -1,7 +1,8 @@
+import React from 'react'
+import { NetworkFee } from 'src/components/Network/NetworkFee'
+import { render } from 'src/test/test-utils'
 import { ChainId } from 'wallet/src/constants/chains'
-import { render } from 'wallet/src/test/test-utils'
 import { noOpFunction } from 'wallet/src/test/utils'
-import { NetworkFee } from './NetworkFee'
 
 jest.mock('wallet/src/features/gas/hooks', () => {
   return {
diff --git a/packages/wallet/src/components/network/NetworkFee.tsx b/apps/mobile/src/components/Network/NetworkFee.tsx
similarity index 91%
rename from packages/wallet/src/components/network/NetworkFee.tsx
rename to apps/mobile/src/components/Network/NetworkFee.tsx
index 09f0e1866c3..7a8270d405c 100644
--- a/packages/wallet/src/components/network/NetworkFee.tsx
+++ b/apps/mobile/src/components/Network/NetworkFee.tsx
@@ -1,9 +1,10 @@
+import React from 'react'
 import { useTranslation } from 'react-i18next'
+import { SpinningLoader } from 'src/components/loading/SpinningLoader'
+import { InlineNetworkPill } from 'src/components/Network/NetworkPill'
 import { Flex, Icons, Text, TouchableArea } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
-import { SpinningLoader } from 'wallet/src/components/loading/SpinningLoader'
-import { InlineNetworkPill } from 'wallet/src/components/network/NetworkPill'
 import { ChainId } from 'wallet/src/constants/chains'
 import { useUSDValue } from 'wallet/src/features/gas/hooks'
 import { GasFeeResult } from 'wallet/src/features/gas/types'
diff --git a/packages/wallet/src/components/network/NetworkOption.tsx b/apps/mobile/src/components/Network/NetworkOption.tsx
similarity index 92%
rename from packages/wallet/src/components/network/NetworkOption.tsx
rename to apps/mobile/src/components/Network/NetworkOption.tsx
index 6cdcc114242..41beec8e564 100644
--- a/packages/wallet/src/components/network/NetworkOption.tsx
+++ b/apps/mobile/src/components/Network/NetworkOption.tsx
@@ -1,9 +1,10 @@
+import { default as React } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Flex, Separator, Text, useSporeColors } from 'ui/src'
 import Check from 'ui/src/assets/icons/check.svg'
 import { iconSizes } from 'ui/src/theme'
 import { NetworkLogo } from 'wallet/src/components/CurrencyLogo/NetworkLogo'
-import { CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
+import { ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
 
 const NETWORK_OPTION_ICON_SIZE = iconSizes.icon24
 
diff --git a/packages/wallet/src/components/network/NetworkPill.test.tsx b/apps/mobile/src/components/Network/NetworkPill.test.tsx
similarity index 78%
rename from packages/wallet/src/components/network/NetworkPill.test.tsx
rename to apps/mobile/src/components/Network/NetworkPill.test.tsx
index f010d8d4ab6..091dc1b9a93 100644
--- a/packages/wallet/src/components/network/NetworkPill.test.tsx
+++ b/apps/mobile/src/components/Network/NetworkPill.test.tsx
@@ -1,6 +1,7 @@
+import React from 'react'
+import { InlineNetworkPill, NetworkPill } from 'src/components/Network/NetworkPill'
+import { render } from 'src/test/test-utils'
 import { ChainId } from 'wallet/src/constants/chains'
-import { render } from 'wallet/src/test/test-utils'
-import { InlineNetworkPill, NetworkPill } from './NetworkPill'
 
 describe(NetworkPill, () => {
   it('renders a NetworkPill without image', () => {
diff --git a/packages/wallet/src/components/network/NetworkPill.tsx b/apps/mobile/src/components/Network/NetworkPill.tsx
similarity index 88%
rename from packages/wallet/src/components/network/NetworkPill.tsx
rename to apps/mobile/src/components/Network/NetworkPill.tsx
index 201a8fcc195..85a39beafc1 100644
--- a/packages/wallet/src/components/network/NetworkPill.tsx
+++ b/apps/mobile/src/components/Network/NetworkPill.tsx
@@ -1,8 +1,8 @@
-import { ComponentProps } from 'react'
+import React, { ComponentProps } from 'react'
+import { Pill } from 'src/components/text/Pill'
 import { iconSizes } from 'ui/src/theme'
 import { NetworkLogo } from 'wallet/src/components/CurrencyLogo/NetworkLogo'
-import { Pill } from 'wallet/src/components/text/Pill'
-import { CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
+import { ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
 import { useNetworkColors } from 'wallet/src/utils/colors'
 
 export type NetworkPillProps = {
diff --git a/packages/wallet/src/components/network/__snapshots__/NetworkFee.test.tsx.snap b/apps/mobile/src/components/Network/__snapshots__/NetworkFee.test.tsx.snap
similarity index 96%
rename from packages/wallet/src/components/network/__snapshots__/NetworkFee.test.tsx.snap
rename to apps/mobile/src/components/Network/__snapshots__/NetworkFee.test.tsx.snap
index cde3efa6480..93359586628 100644
--- a/packages/wallet/src/components/network/__snapshots__/NetworkFee.test.tsx.snap
+++ b/apps/mobile/src/components/Network/__snapshots__/NetworkFee.test.tsx.snap
@@ -155,13 +155,17 @@ exports[`NetworkFee renders a NetworkFee in a loading state 1`] = `
         {
           "alignItems": "center",
           "backgroundColor": "#3939391a",
+          "borderBottomColor": "transparent",
           "borderBottomLeftRadius": 8,
           "borderBottomRightRadius": 8,
           "borderBottomWidth": 1,
           "borderColor": "transparent",
+          "borderLeftColor": "transparent",
           "borderLeftWidth": 1,
+          "borderRightColor": "transparent",
           "borderRightWidth": 1,
           "borderStyle": "solid",
+          "borderTopColor": "transparent",
           "borderTopLeftRadius": 8,
           "borderTopRightRadius": 8,
           "borderTopWidth": 1,
@@ -209,6 +213,7 @@ exports[`NetworkFee renders a NetworkFee in a loading state 1`] = `
       sentry-label="SpinningLoader"
       style={
         {
+          "alignItems": "stretch",
           "flexDirection": "column",
           "transform": [
             {
@@ -445,13 +450,17 @@ exports[`NetworkFee renders a NetworkFee in an error state 1`] = `
         {
           "alignItems": "center",
           "backgroundColor": "#3939391a",
+          "borderBottomColor": "transparent",
           "borderBottomLeftRadius": 8,
           "borderBottomRightRadius": 8,
           "borderBottomWidth": 1,
           "borderColor": "transparent",
+          "borderLeftColor": "transparent",
           "borderLeftWidth": 1,
+          "borderRightColor": "transparent",
           "borderRightWidth": 1,
           "borderStyle": "solid",
+          "borderTopColor": "transparent",
           "borderTopLeftRadius": 8,
           "borderTopRightRadius": 8,
           "borderTopWidth": 1,
@@ -657,13 +666,17 @@ exports[`NetworkFee renders a NetworkFee normally 1`] = `
         {
           "alignItems": "center",
           "backgroundColor": "#3939391a",
+          "borderBottomColor": "transparent",
           "borderBottomLeftRadius": 8,
           "borderBottomRightRadius": 8,
           "borderBottomWidth": 1,
           "borderColor": "transparent",
+          "borderLeftColor": "transparent",
           "borderLeftWidth": 1,
+          "borderRightColor": "transparent",
           "borderRightWidth": 1,
           "borderStyle": "solid",
+          "borderTopColor": "transparent",
           "borderTopLeftRadius": 8,
           "borderTopRightRadius": 8,
           "borderTopWidth": 1,
diff --git a/packages/wallet/src/components/network/__snapshots__/NetworkPill.test.tsx.snap b/apps/mobile/src/components/Network/__snapshots__/NetworkPill.test.tsx.snap
similarity index 86%
rename from packages/wallet/src/components/network/__snapshots__/NetworkPill.test.tsx.snap
rename to apps/mobile/src/components/Network/__snapshots__/NetworkPill.test.tsx.snap
index ffb53d93538..dee2512bbe6 100644
--- a/packages/wallet/src/components/network/__snapshots__/NetworkPill.test.tsx.snap
+++ b/apps/mobile/src/components/Network/__snapshots__/NetworkPill.test.tsx.snap
@@ -6,13 +6,17 @@ exports[`NetworkPill renders a NetworkPill with border 1`] = `
     {
       "alignItems": "center",
       "backgroundColor": "#2098531a",
+      "borderBottomColor": "transparent",
       "borderBottomLeftRadius": 999999,
       "borderBottomRightRadius": 999999,
       "borderBottomWidth": 1,
       "borderColor": "#209853",
+      "borderLeftColor": "transparent",
       "borderLeftWidth": 1,
+      "borderRightColor": "transparent",
       "borderRightWidth": 1,
       "borderStyle": "solid",
+      "borderTopColor": "transparent",
       "borderTopLeftRadius": 999999,
       "borderTopRightRadius": 999999,
       "borderTopWidth": 1,
@@ -51,13 +55,17 @@ exports[`NetworkPill renders a NetworkPill without image 1`] = `
     {
       "alignItems": "center",
       "backgroundColor": "#2098531a",
+      "borderBottomColor": "transparent",
       "borderBottomLeftRadius": 999999,
       "borderBottomRightRadius": 999999,
       "borderBottomWidth": 1,
       "borderColor": "transparent",
+      "borderLeftColor": "transparent",
       "borderLeftWidth": 1,
+      "borderRightColor": "transparent",
       "borderRightWidth": 1,
       "borderStyle": "solid",
+      "borderTopColor": "transparent",
       "borderTopLeftRadius": 999999,
       "borderTopRightRadius": 999999,
       "borderTopWidth": 1,
@@ -96,13 +104,17 @@ exports[`NetworkPill renders an InlineNetworkPill 1`] = `
     {
       "alignItems": "center",
       "backgroundColor": "#2098531a",
+      "borderBottomColor": "transparent",
       "borderBottomLeftRadius": 8,
       "borderBottomRightRadius": 8,
       "borderBottomWidth": 1,
       "borderColor": "transparent",
+      "borderLeftColor": "transparent",
       "borderLeftWidth": 1,
+      "borderRightColor": "transparent",
       "borderRightWidth": 1,
       "borderStyle": "solid",
+      "borderTopColor": "transparent",
       "borderTopLeftRadius": 8,
       "borderTopRightRadius": 8,
       "borderTopWidth": 1,
diff --git a/packages/wallet/src/components/network/hooks.tsx b/apps/mobile/src/components/Network/hooks.tsx
similarity index 81%
rename from packages/wallet/src/components/network/hooks.tsx
rename to apps/mobile/src/components/Network/hooks.tsx
index 2e5a5340f0b..8891095f754 100644
--- a/packages/wallet/src/components/network/hooks.tsx
+++ b/apps/mobile/src/components/Network/hooks.tsx
@@ -1,7 +1,7 @@
-import { useMemo } from 'react'
-import { NetworkOption } from 'wallet/src/components/network/NetworkOption'
+import { default as React, useMemo } from 'react'
+import { NetworkOption } from 'src/components/Network/NetworkOption'
+import { ElementName } from 'src/features/telemetry/constants'
 import { ALL_SUPPORTED_CHAIN_IDS, ChainId } from 'wallet/src/constants/chains'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 export function useNetworkOptions({
   onPress,
diff --git a/apps/mobile/src/components/PriceExplorer/AnimatedDecimalNumber.tsx b/apps/mobile/src/components/PriceExplorer/AnimatedDecimalNumber.tsx
index 3e64d28ec58..dbe154d9f1d 100644
--- a/apps/mobile/src/components/PriceExplorer/AnimatedDecimalNumber.tsx
+++ b/apps/mobile/src/components/PriceExplorer/AnimatedDecimalNumber.tsx
@@ -3,7 +3,7 @@ import { useWindowDimensions } from 'react-native'
 import { useAnimatedStyle, useDerivedValue } from 'react-native-reanimated'
 import { AnimatedText } from 'src/components/text/AnimatedText'
 import { Flex, useDeviceDimensions, useSporeColors } from 'ui/src'
-import { TextVariantTokens, fonts } from 'ui/src/theme'
+import { fonts, TextVariantTokens } from 'ui/src/theme'
 import { ValueAndFormatted } from './usePrice'
 
 type AnimatedDecimalNumberProps = {
diff --git a/apps/mobile/src/components/PriceExplorer/PriceExplorer.tsx b/apps/mobile/src/components/PriceExplorer/PriceExplorer.tsx
index 1500a4e1c1d..d076a09eacf 100644
--- a/apps/mobile/src/components/PriceExplorer/PriceExplorer.tsx
+++ b/apps/mobile/src/components/PriceExplorer/PriceExplorer.tsx
@@ -1,16 +1,16 @@
 import { ImpactFeedbackStyle } from 'expo-haptics'
 import { memo, useMemo } from 'react'
 import { I18nManager } from 'react-native'
-import { SharedValue, useDerivedValue } from 'react-native-reanimated'
+import { SharedValue } from 'react-native-reanimated'
 import { LineChart, LineChartProvider, TLineChartDataProp } from 'react-native-wagmi-charts'
+import { Loader } from 'src/components/loading'
+import { CURSOR_INNER_SIZE, CURSOR_SIZE } from 'src/components/PriceExplorer/constants'
 import PriceExplorerAnimatedNumber from 'src/components/PriceExplorer/PriceExplorerAnimatedNumber'
 import { PriceExplorerError } from 'src/components/PriceExplorer/PriceExplorerError'
 import { DatetimeText, RelativeChangeText } from 'src/components/PriceExplorer/Text'
 import { TimeRangeGroup } from 'src/components/PriceExplorer/TimeRangeGroup'
-import { CURSOR_INNER_SIZE, CURSOR_SIZE } from 'src/components/PriceExplorer/constants'
 import { useChartDimensions } from 'src/components/PriceExplorer/useChartDimensions'
 import { useLineChartPrice } from 'src/components/PriceExplorer/usePrice'
-import { Loader } from 'src/components/loading'
 import { invokeImpact } from 'src/utils/haptic'
 import { Flex } from 'ui/src'
 import { spacing } from 'ui/src/theme'
@@ -24,7 +24,7 @@ type PriceTextProps = {
   loading: boolean
   relativeChange?: SharedValue<number>
   numberOfDigits: PriceNumberOfDigits
-  spotPrice?: SharedValue<number>
+  spotPrice?: number
 }
 
 function PriceTextSection({ loading, numberOfDigits, spotPrice }: PriceTextProps): JSX.Element {
@@ -84,15 +84,14 @@ export const PriceExplorer = memo(function PriceExplorer({
     return { lastPricePoint: lastPoint, convertedPriceHistory: priceHistory }
   }, [data, conversionRate])
 
-  const convertedSpotValue = useDerivedValue(() => conversionRate * (data?.spot?.value?.value ?? 0))
   const convertedSpot = useMemo((): TokenSpotData | undefined => {
     return (
       data?.spot && {
         ...data?.spot,
-        value: convertedSpotValue,
+        value: { value: conversionRate * (data?.spot?.value?.value ?? 0) },
       }
     )
-  }, [data, convertedSpotValue])
+  }, [data, conversionRate])
 
   if (
     !loading &&
@@ -189,7 +188,7 @@ function PriceExplorerChart({
           loading={loading}
           numberOfDigits={numberOfDigits}
           relativeChange={spot?.relativeChange}
-          spotPrice={spot?.value}
+          spotPrice={spot?.value?.value}
         />
         {/* TODO(MOB-2166): remove forced LTR direction + scaleX horizontal flip technique once react-native-wagmi-charts fixes this: https://github.com/coinjar/react-native-wagmi-charts/issues/136 */}
         <Flex direction="ltr" my="$spacing24" style={{ transform: [{ scaleX: isRTL ? -1 : 1 }] }}>
diff --git a/apps/mobile/src/components/PriceExplorer/PriceExplorerAnimatedNumber.tsx b/apps/mobile/src/components/PriceExplorer/PriceExplorerAnimatedNumber.tsx
index 9f3b6ed4f77..652e4d35036 100644
--- a/apps/mobile/src/components/PriceExplorer/PriceExplorerAnimatedNumber.tsx
+++ b/apps/mobile/src/components/PriceExplorer/PriceExplorerAnimatedNumber.tsx
@@ -24,22 +24,6 @@ import { TextLoaderWrapper } from 'ui/src/components/text/Text'
 import { fonts } from 'ui/src/theme'
 import { FiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
 
-// if price per token has > 3 numbers before the decimal, start showing decimals in neutral3
-// otherwise, show entire price in neutral1
-const DEEMPHASIZED_DECIMALS_THRESHOLD = 3
-
-const getEmphasizedNumberColor = (
-  index: number,
-  commaIndex: number,
-  emphasizedColor: string,
-  deemphasizedColor: string
-): string => {
-  if (index >= commaIndex && commaIndex > DEEMPHASIZED_DECIMALS_THRESHOLD) {
-    return deemphasizedColor
-  }
-  return emphasizedColor
-}
-
 const NumbersMain = ({
   color,
   backgroundColor,
@@ -111,12 +95,6 @@ const RollNumber = ({
   currency: FiatCurrencyInfo
 }): JSX.Element => {
   const colors = useSporeColors()
-  const numberColor = getEmphasizedNumberColor(
-    index,
-    commaIndex,
-    colors.neutral1.val,
-    colors.neutral3.val
-  )
 
   const animatedDigit = useDerivedValue(() => {
     const char = chars.value[index - (commaIndex - decimalPlace.value)]
@@ -125,8 +103,9 @@ const RollNumber = ({
   }, [chars])
 
   const animatedFontStyle = useAnimatedStyle(() => {
+    const color = index >= commaIndex ? colors.neutral3.val : colors.neutral1.val
     return {
-      color: numberColor,
+      color,
     }
   })
 
@@ -232,7 +211,7 @@ const RollNumber = ({
       ]}>
       <MemoizedNumbers
         backgroundColor={colors.surface1.val}
-        color={numberColor}
+        color={index >= commaIndex ? colors.neutral3.val : colors.neutral1.val}
         hidePlaceholder={hidePlaceholder}
       />
     </Animated.View>
diff --git a/apps/mobile/src/components/PriceExplorer/TimeRangeGroup.tsx b/apps/mobile/src/components/PriceExplorer/TimeRangeGroup.tsx
index 86b22030c0c..144158d19e6 100644
--- a/apps/mobile/src/components/PriceExplorer/TimeRangeGroup.tsx
+++ b/apps/mobile/src/components/PriceExplorer/TimeRangeGroup.tsx
@@ -1,8 +1,8 @@
 import React, { useState } from 'react'
 import { I18nManager, StyleSheet, View } from 'react-native'
 import {
-  SharedValue,
   interpolateColor,
+  SharedValue,
   useAnimatedStyle,
   useSharedValue,
 } from 'react-native-reanimated'
diff --git a/apps/mobile/src/components/PriceExplorer/__snapshots__/Text.test.tsx.snap b/apps/mobile/src/components/PriceExplorer/__snapshots__/Text.test.tsx.snap
index 2272247fc0b..785a7a26397 100644
--- a/apps/mobile/src/components/PriceExplorer/__snapshots__/Text.test.tsx.snap
+++ b/apps/mobile/src/components/PriceExplorer/__snapshots__/Text.test.tsx.snap
@@ -32,6 +32,7 @@ exports[`PriceText renders loading state 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "flexDirection": "row",
     }
   }
@@ -70,6 +71,7 @@ exports[`PriceText renders without error 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "flexDirection": "row",
     }
   }
@@ -135,6 +137,7 @@ exports[`PriceText renders without error less than a dollar 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "flexDirection": "row",
     }
   }
@@ -200,6 +203,7 @@ exports[`RelativeChangeText renders loading state 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "flexDirection": "column",
       "marginTop": 2,
     }
@@ -209,6 +213,7 @@ exports[`RelativeChangeText renders loading state 1`] = `
     onLayout={[Function]}
     style={
       {
+        "alignItems": "stretch",
         "flexDirection": "column",
         "opacity": 0,
       }
@@ -240,6 +245,7 @@ exports[`RelativeChangeText renders loading state 1`] = `
           <View
             style={
               {
+                "alignItems": "stretch",
                 "flexDirection": "row",
               }
             }
@@ -292,6 +298,7 @@ exports[`RelativeChangeText renders loading state 1`] = `
         <View
           style={
             {
+              "alignItems": "stretch",
               "backgroundColor": "#F9F9F9",
               "borderBottomLeftRadius": 4,
               "borderBottomRightRadius": 4,
diff --git a/apps/mobile/src/components/PriceExplorer/constants.ts b/apps/mobile/src/components/PriceExplorer/constants.ts
index a323b61f3cc..9db98649da5 100644
--- a/apps/mobile/src/components/PriceExplorer/constants.ts
+++ b/apps/mobile/src/components/PriceExplorer/constants.ts
@@ -1,6 +1,6 @@
+import { ElementName } from 'src/features/telemetry/constants'
 import { HistoryDuration } from 'wallet/src/data/__generated__/types-and-hooks'
 import i18n from 'wallet/src/i18n/i18n'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 export const NUM_GRAPHS = 5
 
diff --git a/apps/mobile/src/components/PriceExplorer/usePrice.test.ts b/apps/mobile/src/components/PriceExplorer/usePrice.test.ts
index 34e96e4fd29..c505733109e 100644
--- a/apps/mobile/src/components/PriceExplorer/usePrice.test.ts
+++ b/apps/mobile/src/components/PriceExplorer/usePrice.test.ts
@@ -111,9 +111,8 @@ describe(useLineChartPrice, () => {
     })
 
     it('returns currentSpot if it is provided', async () => {
-      const spotPrice = makeMutable(1)
-      const { result } = renderHookWithProviders(useLineChartPrice, {
-        initialProps: [spotPrice],
+      const { result, rerender } = renderHookWithProviders(useLineChartPrice, {
+        initialProps: [1],
       })
 
       expect(result.current).toEqual({
@@ -122,7 +121,9 @@ describe(useLineChartPrice, () => {
         shouldAnimate: expect.objectContaining({ value: true }),
       })
 
-      spotPrice.value = 2
+      await act(() => {
+        rerender([2])
+      })
 
       await waitFor(() => {
         expect(result.current).toEqual({
@@ -149,7 +150,7 @@ describe(useLineChartPrice, () => {
     it('returns active cursor price even if currentSpot and data are provided', async () => {
       mockCursorPrice('3')
       const { result } = renderHookWithProviders(useLineChartPrice, {
-        initialProps: [makeMutable(4)],
+        initialProps: [4],
       })
 
       expect(result.current).toEqual({
@@ -162,7 +163,7 @@ describe(useLineChartPrice, () => {
     it('updates returned active cursor price when it changes', async () => {
       mockCursorPrice('1')
       const { result } = renderHookWithProviders(useLineChartPrice, {
-        initialProps: [makeMutable(4)],
+        initialProps: [4],
       })
 
       expect(result.current).toEqual(
diff --git a/apps/mobile/src/components/PriceExplorer/usePrice.tsx b/apps/mobile/src/components/PriceExplorer/usePrice.tsx
index 28fc16af3e0..3c93865a4df 100644
--- a/apps/mobile/src/components/PriceExplorer/usePrice.tsx
+++ b/apps/mobile/src/components/PriceExplorer/usePrice.tsx
@@ -26,9 +26,7 @@ export type ValueAndFormattedWithAnimation = ValueAndFormatted & {
  * Wrapper around react-native-wagmi-chart#useLineChartPrice
  * @returns latest price when not scrubbing and active price when scrubbing
  */
-export function useLineChartPrice(
-  currentSpot?: SharedValue<number>
-): ValueAndFormattedWithAnimation {
+export function useLineChartPrice(currentSpot?: number): ValueAndFormattedWithAnimation {
   const { value: activeCursorPrice } = useRNWagmiChartLineChartPrice({
     // do not round
     precision: 18,
@@ -57,7 +55,7 @@ export function useLineChartPrice(
 
     shouldAnimate.value = true
     // show spot price when chart not scrubbing, or if not available, show the last price in the chart
-    return currentSpot?.value ?? data[data.length - 1]?.value ?? 0
+    return currentSpot ?? data[data.length - 1]?.value ?? 0
   })
   const priceFormatted = useDerivedValue(() => {
     const { symbol, code } = currencyInfo
diff --git a/apps/mobile/src/components/PriceExplorer/usePriceHistory.test.ts b/apps/mobile/src/components/PriceExplorer/usePriceHistory.test.ts
index fa7da3e30a9..c513bfb4207 100644
--- a/apps/mobile/src/components/PriceExplorer/usePriceHistory.test.ts
+++ b/apps/mobile/src/components/PriceExplorer/usePriceHistory.test.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { waitFor } from '@testing-library/react-native'
 import { act } from 'react-test-renderer'
 import { useTokenPriceHistory } from 'src/components/PriceExplorer/usePriceHistory'
@@ -8,15 +9,15 @@ import {
   TokenMarket as TokenMarketType,
   TokenProject as TokenProjectType,
 } from 'wallet/src/data/__generated__/types-and-hooks'
-import { SAMPLE_CURRENCY_ID_1, faker } from 'wallet/src/test/fixtures'
+import { faker, SAMPLE_CURRENCY_ID_1 } from 'wallet/src/test/fixtures'
 import {
   EthToken,
   TokenDayPriceHistory,
   TokenMarket,
   TokenProjectDay,
+  TokenProjects,
   TokenProjectWeek,
   TokenProjectYear,
-  TokenProjects,
   TokenWeekPriceHistory,
   TokenYearPriceHistory,
 } from 'wallet/src/test/gqlFixtures'
@@ -85,8 +86,8 @@ describe(useTokenPriceHistory, () => {
     })
 
     expect(result.current.data?.spot).toEqual({
-      value: expect.objectContaining({ value: TokenMarket.price?.value }),
-      relativeChange: expect.objectContaining({ value: TokenMarket.pricePercentChange?.value }),
+      value: { value: TokenMarket.price?.value },
+      relativeChange: { value: TokenMarket.pricePercentChange?.value },
     })
   })
 
@@ -215,10 +216,8 @@ describe(useTokenPriceHistory, () => {
 
       await waitFor(() => {
         expect(result.current.data?.spot).toEqual({
-          value: expect.objectContaining({ value: TokenProjectDay.markets?.[0]?.price?.value }),
-          relativeChange: expect.objectContaining({
-            value: TokenProjectDay.markets?.[0]?.pricePercentChange24h?.value,
-          }),
+          value: { value: TokenProjectDay.markets?.[0]?.price?.value },
+          relativeChange: { value: TokenProjectDay.markets?.[0]?.pricePercentChange24h?.value },
         })
       })
     })
@@ -250,10 +249,8 @@ describe(useTokenPriceHistory, () => {
 
       await waitFor(() => {
         expect(result.current.data?.spot).toEqual({
-          value: expect.objectContaining({ value: TokenProjectYear.markets?.[0]?.price?.value }),
-          relativeChange: expect.objectContaining({
-            value: TokenProjectYear.markets?.[0]?.pricePercentChange24h?.value,
-          }),
+          value: { value: TokenProjectYear.markets?.[0]?.price?.value },
+          relativeChange: { value: TokenProjectYear.markets?.[0]?.pricePercentChange24h?.value },
         })
       })
     })
@@ -301,10 +298,8 @@ describe(useTokenPriceHistory, () => {
         expect(result.current.data).toEqual({
           priceHistory: formatPriceHistory(TokenDayPriceHistory),
           spot: {
-            value: expect.objectContaining({ value: TokenProjectDay.markets?.[0]?.price?.value }),
-            relativeChange: expect.objectContaining({
-              value: TokenProjectDay.markets?.[0]?.pricePercentChange24h?.value,
-            }),
+            value: { value: TokenProjectDay.markets?.[0]?.price?.value },
+            relativeChange: { value: TokenProjectDay.markets?.[0]?.pricePercentChange24h?.value },
           },
         })
       })
@@ -318,10 +313,8 @@ describe(useTokenPriceHistory, () => {
         expect(result.current.data).toEqual({
           priceHistory: formatPriceHistory(TokenWeekPriceHistory),
           spot: {
-            value: expect.objectContaining({ value: TokenProjectWeek.markets?.[0]?.price?.value }),
-            relativeChange: expect.objectContaining({
-              value: TokenProjectWeek.markets?.[0]?.pricePercentChange24h?.value,
-            }),
+            value: { value: TokenProjectWeek.markets?.[0]?.price?.value },
+            relativeChange: { value: TokenProjectWeek.markets?.[0]?.pricePercentChange24h?.value },
           },
         })
       })
diff --git a/apps/mobile/src/components/PriceExplorer/usePriceHistory.ts b/apps/mobile/src/components/PriceExplorer/usePriceHistory.ts
index 46fbfb34450..1bc98a03da9 100644
--- a/apps/mobile/src/components/PriceExplorer/usePriceHistory.ts
+++ b/apps/mobile/src/components/PriceExplorer/usePriceHistory.ts
@@ -1,15 +1,15 @@
 import { maxBy } from 'lodash'
 import { Dispatch, SetStateAction, useCallback, useMemo, useState } from 'react'
-import { SharedValue, useDerivedValue } from 'react-native-reanimated'
+import { SharedValue } from 'react-native-reanimated'
 import { TLineChartData } from 'react-native-wagmi-charts'
+import { GqlResult } from 'src/features/dataApi/types'
 import { PollingInterval } from 'wallet/src/constants/misc'
+import { isError, isNonPollingRequestInFlight } from 'wallet/src/data/utils'
 import {
   HistoryDuration,
   TimestampedAmount,
   useTokenPriceHistoryQuery,
 } from 'wallet/src/data/__generated__/types-and-hooks'
-import { isError, isNonPollingRequestInFlight } from 'wallet/src/data/utils'
-import { GqlResult } from 'wallet/src/features/dataApi/types'
 import { currencyIdToContractInput } from 'wallet/src/features/dataApi/utils'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 
@@ -69,18 +69,15 @@ export function useTokenPriceHistory(
   const pricePercentChange24h =
     offChainData?.pricePercentChange24h?.value ?? onChainData?.pricePercentChange24h?.value ?? 0
 
-  const spotValue = useDerivedValue(() => price ?? 0)
-  const spotRelativeChange = useDerivedValue(() => pricePercentChange24h)
-
   const spot = useMemo(
     () =>
-      price !== undefined
+      price
         ? {
-            value: spotValue,
-            relativeChange: spotRelativeChange,
+            value: { value: price },
+            relativeChange: { value: pricePercentChange24h },
           }
         : undefined,
-    [price, spotValue, spotRelativeChange]
+    [price, pricePercentChange24h]
   )
 
   const formattedPriceHistory = useMemo(() => {
diff --git a/apps/mobile/src/components/QRCodeScanner/QRCode.tsx b/apps/mobile/src/components/QRCodeScanner/QRCode.tsx
index 53cbb40ea95..df7311b9a1b 100644
--- a/apps/mobile/src/components/QRCodeScanner/QRCode.tsx
+++ b/apps/mobile/src/components/QRCodeScanner/QRCode.tsx
@@ -1,7 +1,9 @@
 import React, { memo, useMemo } from 'react'
 import { ImageSourcePropType, StyleSheet } from 'react-native'
 import QRCode from 'src/components/QRCodeScanner/custom-qr-code-generator'
-import { ColorTokens, Flex, Unicon, useSporeColors, useUniconColors } from 'ui/src'
+import { Unicon } from 'src/components/unicons/Unicon'
+import { useUniconColors } from 'src/components/unicons/utils'
+import { ColorTokens, Flex, useSporeColors } from 'ui/src'
 import { borderRadii, opacify } from 'ui/src/theme'
 import { isAndroid } from 'wallet/src/utils/platform'
 
diff --git a/apps/mobile/src/components/QRCodeScanner/QRCodeScanner.tsx b/apps/mobile/src/components/QRCodeScanner/QRCodeScanner.tsx
index 1e985703f6a..97fd366b24f 100644
--- a/apps/mobile/src/components/QRCodeScanner/QRCodeScanner.tsx
+++ b/apps/mobile/src/components/QRCodeScanner/QRCodeScanner.tsx
@@ -6,7 +6,10 @@ import { Alert, LayoutChangeEvent, LayoutRectangle, StyleSheet } from 'react-nat
 import { launchImageLibrary } from 'react-native-image-picker'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
 import { Defs, LinearGradient, Path, Rect, Stop, Svg } from 'react-native-svg'
+import PasteButton from 'src/components/buttons/PasteButton'
 import { DevelopmentOnly } from 'src/components/DevelopmentOnly/DevelopmentOnly'
+import { SpinningLoader } from 'src/components/loading/SpinningLoader'
+import { openSettings } from 'src/utils/linking'
 import {
   AnimatedFlex,
   Button,
@@ -19,9 +22,6 @@ import {
 import CameraScan from 'ui/src/assets/icons/camera-scan.svg'
 import { iconSizes, spacing } from 'ui/src/theme'
 import { useAsyncData } from 'utilities/src/react/hooks'
-import PasteButton from 'wallet/src/components/buttons/PasteButton'
-import { SpinningLoader } from 'wallet/src/components/loading/SpinningLoader'
-import { openSettings } from 'wallet/src/utils/linking'
 
 type QRCodeScannerProps = {
   onScanCode: (data: string) => void
diff --git a/apps/mobile/src/components/QRCodeScanner/WalletQRCode.tsx b/apps/mobile/src/components/QRCodeScanner/WalletQRCode.tsx
index db9a5904ee0..31225c51c14 100644
--- a/apps/mobile/src/components/QRCodeScanner/WalletQRCode.tsx
+++ b/apps/mobile/src/components/QRCodeScanner/WalletQRCode.tsx
@@ -1,28 +1,20 @@
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
+import { AddressDisplay } from 'src/components/AddressDisplay'
 import { GradientBackground } from 'src/components/gradients/GradientBackground'
 import { UniconThemedGradient } from 'src/components/gradients/UniconThemedGradient'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
 import { QRCodeDisplay } from 'src/components/QRCodeScanner/QRCode'
+import { LearnMoreLink } from 'src/components/text/LearnMoreLink'
+import { useUniconColors } from 'src/components/unicons/utils'
 import { NetworkLogos } from 'src/components/WalletConnect/NetworkLogos'
-import {
-  AnimatedFlex,
-  Flex,
-  Icons,
-  Text,
-  TouchableArea,
-  useIsDarkMode,
-  useMedia,
-  useSporeColors,
-  useUniconColors,
-} from 'ui/src'
+import { ModalName } from 'src/features/telemetry/constants'
+import { AnimatedFlex, Flex, Icons, Text, useMedia, useSporeColors } from 'ui/src'
 import { iconSizes, spacing } from 'ui/src/theme'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import { ALL_SUPPORTED_CHAIN_IDS } from 'wallet/src/constants/chains'
 import { uniswapUrls } from 'wallet/src/constants/urls'
-import { ModalName } from 'wallet/src/telemetry/constants'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 
 interface Props {
   address?: Address
@@ -87,17 +79,16 @@ export function WalletQRCode({ address }: Props): JSX.Element | null {
         <Text color="$neutral2" lineHeight={20} textAlign="center" variant="body3">
           {t('You can send tokens on all of our supported networks to this address.')}
         </Text>
-        <TouchableArea onPress={(): void => setShowModal(true)}>
-          <Flex row gap="$spacing4">
-            <NetworkLogos negativeGap chains={ALL_SUPPORTED_CHAIN_IDS} />
-            <Icons.RotatableChevron
-              color="$neutral3"
-              direction="down"
-              height={iconSizes.icon20}
-              width={iconSizes.icon20}
-            />
-          </Flex>
-        </TouchableArea>
+        <Flex row gap="$spacing4">
+          <NetworkLogos negativeGap chains={ALL_SUPPORTED_CHAIN_IDS} />
+          <Icons.RotatableChevron
+            color="$neutral3"
+            direction="down"
+            height={iconSizes.icon20}
+            width={iconSizes.icon20}
+            onPress={(): void => setShowModal(true)}
+          />
+        </Flex>
       </AnimatedFlex>
       {showModal && (
         <WarningModal
diff --git a/packages/wallet/src/components/RecipientSearch/RecipientList.tsx b/apps/mobile/src/components/RecipientSelect/RecipientList.tsx
similarity index 78%
rename from packages/wallet/src/components/RecipientSearch/RecipientList.tsx
rename to apps/mobile/src/components/RecipientSelect/RecipientList.tsx
index 1fe11a3363a..2c680b657e5 100644
--- a/packages/wallet/src/components/RecipientSearch/RecipientList.tsx
+++ b/apps/mobile/src/components/RecipientSelect/RecipientList.tsx
@@ -1,8 +1,8 @@
+import React from 'react'
 import { ListRenderItemInfo, SectionList, SectionListData } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
-import { isWeb } from 'tamagui'
+import { AddressDisplay } from 'src/components/AddressDisplay'
 import { AnimatedFlex, Inset, Text, TouchableArea } from 'ui/src'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
 import { SearchableRecipient } from 'wallet/src/features/address/types'
 
 interface RecipientListProps {
@@ -13,8 +13,7 @@ interface RecipientListProps {
 export function RecipientList({ onPress, sections }: RecipientListProps): JSX.Element {
   const renderItem = function ({ item }: ListRenderItemInfo<SearchableRecipient>): JSX.Element {
     return (
-      // TODO(EXT-526): re-enable `exiting` animation when it's fixed.
-      <AnimatedFlex entering={FadeIn} exiting={isWeb ? undefined : FadeOut} py="$spacing12">
+      <AnimatedFlex entering={FadeIn} exiting={FadeOut} py="$spacing12">
         <RecipientRow recipient={item} onPress={onPress} />
       </AnimatedFlex>
     )
@@ -36,12 +35,7 @@ export function RecipientList({ onPress, sections }: RecipientListProps): JSX.El
 
 function SectionHeader(info: { section: SectionListData<SearchableRecipient> }): JSX.Element {
   return (
-    <AnimatedFlex
-      backgroundColor="$surface1"
-      entering={FadeIn}
-      // TODO(EXT-526): re-enable `exiting` animation when it's fixed.
-      exiting={isWeb ? undefined : FadeOut}
-      py="$spacing8">
+    <AnimatedFlex backgroundColor="$surface1" entering={FadeIn} exiting={FadeOut} py="$spacing8">
       <Text color="$neutral2" variant="subheading2">
         {info.section.title}
       </Text>
diff --git a/apps/mobile/src/components/RecipientSelect/RecipientScanModal.tsx b/apps/mobile/src/components/RecipientSelect/RecipientScanModal.tsx
index 5d8415efd98..fce8a8f0834 100644
--- a/apps/mobile/src/components/RecipientSelect/RecipientScanModal.tsx
+++ b/apps/mobile/src/components/RecipientSelect/RecipientScanModal.tsx
@@ -4,17 +4,18 @@ import { useTranslation } from 'react-i18next'
 import { Alert } from 'react-native'
 import 'react-native-reanimated'
 import { useAppSelector } from 'src/app/hooks'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import { QRCodeScanner } from 'src/components/QRCodeScanner/QRCodeScanner'
 import { WalletQRCode } from 'src/components/QRCodeScanner/WalletQRCode'
 import { getSupportedURI, URIType } from 'src/components/WalletConnect/ScanSheet/util'
-import { Flex, Text, TouchableArea, useIsDarkMode, useSporeColors } from 'ui/src'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
+import { Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
 import Scan from 'ui/src/assets/icons/receive.svg'
 import ScanQRIcon from 'ui/src/assets/icons/scan.svg'
 import { iconSizes } from 'ui/src/theme'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { selectActiveAccountAddress } from 'wallet/src/features/wallet/selectors'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 
 type Props = {
   onClose: () => void
diff --git a/apps/mobile/src/components/RecipientSelect/RecipientSelect.tsx b/apps/mobile/src/components/RecipientSelect/RecipientSelect.tsx
index c45e0ed5038..8df5e1f9583 100644
--- a/apps/mobile/src/components/RecipientSelect/RecipientSelect.tsx
+++ b/apps/mobile/src/components/RecipientSelect/RecipientSelect.tsx
@@ -2,17 +2,17 @@ import React, { memo, useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Keyboard } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
+import { useBottomSheetContext } from 'src/components/modals/BottomSheetContext'
+import { filterRecipientByNameAndAddress } from 'src/components/RecipientSelect/filter'
+import { useRecipients } from 'src/components/RecipientSelect/hooks'
+import { RecipientList } from 'src/components/RecipientSelect/RecipientList'
 import { RecipientScanModal } from 'src/components/RecipientSelect/RecipientScanModal'
+import { filterSections } from 'src/components/RecipientSelect/utils'
+import { SearchBar } from 'src/components/TokenSelector/SearchBar'
+import { ElementName } from 'src/features/telemetry/constants'
 import { AnimatedFlex, Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
 import ScanQRIcon from 'ui/src/assets/icons/scan.svg'
 import { iconSizes } from 'ui/src/theme'
-import { useBottomSheetContext } from 'wallet/src/components/modals/BottomSheetContext'
-import { filterRecipientByNameAndAddress } from 'wallet/src/components/RecipientSearch/filter'
-import { useRecipients } from 'wallet/src/components/RecipientSearch/hooks'
-import { RecipientList } from 'wallet/src/components/RecipientSearch/RecipientList'
-import { filterSections } from 'wallet/src/components/RecipientSearch/utils'
-import { SearchBar } from 'wallet/src/features/search/SearchBar'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 interface RecipientSelectProps {
   onSelectRecipient: (newRecipientAddress: string) => void
diff --git a/packages/wallet/src/components/RecipientSearch/filter.test.ts b/apps/mobile/src/components/RecipientSelect/filter.test.ts
similarity index 98%
rename from packages/wallet/src/components/RecipientSearch/filter.test.ts
rename to apps/mobile/src/components/RecipientSelect/filter.test.ts
index 69f49f02f55..b3361a01ce5 100644
--- a/packages/wallet/src/components/RecipientSearch/filter.test.ts
+++ b/apps/mobile/src/components/RecipientSelect/filter.test.ts
@@ -4,7 +4,7 @@ import {
   filterRecipientByNameAndAddress,
   filterRecipientsByAddress,
   filterRecipientsByName,
-} from 'wallet/src/components/RecipientSearch/filter'
+} from 'src/components/RecipientSelect/filter'
 import { SearchableRecipient } from 'wallet/src/features/address/types'
 import { SearchableRecipients } from 'wallet/src/test/fixtures'
 
diff --git a/packages/wallet/src/components/RecipientSearch/filter.ts b/apps/mobile/src/components/RecipientSelect/filter.ts
similarity index 100%
rename from packages/wallet/src/components/RecipientSearch/filter.ts
rename to apps/mobile/src/components/RecipientSelect/filter.ts
diff --git a/apps/mobile/src/components/RecipientSelect/hooks.test.ts b/apps/mobile/src/components/RecipientSelect/hooks.test.ts
index 744bcd408a1..743b29d209e 100644
--- a/apps/mobile/src/components/RecipientSelect/hooks.test.ts
+++ b/apps/mobile/src/components/RecipientSelect/hooks.test.ts
@@ -3,7 +3,8 @@ import { waitFor } from '@testing-library/react-native'
 import { toIncludeSameMembers } from 'jest-extended'
 import { act } from 'react-test-renderer'
 import { MobileState } from 'src/app/reducer'
-import { useRecipients } from 'wallet/src/components/RecipientSearch/hooks'
+import { useRecipients } from 'src/components/RecipientSelect/hooks'
+import { renderHook } from 'src/test/test-utils'
 import { ChainId } from 'wallet/src/constants/chains'
 import { SearchableRecipient } from 'wallet/src/features/address/types'
 import { TransactionStateMap } from 'wallet/src/features/transactions/slice'
@@ -18,14 +19,9 @@ import {
   sendTxDetailsFailed,
   sendTxDetailsPending,
 } from 'wallet/src/test/fixtures'
-import { renderHook } from 'wallet/src/test/test-utils'
 
 expect.extend({ toIncludeSameMembers })
 
-/**
- * Tests interaction of mobile state with useRecipients hook
- */
-
 type PreloadedStateProps = {
   watchedAddresses?: Address[]
   hasInactiveAccounts?: boolean
@@ -234,6 +230,7 @@ describe(useRecipients, () => {
         }),
       })
 
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const section = result.current.sections[0]!
       expect(section.title).toEqual('Recent')
       // This method doesn't check the order of the elements
diff --git a/packages/wallet/src/components/RecipientSearch/hooks.ts b/apps/mobile/src/components/RecipientSelect/hooks.ts
similarity index 98%
rename from packages/wallet/src/components/RecipientSearch/hooks.ts
rename to apps/mobile/src/components/RecipientSelect/hooks.ts
index d0fcd4b1146..82a3ac1f62a 100644
--- a/packages/wallet/src/components/RecipientSearch/hooks.ts
+++ b/apps/mobile/src/components/RecipientSelect/hooks.ts
@@ -1,5 +1,6 @@
 import { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { useAppSelector } from 'src/app/hooks'
 import { ChainId } from 'wallet/src/constants/chains'
 import { SearchableRecipient } from 'wallet/src/features/address/types'
 import { uniqueAddressesOnly } from 'wallet/src/features/address/utils'
@@ -7,7 +8,6 @@ import { useENS } from 'wallet/src/features/ens/useENS'
 import { selectWatchedAddressSet } from 'wallet/src/features/favorites/selectors'
 import { selectRecipientsByRecency } from 'wallet/src/features/transactions/selectors'
 import { selectInactiveAccounts } from 'wallet/src/features/wallet/selectors'
-import { useAppSelector } from 'wallet/src/state'
 import { getValidAddress } from 'wallet/src/utils/addresses'
 
 const MAX_RECENT_RECIPIENTS = 15
diff --git a/packages/wallet/src/components/RecipientSearch/utils.test.ts b/apps/mobile/src/components/RecipientSelect/utils.test.ts
similarity index 94%
rename from packages/wallet/src/components/RecipientSearch/utils.test.ts
rename to apps/mobile/src/components/RecipientSelect/utils.test.ts
index a086de89090..f7b2a63565b 100644
--- a/packages/wallet/src/components/RecipientSearch/utils.test.ts
+++ b/apps/mobile/src/components/RecipientSelect/utils.test.ts
@@ -1,4 +1,4 @@
-import { filterSections } from 'wallet/src/components/RecipientSearch/utils'
+import { filterSections } from 'src/components/RecipientSelect/utils'
 import {
   RecipientSections,
   SAMPLE_SEED_ADDRESS_1,
diff --git a/packages/wallet/src/components/RecipientSearch/utils.ts b/apps/mobile/src/components/RecipientSelect/utils.ts
similarity index 100%
rename from packages/wallet/src/components/RecipientSearch/utils.ts
rename to apps/mobile/src/components/RecipientSelect/utils.ts
diff --git a/apps/mobile/src/components/RemoveWallet/AssociatedAccountsList.tsx b/apps/mobile/src/components/RemoveWallet/AssociatedAccountsList.tsx
index 3b62016a75d..6e9fc53b80b 100644
--- a/apps/mobile/src/components/RemoveWallet/AssociatedAccountsList.tsx
+++ b/apps/mobile/src/components/RemoveWallet/AssociatedAccountsList.tsx
@@ -1,11 +1,11 @@
 import React, { useMemo } from 'react'
 import { ScrollView, StyleSheet } from 'react-native'
+import { useAccountList } from 'src/components/accounts/hooks'
+import { AddressDisplay } from 'src/components/AddressDisplay'
 import { Flex, Text, useDeviceDimensions } from 'ui/src'
 import { spacing } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
 import { AccountListQuery } from 'wallet/src/data/__generated__/types-and-hooks'
-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'
 
diff --git a/apps/mobile/src/components/RemoveWallet/RemoveLastMnemonicWalletFooter.tsx b/apps/mobile/src/components/RemoveWallet/RemoveLastMnemonicWalletFooter.tsx
index dcf36b62be9..d985925955d 100644
--- a/apps/mobile/src/components/RemoveWallet/RemoveLastMnemonicWalletFooter.tsx
+++ b/apps/mobile/src/components/RemoveWallet/RemoveLastMnemonicWalletFooter.tsx
@@ -1,8 +1,8 @@
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { SpinningLoader } from 'src/components/loading/SpinningLoader'
+import { ElementName } from 'src/features/telemetry/constants'
 import { Button, CheckBox, Flex, Text } from 'ui/src'
-import { SpinningLoader } from 'wallet/src/components/loading/SpinningLoader'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 export function RemoveLastMnemonicWalletFooter({
   onPress,
diff --git a/apps/mobile/src/components/RemoveWallet/RemoveWalletModal.tsx b/apps/mobile/src/components/RemoveWallet/RemoveWalletModal.tsx
index 459cfddec0e..6edcf1af70e 100644
--- a/apps/mobile/src/components/RemoveWallet/RemoveWalletModal.tsx
+++ b/apps/mobile/src/components/RemoveWallet/RemoveWalletModal.tsx
@@ -4,6 +4,8 @@ import { useAnimatedStyle, withTiming } from 'react-native-reanimated'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { Delay } from 'src/components/layout/Delayed'
+import { SpinningLoader } from 'src/components/loading/SpinningLoader'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { AssociatedAccountsList } from 'src/components/RemoveWallet/AssociatedAccountsList'
 import { RemoveLastMnemonicWalletFooter } from 'src/components/RemoveWallet/RemoveLastMnemonicWalletFooter'
 import { RemoveWalletStep, useModalContent } from 'src/components/RemoveWallet/useModalContent'
@@ -11,11 +13,10 @@ import { navigateToOnboardingImportMethod } from 'src/components/RemoveWallet/ut
 import { useBiometricAppSettings, useBiometricPrompt } from 'src/features/biometrics/hooks'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { selectModalState } from 'src/features/modals/selectModalState'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { OnboardingScreens, Screens } from 'src/screens/Screens'
 import { AnimatedFlex, Button, ColorTokens, Flex, Text, ThemeKeys, useSporeColors } from 'ui/src'
 import { iconSizes, opacify } from 'ui/src/theme'
-import { SpinningLoader } from 'wallet/src/components/loading/SpinningLoader'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
 import { ImportType, OnboardingEntryPoint } from 'wallet/src/features/onboarding/types'
 import {
   EditAccountAction,
@@ -24,7 +25,6 @@ import {
 import { useAccounts } from 'wallet/src/features/wallet/hooks'
 import { selectSignerMnemonicAccounts } from 'wallet/src/features/wallet/selectors'
 import { setFinishedOnboarding } from 'wallet/src/features/wallet/slice'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 
 export function RemoveWalletModal(): JSX.Element | null {
   const { t } = useTranslation()
diff --git a/apps/mobile/src/components/RemoveWallet/useModalContent.tsx b/apps/mobile/src/components/RemoveWallet/useModalContent.tsx
index 5e55bc9e43b..fbeb5c487da 100644
--- a/apps/mobile/src/components/RemoveWallet/useModalContent.tsx
+++ b/apps/mobile/src/components/RemoveWallet/useModalContent.tsx
@@ -42,7 +42,7 @@ export const useModalContent = ({
 }: ModalContentParams): ModalContentResult | undefined => {
   const { t } = useTranslation()
 
-  const displayName = useDisplayName(account?.address, { includeUnitagSuffix: true })
+  const displayName = useDisplayName(account?.address)
 
   return useMemo(() => {
     // 1st speed bump when removing recovery phrase
@@ -173,7 +173,7 @@ export const useModalContent = ({
     account,
     associatedAccounts,
     currentStep,
-    displayName,
+    displayName?.name,
     isRemovingRecoveryPhrase,
     isReplacing,
     t,
diff --git a/apps/mobile/src/components/RestoreWalletModal/RestoreWalletModal.tsx b/apps/mobile/src/components/RestoreWalletModal/RestoreWalletModal.tsx
index ee4d9e31956..c7fdc425a00 100644
--- a/apps/mobile/src/components/RestoreWalletModal/RestoreWalletModal.tsx
+++ b/apps/mobile/src/components/RestoreWalletModal/RestoreWalletModal.tsx
@@ -2,14 +2,14 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { useAppDispatch } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { closeAllModals, closeModal } from 'src/features/modals/modalSlice'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { OnboardingScreens, Screens } from 'src/screens/Screens'
 import { Button, Flex, Text, useSporeColors } from 'ui/src'
 import LockIcon from 'ui/src/assets/icons/lock.svg'
 import { iconSizes, opacify } from 'ui/src/theme'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
 import { ImportType, OnboardingEntryPoint } from 'wallet/src/features/onboarding/types'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 
 export function RestoreWalletModal(): JSX.Element | null {
   const { t } = useTranslation()
diff --git a/apps/mobile/src/components/Settings/BiometricAuthWarningModal.tsx b/apps/mobile/src/components/Settings/BiometricAuthWarningModal.tsx
index 93809b8c7e2..94a7693daca 100644
--- a/apps/mobile/src/components/Settings/BiometricAuthWarningModal.tsx
+++ b/apps/mobile/src/components/Settings/BiometricAuthWarningModal.tsx
@@ -1,12 +1,9 @@
 import React from 'react'
 import { useTranslation } from 'react-i18next'
+import { WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal, { WarningModalProps } from 'src/components/modals/WarningModal/WarningModal'
 import { useBiometricName } from 'src/features/biometrics/hooks'
-import {
-  WarningModal,
-  WarningModalProps,
-} from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
+import { ModalName } from 'src/features/telemetry/constants'
 
 type Props = {
   isTouchIdDevice: boolean
diff --git a/apps/mobile/src/components/Settings/SettingsRow.tsx b/apps/mobile/src/components/Settings/SettingsRow.tsx
index 156a215b50b..6569bebb71a 100644
--- a/apps/mobile/src/components/Settings/SettingsRow.tsx
+++ b/apps/mobile/src/components/Settings/SettingsRow.tsx
@@ -7,15 +7,15 @@ import {
   SettingsStackNavigationProp,
   SettingsStackParamList,
 } from 'src/app/navigation/types'
+import { Switch } from 'src/components/buttons/Switch'
+import { Arrow } from 'src/components/icons/Arrow'
 import { openModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { Screens } from 'src/screens/Screens'
+import { openUri } from 'src/utils/linking'
 import { Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
-import { Switch } from 'wallet/src/components/buttons/Switch'
-import { Arrow } from 'wallet/src/components/icons/Arrow'
 import { useAppDispatch } from 'wallet/src/state'
-import { ModalName } from 'wallet/src/telemetry/constants'
-import { openUri } from 'wallet/src/utils/linking'
 
 export interface SettingsSection {
   subTitle: string
@@ -27,8 +27,7 @@ export interface SettingsSectionItemComponent {
   component: JSX.Element
   isHidden?: boolean
 }
-type SettingsModal = typeof ModalName.FiatCurrencySelector | typeof ModalName.LanguageSelector
-
+type SettingsModal = Extract<ModalName, ModalName.FiatCurrencySelector | ModalName.LanguageSelector>
 export interface SettingsSectionItem {
   screen?: keyof SettingsStackParamList | typeof Screens.OnboardingStack
   modal?: SettingsModal
diff --git a/packages/wallet/src/features/transactions/TransactionDetails/SwapFee.tsx b/apps/mobile/src/components/SwapFee/SwapFee.tsx
similarity index 98%
rename from packages/wallet/src/features/transactions/TransactionDetails/SwapFee.tsx
rename to apps/mobile/src/components/SwapFee/SwapFee.tsx
index a5cdf073b53..927bc5a7502 100644
--- a/packages/wallet/src/features/transactions/TransactionDetails/SwapFee.tsx
+++ b/apps/mobile/src/components/SwapFee/SwapFee.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { Flex, Icons, Text, TouchableArea } from 'ui/src'
 import { NumberType } from 'utilities/src/format/types'
diff --git a/packages/wallet/src/features/portfolio/HiddenTokensRow.tsx b/apps/mobile/src/components/TokenBalanceList/HiddenTokensRow.tsx
similarity index 85%
rename from packages/wallet/src/features/portfolio/HiddenTokensRow.tsx
rename to apps/mobile/src/components/TokenBalanceList/HiddenTokensRow.tsx
index 180cf8d8bdd..6426f7904aa 100644
--- a/packages/wallet/src/features/portfolio/HiddenTokensRow.tsx
+++ b/apps/mobile/src/components/TokenBalanceList/HiddenTokensRow.tsx
@@ -1,31 +1,28 @@
 import { ImpactFeedbackStyle } from 'expo-haptics'
-import { useCallback } from 'react'
+import React, { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Easing, useAnimatedStyle, useSharedValue, withTiming } from 'react-native-reanimated'
 import { AnimatedFlex, Flex, Icons, Text, TouchableArea } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 
 export function HiddenTokensRow({
-  padded = false,
   numHidden,
   isExpanded,
   onPress,
 }: {
-  padded?: boolean
   numHidden: number
   isExpanded: boolean
   onPress: () => void
 }): JSX.Element {
   const { t } = useTranslation()
 
-  // TODO (EXT-482): make chevron rotation work with Tamagui animation
   const chevronRotate = useSharedValue(isExpanded ? 180 : 0)
 
   const chevronAnimatedStyle = useAnimatedStyle(() => {
     return {
       transform: [{ rotateZ: `${chevronRotate.value}deg` }],
     }
-  }, [])
+  })
 
   const onPressRow = useCallback(() => {
     chevronRotate.value = withTiming(chevronRotate.value === 0 ? 180 : 0, {
@@ -37,12 +34,7 @@ export function HiddenTokensRow({
 
   return (
     <TouchableArea hapticFeedback hapticStyle={ImpactFeedbackStyle.Light} onPress={onPressRow}>
-      <Flex
-        row
-        alignItems="center"
-        justifyContent="space-between"
-        px={padded ? '$spacing24' : '$none'}
-        py="$spacing12">
+      <Flex row alignItems="center" justifyContent="space-between" px="$spacing24" py="$spacing12">
         <Text color="$neutral2" variant="subheading2">
           {t('Hidden ({{numHidden}})', { numHidden })}
         </Text>
diff --git a/apps/mobile/src/components/TokenBalanceList/TokenBalanceList.tsx b/apps/mobile/src/components/TokenBalanceList/TokenBalanceList.tsx
index 61c58113bdf..b408e24051f 100644
--- a/apps/mobile/src/components/TokenBalanceList/TokenBalanceList.tsx
+++ b/apps/mobile/src/components/TokenBalanceList/TokenBalanceList.tsx
@@ -8,31 +8,25 @@ import Animated, { FadeInDown, FadeOut } from 'react-native-reanimated'
 import { useAppStackNavigation } from 'src/app/navigation/types'
 import { useAdaptiveFooter } from 'src/components/home/hooks'
 import {
+  TabProps,
   TAB_BAR_HEIGHT,
   TAB_VIEW_SCROLL_THROTTLE,
-  TabProps,
 } from 'src/components/layout/TabHelpers'
+import { Loader } from 'src/components/loading'
+import { HiddenTokensRow } from 'src/components/TokenBalanceList/HiddenTokensRow'
 import { TokenBalanceItemContextMenu } from 'src/components/TokenBalanceList/TokenBalanceItemContextMenu'
-import { Screens } from 'src/screens/Screens'
-import {
-  AnimatedFlex,
-  Flex,
-  Loader,
-  useDeviceDimensions,
-  useDeviceInsets,
-  useSporeColors,
-} from 'ui/src'
-import { zIndices } from 'ui/src/theme'
-import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
-import { isError, isNonPollingRequestInFlight } from 'wallet/src/data/utils'
-import { HiddenTokensRow } from 'wallet/src/features/portfolio/HiddenTokensRow'
-import { TokenBalanceItem } from 'wallet/src/features/portfolio/TokenBalanceItem'
 import {
   HIDDEN_TOKEN_BALANCES_ROW,
   TokenBalanceListContextProvider,
   TokenBalanceListRow,
   useTokenBalanceListContext,
-} from 'wallet/src/features/portfolio/TokenBalanceListContext'
+} from 'src/components/TokenBalanceList/TokenBalanceListContext'
+import { Screens } from 'src/screens/Screens'
+import { AnimatedFlex, Flex, useDeviceDimensions, useDeviceInsets, useSporeColors } from 'ui/src'
+import { zIndices } from 'ui/src/theme'
+import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
+import { isError, isNonPollingRequestInFlight } from 'wallet/src/data/utils'
+import { TokenBalanceItem } from 'wallet/src/features/portfolio/TokenBalanceItem'
 import { CurrencyId } from 'wallet/src/utils/currencyId'
 import { isAndroid } from 'wallet/src/utils/platform'
 
@@ -172,7 +166,9 @@ export const TokenBalanceListInner = forwardRef<
   // add negative z index to prevent footer from covering hidden tokens row when minimized
   const ListFooterComponentStyle = useMemo(() => ({ zIndex: zIndices.negative }), [])
 
-  const List = renderedInModal ? BottomSheetFlatList<TokenBalanceListRow> : Animated.FlatList
+  const List = renderedInModal
+    ? BottomSheetFlatList<TokenBalanceListRow>
+    : Animated.FlatList<TokenBalanceListRow>
 
   const getItemLayout = useCallback(
     (
@@ -260,7 +256,6 @@ const TokenBalanceItemRow = memo(function TokenBalanceItemRow({
   if (item === HIDDEN_TOKEN_BALANCES_ROW) {
     return (
       <HiddenTokensRow
-        padded
         isExpanded={hiddenTokensExpanded}
         numHidden={hiddenTokensCount}
         onPress={(): void => {
diff --git a/packages/wallet/src/features/portfolio/TokenBalanceListContext.tsx b/apps/mobile/src/components/TokenBalanceList/TokenBalanceListContext.tsx
similarity index 100%
rename from packages/wallet/src/features/portfolio/TokenBalanceListContext.tsx
rename to apps/mobile/src/components/TokenBalanceList/TokenBalanceListContext.tsx
diff --git a/apps/mobile/src/components/TokenDetails/LinkButton.tsx b/apps/mobile/src/components/TokenDetails/LinkButton.tsx
index b7018422682..2d5ad6f2b82 100644
--- a/apps/mobile/src/components/TokenDetails/LinkButton.tsx
+++ b/apps/mobile/src/components/TokenDetails/LinkButton.tsx
@@ -2,14 +2,14 @@ import React from 'react'
 import { SvgProps } from 'react-native-svg'
 import { useAppDispatch } from 'src/app/hooks'
 import Trace from 'src/components/Trace/Trace'
+import { ElementName } from 'src/features/telemetry/constants'
+import { setClipboard } from 'src/utils/clipboard'
+import { openUri } from 'src/utils/linking'
 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'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
-import { ElementNameType } from 'wallet/src/telemetry/constants'
-import { setClipboard } from 'wallet/src/utils/clipboard'
-import { openUri } from 'wallet/src/utils/linking'
 
 export enum LinkButtonType {
   Copy = 'copy',
@@ -28,7 +28,7 @@ export function LinkButton({
   buttonType: LinkButtonType
   label: string
   Icon?: React.FC<SvgProps & { size?: IconProps['size'] }>
-  element: ElementNameType
+  element: ElementName
   openExternalBrowser?: boolean
   isSafeUri?: boolean
   value: string
diff --git a/apps/mobile/src/components/TokenDetails/SendButton.tsx b/apps/mobile/src/components/TokenDetails/SendButton.tsx
index 40bc2d50e26..030ae495975 100644
--- a/apps/mobile/src/components/TokenDetails/SendButton.tsx
+++ b/apps/mobile/src/components/TokenDetails/SendButton.tsx
@@ -1,8 +1,8 @@
 import React from 'react'
+import { ElementName } from 'src/features/telemetry/constants'
 import { Flex, TouchableArea } from 'ui/src'
 import SendIcon from 'ui/src/assets/icons/send-action.svg'
 import { iconSizes } from 'ui/src/theme'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 type Props = {
   onPress: () => void
diff --git a/apps/mobile/src/components/TokenDetails/TokenBalances.tsx b/apps/mobile/src/components/TokenDetails/TokenBalances.tsx
index 3de1ccb1065..c97173d7b24 100644
--- a/apps/mobile/src/components/TokenDetails/TokenBalances.tsx
+++ b/apps/mobile/src/components/TokenDetails/TokenBalances.tsx
@@ -1,5 +1,6 @@
 import React, { useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
+import { InlineNetworkPill } from 'src/components/Network/NetworkPill'
 import { useTokenDetailsNavigation } from 'src/components/TokenDetails/hooks'
 import Trace from 'src/components/Trace/Trace'
 import { MobileEventName } from 'src/features/telemetry/constants'
@@ -7,7 +8,6 @@ import { Flex, Separator, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
 import { TokenLogo } from 'wallet/src/components/CurrencyLogo/TokenLogo'
-import { InlineNetworkPill } from 'wallet/src/components/network/NetworkPill'
 import { PortfolioBalance } from 'wallet/src/features/dataApi/types'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
@@ -33,7 +33,7 @@ export function TokenBalances({
 
   const activeAccount = useActiveAccount()
   const accountType = activeAccount?.type
-  const displayName = useDisplayName(activeAccount?.address, { includeUnitagSuffix: true })?.name
+  const displayName = useDisplayName(activeAccount?.address)?.name
   const isReadonly = accountType === AccountType.Readonly
 
   const hasCurrentChainBalances = Boolean(currentChainBalance)
diff --git a/apps/mobile/src/components/TokenDetails/TokenDetailsActionButtons.tsx b/apps/mobile/src/components/TokenDetails/TokenDetailsActionButtons.tsx
index ed3c0a4b31c..59cfc3d3d67 100644
--- a/apps/mobile/src/components/TokenDetails/TokenDetailsActionButtons.tsx
+++ b/apps/mobile/src/components/TokenDetails/TokenDetailsActionButtons.tsx
@@ -1,9 +1,9 @@
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import Trace from 'src/components/Trace/Trace'
+import { ElementName, SectionName } from 'src/features/telemetry/constants'
 import { Button, Flex } from 'ui/src'
 import { validColor } from 'ui/src/theme'
-import { ElementName, ElementNameType, SectionName } from 'wallet/src/telemetry/constants'
 import { getContrastPassingTextColor } from 'wallet/src/utils/colors'
 
 function CTAButton({
@@ -13,7 +13,7 @@ function CTAButton({
   tokenColor,
 }: {
   title: string
-  element: ElementNameType
+  element: ElementName
   onPress: () => void
   tokenColor?: Maybe<string>
 }): JSX.Element {
diff --git a/apps/mobile/src/components/TokenDetails/TokenDetailsHeader.tsx b/apps/mobile/src/components/TokenDetails/TokenDetailsHeader.tsx
index 2f44731dde9..96536c41d79 100644
--- a/apps/mobile/src/components/TokenDetails/TokenDetailsHeader.tsx
+++ b/apps/mobile/src/components/TokenDetails/TokenDetailsHeader.tsx
@@ -1,8 +1,8 @@
 import React from 'react'
+import WarningIcon from 'src/components/tokens/WarningIcon'
 import { Flex, flexStyles, Text, TouchableArea } from 'ui/src'
 import { iconSizes, imageSizes } from 'ui/src/theme'
 import { TokenLogo } from 'wallet/src/components/CurrencyLogo/TokenLogo'
-import WarningIcon from 'wallet/src/components/icons/WarningIcon'
 import { SafetyLevel, TokenDetailsScreenQuery } from 'wallet/src/data/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'wallet/src/features/chains/utils'
 
diff --git a/apps/mobile/src/components/TokenDetails/TokenDetailsLinks.tsx b/apps/mobile/src/components/TokenDetails/TokenDetailsLinks.tsx
index cb0d2c11231..10190a89090 100644
--- a/apps/mobile/src/components/TokenDetails/TokenDetailsLinks.tsx
+++ b/apps/mobile/src/components/TokenDetails/TokenDetailsLinks.tsx
@@ -2,18 +2,16 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { ScrollView, View } from 'react-native'
 import { getBlockExplorerIcon } from 'src/components/icons/BlockExplorerIcon'
+import { ElementName } from 'src/features/telemetry/constants'
+import { ExplorerDataType, getExplorerLink, getTwitterLink } from 'src/utils/linking'
 import { Flex, Text } from 'ui/src'
 import GlobeIcon from 'ui/src/assets/icons/globe-filled.svg'
-import TwitterIcon from 'ui/src/assets/icons/x-twitter.svg'
-import { CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
+import AddressIcon from 'ui/src/assets/icons/sticky-note-text-square.svg'
+import TwitterIcon from 'ui/src/assets/icons/twitter.svg'
+import { ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
 import { TokenDetailsScreenQuery } from 'wallet/src/data/__generated__/types-and-hooks'
-import { ElementName } from 'wallet/src/telemetry/constants'
-import {
-  currencyIdToAddress,
-  currencyIdToChain,
-  isDefaultNativeAddress,
-} from 'wallet/src/utils/currencyId'
-import { ExplorerDataType, getExplorerLink, getTwitterLink } from 'wallet/src/utils/linking'
+import { sanitizeAddressText, shortenAddress } from 'wallet/src/utils/addresses'
+import { currencyIdToAddress, currencyIdToChain } from 'wallet/src/utils/currencyId'
 import { LinkButton, LinkButtonType } from './LinkButton'
 
 export function TokenDetailsLinks({
@@ -29,7 +27,6 @@ export function TokenDetailsLinks({
   const chainId = currencyIdToChain(currencyId) ?? ChainId.Mainnet
   const address = currencyIdToAddress(currencyId)
   const explorerLink = getExplorerLink(chainId, address, ExplorerDataType.TOKEN)
-  const explorerName = CHAIN_INFO[chainId].explorer.name
 
   return (
     // eslint-disable-next-line react-native/no-inline-styles
@@ -41,11 +38,11 @@ export function TokenDetailsLinks({
         <ScrollView horizontal showsHorizontalScrollIndicator={false}>
           <Flex row gap="$spacing8" px="$spacing16">
             <LinkButton
-              Icon={getBlockExplorerIcon(chainId)}
-              buttonType={LinkButtonType.Link}
-              element={ElementName.TokenLinkEtherscan}
-              label={explorerName}
-              value={explorerLink}
+              Icon={AddressIcon}
+              buttonType={LinkButtonType.Copy}
+              element={ElementName.TokenAddress}
+              label={sanitizeAddressText(shortenAddress(address)) ?? ''}
+              value={address}
             />
             {homepageUrl && (
               <LinkButton
@@ -65,14 +62,13 @@ export function TokenDetailsLinks({
                 value={getTwitterLink(twitterName)}
               />
             )}
-            {!isDefaultNativeAddress(address) && (
-              <LinkButton
-                buttonType={LinkButtonType.Copy}
-                element={ElementName.Copy}
-                label={t('Contract')}
-                value={address}
-              />
-            )}
+            <LinkButton
+              Icon={getBlockExplorerIcon(chainId)}
+              buttonType={LinkButtonType.Link}
+              element={ElementName.TokenLinkEtherscan}
+              label={CHAIN_INFO[chainId].explorer.name}
+              value={explorerLink}
+            />
           </Flex>
         </ScrollView>
       </Flex>
diff --git a/apps/mobile/src/components/TokenDetails/hooks.test.ts b/apps/mobile/src/components/TokenDetails/hooks.test.ts
deleted file mode 100644
index fe994bb32d6..00000000000
--- a/apps/mobile/src/components/TokenDetails/hooks.test.ts
+++ /dev/null
@@ -1,179 +0,0 @@
-import { useCrossChainBalances, useTokenDetailsNavigation } from 'src/components/TokenDetails/hooks'
-import { Screens } from 'src/screens/Screens'
-import { act, renderHook, waitFor } from 'src/test/test-utils'
-import { USDBC_BASE, USDC_ARBITRUM } from 'wallet/src/constants/tokens'
-import { Chain } from 'wallet/src/data/__generated__/types-and-hooks'
-import { fromGraphQLChain } from 'wallet/src/features/chains/utils'
-import { currencyIdToContractInput } from 'wallet/src/features/dataApi/utils'
-import { SAMPLE_CURRENCY_ID_1, mockWalletPreloadedState } from 'wallet/src/test/fixtures'
-import { Portfolio, Portfolio2, PortfolioBalancesById } from 'wallet/src/test/gqlFixtures'
-
-const mockedNavigation = {
-  navigate: jest.fn(),
-  canGoBack: jest.fn(),
-  pop: jest.fn(),
-  push: jest.fn(),
-}
-
-jest.mock('@react-navigation/native', () => {
-  const actualNav = jest.requireActual('@react-navigation/native')
-  return {
-    ...actualNav,
-    // eslint-disable-next-line @typescript-eslint/explicit-function-return-type
-    useNavigation: () => mockedNavigation,
-  }
-})
-
-describe(useCrossChainBalances, () => {
-  describe('currentChainBalance', () => {
-    it('returns null if there are no balances for the specified currency', async () => {
-      const { result } = renderHook(() => useCrossChainBalances(SAMPLE_CURRENCY_ID_1, null), {
-        preloadedState: mockWalletPreloadedState,
-      })
-
-      await act(() => undefined)
-
-      expect(result.current).toEqual(
-        expect.objectContaining({
-          currentChainBalance: null,
-        })
-      )
-    })
-
-    it('returns balance if there is at least one for the specified currency', async () => {
-      const { result } = renderHook(() => useCrossChainBalances(SAMPLE_CURRENCY_ID_1, null), {
-        preloadedState: mockWalletPreloadedState,
-        resolvers: {
-          Query: {
-            portfolios: () => [Portfolio],
-          },
-        },
-      })
-
-      await waitFor(() => {
-        expect(result.current).toEqual(
-          expect.objectContaining({
-            currentChainBalance: PortfolioBalancesById[SAMPLE_CURRENCY_ID_1],
-          })
-        )
-      })
-    })
-  })
-
-  describe('otherChainBalances', () => {
-    // Current chain balance will be determined by the following currency id
-    const currencyId1 = `${fromGraphQLChain(Chain.Base)}-${USDBC_BASE.address.toLocaleLowerCase()}`
-    const currencyId2 = `${fromGraphQLChain(
-      Chain.Arbitrum
-    )}-${USDC_ARBITRUM.address.toLocaleLowerCase()}`
-
-    it('returns null if there are no bridged currencies', async () => {
-      const { result } = renderHook(() => useCrossChainBalances(SAMPLE_CURRENCY_ID_1, null), {
-        preloadedState: mockWalletPreloadedState,
-      })
-
-      await act(() => undefined)
-
-      expect(result.current).toEqual(
-        expect.objectContaining({
-          otherChainBalances: null,
-        })
-      )
-    })
-
-    it('does not include current chain balance in other chain balances', async () => {
-      const bridgeInfo: { chain: Chain; address?: string }[] = [
-        { chain: Chain.Base, address: USDBC_BASE.address.toLocaleLowerCase() },
-        { chain: Chain.Arbitrum, address: USDC_ARBITRUM.address.toLocaleLowerCase() },
-      ]
-      const { result } = renderHook(() => useCrossChainBalances(currencyId1, bridgeInfo), {
-        preloadedState: mockWalletPreloadedState,
-        resolvers: {
-          Query: {
-            portfolios: () => [Portfolio2],
-          },
-        },
-      })
-
-      await waitFor(() => {
-        expect(result.current).toEqual(
-          expect.objectContaining({
-            currentChainBalance: PortfolioBalancesById[currencyId1],
-            otherChainBalances: [PortfolioBalancesById[currencyId2]],
-          })
-        )
-      })
-    })
-  })
-})
-
-describe(useTokenDetailsNavigation, () => {
-  afterEach(() => {
-    jest.resetAllMocks()
-  })
-
-  it('returns correct result', () => {
-    const { result } = renderHook(() => useTokenDetailsNavigation())
-
-    expect(result.current).toEqual({
-      preload: expect.any(Function),
-      navigate: expect.any(Function),
-      navigateWithPop: expect.any(Function),
-    })
-  })
-
-  it('preloads token details when preload function is called', async () => {
-    const queryResolver = jest.fn()
-    const { result } = renderHook(() => useTokenDetailsNavigation(), {
-      resolvers: {
-        Query: {
-          token: queryResolver,
-        },
-      },
-    })
-
-    await act(() => result.current.preload(SAMPLE_CURRENCY_ID_1))
-
-    expect(queryResolver).toHaveBeenCalledTimes(1)
-    expect(queryResolver.mock.calls[0][1]).toEqual(currencyIdToContractInput(SAMPLE_CURRENCY_ID_1))
-  })
-
-  it('navigates to token details when navigate function is called', async () => {
-    const { result } = renderHook(() => useTokenDetailsNavigation())
-
-    await act(() => result.current.navigate(SAMPLE_CURRENCY_ID_1))
-
-    expect(mockedNavigation.navigate).toHaveBeenCalledTimes(1)
-    expect(mockedNavigation.navigate).toHaveBeenNthCalledWith(1, Screens.TokenDetails, {
-      currencyId: SAMPLE_CURRENCY_ID_1,
-    })
-  })
-
-  describe('navigationWithPop', () => {
-    it('pops the last screen from the stack and navigates to token details if can go back', async () => {
-      mockedNavigation.canGoBack.mockReturnValueOnce(true)
-      const { result } = renderHook(() => useTokenDetailsNavigation())
-
-      await act(() => result.current.navigateWithPop(SAMPLE_CURRENCY_ID_1))
-
-      expect(mockedNavigation.pop).toHaveBeenCalledTimes(1)
-      expect(mockedNavigation.push).toHaveBeenCalledTimes(1)
-      expect(mockedNavigation.push).toHaveBeenNthCalledWith(1, Screens.TokenDetails, {
-        currencyId: SAMPLE_CURRENCY_ID_1,
-      })
-    })
-
-    it('pushes token details screen to the stack without popping if there is no previous screen', async () => {
-      mockedNavigation.canGoBack.mockReturnValueOnce(false)
-      const { result } = renderHook(() => useTokenDetailsNavigation())
-
-      await act(() => result.current.navigateWithPop(SAMPLE_CURRENCY_ID_1))
-
-      expect(mockedNavigation.pop).not.toHaveBeenCalled()
-      expect(mockedNavigation.push).toHaveBeenCalledTimes(1)
-      expect(mockedNavigation.push).toHaveBeenNthCalledWith(1, Screens.TokenDetails, {
-        currencyId: SAMPLE_CURRENCY_ID_1,
-      })
-    })
-  })
-})
diff --git a/apps/mobile/src/components/TokenDetails/hooks.ts b/apps/mobile/src/components/TokenDetails/hooks.ts
index fe6b4da12f7..3cebca145ee 100644
--- a/apps/mobile/src/components/TokenDetails/hooks.ts
+++ b/apps/mobile/src/components/TokenDetails/hooks.ts
@@ -10,9 +10,9 @@ import { fromGraphQLChain } from 'wallet/src/features/chains/utils'
 import { PortfolioBalance } from 'wallet/src/features/dataApi/types'
 import { currencyIdToContractInput } from 'wallet/src/features/dataApi/utils'
 import {
-  CurrencyId,
   buildCurrencyId,
   buildNativeCurrencyId,
+  CurrencyId,
   currencyIdToChain,
 } from 'wallet/src/utils/currencyId'
 
diff --git a/packages/wallet/src/components/network/NetworkFilter.tsx b/apps/mobile/src/components/TokenSelector/NetworkFilter.tsx
similarity index 93%
rename from packages/wallet/src/components/network/NetworkFilter.tsx
rename to apps/mobile/src/components/TokenSelector/NetworkFilter.tsx
index d7f6f43563b..b9ea4905467 100644
--- a/packages/wallet/src/components/network/NetworkFilter.tsx
+++ b/apps/mobile/src/components/TokenSelector/NetworkFilter.tsx
@@ -1,19 +1,18 @@
 import { ImpactFeedbackStyle, selectionAsync } from 'expo-haptics'
-import { useCallback, useMemo, useState } from 'react'
+import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Keyboard, LayoutAnimation, StyleSheet, VirtualizedList } from 'react-native'
-import { isWeb } from 'tamagui'
+import { ActionSheetModal } from 'src/components/modals/ActionSheetModal'
+import { useNetworkOptions } from 'src/components/Network/hooks'
+import { ModalName } from 'src/features/telemetry/constants'
 import { Flex, Icons, Text, TouchableArea } from 'ui/src'
 import EllipsisIcon from 'ui/src/assets/icons/ellipsis.svg'
 import { colors, iconSizes } from 'ui/src/theme'
 import {
-  SQUARE_BORDER_RADIUS as NETWORK_LOGO_SQUARE_BORDER_RADIUS,
   NetworkLogo,
+  SQUARE_BORDER_RADIUS as NETWORK_LOGO_SQUARE_BORDER_RADIUS,
 } from 'wallet/src/components/CurrencyLogo/NetworkLogo'
-import { ActionSheetModal } from 'wallet/src/components/modals/ActionSheetModal'
-import { useNetworkOptions } from 'wallet/src/components/network/hooks'
 import { ChainId } from 'wallet/src/constants/chains'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 const ELLIPSIS = 'ellipsis'
 const NETWORK_ICON_SIZE = iconSizes.icon20
@@ -110,9 +109,7 @@ export function NetworkFilter({
   const onPress = useCallback(
     async (chainId: ChainId | null) => {
       LayoutAnimation.configureNext(LayoutAnimation.Presets.easeInEaseOut)
-      if (!isWeb) {
-        await selectionAsync()
-      }
+      await selectionAsync()
       setShowModal(false)
       if (showEllipsisIcon && chainId !== selectedChain) {
         setShowEllipsisIcon(false)
diff --git a/packages/wallet/src/features/search/SearchBar.tsx b/apps/mobile/src/components/TokenSelector/SearchBar.tsx
similarity index 80%
rename from packages/wallet/src/features/search/SearchBar.tsx
rename to apps/mobile/src/components/TokenSelector/SearchBar.tsx
index 61ba7b8d827..f4c9f7dd523 100644
--- a/packages/wallet/src/features/search/SearchBar.tsx
+++ b/apps/mobile/src/components/TokenSelector/SearchBar.tsx
@@ -1,7 +1,8 @@
+import React from 'react'
+import { SearchTextInput, SearchTextInputProps } from 'src/components/input/SearchTextInput'
+import { ElementName } from 'src/features/telemetry/constants'
 import { Flex, Icons, TouchableArea } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
-import { SearchTextInput, SearchTextInputProps } from 'wallet/src/features/search/SearchTextInput'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 interface SearchBarProps extends SearchTextInputProps {
   onBack?: () => void
diff --git a/packages/wallet/src/components/TokenSelector/SelectTokenButton.tsx b/apps/mobile/src/components/TokenSelector/SelectTokenButton.tsx
similarity index 99%
rename from packages/wallet/src/components/TokenSelector/SelectTokenButton.tsx
rename to apps/mobile/src/components/TokenSelector/SelectTokenButton.tsx
index f027ba7d04b..2063112a1bc 100644
--- a/packages/wallet/src/components/TokenSelector/SelectTokenButton.tsx
+++ b/apps/mobile/src/components/TokenSelector/SelectTokenButton.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { Flex, Icons, Text, TouchableArea } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
diff --git a/packages/wallet/src/components/TokenSelector/SuggestedToken.tsx b/apps/mobile/src/components/TokenSelector/SuggestedToken.tsx
similarity index 93%
rename from packages/wallet/src/components/TokenSelector/SuggestedToken.tsx
rename to apps/mobile/src/components/TokenSelector/SuggestedToken.tsx
index 024280f3ce7..85b2fd6fdaf 100644
--- a/packages/wallet/src/components/TokenSelector/SuggestedToken.tsx
+++ b/apps/mobile/src/components/TokenSelector/SuggestedToken.tsx
@@ -1,14 +1,14 @@
 import { ImpactFeedbackStyle } from 'expo-haptics'
 import { memo } from 'react'
-import { TouchableArea, useSporeColors } from 'ui/src'
-import { iconSizes } from 'ui/src/theme'
-import { TokenLogo } from 'wallet/src/components/CurrencyLogo/TokenLogo'
-import { Pill } from 'wallet/src/components/text/Pill'
+import { Pill } from 'src/components/text/Pill'
 import {
   OnSelectCurrency,
   SuggestedTokenSection,
   TokenOption,
-} from 'wallet/src/components/TokenSelector/types'
+} from 'src/components/TokenSelector/types'
+import { TouchableArea, useSporeColors } from 'ui/src'
+import { iconSizes } from 'ui/src/theme'
+import { TokenLogo } from 'wallet/src/components/CurrencyLogo/TokenLogo'
 import { getSymbolDisplayText } from 'wallet/src/utils/currency'
 
 function _SuggestedToken({
diff --git a/apps/mobile/src/components/TokenSelector/TokenFiatOnRampList.tsx b/apps/mobile/src/components/TokenSelector/TokenFiatOnRampList.tsx
index 235867b4258..bb8f139f822 100644
--- a/apps/mobile/src/components/TokenSelector/TokenFiatOnRampList.tsx
+++ b/apps/mobile/src/components/TokenSelector/TokenFiatOnRampList.tsx
@@ -2,12 +2,13 @@ import { BottomSheetFlatList } from '@gorhom/bottom-sheet'
 import React, { memo, useCallback, useMemo, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ListRenderItemInfo } from 'react-native'
+import { Loader } from 'src/components/loading'
+import { TokenOptionItem } from 'src/components/TokenSelector/TokenOptionItem'
 import { FiatOnRampCurrency } from 'src/features/fiatOnRamp/types'
-import { Flex, Icons, Inset, Loader, Text, TouchableArea } from 'ui/src'
+import { ElementName } from 'src/features/telemetry/constants'
+import { Flex, Icons, Inset, Text, TouchableArea } from 'ui/src'
 import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
-import { TokenOptionItem } from 'wallet/src/components/TokenSelector/TokenOptionItem'
 import { ChainId } from 'wallet/src/constants/chains'
-import { ElementName } from 'wallet/src/telemetry/constants'
 import { CurrencyId } from 'wallet/src/utils/currencyId'
 
 interface Props {
diff --git a/packages/wallet/src/components/TokenSelector/TokenOptionItem.tsx b/apps/mobile/src/components/TokenSelector/TokenOptionItem.tsx
similarity index 92%
rename from packages/wallet/src/components/TokenSelector/TokenOptionItem.tsx
rename to apps/mobile/src/components/TokenSelector/TokenOptionItem.tsx
index 65c37c335d3..13b135cbc98 100644
--- a/packages/wallet/src/components/TokenSelector/TokenOptionItem.tsx
+++ b/apps/mobile/src/components/TokenSelector/TokenOptionItem.tsx
@@ -1,17 +1,17 @@
 import { ImpactFeedbackStyle } from 'expo-haptics'
 import React, { useCallback, useState } from 'react'
 import { Keyboard } from 'react-native'
+import { InlineNetworkPill } from 'src/components/Network/NetworkPill'
+import TokenWarningModal from 'src/components/tokens/TokenWarningModal'
+import WarningIcon from 'src/components/tokens/WarningIcon'
+import { TokenOption } from 'src/components/TokenSelector/types'
+import { useTokenWarningDismissed } from 'src/features/tokens/safetyHooks'
 import { Flex, Text, TouchableArea } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
 import { TokenLogo } from 'wallet/src/components/CurrencyLogo/TokenLogo'
-import WarningIcon from 'wallet/src/components/icons/WarningIcon'
-import { InlineNetworkPill } from 'wallet/src/components/network/NetworkPill'
-import { TokenOption } from 'wallet/src/components/TokenSelector/types'
 import { SafetyLevel } from 'wallet/src/data/__generated__/types-and-hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { useTokenWarningDismissed } from 'wallet/src/features/tokens/safetyHooks'
-import TokenWarningModal from 'wallet/src/features/tokens/TokenWarningModal'
 import { shortenAddress } from 'wallet/src/utils/addresses'
 import { getSymbolDisplayText } from 'wallet/src/utils/currency'
 
@@ -67,7 +67,6 @@ function _TokenOptionItem({
         hapticStyle={ImpactFeedbackStyle.Light}
         opacity={showWarnings && safetyLevel === SafetyLevel.Blocked ? 0.5 : 1}
         testID={`token-option-${currency.chainId}-${currency.symbol}`}
-        width="100%"
         onPress={onPressTokenOption}>
         <Flex
           row
diff --git a/packages/wallet/src/components/TokenSelector/TokenSelector.tsx b/apps/mobile/src/components/TokenSelector/TokenSelector.tsx
similarity index 53%
rename from packages/wallet/src/components/TokenSelector/TokenSelector.tsx
rename to apps/mobile/src/components/TokenSelector/TokenSelector.tsx
index 264a0fa0bbb..2aee156593b 100644
--- a/packages/wallet/src/components/TokenSelector/TokenSelector.tsx
+++ b/apps/mobile/src/components/TokenSelector/TokenSelector.tsx
@@ -1,31 +1,33 @@
 import { Currency } from '@uniswap/sdk-core'
 import { hasStringAsync } from 'expo-clipboard'
-import { memo, useCallback, useEffect, useMemo, useState } from 'react'
+import React, { memo, useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Keyboard } from 'react-native'
+import PasteButton from 'src/components/buttons/PasteButton'
+import { SearchContext } from 'src/components/explore/search/SearchContext'
+import { SearchTextInput } from 'src/components/input/SearchTextInput'
+import { useBottomSheetContext } from 'src/components/modals/BottomSheetContext'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
+import { useFilterCallbacks } from 'src/components/TokenSelector/hooks'
+import { NetworkFilter } from 'src/components/TokenSelector/NetworkFilter'
+import { TokenSelectorEmptySearchList } from 'src/components/TokenSelector/TokenSelectorEmptySearchList'
+import { TokenSelectorSearchResultsList } from 'src/components/TokenSelector/TokenSelectorSearchResultsList'
+import { TokenSelectorSendList } from 'src/components/TokenSelector/TokenSelectorSendList'
+import { TokenSelectorSwapInputList } from 'src/components/TokenSelector/TokenSelectorSwapInputList'
+import { TokenSelectorSwapOutputList } from 'src/components/TokenSelector/TokenSelectorSwapOutputList'
+import {
+  SuggestedTokenSection,
+  TokenSection,
+  TokenSelectorFlow,
+} from 'src/components/TokenSelector/types'
+import Trace from 'src/components/Trace/Trace'
+import { ElementName, ModalName, SectionName } from 'src/features/telemetry/constants'
+import { getClipboard } from 'src/utils/clipboard'
 import { Flex, useSporeColors } from 'ui/src'
-import { logger } from 'utilities/src/logger/logger'
-import { Trace } from 'utilities/src/telemetry/trace/Trace'
 import { useDebounce } from 'utilities/src/time/timing'
-import PasteButton from 'wallet/src/components/buttons/PasteButton'
-import { useBottomSheetContext } from 'wallet/src/components/modals/BottomSheetContext'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { NetworkFilter } from 'wallet/src/components/network/NetworkFilter'
-import { useFilterCallbacks } from 'wallet/src/components/TokenSelector/hooks'
-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 { SuggestedTokenSection, TokenSection } from 'wallet/src/components/TokenSelector/types'
 import { ChainId } from 'wallet/src/constants/chains'
 import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
-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 { ElementName, ModalName, SectionName } from 'wallet/src/telemetry/constants'
-import { getClipboard } from 'wallet/src/utils/clipboard'
 
 export enum TokenSelectorVariation {
   // used for Send flow, only show currencies with a balance
@@ -38,10 +40,11 @@ export enum TokenSelectorVariation {
   SuggestedAndFavoritesAndPopular = 'suggested-and-favorites-and-popular',
 }
 
-interface BaseTokenSelectorProps {
+interface TokenSelectorProps {
   currencyField: CurrencyField
   flow: TokenSelectorFlow
   chainId?: ChainId
+  variation: TokenSelectorVariation
   onClose: () => void
   onSelectCurrency: (
     currency: Currency,
@@ -50,27 +53,12 @@ interface BaseTokenSelectorProps {
   ) => void
 }
 
-type TokenSelectorProps = BaseTokenSelectorProps &
-  (
-    | {
-        onSendEmptyActionPress: () => void
-        variation: TokenSelectorVariation.BalancesOnly
-      }
-    | {
-        onSendEmptyActionPress?: never
-        variation:
-          | TokenSelectorVariation.BalancesAndPopular
-          | TokenSelectorVariation.SuggestedAndFavoritesAndPopular
-      }
-  )
-
 function TokenSelectorContent({
   currencyField,
   flow,
   onSelectCurrency,
   chainId,
   onClose,
-  onSendEmptyActionPress,
   variation,
 }: TokenSelectorProps): JSX.Element {
   const { isSheetReady } = useBottomSheetContext()
@@ -130,71 +118,6 @@ function TokenSelectorContent({
 
   const [searchInFocus, setSearchInFocus] = useState(false)
 
-  const onSendEmptyActionPressWithClose = useCallback(() => {
-    onClose()
-    if (!onSendEmptyActionPress) {
-      logger.error(
-        new Error(
-          'Invalid call to `onSendEmptyActionPressWithClose` with missing `onSendEmptyActionPress`'
-        ),
-        { tags: { file: 'TokenSelector.tsx', function: 'onSendEmptyActionPressWithClose' } }
-      )
-      return
-    }
-    onSendEmptyActionPress()
-  }, [onClose, onSendEmptyActionPress])
-
-  const tokenSelector = useMemo(() => {
-    if (searchInFocus && !searchFilter) {
-      return <TokenSelectorEmptySearchList onSelectCurrency={onSelectCurrencyCallback} />
-    }
-
-    if (searchFilter) {
-      return (
-        <TokenSelectorSearchResultsList
-          chainFilter={chainFilter}
-          debouncedSearchFilter={debouncedSearchFilter}
-          isBalancesOnlySearch={variation === TokenSelectorVariation.BalancesOnly}
-          searchFilter={searchFilter}
-          onSelectCurrency={onSelectCurrencyCallback}
-        />
-      )
-    }
-
-    switch (variation) {
-      case TokenSelectorVariation.BalancesOnly:
-        return (
-          <TokenSelectorSendList
-            chainFilter={chainFilter}
-            onEmptyActionPress={onSendEmptyActionPressWithClose}
-            onSelectCurrency={onSelectCurrencyCallback}
-          />
-        )
-      case TokenSelectorVariation.BalancesAndPopular:
-        return (
-          <TokenSelectorSwapInputList
-            chainFilter={chainFilter}
-            onSelectCurrency={onSelectCurrencyCallback}
-          />
-        )
-      case TokenSelectorVariation.SuggestedAndFavoritesAndPopular:
-        return (
-          <TokenSelectorSwapOutputList
-            chainFilter={chainFilter}
-            onSelectCurrency={onSelectCurrencyCallback}
-          />
-        )
-    }
-  }, [
-    searchInFocus,
-    searchFilter,
-    variation,
-    onSelectCurrencyCallback,
-    chainFilter,
-    debouncedSearchFilter,
-    onSendEmptyActionPressWithClose,
-  ])
-
   return (
     <Trace logImpression element={currencyFieldName} section={SectionName.TokenSelector}>
       <Flex grow gap="$spacing16" px="$spacing16">
@@ -212,8 +135,33 @@ function TokenSelectorContent({
 
         {isSheetReady && (
           <Flex grow>
-            {tokenSelector}
-
+            {searchInFocus && !searchFilter ? (
+              <TokenSelectorEmptySearchList onSelectCurrency={onSelectCurrencyCallback} />
+            ) : searchFilter ? (
+              <TokenSelectorSearchResultsList
+                chainFilter={chainFilter}
+                debouncedSearchFilter={debouncedSearchFilter}
+                isBalancesOnlySearch={variation === TokenSelectorVariation.BalancesOnly}
+                searchFilter={searchFilter}
+                onSelectCurrency={onSelectCurrencyCallback}
+              />
+            ) : variation === TokenSelectorVariation.BalancesOnly ? (
+              <TokenSelectorSendList
+                chainFilter={chainFilter}
+                onClose={onClose}
+                onSelectCurrency={onSelectCurrencyCallback}
+              />
+            ) : variation === TokenSelectorVariation.BalancesAndPopular ? (
+              <TokenSelectorSwapInputList
+                chainFilter={chainFilter}
+                onSelectCurrency={onSelectCurrencyCallback}
+              />
+            ) : variation === TokenSelectorVariation.SuggestedAndFavoritesAndPopular ? (
+              <TokenSelectorSwapOutputList
+                chainFilter={chainFilter}
+                onSelectCurrency={onSelectCurrencyCallback}
+              />
+            ) : null}
             {(!searchInFocus || searchFilter) && (
               <Flex position="absolute" right={0}>
                 <NetworkFilter
diff --git a/packages/wallet/src/components/TokenSelector/TokenSelectorEmptySearchList.tsx b/apps/mobile/src/components/TokenSelector/TokenSelectorEmptySearchList.tsx
similarity index 82%
rename from packages/wallet/src/components/TokenSelector/TokenSelectorEmptySearchList.tsx
rename to apps/mobile/src/components/TokenSelector/TokenSelectorEmptySearchList.tsx
index cb3ebab20c9..c8b2bad9760 100644
--- a/packages/wallet/src/components/TokenSelector/TokenSelectorEmptySearchList.tsx
+++ b/apps/mobile/src/components/TokenSelector/TokenSelectorEmptySearchList.tsx
@@ -1,21 +1,17 @@
-import { memo, useCallback, useMemo } from 'react'
+import React, { memo, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { TokenSelectorList } from 'src/components/TokenSelector/TokenSelectorList'
+import { OnSelectCurrency, TokenOption, TokenSection } from 'src/components/TokenSelector/types'
+import { getTokenOptionsSection } from 'src/components/TokenSelector/utils'
+import { clearSearchHistory } from 'src/features/explore/searchHistorySlice'
+import { SearchResultType, TokenSearchResult } from 'src/features/explore/SearchResult'
+import { selectSearchHistory } from 'src/features/explore/selectSearchHistory'
+import { usePopularTokens } from 'src/features/tokens/hooks'
 import { Text, TouchableArea } from 'ui/src'
-import { TokenSelectorList } from 'wallet/src/components/TokenSelector/TokenSelectorList'
-import {
-  OnSelectCurrency,
-  TokenOption,
-  TokenSection,
-} from 'wallet/src/components/TokenSelector/types'
-import { getTokenOptionsSection } from 'wallet/src/components/TokenSelector/utils'
 import { SafetyLevel } from 'wallet/src/data/__generated__/types-and-hooks'
 import { CurrencyInfo, GqlResult } from 'wallet/src/features/dataApi/types'
 import { buildCurrency, gqlTokenToCurrencyInfo } from 'wallet/src/features/dataApi/utils'
-import { clearSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
-import { SearchResultType, TokenSearchResult } from 'wallet/src/features/search/SearchResult'
-import { selectSearchHistory } from 'wallet/src/features/search/selectSearchHistory'
-import { usePopularTokens } from 'wallet/src/features/tokens/hooks'
-import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 import { currencyId } from 'wallet/src/utils/currencyId'
 
 function searchResultToCurrencyInfo({
diff --git a/packages/wallet/src/components/TokenSelector/TokenSelectorList.tsx b/apps/mobile/src/components/TokenSelector/TokenSelectorList.tsx
similarity index 79%
rename from packages/wallet/src/components/TokenSelector/TokenSelectorList.tsx
rename to apps/mobile/src/components/TokenSelector/TokenSelectorList.tsx
index 71502a3dcf5..a74f93742e9 100644
--- a/packages/wallet/src/components/TokenSelector/TokenSelectorList.tsx
+++ b/apps/mobile/src/components/TokenSelector/TokenSelectorList.tsx
@@ -1,28 +1,27 @@
-import { memo, useCallback, useEffect, useRef } from 'react'
+import { BottomSheetSectionList } from '@gorhom/bottom-sheet'
+import React, { memo, useCallback, useEffect, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
+import { SectionList } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
-import { isWeb } from 'tamagui'
-import { AnimatedFlex, Flex, Loader, Skeleton, Text } from 'ui/src'
-import { fonts } from 'ui/src/theme'
-import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
-import { useBottomSheetFocusHook } from 'wallet/src/components/modals/hooks'
-import { renderSuggestedTokenItem } from 'wallet/src/components/TokenSelector/renderSuggestedTokenItem'
-import { suggestedTokensKeyExtractor } from 'wallet/src/components/TokenSelector/suggestedTokensKeyExtractor'
-import { TokenOptionItem } from 'wallet/src/components/TokenSelector/TokenOptionItem'
-import {
-  SectionHeaderProps,
-  TokenSectionBaseList,
-  TokenSectionBaseListRef,
-} from 'wallet/src/components/TokenSelector/TokenSectionBaseList'
+import { Loader } from 'src/components/loading'
+import { useBottomSheetFocusHook } from 'src/components/modals/hooks'
+import { TokenOptionItem } from 'src/components/TokenSelector/TokenOptionItem'
 import {
   OnSelectCurrency,
   SuggestedTokenSection,
   TokenOption,
   TokenSection,
   TokenSelectorListSections,
-} from 'wallet/src/components/TokenSelector/types'
+} from 'src/components/TokenSelector/types'
+import { AnimatedFlex, Flex, Text, useDeviceInsets } from 'ui/src'
+import { fonts } from 'ui/src/theme'
+import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
 import { ChainId } from 'wallet/src/constants/chains'
 import { CurrencyId } from 'wallet/src/utils/currencyId'
+import { renderSuggestedTokenItem } from './renderSuggestedTokenItem'
+import { suggestedTokensKeyExtractor } from './suggestedTokensKeyExtractor'
+
+type SectionHeaderProps = Pick<TokenSection, 'title' | 'rightElement'>
 
 function isSuggestedTokenItem(data: TokenOption | TokenOption[]): data is TokenOption[] {
   return Array.isArray(data)
@@ -95,7 +94,8 @@ function _TokenSelectorList({
   showTokenAddress,
 }: TokenSelectorListProps): JSX.Element {
   const { t } = useTranslation()
-  const sectionListRef = useRef<TokenSectionBaseListRef>()
+  const insets = useDeviceInsets()
+  const sectionListRef = useRef<SectionList<TokenOption>>(null)
 
   useEffect(() => {
     if (sections?.length) {
@@ -170,9 +170,7 @@ function _TokenSelectorList({
     return (
       <Flex grow>
         <Flex py="$spacing16" width={80}>
-          <Skeleton>
-            <Loader.Box height={fonts.subheading2.lineHeight} />
-          </Skeleton>
+          <Loader.Box height={fonts.subheading2.lineHeight} />
         </Flex>
         <Loader.Token repeat={5} />
       </Flex>
@@ -180,16 +178,22 @@ function _TokenSelectorList({
   }
 
   return (
-    // TODO(EXT-526): re-enable `exiting` animation when it's fixed.
-    <AnimatedFlex grow entering={FadeIn} exiting={isWeb ? undefined : FadeOut}>
-      <TokenSectionBaseList
+    <AnimatedFlex grow entering={FadeIn} exiting={FadeOut}>
+      <BottomSheetSectionList<TokenOption | TokenOption[], SuggestedTokenSection | TokenSection>
+        ref={sectionListRef}
         ListEmptyComponent={emptyElement}
+        bounces={true}
+        contentContainerStyle={{ paddingBottom: insets.bottom }}
         focusHook={useBottomSheetFocusHook}
         keyExtractor={key}
+        keyboardDismissMode="on-drag"
+        keyboardShouldPersistTaps="always"
         renderItem={renderItem}
         renderSectionHeader={renderSectionHeader}
-        sectionListRef={sectionListRef}
         sections={sections ?? []}
+        showsVerticalScrollIndicator={false}
+        stickySectionHeadersEnabled={true}
+        windowSize={4}
       />
     </AnimatedFlex>
   )
diff --git a/packages/wallet/src/components/TokenSelector/TokenSelectorSearchResultsList.tsx b/apps/mobile/src/components/TokenSelector/TokenSelectorSearchResultsList.tsx
similarity index 87%
rename from packages/wallet/src/components/TokenSelector/TokenSelectorSearchResultsList.tsx
rename to apps/mobile/src/components/TokenSelector/TokenSelectorSearchResultsList.tsx
index e538d33bf9d..a3dba8a35dc 100644
--- a/packages/wallet/src/components/TokenSelector/TokenSelectorSearchResultsList.tsx
+++ b/apps/mobile/src/components/TokenSelector/TokenSelectorSearchResultsList.tsx
@@ -1,26 +1,20 @@
-import { memo, useCallback, useMemo } from 'react'
+import React, { memo, useCallback, useMemo } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
-import { Flex, Text } from 'ui/src'
+import { useAppDispatch } from 'src/app/hooks'
 import {
   usePortfolioBalancesForAddressById,
   usePortfolioTokenOptions,
-} from 'wallet/src/components/TokenSelector/hooks'
-import {
-  SectionHeader,
-  TokenSelectorList,
-} from 'wallet/src/components/TokenSelector/TokenSelectorList'
-import { OnSelectCurrency, TokenSection } from 'wallet/src/components/TokenSelector/types'
-import {
-  formatSearchResults,
-  getTokenOptionsSection,
-} from 'wallet/src/components/TokenSelector/utils'
+} from 'src/components/TokenSelector/hooks'
+import { SectionHeader, TokenSelectorList } from 'src/components/TokenSelector/TokenSelectorList'
+import { OnSelectCurrency, TokenSection } from 'src/components/TokenSelector/types'
+import { formatSearchResults, getTokenOptionsSection } from 'src/components/TokenSelector/utils'
+import { useSearchTokens } from 'src/features/dataApi/searchTokens'
+import { addToSearchHistory } from 'src/features/explore/searchHistorySlice'
+import { SearchResultType } from 'src/features/explore/SearchResult'
+import { Flex, Text } from 'ui/src'
 import { ChainId } from 'wallet/src/constants/chains'
-import { useSearchTokens } from 'wallet/src/features/dataApi/searchTokens'
 import { GqlResult } from 'wallet/src/features/dataApi/types'
-import { addToSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
-import { SearchResultType } from 'wallet/src/features/search/SearchResult'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
-import { useAppDispatch } from 'wallet/src/state'
 
 function EmptyResults({ searchFilter }: { searchFilter: string }): JSX.Element {
   const { t } = useTranslation()
diff --git a/packages/wallet/src/components/TokenSelector/TokenSelectorSendList.tsx b/apps/mobile/src/components/TokenSelector/TokenSelectorSendList.tsx
similarity index 69%
rename from packages/wallet/src/components/TokenSelector/TokenSelectorSendList.tsx
rename to apps/mobile/src/components/TokenSelector/TokenSelectorSendList.tsx
index a4ac81f6864..fcf918b251f 100644
--- a/packages/wallet/src/components/TokenSelector/TokenSelectorSendList.tsx
+++ b/apps/mobile/src/components/TokenSelector/TokenSelectorSendList.tsx
@@ -1,19 +1,21 @@
-import { memo, useMemo } from 'react'
+import React, { memo, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
+import { useAppDispatch } from 'src/app/hooks'
+import { usePortfolioTokenOptions } from 'src/components/TokenSelector/hooks'
+import { SectionHeader, TokenSelectorList } from 'src/components/TokenSelector/TokenSelectorList'
+import { getTokenOptionsSection } from 'src/components/TokenSelector/utils'
+import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
+import { useFiatOnRampIpAddressQuery } from 'wallet/src/features/fiatOnRamp/api'
+
+import { SpinningLoader } from 'src/components/loading/SpinningLoader'
+import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
+import { OnSelectCurrency, TokenSection } from 'src/components/TokenSelector/types'
+import { closeModal, openModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { Flex } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
-import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
-import { SpinningLoader } from 'wallet/src/components/loading/SpinningLoader'
-import { usePortfolioTokenOptions } from 'wallet/src/components/TokenSelector/hooks'
-import {
-  SectionHeader,
-  TokenSelectorList,
-} from 'wallet/src/components/TokenSelector/TokenSelectorList'
-import { OnSelectCurrency, TokenSection } from 'wallet/src/components/TokenSelector/types'
-import { getTokenOptionsSection } from 'wallet/src/components/TokenSelector/utils'
 import { ChainId } from 'wallet/src/constants/chains'
 import { GqlResult } from 'wallet/src/features/dataApi/types'
-import { useFiatOnRampIpAddressQuery } from 'wallet/src/features/fiatOnRamp/api'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 
 function useTokenSectionsForSend(chainFilter: ChainId | null): GqlResult<TokenSection[]> {
@@ -46,12 +48,28 @@ function useTokenSectionsForSend(chainFilter: ChainId | null): GqlResult<TokenSe
   )
 }
 
-function EmptyList({ onEmptyActionPress }: { onEmptyActionPress: () => void }): JSX.Element {
+function EmptyList({ onClose }: { onClose: () => void }): JSX.Element {
   const { t } = useTranslation()
   const { data: ipAddressData, isLoading } = useFiatOnRampIpAddressQuery()
+  const dispatch = useAppDispatch()
 
   const fiatOnRampEligible = Boolean(ipAddressData?.isBuyAllowed)
 
+  const onEmptyActionPress = (): void => {
+    onClose()
+    dispatch(closeModal({ name: ModalName.Send }))
+    if (fiatOnRampEligible) {
+      dispatch(openModal({ name: ModalName.FiatOnRamp }))
+    } else {
+      dispatch(
+        openModal({
+          name: ModalName.WalletConnectScan,
+          initialState: ScannerModalState.WalletQr,
+        })
+      )
+    }
+  }
+
   return (
     <Flex>
       <SectionHeader title={t('Your tokens')} />
@@ -80,17 +98,14 @@ function EmptyList({ onEmptyActionPress }: { onEmptyActionPress: () => void }):
 function _TokenSelectorSendList({
   onSelectCurrency,
   chainFilter,
-  onEmptyActionPress,
+  onClose,
 }: {
   onSelectCurrency: OnSelectCurrency
   chainFilter: ChainId | null
-  onEmptyActionPress: () => void
+  onClose: () => void
 }): JSX.Element {
   const { data: sections, loading, error, refetch } = useTokenSectionsForSend(chainFilter)
-  const emptyElement = useMemo(
-    () => <EmptyList onEmptyActionPress={onEmptyActionPress} />,
-    [onEmptyActionPress]
-  )
+  const emptyElement = useMemo(() => <EmptyList onClose={onClose} />, [onClose])
 
   return (
     <TokenSelectorList
diff --git a/packages/wallet/src/components/TokenSelector/TokenSelectorSwapInputList.tsx b/apps/mobile/src/components/TokenSelector/TokenSelectorSwapInputList.tsx
similarity index 88%
rename from packages/wallet/src/components/TokenSelector/TokenSelectorSwapInputList.tsx
rename to apps/mobile/src/components/TokenSelector/TokenSelectorSwapInputList.tsx
index 70587b7a44c..50cb9b2021b 100644
--- a/packages/wallet/src/components/TokenSelector/TokenSelectorSwapInputList.tsx
+++ b/apps/mobile/src/components/TokenSelector/TokenSelectorSwapInputList.tsx
@@ -1,19 +1,16 @@
-import { memo, useCallback, useMemo } from 'react'
+import React, { memo, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import {
   usePopularTokensOptions,
   usePortfolioTokenOptions,
-} from 'wallet/src/components/TokenSelector/hooks'
-import { TokenSelectorList } from 'wallet/src/components/TokenSelector/TokenSelectorList'
+} from 'src/components/TokenSelector/hooks'
+import { TokenSelectorList } from 'src/components/TokenSelector/TokenSelectorList'
 import {
   OnSelectCurrency,
   TokenSection,
   TokenSelectorListSections,
-} from 'wallet/src/components/TokenSelector/types'
-import {
-  getTokenOptionsSection,
-  tokenOptionDifference,
-} from 'wallet/src/components/TokenSelector/utils'
+} from 'src/components/TokenSelector/types'
+import { getTokenOptionsSection, tokenOptionDifference } from 'src/components/TokenSelector/utils'
 import { ChainId } from 'wallet/src/constants/chains'
 import { GqlResult } from 'wallet/src/features/dataApi/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
diff --git a/packages/wallet/src/components/TokenSelector/TokenSelectorSwapOutputList.tsx b/apps/mobile/src/components/TokenSelector/TokenSelectorSwapOutputList.tsx
similarity index 89%
rename from packages/wallet/src/components/TokenSelector/TokenSelectorSwapOutputList.tsx
rename to apps/mobile/src/components/TokenSelector/TokenSelectorSwapOutputList.tsx
index 8aff227e8a4..cda31d75638 100644
--- a/packages/wallet/src/components/TokenSelector/TokenSelectorSwapOutputList.tsx
+++ b/apps/mobile/src/components/TokenSelector/TokenSelectorSwapOutputList.tsx
@@ -1,16 +1,13 @@
-import { memo, useCallback, useMemo } from 'react'
+import React, { memo, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import {
   useCommonTokensOptions,
   useFavoriteTokensOptions,
   usePopularTokensOptions,
-} from 'wallet/src/components/TokenSelector/hooks'
-import { TokenSelectorList } from 'wallet/src/components/TokenSelector/TokenSelectorList'
-import {
-  OnSelectCurrency,
-  TokenSelectorListSections,
-} from 'wallet/src/components/TokenSelector/types'
-import { getTokenOptionsSection } from 'wallet/src/components/TokenSelector/utils'
+} from 'src/components/TokenSelector/hooks'
+import { TokenSelectorList } from 'src/components/TokenSelector/TokenSelectorList'
+import { OnSelectCurrency, TokenSelectorListSections } from 'src/components/TokenSelector/types'
+import { getTokenOptionsSection } from 'src/components/TokenSelector/utils'
 import { ChainId } from 'wallet/src/constants/chains'
 import { GqlResult } from 'wallet/src/features/dataApi/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
diff --git a/packages/wallet/src/components/TokenSelector/filter.test.ts b/apps/mobile/src/components/TokenSelector/filter.test.ts
similarity index 96%
rename from packages/wallet/src/components/TokenSelector/filter.test.ts
rename to apps/mobile/src/components/TokenSelector/filter.test.ts
index ae2dcd99850..9ece8f90478 100644
--- a/packages/wallet/src/components/TokenSelector/filter.test.ts
+++ b/apps/mobile/src/components/TokenSelector/filter.test.ts
@@ -1,6 +1,6 @@
 import { Currency } from '@uniswap/sdk-core'
-import { filter } from 'wallet/src/components/TokenSelector/filter'
-import { TokenOption } from 'wallet/src/components/TokenSelector/types'
+import { filter } from 'src/components/TokenSelector/filter'
+import { TokenOption } from 'src/components/TokenSelector/types'
 import { ChainId } from 'wallet/src/constants/chains'
 import { DAI, DAI_ARBITRUM_ONE } from 'wallet/src/constants/tokens'
 import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
diff --git a/packages/wallet/src/components/TokenSelector/filter.ts b/apps/mobile/src/components/TokenSelector/filter.ts
similarity index 97%
rename from packages/wallet/src/components/TokenSelector/filter.ts
rename to apps/mobile/src/components/TokenSelector/filter.ts
index 6addda9dd33..9bf7a6038e9 100644
--- a/packages/wallet/src/components/TokenSelector/filter.ts
+++ b/apps/mobile/src/components/TokenSelector/filter.ts
@@ -1,5 +1,5 @@
 import Fuse from 'fuse.js'
-import { TokenOption } from 'wallet/src/components/TokenSelector/types'
+import { TokenOption } from 'src/components/TokenSelector/types'
 import { ChainId } from 'wallet/src/constants/chains'
 
 const searchOptions: Fuse.IFuseOptions<TokenOption> = {
diff --git a/packages/wallet/src/components/TokenSelector/flowToModalName.tsx b/apps/mobile/src/components/TokenSelector/flowToModalName.tsx
similarity index 58%
rename from packages/wallet/src/components/TokenSelector/flowToModalName.tsx
rename to apps/mobile/src/components/TokenSelector/flowToModalName.tsx
index b094718d73b..bcd6f8ba07e 100644
--- a/packages/wallet/src/components/TokenSelector/flowToModalName.tsx
+++ b/apps/mobile/src/components/TokenSelector/flowToModalName.tsx
@@ -1,7 +1,7 @@
-import { TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
-import { ModalName, ModalNameType } from 'wallet/src/telemetry/constants'
+import { TokenSelectorFlow } from 'src/components/TokenSelector/types'
+import { ModalName } from 'src/features/telemetry/constants'
 
-export function flowToModalName(flow: TokenSelectorFlow): ModalNameType | undefined {
+export function flowToModalName(flow: TokenSelectorFlow): ModalName | undefined {
   switch (flow) {
     case TokenSelectorFlow.Swap:
       return ModalName.Swap
diff --git a/packages/wallet/src/components/TokenSelector/hooks.tsx b/apps/mobile/src/components/TokenSelector/hooks.tsx
similarity index 92%
rename from packages/wallet/src/components/TokenSelector/hooks.tsx
rename to apps/mobile/src/components/TokenSelector/hooks.tsx
index 4329faddda6..793ef3e26d6 100644
--- a/packages/wallet/src/components/TokenSelector/hooks.tsx
+++ b/apps/mobile/src/components/TokenSelector/hooks.tsx
@@ -1,8 +1,12 @@
 import { useCallback, useEffect, useMemo, useState } from 'react'
-import { filter } from 'wallet/src/components/TokenSelector/filter'
-import { flowToModalName } from 'wallet/src/components/TokenSelector/flowToModalName'
-import { TokenOption } from 'wallet/src/components/TokenSelector/types'
-import { createEmptyBalanceOption } from 'wallet/src/components/TokenSelector/utils'
+import { useAppSelector } from 'src/app/hooks'
+import { filter } from 'src/components/TokenSelector/filter'
+import { TokenOption, TokenSelectorFlow } from 'src/components/TokenSelector/types'
+import { createEmptyBalanceOption } from 'src/components/TokenSelector/utils'
+import { useTokenProjects } from 'src/features/dataApi/tokenProjects'
+import { usePopularTokens } from 'src/features/dataApi/topTokens'
+import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
+import { MobileEventName } from 'src/features/telemetry/constants'
 import { BRIDGED_BASE_ADDRESSES } from 'wallet/src/constants/addresses'
 import { ChainId } from 'wallet/src/constants/chains'
 import { DAI, USDC, USDT, WBTC } from 'wallet/src/constants/tokens'
@@ -11,21 +15,16 @@ import {
   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 { CurrencyInfo, GqlResult, PortfolioBalance } from 'wallet/src/features/dataApi/types'
 import { usePersistedError } from 'wallet/src/features/dataApi/utils'
 import { selectFavoriteTokens } from 'wallet/src/features/favorites/selectors'
-import { TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
-import { useAppSelector } from 'wallet/src/state'
-import { sendWalletAnalyticsEvent } from 'wallet/src/telemetry'
-import { WalletEventName } from 'wallet/src/telemetry/constants'
 import { areAddressesEqual } from 'wallet/src/utils/addresses'
 import {
   buildNativeCurrencyId,
   buildWrappedNativeCurrencyId,
   currencyId,
 } from 'wallet/src/utils/currencyId'
+import { flowToModalName } from './flowToModalName'
 
 // Use Mainnet base token addresses since TokenProjects query returns each token
 // on each network
@@ -116,7 +115,7 @@ export function useFilterCallbacks(
   const onChangeChainFilter = useCallback(
     (newChainFilter: typeof chainFilter) => {
       setChainFilter(newChainFilter)
-      sendWalletAnalyticsEvent(WalletEventName.NetworkFilterSelected, {
+      sendMobileAnalyticsEvent(MobileEventName.NetworkFilterSelected, {
         chain: newChainFilter ?? 'All',
         modal: flowToModalName(flow),
       })
diff --git a/packages/wallet/src/components/TokenSelector/renderSuggestedTokenItem.tsx b/apps/mobile/src/components/TokenSelector/renderSuggestedTokenItem.tsx
similarity index 82%
rename from packages/wallet/src/components/TokenSelector/renderSuggestedTokenItem.tsx
rename to apps/mobile/src/components/TokenSelector/renderSuggestedTokenItem.tsx
index 5600f34920d..0f8f84fa164 100644
--- a/packages/wallet/src/components/TokenSelector/renderSuggestedTokenItem.tsx
+++ b/apps/mobile/src/components/TokenSelector/renderSuggestedTokenItem.tsx
@@ -1,10 +1,11 @@
-import { Flex } from 'ui/src'
-import { SuggestedToken } from 'wallet/src/components/TokenSelector/SuggestedToken'
+import React from 'react'
+import { SuggestedToken } from 'src/components/TokenSelector/SuggestedToken'
 import {
   OnSelectCurrency,
   SuggestedTokenSection,
   TokenOption,
-} from 'wallet/src/components/TokenSelector/types'
+} from 'src/components/TokenSelector/types'
+import { Flex } from 'ui/src'
 
 export function renderSuggestedTokenItem({
   item: suggestedTokens,
diff --git a/packages/wallet/src/components/TokenSelector/suggestedTokensKeyExtractor.tsx b/apps/mobile/src/components/TokenSelector/suggestedTokensKeyExtractor.tsx
similarity index 70%
rename from packages/wallet/src/components/TokenSelector/suggestedTokensKeyExtractor.tsx
rename to apps/mobile/src/components/TokenSelector/suggestedTokensKeyExtractor.tsx
index ed7a61d82b8..6874d7914ad 100644
--- a/packages/wallet/src/components/TokenSelector/suggestedTokensKeyExtractor.tsx
+++ b/apps/mobile/src/components/TokenSelector/suggestedTokensKeyExtractor.tsx
@@ -1,4 +1,4 @@
-import { TokenOption } from 'wallet/src/components/TokenSelector/types'
+import { TokenOption } from 'src/components/TokenSelector/types'
 
 export function suggestedTokensKeyExtractor(suggestedTokens: TokenOption[]): string {
   return suggestedTokens.map((token) => token.currencyInfo.currencyId).join('-')
diff --git a/packages/wallet/src/components/TokenSelector/types.ts b/apps/mobile/src/components/TokenSelector/types.ts
similarity index 92%
rename from packages/wallet/src/components/TokenSelector/types.ts
rename to apps/mobile/src/components/TokenSelector/types.ts
index 961f5b02519..740b0bee101 100644
--- a/packages/wallet/src/components/TokenSelector/types.ts
+++ b/apps/mobile/src/components/TokenSelector/types.ts
@@ -21,7 +21,11 @@ export type TokenSection = {
 export type SuggestedTokenSection = {
   title: string
   data: TokenOption[][]
-  rightElement?: JSX.Element
 }
 
 export type TokenSelectorListSections = Array<SuggestedTokenSection | TokenSection>
+
+export enum TokenSelectorFlow {
+  Swap,
+  Transfer,
+}
diff --git a/packages/wallet/src/components/TokenSelector/utils.ts b/apps/mobile/src/components/TokenSelector/utils.ts
similarity index 96%
rename from packages/wallet/src/components/TokenSelector/utils.ts
rename to apps/mobile/src/components/TokenSelector/utils.ts
index fde73601dc3..9fa7e5df601 100644
--- a/packages/wallet/src/components/TokenSelector/utils.ts
+++ b/apps/mobile/src/components/TokenSelector/utils.ts
@@ -1,5 +1,5 @@
+import { TokenOption, TokenSection } from 'src/components/TokenSelector/types'
 import { differenceWith } from 'utilities/src/primitives/array'
-import { TokenOption, TokenSection } from 'wallet/src/components/TokenSelector/types'
 import { CurrencyInfo, PortfolioBalance } from 'wallet/src/features/dataApi/types'
 import { areCurrencyIdsEqual } from 'wallet/src/utils/currencyId'
 
diff --git a/apps/mobile/src/components/Trace/Trace.tsx b/apps/mobile/src/components/Trace/Trace.tsx
index 7d218a99631..87a32a33ad6 100644
--- a/apps/mobile/src/components/Trace/Trace.tsx
+++ b/apps/mobile/src/components/Trace/Trace.tsx
@@ -1,15 +1,20 @@
 import { memo, PropsWithChildren } from 'react'
-import { ManualPageViewScreen, MobileEventName } from 'src/features/telemetry/constants'
+import {
+  ElementName,
+  ManualPageViewScreen,
+  MobileEventName,
+  ModalName,
+  SectionName,
+} from 'src/features/telemetry/constants'
 import { AppScreen } from 'src/screens/Screens'
-import { TraceProps, Trace as UntypedTrace } from 'utilities/src/telemetry/trace/Trace'
-import { ElementNameType, ModalNameType, SectionNameType } from 'wallet/src/telemetry/constants'
+import { Trace as UntypedTrace, TraceProps } from 'utilities/src/telemetry/trace/Trace'
 
 // Mobile specific version of ITraceContext
 interface MobileTraceContext {
   screen?: AppScreen | ManualPageViewScreen
-  section?: SectionNameType
-  modal?: ModalNameType
-  element?: ElementNameType
+  section?: SectionName
+  modal?: ModalName
+  element?: ElementName
 }
 
 interface MobileTracePropsOverrides {
diff --git a/apps/mobile/src/components/Trace/TraceTabView.tsx b/apps/mobile/src/components/Trace/TraceTabView.tsx
index eb10e591d20..81350cb0528 100644
--- a/apps/mobile/src/components/Trace/TraceTabView.tsx
+++ b/apps/mobile/src/components/Trace/TraceTabView.tsx
@@ -2,10 +2,10 @@ import { SharedEventName } from '@uniswap/analytics-events'
 import React from 'react'
 import { Route, TabView, TabViewProps } from 'react-native-tab-view'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
+import { SectionName } from 'src/features/telemetry/constants'
 import { Screens } from 'src/screens/Screens'
-import { SectionNameType } from 'wallet/src/telemetry/constants'
 
-type TraceRouteProps = { key: SectionNameType } & Route
+type TraceRouteProps = { key: SectionName } & Route
 
 export default function TraceTabView<T extends TraceRouteProps>({
   onIndexChange,
diff --git a/apps/mobile/src/components/Trace/TraceUserProperties.test.tsx b/apps/mobile/src/components/Trace/TraceUserProperties.test.tsx
index cf7dd03fb26..46c8a2877e5 100644
--- a/apps/mobile/src/components/Trace/TraceUserProperties.test.tsx
+++ b/apps/mobile/src/components/Trace/TraceUserProperties.test.tsx
@@ -6,8 +6,8 @@ import { TraceUserProperties } from 'src/components/Trace/TraceUserProperties'
 import * as biometricHooks from 'src/features/biometrics/hooks'
 import { AuthMethod, UserPropertyName } from 'src/features/telemetry/constants'
 import * as versionUtils from 'src/utils/version'
-import * as useIsDarkModeFile from 'ui/src/hooks/useIsDarkMode'
 import { analytics } from 'utilities/src/telemetry/analytics/analytics'
+import * as appearanceHooks from 'wallet/src/features/appearance/hooks'
 import { FiatCurrency } from 'wallet/src/features/fiatCurrency/constants'
 import * as fiatCurrencyHooks from 'wallet/src/features/fiatCurrency/hooks'
 import * as languageHooks from 'wallet/src/features/language/hooks'
@@ -78,7 +78,7 @@ describe('TraceUserProperties', () => {
       touchId: false,
       faceId: true,
     })
-    mockFn(useIsDarkModeFile, 'useIsDarkMode', true)
+    mockFn(appearanceHooks, 'useIsDarkMode', true)
     mockFn(fiatCurrencyHooks, 'useAppFiatCurrency', FiatCurrency.UnitedStatesDollar)
     mockFn(languageHooks, 'useCurrentLanguageInfo', { loggingName: 'English' })
     mockFn(appHooks, 'useAppSelector', { enabled: true })
@@ -140,7 +140,7 @@ describe('TraceUserProperties', () => {
       touchId: false,
       faceId: false,
     })
-    mockFn(useIsDarkModeFile, 'useIsDarkMode', true)
+    mockFn(appearanceHooks, 'useIsDarkMode', true)
     mockFn(fiatCurrencyHooks, 'useAppFiatCurrency', FiatCurrency.UnitedStatesDollar)
     mockFn(languageHooks, 'useCurrentLanguageInfo', { loggingName: 'English' })
 
diff --git a/apps/mobile/src/components/Trace/TraceUserProperties.tsx b/apps/mobile/src/components/Trace/TraceUserProperties.tsx
index 9e1ab45ea94..7709d21f769 100644
--- a/apps/mobile/src/components/Trace/TraceUserProperties.tsx
+++ b/apps/mobile/src/components/Trace/TraceUserProperties.tsx
@@ -6,11 +6,11 @@ import {
   useDeviceSupportsBiometricAuth,
 } from 'src/features/biometrics/hooks'
 import { setUserProperty } from 'src/features/telemetry'
-import { UserPropertyName, getAuthMethod } from 'src/features/telemetry/constants'
+import { getAuthMethod, UserPropertyName } from 'src/features/telemetry/constants'
 import { selectAllowAnalytics } from 'src/features/telemetry/selectors'
 import { getFullAppVersion } from 'src/utils/version'
-import { useIsDarkMode } from 'ui/src'
 import { analytics } from 'utilities/src/telemetry/analytics/analytics'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { useAppFiatCurrency } from 'wallet/src/features/fiatCurrency/hooks'
 import { useCurrentLanguageInfo } from 'wallet/src/features/language/hooks'
 import { BackupType } from 'wallet/src/features/wallet/accounts/types'
diff --git a/apps/mobile/src/components/WalletConnect/ConnectedDapps/ConnectedDappsList.tsx b/apps/mobile/src/components/WalletConnect/ConnectedDapps/ConnectedDappsList.tsx
index 739d0ef0ccc..fdec03392ae 100644
--- a/apps/mobile/src/components/WalletConnect/ConnectedDapps/ConnectedDappsList.tsx
+++ b/apps/mobile/src/components/WalletConnect/ConnectedDapps/ConnectedDappsList.tsx
@@ -8,13 +8,14 @@ import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import { DappConnectedNetworkModal } from 'src/components/WalletConnect/ConnectedDapps/DappConnectedNetworksModal'
 import { DappConnectionItem } from 'src/components/WalletConnect/ConnectedDapps/DappConnectionItem'
 import { openModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import {
   removePendingSession,
   WalletConnectSession,
 } from 'src/features/walletConnect/walletConnectSlice'
-import { AnimatedFlex, Flex, Icons, Text, TouchableArea, useDeviceDimensions } from 'ui/src'
+import { AnimatedFlex, Flex, Text, TouchableArea, useDeviceDimensions } from 'ui/src'
+import { Edit as EditIcon, Scan as ScanIcon } from 'ui/src/components/icons'
 import { spacing } from 'ui/src/theme'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 type ConnectedDappsProps = {
   sessions: WalletConnectSession[]
@@ -60,14 +61,14 @@ export function ConnectedDappsList({ backButton, sessions }: ConnectedDappsProps
                   setIsEditing(!isEditing)
                 }}>
                 {isEditing ? (
-                  <Icons.Edit color="$accent1" size="$icon.20" />
+                  <EditIcon color="$accent1" size="$icon.20" />
                 ) : (
-                  <Icons.Edit color="$neutral2" size="$icon.20" />
+                  <EditIcon color="$neutral2" size="$icon.20" />
                 )}
               </TouchableArea>
             ) : (
               <TouchableArea onPress={onPressScan}>
-                <Icons.Scan color="$neutral2" size="$icon.20" />
+                <ScanIcon color="$neutral2" size="$icon.20" />
               </TouchableArea>
             )}
           </Flex>
diff --git a/apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectedNetworksModal.tsx b/apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectedNetworksModal.tsx
index a00d3c63dc7..df06235c620 100644
--- a/apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectedNetworksModal.tsx
+++ b/apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectedNetworksModal.tsx
@@ -3,7 +3,9 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'
 import 'react-native-reanimated'
 import { useAppDispatch } from 'src/app/hooks'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { DappHeaderIcon } from 'src/components/WalletConnect/DappHeaderIcon'
+import { ModalName } from 'src/features/telemetry/constants'
 import { wcWeb3Wallet } from 'src/features/walletConnect/saga'
 import { removeSession, WalletConnectSession } from 'src/features/walletConnect/walletConnectSlice'
 import { Button, Flex, Text } from 'ui/src'
@@ -11,13 +13,11 @@ import { iconSizes } from 'ui/src/theme'
 import { logger } from 'utilities/src/logger/logger'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { NetworkLogo } from 'wallet/src/components/CurrencyLogo/NetworkLogo'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
 import { CHAIN_INFO } from 'wallet/src/constants/chains'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 import { WalletConnectEvent } from 'wallet/src/features/walletConnect/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
 interface DappConnectedNetworkModalProps {
   session: WalletConnectSession
   onClose: () => void
diff --git a/apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectionItem.tsx b/apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectionItem.tsx
index 8032b916ec9..c03f0693899 100644
--- a/apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectionItem.tsx
+++ b/apps/mobile/src/components/WalletConnect/ConnectedDapps/DappConnectionItem.tsx
@@ -9,8 +9,9 @@ import { FadeIn, FadeOut } from 'react-native-reanimated'
 import { useAppDispatch } from 'src/app/hooks'
 import { DappHeaderIcon } from 'src/components/WalletConnect/DappHeaderIcon'
 import { NetworkLogos } from 'src/components/WalletConnect/NetworkLogos'
+import { ElementName } from 'src/features/telemetry/constants'
 import { wcWeb3Wallet } from 'src/features/walletConnect/saga'
-import { WalletConnectSession, removeSession } from 'src/features/walletConnect/walletConnectSlice'
+import { removeSession, WalletConnectSession } from 'src/features/walletConnect/walletConnectSlice'
 import { disableOnPress } from 'src/utils/disableOnPress'
 import { AnimatedTouchableArea, Flex, Text, TouchableArea } from 'ui/src'
 import { iconSizes, spacing } from 'ui/src/theme'
@@ -20,7 +21,6 @@ import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 import { WalletConnectEvent } from 'wallet/src/features/walletConnect/types'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 export function DappConnectionItem({
   session,
diff --git a/apps/mobile/src/components/WalletConnect/NetworkLogos.tsx b/apps/mobile/src/components/WalletConnect/NetworkLogos.tsx
index d814e4ab444..74706ef075a 100644
--- a/apps/mobile/src/components/WalletConnect/NetworkLogos.tsx
+++ b/apps/mobile/src/components/WalletConnect/NetworkLogos.tsx
@@ -3,7 +3,7 @@ import 'react-native-reanimated'
 import { Flex, FlexProps, Text } from 'ui/src'
 import { iconSizes, spacing } from 'ui/src/theme'
 import { NetworkLogo } from 'wallet/src/components/CurrencyLogo/NetworkLogo'
-import { CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
+import { ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
 
 export type NetworkLogosProps = {
   chains: ChainId[]
diff --git a/apps/mobile/src/components/WalletConnect/RequestModal/HeaderText.tsx b/apps/mobile/src/components/WalletConnect/RequestModal/HeaderText.tsx
index 056464b6cd3..25e38f3c385 100644
--- a/apps/mobile/src/components/WalletConnect/RequestModal/HeaderText.tsx
+++ b/apps/mobile/src/components/WalletConnect/RequestModal/HeaderText.tsx
@@ -5,7 +5,7 @@ import { truncateDappName } from 'src/components/WalletConnect/ScanSheet/util'
 import { WalletConnectRequest } from 'src/features/walletConnect/walletConnectSlice'
 import { Text } from 'ui/src'
 import { EthMethod } from 'wallet/src/features/walletConnect/types'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
 export function HeaderText({
   request,
diff --git a/apps/mobile/src/components/WalletConnect/RequestModal/RequestDetails.tsx b/apps/mobile/src/components/WalletConnect/RequestModal/RequestDetails.tsx
index 68514111a57..0bc0b9934dc 100644
--- a/apps/mobile/src/components/WalletConnect/RequestModal/RequestDetails.tsx
+++ b/apps/mobile/src/components/WalletConnect/RequestModal/RequestDetails.tsx
@@ -10,6 +10,7 @@ import {
   SignRequest,
   WalletConnectRequest,
 } from 'src/features/walletConnect/walletConnectSlice'
+import { ExplorerDataType, getExplorerLink } from 'src/utils/linking'
 import { useNoYoloParser } from 'src/utils/useNoYoloParser'
 import { Flex, Text, useSporeColors } from 'ui/src'
 import { iconSizes, TextVariantTokens } from 'ui/src/theme'
@@ -19,7 +20,6 @@ import { toSupportedChainId } from 'wallet/src/features/chains/utils'
 import { useENS } from 'wallet/src/features/ens/useENS'
 import { EthMethod, EthTransaction } from 'wallet/src/features/walletConnect/types'
 import { getValidAddress, shortenAddress } from 'wallet/src/utils/addresses'
-import { ExplorerDataType, getExplorerLink } from 'wallet/src/utils/linking'
 
 const getStrMessage = (request: WalletConnectRequest): string => {
   if (request.type === EthMethod.PersonalSign || request.type === EthMethod.EthSign) {
diff --git a/apps/mobile/src/components/WalletConnect/RequestModal/SpendingDetails.tsx b/apps/mobile/src/components/WalletConnect/RequestModal/SpendingDetails.tsx
index 6e23096c33a..b8b1a56eaab 100644
--- a/apps/mobile/src/components/WalletConnect/RequestModal/SpendingDetails.tsx
+++ b/apps/mobile/src/components/WalletConnect/RequestModal/SpendingDetails.tsx
@@ -9,7 +9,7 @@ import { useUSDValue } from 'wallet/src/features/gas/hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useNativeCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import { getSymbolDisplayText } from 'wallet/src/utils/currency'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
 export function SpendingDetails({
   value,
diff --git a/apps/mobile/src/components/WalletConnect/RequestModal/WalletConnectRequestModal.tsx b/apps/mobile/src/components/WalletConnect/RequestModal/WalletConnectRequestModal.tsx
index 8b0195da3ba..c3afb9158d0 100644
--- a/apps/mobile/src/components/WalletConnect/RequestModal/WalletConnectRequestModal.tsx
+++ b/apps/mobile/src/components/WalletConnect/RequestModal/WalletConnectRequestModal.tsx
@@ -5,12 +5,18 @@ import React, { PropsWithChildren, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleProp, ViewStyle } from 'react-native'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { AccountDetails } from 'src/components/accounts/AccountDetails'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
+import { NetworkFee } from 'src/components/Network/NetworkFee'
+import { NetworkPill } from 'src/components/Network/NetworkPill'
 import { ClientDetails, PermitInfo } from 'src/components/WalletConnect/RequestModal/ClientDetails'
 import { useHasSufficientFunds } from 'src/components/WalletConnect/RequestModal/hooks'
 import { RequestDetails } from 'src/components/WalletConnect/RequestModal/RequestDetails'
 import { useBiometricAppSettings, useBiometricPrompt } from 'src/features/biometrics/hooks'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
-import { MobileEventName } from 'src/features/telemetry/constants'
+import { ElementName, MobileEventName, ModalName } from 'src/features/telemetry/constants'
+import { NetworkFeeInfoModal } from 'src/features/transactions/swap/modals/NetworkFeeInfoModal'
+import { BlockedAddressWarning } from 'src/features/trm/BlockedAddressWarning'
 import { wcWeb3Wallet } from 'src/features/walletConnect/saga'
 import { selectDidOpenFromDeepLink } from 'src/features/walletConnect/selectors'
 import { signWcRequestActions } from 'src/features/walletConnect/signWcRequestSaga'
@@ -25,16 +31,10 @@ import { Button, Flex, Text, useSporeColors } from 'ui/src'
 import AlertTriangle from 'ui/src/assets/icons/alert-triangle.svg'
 import { iconSizes } from 'ui/src/theme'
 import { logger } from 'utilities/src/logger/logger'
-import { AccountDetails } from 'wallet/src/components/accounts/AccountDetails'
 import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { NetworkFee } from 'wallet/src/components/network/NetworkFee'
-import { NetworkPill } from 'wallet/src/components/network/NetworkPill'
 import { useTransactionGasFee } from 'wallet/src/features/gas/hooks'
 import { GasSpeed } from 'wallet/src/features/gas/types'
 import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
-import { NetworkFeeInfoModal } from 'wallet/src/features/transactions/swap/modals/NetworkFeeInfoModal'
-import { BlockedAddressWarning } from 'wallet/src/features/trm/BlockedAddressWarning'
 import { useIsBlocked, useIsBlockedActiveAddress } from 'wallet/src/features/trm/hooks'
 import { useSignerAccounts } from 'wallet/src/features/wallet/hooks'
 import {
@@ -43,7 +43,6 @@ import {
   WCEventType,
   WCRequestOutcome,
 } from 'wallet/src/features/walletConnect/types'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 import { areAddressesEqual } from 'wallet/src/utils/addresses'
 import { buildCurrencyId } from 'wallet/src/utils/currencyId'
 
diff --git a/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionModal.tsx b/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionModal.tsx
index 80d46597a32..29e78173cc2 100644
--- a/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionModal.tsx
+++ b/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionModal.tsx
@@ -2,13 +2,15 @@ import { getSdkError } from '@walletconnect/utils'
 import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { AccountDetails } from 'src/components/accounts/AccountDetails'
 import { LinkButton } from 'src/components/buttons/LinkButton'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { DappHeaderIcon } from 'src/components/WalletConnect/DappHeaderIcon'
 import { NetworkLogos } from 'src/components/WalletConnect/NetworkLogos'
 import { PendingConnectionSwitchAccountModal } from 'src/components/WalletConnect/ScanSheet/PendingConnectionSwitchAccountModal'
 import { truncateDappName } from 'src/components/WalletConnect/ScanSheet/util'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
-import { MobileEventName } from 'src/features/telemetry/constants'
+import { ElementName, MobileEventName, ModalName } from 'src/features/telemetry/constants'
 import { wcWeb3Wallet } from 'src/features/walletConnect/saga'
 import { selectDidOpenFromDeepLink } from 'src/features/walletConnect/selectors'
 import { getSessionNamespaces } from 'src/features/walletConnect/utils'
@@ -21,8 +23,6 @@ import {
 import { AnimatedFlex, Button, Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
-import { AccountDetails } from 'wallet/src/components/accounts/AccountDetails'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
 import { ChainId } from 'wallet/src/constants/chains'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
@@ -37,7 +37,6 @@ import {
   WCEventType,
   WCRequestOutcome,
 } from 'wallet/src/features/walletConnect/types'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 
 type Props = {
   pendingSession: WalletConnectPendingSession
diff --git a/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionSwitchAccountModal.tsx b/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionSwitchAccountModal.tsx
index a50c93622b4..5d506f58f52 100644
--- a/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionSwitchAccountModal.tsx
+++ b/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionSwitchAccountModal.tsx
@@ -1,11 +1,11 @@
 import React, { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
+import { ActionSheetModal } from 'src/components/modals/ActionSheetModal'
 import { SwitchAccountOption } from 'src/components/WalletConnect/ScanSheet/SwitchAccountOption'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { Flex, Text } from 'ui/src'
-import { ActionSheetModal } from 'wallet/src/components/modals/ActionSheetModal'
 import { Account } from 'wallet/src/features/wallet/accounts/types'
 import { useSignerAccounts } from 'wallet/src/features/wallet/hooks'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 
 type Props = {
   activeAccount: Account | null
diff --git a/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionSwitchNetworkModal.tsx b/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionSwitchNetworkModal.tsx
index 409b8d3327d..53aa6c7f41e 100644
--- a/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionSwitchNetworkModal.tsx
+++ b/apps/mobile/src/components/WalletConnect/ScanSheet/PendingConnectionSwitchNetworkModal.tsx
@@ -1,12 +1,12 @@
 import React, { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
+import { ActionSheetModal } from 'src/components/modals/ActionSheetModal'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { Flex, Separator, Text, useSporeColors } from 'ui/src'
 import Check from 'ui/src/assets/icons/check.svg'
 import { iconSizes } from 'ui/src/theme'
 import { NetworkLogo } from 'wallet/src/components/CurrencyLogo/NetworkLogo'
-import { ActionSheetModal } from 'wallet/src/components/modals/ActionSheetModal'
-import { ALL_SUPPORTED_CHAIN_IDS, CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
+import { ALL_SUPPORTED_CHAIN_IDS, ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
 
 type Props = {
   selectedChainId: ChainId
diff --git a/apps/mobile/src/components/WalletConnect/ScanSheet/SwitchAccountOption.tsx b/apps/mobile/src/components/WalletConnect/ScanSheet/SwitchAccountOption.tsx
index d32dcb18290..5f64b34b2ca 100644
--- a/apps/mobile/src/components/WalletConnect/ScanSheet/SwitchAccountOption.tsx
+++ b/apps/mobile/src/components/WalletConnect/ScanSheet/SwitchAccountOption.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
-import { Flex, Separator, Text, Unicon, useSporeColors } from 'ui/src'
+import { Unicon } from 'src/components/unicons/Unicon'
+import { Flex, Separator, Text, useSporeColors } from 'ui/src'
 import Check from 'ui/src/assets/icons/check.svg'
-import { DisplayNameText } from 'wallet/src/components/accounts/DisplayNameText'
 import { Account } from 'wallet/src/features/wallet/accounts/types'
 import { useDisplayName } from 'wallet/src/features/wallet/hooks'
 import { shortenAddress } from 'wallet/src/utils/addresses'
@@ -23,10 +23,13 @@ export const SwitchAccountOption = ({ account, activeAccount }: Props): JSX.Elem
       <Flex row alignItems="center" justifyContent="space-between" px="$spacing24" py="$spacing8">
         <Unicon address={account.address} size={ICON_SIZE} />
         <Flex shrink alignItems="center" p="$none">
-          <DisplayNameText
-            displayName={displayName}
-            textProps={{ variant: 'body1', testID: `address-display/name/${displayName?.name}` }}
-          />
+          <Text
+            color="$neutral1"
+            numberOfLines={1}
+            testID={`address-display/name/${displayName?.name}`}
+            variant="body1">
+            {displayName?.name}
+          </Text>
           <Text color="$neutral2" variant="subheading2">
             {shortenAddress(account.address)}
           </Text>
diff --git a/apps/mobile/src/components/WalletConnect/ScanSheet/WalletConnectModal.tsx b/apps/mobile/src/components/WalletConnect/ScanSheet/WalletConnectModal.tsx
index b93598d10cc..86b1cab3d74 100644
--- a/apps/mobile/src/components/WalletConnect/ScanSheet/WalletConnectModal.tsx
+++ b/apps/mobile/src/components/WalletConnect/ScanSheet/WalletConnectModal.tsx
@@ -6,6 +6,7 @@ import 'react-native-reanimated'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { useEagerExternalProfileRootNavigation } from 'src/app/navigation/hooks'
 import { BackButtonView } from 'src/components/layout/BackButtonView'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import { QRCodeScanner } from 'src/components/QRCodeScanner/QRCodeScanner'
 import { WalletQRCode } from 'src/components/QRCodeScanner/WalletQRCode'
@@ -14,25 +15,23 @@ import { ConnectedDappsList } from 'src/components/WalletConnect/ConnectedDapps/
 import {
   getSupportedURI,
   isAllowedUwULinkRequest,
-  parseScantasticParams,
   URIType,
   UWULINK_PREFIX,
 } from 'src/components/WalletConnect/ScanSheet/util'
-import { openModal } from 'src/features/modals/modalSlice'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { useWalletConnect } from 'src/features/walletConnect/useWalletConnect'
 import { pairWithWalletConnectURI } from 'src/features/walletConnect/utils'
 import { addRequest } from 'src/features/walletConnect/walletConnectSlice'
-import { Flex, Text, TouchableArea, useIsDarkMode, useSporeColors } from 'ui/src'
+import { Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
 import Scan from 'ui/src/assets/icons/receive.svg'
 import ScanQRIcon from 'ui/src/assets/icons/scan.svg'
 import { iconSizes } from 'ui/src/theme'
 import { logger } from 'utilities/src/logger/logger'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
 import { useFeatureFlag } from 'wallet/src/features/experiments/hooks'
 import { selectActiveAccountAddress } from 'wallet/src/features/wallet/selectors'
 import { EthMethod, UwULinkRequest } from 'wallet/src/features/walletConnect/types'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 
 type Props = {
   initialScreenState?: ScannerModalState
@@ -53,8 +52,7 @@ export function WalletConnectModal({
   const [shouldFreezeCamera, setShouldFreezeCamera] = useState(false)
   const { preload, navigate } = useEagerExternalProfileRootNavigation()
   const dispatch = useAppDispatch()
-  const isUwULinkEnabled = useFeatureFlag(FEATURE_FLAGS.UwULink)
-  const isScantasticEnabled = useFeatureFlag(FEATURE_FLAGS.Scantastic)
+  const uwuLinkEnabled = useFeatureFlag(FEATURE_FLAGS.UwULink)
 
   // Update QR scanner states when pending session error alert is shown from WCv2 saga event channel
   useEffect(() => {
@@ -72,12 +70,11 @@ export function WalletConnectModal({
       }
       await selectionAsync()
 
-      const supportedURI = await getSupportedURI(uri, { isUwULinkEnabled, isScantasticEnabled })
+      const supportedURI = await getSupportedURI(uri, uwuLinkEnabled)
       if (!supportedURI) {
         setShouldFreezeCamera(true)
         Alert.alert(
           t('Invalid QR Code'),
-          // TODO(EXT-495): Add Scantastic product name here when ready
           t(
             'Make sure that you’re scanning a valid WalletConnect or Ethereum address QR code before trying again.'
           ),
@@ -140,26 +137,6 @@ export function WalletConnectModal({
         }
       }
 
-      if (supportedURI.type === URIType.Scantastic) {
-        const { pubKey, uuid, vendor, model, browser } = parseScantasticParams(supportedURI.value)
-
-        setShouldFreezeCamera(true)
-        dispatch(
-          openModal({
-            name: ModalName.Scantastic,
-            initialState: {
-              pubKey,
-              uuid,
-              vendor,
-              model,
-              browser,
-            },
-          })
-        )
-
-        return
-      }
-
       if (supportedURI.type === URIType.UwULink) {
         setShouldFreezeCamera(true)
         try {
@@ -225,8 +202,7 @@ export function WalletConnectModal({
       setShouldFreezeCamera,
       shouldFreezeCamera,
       hasPendingSessionError,
-      isUwULinkEnabled,
-      isScantasticEnabled,
+      uwuLinkEnabled,
       t,
       dispatch,
     ]
diff --git a/apps/mobile/src/components/WalletConnect/ScanSheet/util.test.ts b/apps/mobile/src/components/WalletConnect/ScanSheet/util.test.ts
index 94f314a3a14..90b3c31b86c 100644
--- a/apps/mobile/src/components/WalletConnect/ScanSheet/util.test.ts
+++ b/apps/mobile/src/components/WalletConnect/ScanSheet/util.test.ts
@@ -4,7 +4,7 @@ import {
   wcInUniwapScheme,
   wcUniversalLinkUrl,
 } from 'src/features/deepLinking/handleDeepLinkSaga.test'
-import { CUSTOM_UNI_QR_CODE_PREFIX, URIType, getSupportedURI } from './util'
+import { CUSTOM_UNI_QR_CODE_PREFIX, getSupportedURI, URIType } from './util'
 
 const VALID_WC_V1_URI = 'validWcV1Uri@1?relay-protocol=irn&symKey=51e'
 const VALID_WC_V2_URI = 'validWcV2Uri@2?relay-protocol=irn&symKey=51e'
diff --git a/apps/mobile/src/components/WalletConnect/ScanSheet/util.ts b/apps/mobile/src/components/WalletConnect/ScanSheet/util.ts
index 5712e27dc5b..716684f58b5 100644
--- a/apps/mobile/src/components/WalletConnect/ScanSheet/util.ts
+++ b/apps/mobile/src/components/WalletConnect/ScanSheet/util.ts
@@ -5,7 +5,6 @@ import {
   UNISWAP_URL_SCHEME_WALLETCONNECT_AS_PARAM,
   UNISWAP_WALLETCONNECT_URL,
 } from 'src/features/deepLinking/handleDeepLinkSaga'
-import { ScantasticModalState } from 'src/features/scantastic/ScantasticModalState'
 import { UwULinkRequest } from 'wallet/src/features/walletConnect/types'
 import { getValidAddress } from 'wallet/src/utils/addresses'
 
@@ -14,7 +13,6 @@ export enum URIType {
   WalletConnectV2URL = 'walletconnect-v2',
   Address = 'address',
   EasterEgg = 'easter-egg',
-  Scantastic = 'scantastic',
   UwULink = 'uwu-link',
 }
 
@@ -23,11 +21,6 @@ export type URIFormat = {
   value: string
 }
 
-interface EnabledFeatureFlags {
-  isUwULinkEnabled: boolean
-  isScantasticEnabled: boolean
-}
-
 const UNISNAP_CONTRACT_ADDRESS = '0xFd2308677A0eb48e2d0c4038c12AA7DCb703e8DC'
 const UWULINK_CONTRACT_ALLOWLIST = [UNISNAP_CONTRACT_ADDRESS]
 const UWULINK_MAX_TXN_VALUE = '0.001'
@@ -45,7 +38,7 @@ export function truncateDappName(name: string): string {
 
 export async function getSupportedURI(
   uri: string,
-  enabledFeatureFlags?: EnabledFeatureFlags
+  isUwULinkEnabled?: boolean
 ): Promise<URIFormat | undefined> {
   if (!uri) {
     return undefined
@@ -61,11 +54,6 @@ export async function getSupportedURI(
     return { type: URIType.Address, value: maybeMetamaskAddress }
   }
 
-  const maybeScantasticAddress = getScantasticAddress(uri)
-  if (enabledFeatureFlags?.isScantasticEnabled && maybeScantasticAddress) {
-    return { type: URIType.Scantastic, value: maybeScantasticAddress }
-  }
-
   // The check for custom prefixes must be before the parseUri version 2 check because
   // parseUri(hello_uniwallet:[valid_wc_uri]) also returns version 2
   const { uri: maybeCustomWcUri, type } =
@@ -91,7 +79,7 @@ export async function getSupportedURI(
     return { type: URIType.EasterEgg, value: uri }
   }
 
-  if (enabledFeatureFlags?.isUwULinkEnabled && isUwULink(uri)) {
+  if (isUwULinkEnabled && isUwULink(uri)) {
     return { type: URIType.UwULink, value: uri.slice(UWULINK_PREFIX.length) }
   }
 }
@@ -151,24 +139,3 @@ function getMetamaskAddress(uri: string): Nullable<string> {
 
   return getValidAddress(uriParts[1], /*withChecksum=*/ true, /*log=*/ false)
 }
-
-// format is scantastic://<uri>
-function getScantasticAddress(uri: string): Nullable<string> {
-  const uriParts = uri.split('://')
-
-  if (uriParts.length < 2) {
-    return null
-  }
-
-  return uriParts[1] || null
-}
-
-/** parses scantastic params for a valid scantastic URI. */
-export function parseScantasticParams(uri: string): ScantasticModalState {
-  const pubKey = new URLSearchParams(uri).get('pubKey') || ''
-  const uuid = new URLSearchParams(uri).get('uuid') || ''
-  const vendor = new URLSearchParams(uri).get('vendor') || ''
-  const model = new URLSearchParams(uri).get('model') || ''
-  const browser = new URLSearchParams(uri).get('browser') || ''
-  return { pubKey, uuid, vendor, model, browser }
-}
diff --git a/apps/mobile/src/components/WalletConnect/WalletConnectModals.tsx b/apps/mobile/src/components/WalletConnect/WalletConnectModals.tsx
index 7b41deda1ef..390156d095c 100644
--- a/apps/mobile/src/components/WalletConnect/WalletConnectModals.tsx
+++ b/apps/mobile/src/components/WalletConnect/WalletConnectModals.tsx
@@ -1,10 +1,14 @@
 import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { useAppDispatch } from 'src/app/hooks'
+import { AccountDetails } from 'src/components/accounts/AccountDetails'
+import { WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
 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 { ModalName } from 'src/features/telemetry/constants'
 import { useWalletConnect } from 'src/features/walletConnect/useWalletConnect'
 import {
   removePendingSession,
@@ -16,15 +20,11 @@ import { useAppStateTrigger } from 'src/utils/useAppStateTrigger'
 import { Flex, useSporeColors } from 'ui/src'
 import EyeIcon from 'ui/src/assets/icons/eye.svg'
 import { iconSizes } from 'ui/src/theme'
-import { AccountDetails } from 'wallet/src/components/accounts/AccountDetails'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
 import {
   useActiveAccount,
   useActiveAccountAddressWithThrow,
   useSignerAccounts,
 } from 'wallet/src/features/wallet/hooks'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { areAddressesEqual } from 'wallet/src/utils/addresses'
 
 export function WalletConnectModals(): JSX.Element {
diff --git a/apps/mobile/src/components/accounts/AccountCardItem.tsx b/apps/mobile/src/components/accounts/AccountCardItem.tsx
index 6c07bc8dbe7..8de7df63a41 100644
--- a/apps/mobile/src/components/accounts/AccountCardItem.tsx
+++ b/apps/mobile/src/components/accounts/AccountCardItem.tsx
@@ -4,20 +4,19 @@ import { useTranslation } from 'react-i18next'
 import ContextMenu from 'react-native-context-menu-view'
 import { useAppDispatch } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
-import { NotificationBadge } from 'src/components/notifications/Badge'
+import { useAccountList } from 'src/components/accounts/hooks'
+import { AddressDisplay } from 'src/components/AddressDisplay'
 import { closeModal, openModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { Screens } from 'src/screens/Screens'
+import { setClipboard } from 'src/utils/clipboard'
 import { disableOnPress } from 'src/utils/disableOnPress'
 import { Flex, Text, TouchableArea } from 'ui/src'
 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 { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
-import { setClipboard } from 'wallet/src/utils/clipboard'
 
 type AccountCardItemProps = {
   address: Address
@@ -134,10 +133,10 @@ export function AccountCardItem({
         <Flex row alignItems="flex-start" gap="$spacing16" testID={`account_item/${address}`}>
           <Flex fill>
             <AddressDisplay
+              showNotificationsBadge
               address={address}
               captionVariant="body3"
               gapBetweenLines="$spacing2"
-              notificationsBadgeContainer={NotificationsBadgeContainer}
               showViewOnlyBadge={isViewOnly}
               size={iconSizes.icon36}
             />
@@ -152,11 +151,3 @@ export function AccountCardItem({
     </ContextMenu>
   )
 }
-
-const NotificationsBadgeContainer = ({
-  children,
-  address,
-}: {
-  children: React.ReactNode
-  address: string
-}): JSX.Element => <NotificationBadge address={address}>{children}</NotificationBadge>
diff --git a/apps/mobile/src/components/accounts/AccountDetails.test.tsx b/apps/mobile/src/components/accounts/AccountDetails.test.tsx
new file mode 100644
index 00000000000..cca076953aa
--- /dev/null
+++ b/apps/mobile/src/components/accounts/AccountDetails.test.tsx
@@ -0,0 +1,18 @@
+import React from 'react'
+import { AccountDetails } from 'src/components/accounts/AccountDetails'
+import { render } from 'src/test/test-utils'
+import { account } from 'wallet/src/test/fixtures'
+
+describe(AccountDetails, () => {
+  it('renders without error', () => {
+    const tree = render(<AccountDetails address={account.address} iconSize={50} />)
+
+    expect(tree.toJSON()).toMatchSnapshot()
+  })
+
+  it('renders without error with chevron', () => {
+    const tree = render(<AccountDetails chevron address={account.address} iconSize={50} />)
+
+    expect(tree.toJSON()).toMatchSnapshot()
+  })
+})
diff --git a/packages/wallet/src/components/accounts/AccountDetails.tsx b/apps/mobile/src/components/accounts/AccountDetails.tsx
similarity index 92%
rename from packages/wallet/src/components/accounts/AccountDetails.tsx
rename to apps/mobile/src/components/accounts/AccountDetails.tsx
index b2f02cb3cfe..b9b896a81e5 100644
--- a/packages/wallet/src/components/accounts/AccountDetails.tsx
+++ b/apps/mobile/src/components/accounts/AccountDetails.tsx
@@ -1,5 +1,6 @@
+import React from 'react'
+import { AddressDisplay } from 'src/components/AddressDisplay'
 import { Flex, Icons, Text } from 'ui/src'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
 import { shortenAddress } from 'wallet/src/utils/addresses'
 
 export function AccountDetails({
diff --git a/apps/mobile/src/components/accounts/AccountHeader.tsx b/apps/mobile/src/components/accounts/AccountHeader.tsx
index 8d1f76141b7..7b6d616aeb5 100644
--- a/apps/mobile/src/components/accounts/AccountHeader.tsx
+++ b/apps/mobile/src/components/accounts/AccountHeader.tsx
@@ -2,31 +2,30 @@ import { impactAsync, ImpactFeedbackStyle, selectionAsync } from 'expo-haptics'
 import React, { useCallback } from 'react'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
+import { AccountIcon } from 'src/components/AccountIcon'
 import { openModal } from 'src/features/modals/modalSlice'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { Screens } from 'src/screens/Screens'
+import { setClipboard } from 'src/utils/clipboard'
 import { isDevBuild } from 'src/utils/version'
 import { Flex, Icons, Text, TouchableArea } from 'ui/src'
-import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
-import { AnimatedUnitagDisplayName } from 'wallet/src/components/accounts/AnimatedUnitagDisplayName'
+import { useENSAvatar } from 'wallet/src/features/ens/api'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
-import { useAvatar, useDisplayName } from 'wallet/src/features/wallet/hooks'
+import { 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 { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 import { sanitizeAddressText, shortenAddress } from 'wallet/src/utils/addresses'
-import { setClipboard } from 'wallet/src/utils/clipboard'
 
 export function AccountHeader(): JSX.Element {
   const activeAddress = useAppSelector(selectActiveAccountAddress)
   const account = useAppSelector(selectActiveAccount)
   const dispatch = useAppDispatch()
 
-  const { avatar } = useAvatar(activeAddress)
+  const { data: avatar } = useENSAvatar(activeAddress)
   const displayName = useDisplayName(activeAddress)
 
   const onPressAccountHeader = useCallback(() => {
@@ -50,7 +49,7 @@ export function AccountHeader(): JSX.Element {
     }
   }
 
-  const walletHasName = displayName && displayName?.type !== DisplayNameType.Address
+  const walletHasName = displayName?.type !== 'address'
   const iconSize = 52
 
   return (
@@ -91,7 +90,17 @@ export function AccountHeader(): JSX.Element {
                 flexShrink={1}
                 hitSlop={20}
                 onPress={onPressAccountHeader}>
-                <AnimatedUnitagDisplayName address={activeAddress} displayName={displayName} />
+                <Text color="$neutral1" flexShrink={1} numberOfLines={1} variant="subheading1">
+                  {displayName?.name}
+                </Text>
+              </TouchableArea>
+              <TouchableArea hapticFeedback flexGrow={1} hitSlop={20} onPress={onPressCopyAddress}>
+                <Flex row alignItems="center" gap="$spacing4">
+                  <Text color="$neutral3" numberOfLines={1} variant="body2">
+                    {sanitizeAddressText(shortenAddress(activeAddress))}
+                  </Text>
+                  <Icons.CopyAlt color="$neutral3" size="$icon.16" />
+                </Flex>
               </TouchableArea>
             </Flex>
           ) : (
diff --git a/apps/mobile/src/components/accounts/AccountList.tsx b/apps/mobile/src/components/accounts/AccountList.tsx
index 8107b31e425..121d7b1aa5f 100644
--- a/apps/mobile/src/components/accounts/AccountList.tsx
+++ b/apps/mobile/src/components/accounts/AccountList.tsx
@@ -3,13 +3,13 @@ import { ComponentProps, default as React, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleSheet } from 'react-native'
 import { AccountCardItem } from 'src/components/accounts/AccountCardItem'
+import { useAccountList } from 'src/components/accounts/hooks'
 import { VirtualizedList } from 'src/components/layout/VirtualizedList'
 import { Flex, Text, useSporeColors } from 'ui/src'
 import { opacify, spacing } from 'ui/src/theme'
 import { useAsyncData } from 'utilities/src/react/hooks'
 import { PollingInterval } from 'wallet/src/constants/misc'
 import { isNonPollingRequestInFlight } from 'wallet/src/data/utils'
-import { useAccountList } from 'wallet/src/features/accounts/hooks'
 import { Account, AccountType } from 'wallet/src/features/wallet/accounts/types'
 
 // Most screens can fit more but this is set conservatively
diff --git a/apps/mobile/src/components/accounts/__snapshots__/AccountDetails.test.tsx.snap b/apps/mobile/src/components/accounts/__snapshots__/AccountDetails.test.tsx.snap
new file mode 100644
index 00000000000..893df88180f
--- /dev/null
+++ b/apps/mobile/src/components/accounts/__snapshots__/AccountDetails.test.tsx.snap
@@ -0,0 +1,670 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`AccountDetails renders without error 1`] = `
+<View
+  style={
+    {
+      "alignItems": "center",
+      "flexDirection": "row",
+      "flexShrink": 1,
+      "gap": 16,
+      "justifyContent": "space-between",
+    }
+  }
+>
+  <View
+    style={
+      {
+        "alignItems": "stretch",
+        "flex": 1,
+        "flexDirection": "row",
+        "flexShrink": 1,
+      }
+    }
+  >
+    <View
+      style={
+        {
+          "alignItems": "center",
+          "flexDirection": "row",
+          "gap": 8,
+        }
+      }
+    >
+      <View
+        style={
+          {
+            "alignItems": "stretch",
+            "backgroundColor": "transparent",
+            "borderBottomLeftRadius": 999999,
+            "borderBottomRightRadius": 999999,
+            "borderTopLeftRadius": 999999,
+            "borderTopRightRadius": 999999,
+            "flexDirection": "column",
+            "position": "relative",
+          }
+        }
+      >
+        <View
+          style={
+            {
+              "alignItems": "center",
+              "borderBottomLeftRadius": 999999,
+              "borderBottomRightRadius": 999999,
+              "borderTopLeftRadius": 999999,
+              "borderTopRightRadius": 999999,
+              "flexDirection": "column",
+              "height": 50,
+              "justifyContent": "center",
+              "paddingBottom": 0,
+              "paddingLeft": 0,
+              "paddingRight": 0,
+              "paddingTop": 0,
+              "width": 50,
+            }
+          }
+        >
+          <View
+            style={
+              {
+                "alignItems": "stretch",
+                "flexDirection": "column",
+                "height": 50,
+                "width": 50,
+              }
+            }
+          >
+            <View
+              style={
+                {
+                  "alignItems": "stretch",
+                  "flexDirection": "column",
+                  "height": 50,
+                  "width": 50,
+                }
+              }
+            >
+              <View
+                style={
+                  {
+                    "flex": 1,
+                  }
+                }
+              >
+                <View
+                  clip={true}
+                  mask={
+                    <UniconMask
+                      attributeData={
+                        {
+                          "0": "#6100FF",
+                          "1": "#76D191",
+                          "2": [
+                            {
+                              "fillType": "evenOdd",
+                              "path": "M31 33V16C31 8.8203 25.1797 3 18 3C10.8203 3 5 8.8203 5 16V33H31ZM18 0C9.16344 0 2 7.16344 2 16V35.807C2 35.9136 2.08642 36 2.19303 36H33.807C33.9136 36 34 35.9136 34 35.807V16C34 7.16344 26.8366 0 18 0Z",
+                            },
+                          ],
+                          "3": [
+                            {
+                              "path": "M8 8C8 8 13.1678 6.70089 14.2197 5.649C15.2716 4.59712 15.2583 2.87836 14.19 1.81004C13.1216 0.741719 11.4029 0.728395 10.351 1.78028C9.29911 2.83216 8 8 8 8Z",
+                            },
+                            {
+                              "path": "M8 8C8 8 13.1678 9.29911 14.2197 10.351C15.2716 11.4029 15.2583 13.1216 14.19 14.19C13.1216 15.2583 11.4029 15.2716 10.351 14.2197C9.29911 13.1678 8 8 8 8Z",
+                            },
+                            {
+                              "path": "M1.78028 10.351C2.83216 9.29911 8 8 8 8C8 8 6.70089 13.1678 5.649 14.2197C4.59712 15.2716 2.87836 15.2583 1.81004 14.19C0.741719 13.1216 0.728395 11.4029 1.78028 10.351Z",
+                            },
+                            {
+                              "path": "M8 8C8 8 2.83216 6.70089 1.78028 5.649C0.728395 4.59712 0.741719 2.87836 1.81004 1.81004C2.87836 0.741719 4.59712 0.728395 5.649 1.78028C6.70089 2.83216 8 8 8 8Z",
+                            },
+                          ],
+                        }
+                      }
+                      showBorder={false}
+                      size={50}
+                    />
+                  }
+                >
+                  <View
+                    transform={
+                      [
+                        {
+                          "scale": 1.3513513513513513,
+                        },
+                      ]
+                    }
+                  >
+                    <View
+                      height={37}
+                      width={37}
+                      x={0}
+                      y={0}
+                    >
+                      <View
+                        colors={
+                          [
+                            "#6100FF",
+                            "#76D191",
+                          ]
+                        }
+                        end={null}
+                        start={null}
+                      />
+                    </View>
+                    <View
+                      color="#D3EBA3"
+                      cx={18.5}
+                      cy={-13.36111111111111}
+                      r={30.833333333333336}
+                    >
+                      <View
+                        blur={15}
+                      />
+                    </View>
+                  </View>
+                </View>
+                <View
+                  clip={true}
+                  mask={
+                    <UniconMask
+                      attributeData={
+                        {
+                          "0": "#6100FF",
+                          "1": "#76D191",
+                          "2": [
+                            {
+                              "fillType": "evenOdd",
+                              "path": "M31 33V16C31 8.8203 25.1797 3 18 3C10.8203 3 5 8.8203 5 16V33H31ZM18 0C9.16344 0 2 7.16344 2 16V35.807C2 35.9136 2.08642 36 2.19303 36H33.807C33.9136 36 34 35.9136 34 35.807V16C34 7.16344 26.8366 0 18 0Z",
+                            },
+                          ],
+                          "3": [
+                            {
+                              "path": "M8 8C8 8 13.1678 6.70089 14.2197 5.649C15.2716 4.59712 15.2583 2.87836 14.19 1.81004C13.1216 0.741719 11.4029 0.728395 10.351 1.78028C9.29911 2.83216 8 8 8 8Z",
+                            },
+                            {
+                              "path": "M8 8C8 8 13.1678 9.29911 14.2197 10.351C15.2716 11.4029 15.2583 13.1216 14.19 14.19C13.1216 15.2583 11.4029 15.2716 10.351 14.2197C9.29911 13.1678 8 8 8 8Z",
+                            },
+                            {
+                              "path": "M1.78028 10.351C2.83216 9.29911 8 8 8 8C8 8 6.70089 13.1678 5.649 14.2197C4.59712 15.2716 2.87836 15.2583 1.81004 14.19C0.741719 13.1216 0.728395 11.4029 1.78028 10.351Z",
+                            },
+                            {
+                              "path": "M8 8C8 8 2.83216 6.70089 1.78028 5.649C0.728395 4.59712 0.741719 2.87836 1.81004 1.81004C2.87836 0.741719 4.59712 0.728395 5.649 1.78028C6.70089 2.83216 8 8 8 8Z",
+                            },
+                          ],
+                        }
+                      }
+                      overlay={true}
+                      showBorder={false}
+                      size={50}
+                    />
+                  }
+                >
+                  <View
+                    color="#000000"
+                    height={50}
+                    opacity={0.08}
+                    width={50}
+                    x={0}
+                    y={0}
+                  />
+                </View>
+              </View>
+            </View>
+          </View>
+        </View>
+      </View>
+      <View
+        style={
+          {
+            "alignItems": "flex-start",
+            "flexDirection": "column",
+            "flexShrink": 1,
+            "gap": 0,
+          }
+        }
+      >
+        <View
+          style={
+            {
+              "alignItems": "center",
+              "flexDirection": "row",
+              "gap": 12,
+              "justifyContent": "center",
+            }
+          }
+        >
+          <Text
+            adjustsFontSizeToFit={true}
+            allowFontScaling={true}
+            maxFontSizeMultiplier={1.4}
+            numberOfLines={1}
+            style={
+              {
+                "color": "#222222",
+                "fontFamily": "Basel-Book",
+                "fontSize": 15,
+                "lineHeight": 20,
+              }
+            }
+            suppressHighlighting={true}
+            testID="address-display/name/0x​82D5...3Fa6"
+          >
+            0x​82D5...3Fa6
+          </Text>
+        </View>
+      </View>
+    </View>
+  </View>
+  <View
+    style={
+      {
+        "alignItems": "center",
+        "flex": 1,
+        "flexDirection": "row",
+        "flexShrink": 1,
+        "gap": 4,
+        "justifyContent": "flex-end",
+      }
+    }
+  >
+    <Text
+      allowFontScaling={true}
+      maxFontSizeMultiplier={1.4}
+      style={
+        {
+          "color": "#7D7D7D",
+          "fontFamily": "Basel-Book",
+          "fontSize": 15,
+          "lineHeight": 20,
+        }
+      }
+      suppressHighlighting={true}
+    >
+      0x82D5...3Fa6
+    </Text>
+  </View>
+</View>
+`;
+
+exports[`AccountDetails renders without error with chevron 1`] = `
+<View
+  style={
+    {
+      "alignItems": "center",
+      "flexDirection": "row",
+      "flexShrink": 1,
+      "gap": 16,
+      "justifyContent": "space-between",
+    }
+  }
+>
+  <View
+    style={
+      {
+        "alignItems": "stretch",
+        "flex": 1,
+        "flexDirection": "row",
+        "flexShrink": 1,
+      }
+    }
+  >
+    <View
+      style={
+        {
+          "alignItems": "center",
+          "flexDirection": "row",
+          "gap": 8,
+        }
+      }
+    >
+      <View
+        style={
+          {
+            "alignItems": "stretch",
+            "backgroundColor": "transparent",
+            "borderBottomLeftRadius": 999999,
+            "borderBottomRightRadius": 999999,
+            "borderTopLeftRadius": 999999,
+            "borderTopRightRadius": 999999,
+            "flexDirection": "column",
+            "position": "relative",
+          }
+        }
+      >
+        <View
+          style={
+            {
+              "alignItems": "center",
+              "borderBottomLeftRadius": 999999,
+              "borderBottomRightRadius": 999999,
+              "borderTopLeftRadius": 999999,
+              "borderTopRightRadius": 999999,
+              "flexDirection": "column",
+              "height": 50,
+              "justifyContent": "center",
+              "paddingBottom": 0,
+              "paddingLeft": 0,
+              "paddingRight": 0,
+              "paddingTop": 0,
+              "width": 50,
+            }
+          }
+        >
+          <View
+            style={
+              {
+                "alignItems": "stretch",
+                "flexDirection": "column",
+                "height": 50,
+                "width": 50,
+              }
+            }
+          >
+            <View
+              style={
+                {
+                  "alignItems": "stretch",
+                  "flexDirection": "column",
+                  "height": 50,
+                  "width": 50,
+                }
+              }
+            >
+              <View
+                style={
+                  {
+                    "flex": 1,
+                  }
+                }
+              >
+                <View
+                  clip={true}
+                  mask={
+                    <UniconMask
+                      attributeData={
+                        {
+                          "0": "#6100FF",
+                          "1": "#76D191",
+                          "2": [
+                            {
+                              "fillType": "evenOdd",
+                              "path": "M31 33V16C31 8.8203 25.1797 3 18 3C10.8203 3 5 8.8203 5 16V33H31ZM18 0C9.16344 0 2 7.16344 2 16V35.807C2 35.9136 2.08642 36 2.19303 36H33.807C33.9136 36 34 35.9136 34 35.807V16C34 7.16344 26.8366 0 18 0Z",
+                            },
+                          ],
+                          "3": [
+                            {
+                              "path": "M8 8C8 8 13.1678 6.70089 14.2197 5.649C15.2716 4.59712 15.2583 2.87836 14.19 1.81004C13.1216 0.741719 11.4029 0.728395 10.351 1.78028C9.29911 2.83216 8 8 8 8Z",
+                            },
+                            {
+                              "path": "M8 8C8 8 13.1678 9.29911 14.2197 10.351C15.2716 11.4029 15.2583 13.1216 14.19 14.19C13.1216 15.2583 11.4029 15.2716 10.351 14.2197C9.29911 13.1678 8 8 8 8Z",
+                            },
+                            {
+                              "path": "M1.78028 10.351C2.83216 9.29911 8 8 8 8C8 8 6.70089 13.1678 5.649 14.2197C4.59712 15.2716 2.87836 15.2583 1.81004 14.19C0.741719 13.1216 0.728395 11.4029 1.78028 10.351Z",
+                            },
+                            {
+                              "path": "M8 8C8 8 2.83216 6.70089 1.78028 5.649C0.728395 4.59712 0.741719 2.87836 1.81004 1.81004C2.87836 0.741719 4.59712 0.728395 5.649 1.78028C6.70089 2.83216 8 8 8 8Z",
+                            },
+                          ],
+                        }
+                      }
+                      showBorder={false}
+                      size={50}
+                    />
+                  }
+                >
+                  <View
+                    transform={
+                      [
+                        {
+                          "scale": 1.3513513513513513,
+                        },
+                      ]
+                    }
+                  >
+                    <View
+                      height={37}
+                      width={37}
+                      x={0}
+                      y={0}
+                    >
+                      <View
+                        colors={
+                          [
+                            "#6100FF",
+                            "#76D191",
+                          ]
+                        }
+                        end={null}
+                        start={null}
+                      />
+                    </View>
+                    <View
+                      color="#D3EBA3"
+                      cx={18.5}
+                      cy={-13.36111111111111}
+                      r={30.833333333333336}
+                    >
+                      <View
+                        blur={15}
+                      />
+                    </View>
+                  </View>
+                </View>
+                <View
+                  clip={true}
+                  mask={
+                    <UniconMask
+                      attributeData={
+                        {
+                          "0": "#6100FF",
+                          "1": "#76D191",
+                          "2": [
+                            {
+                              "fillType": "evenOdd",
+                              "path": "M31 33V16C31 8.8203 25.1797 3 18 3C10.8203 3 5 8.8203 5 16V33H31ZM18 0C9.16344 0 2 7.16344 2 16V35.807C2 35.9136 2.08642 36 2.19303 36H33.807C33.9136 36 34 35.9136 34 35.807V16C34 7.16344 26.8366 0 18 0Z",
+                            },
+                          ],
+                          "3": [
+                            {
+                              "path": "M8 8C8 8 13.1678 6.70089 14.2197 5.649C15.2716 4.59712 15.2583 2.87836 14.19 1.81004C13.1216 0.741719 11.4029 0.728395 10.351 1.78028C9.29911 2.83216 8 8 8 8Z",
+                            },
+                            {
+                              "path": "M8 8C8 8 13.1678 9.29911 14.2197 10.351C15.2716 11.4029 15.2583 13.1216 14.19 14.19C13.1216 15.2583 11.4029 15.2716 10.351 14.2197C9.29911 13.1678 8 8 8 8Z",
+                            },
+                            {
+                              "path": "M1.78028 10.351C2.83216 9.29911 8 8 8 8C8 8 6.70089 13.1678 5.649 14.2197C4.59712 15.2716 2.87836 15.2583 1.81004 14.19C0.741719 13.1216 0.728395 11.4029 1.78028 10.351Z",
+                            },
+                            {
+                              "path": "M8 8C8 8 2.83216 6.70089 1.78028 5.649C0.728395 4.59712 0.741719 2.87836 1.81004 1.81004C2.87836 0.741719 4.59712 0.728395 5.649 1.78028C6.70089 2.83216 8 8 8 8Z",
+                            },
+                          ],
+                        }
+                      }
+                      overlay={true}
+                      showBorder={false}
+                      size={50}
+                    />
+                  }
+                >
+                  <View
+                    color="#000000"
+                    height={50}
+                    opacity={0.08}
+                    width={50}
+                    x={0}
+                    y={0}
+                  />
+                </View>
+              </View>
+            </View>
+          </View>
+        </View>
+      </View>
+      <View
+        style={
+          {
+            "alignItems": "flex-start",
+            "flexDirection": "column",
+            "flexShrink": 1,
+            "gap": 0,
+          }
+        }
+      >
+        <View
+          style={
+            {
+              "alignItems": "center",
+              "flexDirection": "row",
+              "gap": 12,
+              "justifyContent": "center",
+            }
+          }
+        >
+          <Text
+            adjustsFontSizeToFit={true}
+            allowFontScaling={true}
+            maxFontSizeMultiplier={1.4}
+            numberOfLines={1}
+            style={
+              {
+                "color": "#222222",
+                "fontFamily": "Basel-Book",
+                "fontSize": 15,
+                "lineHeight": 20,
+              }
+            }
+            suppressHighlighting={true}
+            testID="address-display/name/0x​82D5...3Fa6"
+          >
+            0x​82D5...3Fa6
+          </Text>
+        </View>
+      </View>
+    </View>
+  </View>
+  <View
+    style={
+      {
+        "alignItems": "center",
+        "flex": 1,
+        "flexDirection": "row",
+        "flexShrink": 1,
+        "gap": 4,
+        "justifyContent": "flex-end",
+      }
+    }
+  >
+    <Text
+      allowFontScaling={true}
+      maxFontSizeMultiplier={1.4}
+      style={
+        {
+          "color": "#7D7D7D",
+          "fontFamily": "Basel-Book",
+          "fontSize": 15,
+          "lineHeight": 20,
+        }
+      }
+      suppressHighlighting={true}
+    >
+      0x82D5...3Fa6
+    </Text>
+    <View
+      style={
+        {
+          "alignItems": "center",
+          "borderBottomLeftRadius": 999999,
+          "borderBottomRightRadius": 999999,
+          "borderTopLeftRadius": 999999,
+          "borderTopRightRadius": 999999,
+          "flexDirection": "column",
+          "justifyContent": "center",
+          "transform": [
+            {
+              "rotate": "180deg",
+            },
+          ],
+        }
+      }
+    >
+      <RNSVGSvgView
+        align="xMidYMid"
+        bbHeight="50"
+        bbWidth="50"
+        fill="none"
+        focusable={false}
+        meetOrSlice={0}
+        minX={0}
+        minY={0}
+        stroke="currentColor"
+        strokeWidth={8}
+        style={
+          [
+            {
+              "backgroundColor": "transparent",
+              "borderWidth": 0,
+            },
+            {
+              "color": "#7D7D7D",
+              "height": 50,
+              "width": 50,
+            },
+            {
+              "flex": 0,
+              "height": 50,
+              "width": 50,
+            },
+          ]
+        }
+        tintColor="#7D7D7D"
+        vbHeight={24}
+        vbWidth={24}
+      >
+        <RNSVGGroup
+          fill={null}
+          propList={
+            [
+              "fill",
+              "stroke",
+              "strokeWidth",
+            ]
+          }
+          stroke={
+            {
+              "type": 2,
+            }
+          }
+          strokeWidth="8"
+        >
+          <RNSVGPath
+            d="M15 6L9 12L15 18"
+            fill={
+              {
+                "payload": 4278190080,
+                "type": 0,
+              }
+            }
+            propList={
+              [
+                "stroke",
+                "strokeWidth",
+                "strokeLinecap",
+                "strokeLinejoin",
+              ]
+            }
+            stroke={
+              {
+                "type": 2,
+              }
+            }
+            strokeLinecap={1}
+            strokeLinejoin={1}
+            strokeWidth="3"
+          />
+        </RNSVGGroup>
+      </RNSVGSvgView>
+    </View>
+  </View>
+</View>
+`;
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 d84cbca8aed..8a900f7cfe6 100644
--- a/apps/mobile/src/components/accounts/__snapshots__/AccountHeader.test.tsx.snap
+++ b/apps/mobile/src/components/accounts/__snapshots__/AccountHeader.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`AccountHeader renders without error 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "flexDirection": "column",
       "gap": 12,
       "overflow": "scroll",
@@ -26,6 +27,7 @@ exports[`AccountHeader renders without error 1`] = `
     <View
       style={
         {
+          "alignItems": "stretch",
           "flexDirection": "row",
           "justifyContent": "space-between",
           "width": "100%",
@@ -73,20 +75,12 @@ exports[`AccountHeader renders without error 1`] = `
         <View
           style={
             {
+              "alignItems": "stretch",
               "backgroundColor": "#FFFFFF",
-              "borderBottomColor": "transparent",
               "borderBottomLeftRadius": 999999,
               "borderBottomRightRadius": 999999,
-              "borderBottomWidth": 0,
-              "borderLeftColor": "transparent",
-              "borderLeftWidth": 0,
-              "borderRightColor": "transparent",
-              "borderRightWidth": 0,
-              "borderStyle": "solid",
-              "borderTopColor": "transparent",
               "borderTopLeftRadius": 999999,
               "borderTopRightRadius": 999999,
-              "borderTopWidth": 0,
               "flexDirection": "column",
               "position": "relative",
             }
@@ -114,6 +108,7 @@ exports[`AccountHeader renders without error 1`] = `
             <View
               style={
                 {
+                  "alignItems": "stretch",
                   "flexDirection": "column",
                   "height": 28,
                   "width": 28,
@@ -123,6 +118,7 @@ exports[`AccountHeader renders without error 1`] = `
               <View
                 style={
                   {
+                    "alignItems": "stretch",
                     "flexDirection": "column",
                     "height": 28,
                     "width": 28,
@@ -474,226 +470,151 @@ exports[`AccountHeader renders without error 1`] = `
             "opacity": 1,
           }
         }
+      >
+        <Text
+          allowFontScaling={true}
+          maxFontSizeMultiplier={1.4}
+          numberOfLines={1}
+          style={
+            {
+              "color": "#222222",
+              "flexShrink": 1,
+              "fontFamily": "Basel-Book",
+              "fontSize": 19,
+              "lineHeight": 24,
+            }
+          }
+          suppressHighlighting={true}
+        >
+          Test Account
+        </Text>
+      </View>
+      <View
+        accessibilityState={
+          {
+            "busy": undefined,
+            "checked": undefined,
+            "disabled": undefined,
+            "expanded": undefined,
+            "selected": undefined,
+          }
+        }
+        accessibilityValue={
+          {
+            "max": undefined,
+            "min": undefined,
+            "now": undefined,
+            "text": undefined,
+          }
+        }
+        accessible={true}
+        collapsable={false}
+        focusable={true}
+        hitSlop={20}
+        onClick={[Function]}
+        onResponderGrant={[Function]}
+        onResponderMove={[Function]}
+        onResponderRelease={[Function]}
+        onResponderTerminate={[Function]}
+        onResponderTerminationRequest={[Function]}
+        onStartShouldSetResponder={[Function]}
+        style={
+          {
+            "flexGrow": 1,
+            "opacity": 1,
+          }
+        }
       >
         <View
           style={
             {
-              "flexDirection": "column",
+              "alignItems": "center",
+              "flexDirection": "row",
+              "gap": 4,
             }
           }
         >
-          <View
+          <Text
+            allowFontScaling={true}
+            maxFontSizeMultiplier={1.4}
+            numberOfLines={1}
             style={
               {
-                "flexDirection": "row",
+                "color": "#CECECE",
+                "fontFamily": "Basel-Book",
+                "fontSize": 17,
+                "lineHeight": 24,
               }
             }
+            suppressHighlighting={true}
           >
-            <Text
-              allowFontScaling={true}
-              maxFontSizeMultiplier={1.4}
-              style={
+            0x​82D5...3Fa6
+          </Text>
+          <RNSVGSvgView
+            align="xMidYMid"
+            bbHeight="16"
+            bbWidth="16"
+            fill="none"
+            focusable={false}
+            meetOrSlice={0}
+            minX={0}
+            minY={0}
+            strokeWidth={8}
+            style={
+              [
                 {
-                  "color": "#222222",
-                  "fontFamily": "Basel-Book",
-                  "fontSize": 19,
-                  "lineHeight": 24,
-                }
-              }
-              suppressHighlighting={true}
-            >
-              Test Account
-            </Text>
-            <View
-              animatedStyle={
+                  "backgroundColor": "transparent",
+                  "borderWidth": 0,
+                },
                 {
-                  "value": {
-                    "transform": [
-                      {
-                        "translateX": 0,
-                      },
-                    ],
-                  },
-                }
-              }
-              collapsable={false}
-              forwardedRef={[Function]}
-              style={
+                  "color": "#CECECE",
+                  "height": 16,
+                  "width": 16,
+                },
                 {
-                  "flexDirection": "row",
-                  "marginLeft": -0,
-                  "transform": [
-                    {
-                      "translateX": 0,
-                    },
-                  ],
-                }
+                  "flex": 0,
+                  "height": 16,
+                  "width": 16,
+                },
+              ]
+            }
+            tintColor="#CECECE"
+            vbHeight={16}
+            vbWidth={16}
+          >
+            <RNSVGGroup
+              fill={null}
+              propList={
+                [
+                  "fill",
+                  "strokeWidth",
+                ]
               }
+              strokeWidth="8"
             >
-              <View
-                onLayout={[Function]}
-                style={
-                  {
-                    "flexDirection": "column",
-                  }
-                }
-              >
-                <Text
-                  allowFontScaling={true}
-                  animatedStyle={
-                    {
-                      "value": {
-                        "opacity": 0,
-                      },
-                    }
-                  }
-                  collapsable={false}
-                  forwardedRef={[Function]}
-                  maxFontSizeMultiplier={1.4}
-                  style={
-                    {
-                      "color": "#CECECE",
-                      "fontFamily": "Basel-Book",
-                      "fontSize": 19,
-                      "lineHeight": 24,
-                      "opacity": 0,
-                    }
-                  }
-                  suppressHighlighting={true}
-                >
-                  .cantswim.eth
-                </Text>
-              </View>
-              <View
-                accessibilityState={
+              <RNSVGPath
+                d="M12.25 4.16667H6.41667C4.96533 4.16667 4.16667 4.96533 4.16667 6.41667V12.25C4.16667 13.7013 4.96533 14.5 6.41667 14.5H12.25C13.7013 14.5 14.5 13.7013 14.5 12.25V6.41667C14.5 4.96533 13.7013 4.16667 12.25 4.16667ZM13.5 12.25C13.5 13.138 13.138 13.5 12.25 13.5H6.41667C5.52867 13.5 5.16667 13.138 5.16667 12.25V6.41667C5.16667 5.52867 5.52867 5.16667 6.41667 5.16667H12.25C13.138 5.16667 13.5 5.52867 13.5 6.41667V12.25ZM2.5 3.74666V9.58667C2.5 10.3853 2.82206 10.582 2.92806 10.6473C3.16406 10.7913 3.23726 11.0993 3.09326 11.3347C2.9986 11.4887 2.83468 11.5733 2.66602 11.5733C2.57735 11.5733 2.48661 11.5493 2.40527 11.5C1.80461 11.132 1.5 10.4887 1.5 9.58667V3.74666C1.5 2.31866 2.31941 1.5 3.74674 1.5H9.58659C10.7099 1.5 11.2467 1.99265 11.5 2.40531C11.644 2.64065 11.57 2.94865 11.3346 3.09265C11.0986 3.23732 10.792 3.16266 10.6473 2.92733C10.5826 2.82133 10.3853 2.49935 9.58659 2.49935H3.74674C2.86141 2.50002 2.5 2.86133 2.5 3.74666Z"
+                fill={
                   {
-                    "busy": undefined,
-                    "checked": undefined,
-                    "disabled": undefined,
-                    "expanded": undefined,
-                    "selected": undefined,
+                    "type": 2,
                   }
                 }
-                accessibilityValue={
-                  {
-                    "max": undefined,
-                    "min": undefined,
-                    "now": undefined,
-                    "text": undefined,
-                  }
+                propList={
+                  [
+                    "fill",
+                    "stroke",
+                    "strokeWidth",
+                  ]
                 }
-                accessible={true}
-                collapsable={false}
-                focusable={true}
-                hitSlop={20}
-                onClick={[Function]}
-                onResponderGrant={[Function]}
-                onResponderMove={[Function]}
-                onResponderRelease={[Function]}
-                onResponderTerminate={[Function]}
-                onResponderTerminationRequest={[Function]}
-                onStartShouldSetResponder={[Function]}
-                style={
+                stroke={
                   {
-                    "opacity": 1,
-                    "paddingLeft": 8,
+                    "type": 2,
                   }
                 }
-              >
-                <View
-                  style={
-                    {
-                      "alignItems": "center",
-                      "flexDirection": "row",
-                      "gap": 4,
-                    }
-                  }
-                >
-                  <Text
-                    allowFontScaling={true}
-                    maxFontSizeMultiplier={1.4}
-                    numberOfLines={1}
-                    style={
-                      {
-                        "color": "#CECECE",
-                        "fontFamily": "Basel-Book",
-                        "fontSize": 17,
-                        "lineHeight": 24,
-                      }
-                    }
-                    suppressHighlighting={true}
-                  >
-                    0x​82D5...3Fa6
-                  </Text>
-                  <RNSVGSvgView
-                    align="xMidYMid"
-                    bbHeight="16"
-                    bbWidth="16"
-                    fill="none"
-                    focusable={false}
-                    meetOrSlice={0}
-                    minX={0}
-                    minY={0}
-                    strokeWidth={8}
-                    style={
-                      [
-                        {
-                          "backgroundColor": "transparent",
-                          "borderWidth": 0,
-                        },
-                        {
-                          "color": "#CECECE",
-                          "height": 16,
-                          "width": 16,
-                        },
-                        {
-                          "flex": 0,
-                          "height": 16,
-                          "width": 16,
-                        },
-                      ]
-                    }
-                    tintColor="#CECECE"
-                    vbHeight={16}
-                    vbWidth={16}
-                  >
-                    <RNSVGGroup
-                      fill={null}
-                      propList={
-                        [
-                          "fill",
-                          "strokeWidth",
-                        ]
-                      }
-                      strokeWidth="8"
-                    >
-                      <RNSVGPath
-                        d="M12.25 4.16667H6.41667C4.96533 4.16667 4.16667 4.96533 4.16667 6.41667V12.25C4.16667 13.7013 4.96533 14.5 6.41667 14.5H12.25C13.7013 14.5 14.5 13.7013 14.5 12.25V6.41667C14.5 4.96533 13.7013 4.16667 12.25 4.16667ZM13.5 12.25C13.5 13.138 13.138 13.5 12.25 13.5H6.41667C5.52867 13.5 5.16667 13.138 5.16667 12.25V6.41667C5.16667 5.52867 5.52867 5.16667 6.41667 5.16667H12.25C13.138 5.16667 13.5 5.52867 13.5 6.41667V12.25ZM2.5 3.74666V9.58667C2.5 10.3853 2.82206 10.582 2.92806 10.6473C3.16406 10.7913 3.23726 11.0993 3.09326 11.3347C2.9986 11.4887 2.83468 11.5733 2.66602 11.5733C2.57735 11.5733 2.48661 11.5493 2.40527 11.5C1.80461 11.132 1.5 10.4887 1.5 9.58667V3.74666C1.5 2.31866 2.31941 1.5 3.74674 1.5H9.58659C10.7099 1.5 11.2467 1.99265 11.5 2.40531C11.644 2.64065 11.57 2.94865 11.3346 3.09265C11.0986 3.23732 10.792 3.16266 10.6473 2.92733C10.5826 2.82133 10.3853 2.49935 9.58659 2.49935H3.74674C2.86141 2.50002 2.5 2.86133 2.5 3.74666Z"
-                        fill={
-                          {
-                            "type": 2,
-                          }
-                        }
-                        propList={
-                          [
-                            "fill",
-                            "stroke",
-                            "strokeWidth",
-                          ]
-                        }
-                        stroke={
-                          {
-                            "type": 2,
-                          }
-                        }
-                        strokeWidth="0.5"
-                      />
-                    </RNSVGGroup>
-                  </RNSVGSvgView>
-                </View>
-              </View>
-            </View>
-          </View>
+                strokeWidth="0.5"
+              />
+            </RNSVGGroup>
+          </RNSVGSvgView>
         </View>
       </View>
     </View>
diff --git a/apps/mobile/src/components/accounts/__snapshots__/AccountList.test.tsx.snap b/apps/mobile/src/components/accounts/__snapshots__/AccountList.test.tsx.snap
index 91f9348f9b9..99d295df45a 100644
--- a/apps/mobile/src/components/accounts/__snapshots__/AccountList.test.tsx.snap
+++ b/apps/mobile/src/components/accounts/__snapshots__/AccountList.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`AccountList renders without error 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "flexDirection": "column",
       "flexShrink": 1,
     }
@@ -62,6 +63,7 @@ exports[`AccountList renders without error 1`] = `
         <View
           style={
             {
+              "alignItems": "stretch",
               "flex": 1,
               "flexDirection": "column",
               "paddingBottom": 8,
@@ -166,6 +168,7 @@ exports[`AccountList renders without error 1`] = `
               <View
                 style={
                   {
+                    "alignItems": "stretch",
                     "flex": 1,
                     "flexDirection": "column",
                   }
@@ -183,6 +186,7 @@ exports[`AccountList renders without error 1`] = `
                   <View
                     style={
                       {
+                        "alignItems": "stretch",
                         "flexDirection": "column",
                         "position": "relative",
                       }
@@ -191,20 +195,12 @@ exports[`AccountList renders without error 1`] = `
                     <View
                       style={
                         {
+                          "alignItems": "stretch",
                           "backgroundColor": "transparent",
-                          "borderBottomColor": "transparent",
                           "borderBottomLeftRadius": 999999,
                           "borderBottomRightRadius": 999999,
-                          "borderBottomWidth": 0,
-                          "borderLeftColor": "transparent",
-                          "borderLeftWidth": 0,
-                          "borderRightColor": "transparent",
-                          "borderRightWidth": 0,
-                          "borderStyle": "solid",
-                          "borderTopColor": "transparent",
                           "borderTopLeftRadius": 999999,
                           "borderTopRightRadius": 999999,
-                          "borderTopWidth": 0,
                           "flexDirection": "column",
                           "position": "relative",
                         }
@@ -232,6 +228,7 @@ exports[`AccountList renders without error 1`] = `
                         <View
                           style={
                             {
+                              "alignItems": "stretch",
                               "flexDirection": "column",
                               "height": 36,
                               "width": 36,
@@ -241,6 +238,7 @@ exports[`AccountList renders without error 1`] = `
                           <View
                             style={
                               {
+                                "alignItems": "stretch",
                                 "flexDirection": "column",
                                 "height": 36,
                                 "width": 36,
@@ -398,36 +396,24 @@ exports[`AccountList renders without error 1`] = `
                         }
                       }
                     >
-                      <View
+                      <Text
+                        adjustsFontSizeToFit={true}
+                        allowFontScaling={true}
+                        maxFontSizeMultiplier={1.4}
+                        numberOfLines={1}
                         style={
                           {
-                            "alignItems": "center",
-                            "flexDirection": "row",
-                            "gap": 2,
-                            "justifyContent": "center",
+                            "color": "#222222",
+                            "fontFamily": "Basel-Book",
+                            "fontSize": 19,
+                            "lineHeight": 24,
                           }
                         }
+                        suppressHighlighting={true}
+                        testID="address-display/name/0x​82D5...3Fa6"
                       >
-                        <Text
-                          adjustsFontSizeToFit={true}
-                          allowFontScaling={true}
-                          maxFontSizeMultiplier={1.4}
-                          numberOfLines={1}
-                          style={
-                            {
-                              "color": "#222222",
-                              "flexShrink": 1,
-                              "fontFamily": "Basel-Book",
-                              "fontSize": 19,
-                              "lineHeight": 24,
-                            }
-                          }
-                          suppressHighlighting={true}
-                          testID="address-display/name/0x​82D5...3Fa6"
-                        >
-                          0x​82D5...3Fa6
-                        </Text>
-                      </View>
+                        0x​82D5...3Fa6
+                      </Text>
                     </View>
                   </View>
                 </View>
diff --git a/packages/wallet/src/features/accounts/hooks.ts b/apps/mobile/src/components/accounts/hooks.ts
similarity index 100%
rename from packages/wallet/src/features/accounts/hooks.ts
rename to apps/mobile/src/components/accounts/hooks.ts
diff --git a/apps/mobile/src/components/animation/AnimateInOrder.tsx b/apps/mobile/src/components/animation/AnimateInOrder.tsx
deleted file mode 100644
index c8118151678..00000000000
--- a/apps/mobile/src/components/animation/AnimateInOrder.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-import { impactAsync, ImpactFeedbackStyle } from 'expo-haptics'
-import { PropsWithChildren, useEffect, useState } from 'react'
-import { Flex, FlexProps } from 'ui/src'
-
-export const AnimateInOrder = ({
-  children,
-  index,
-  animation = 'bouncy',
-  enterStyle = { o: 0, scale: 0.8 },
-  exitStyle = { o: 0, scale: 0.8 },
-  delayMs = 150,
-  hapticOnEnter,
-  ...rest
-}: PropsWithChildren<
-  {
-    index: number
-    hapticOnEnter?: boolean
-    delayMs?: number
-  } & Pick<FlexProps, 'animation' | 'enterStyle' | 'exitStyle'> &
-    FlexProps
->): JSX.Element => {
-  return (
-    <Delay by={index * delayMs} hapticOnEnter={hapticOnEnter}>
-      <Flex
-        key={`animate-${index}`}
-        animation={animation}
-        enterStyle={enterStyle}
-        exitStyle={exitStyle}
-        {...rest}>
-        {children}
-      </Flex>
-    </Delay>
-  )
-}
-
-const Delay = ({
-  children,
-  hapticOnEnter,
-  by,
-}: PropsWithChildren<{ by: number; hapticOnEnter?: boolean }>): JSX.Element | null => {
-  const [done, setDone] = useState(false)
-
-  useEffect(() => {
-    const showTimer = setTimeout(async () => {
-      if (hapticOnEnter) {
-        await impactAsync(ImpactFeedbackStyle.Light)
-      }
-      setDone(true)
-    }, by)
-    return () => clearTimeout(showTimer)
-  }, [by, hapticOnEnter])
-
-  return done ? <>{children}</> : null
-}
diff --git a/apps/mobile/src/components/buttons/CopyTextButton.tsx b/apps/mobile/src/components/buttons/CopyTextButton.tsx
index 4f2aec39f93..0902a9c8ac2 100644
--- a/apps/mobile/src/components/buttons/CopyTextButton.tsx
+++ b/apps/mobile/src/components/buttons/CopyTextButton.tsx
@@ -1,11 +1,11 @@
 import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { setClipboard } from 'src/utils/clipboard'
 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 { 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/FavoriteButton.tsx b/apps/mobile/src/components/buttons/FavoriteButton.tsx
index 1b383c8559c..91a8327862c 100644
--- a/apps/mobile/src/components/buttons/FavoriteButton.tsx
+++ b/apps/mobile/src/components/buttons/FavoriteButton.tsx
@@ -8,8 +8,9 @@ import {
   useSharedValue,
   withTiming,
 } from 'react-native-reanimated'
-import { AnimatedFlex, useIsDarkMode, useSporeColors } from 'ui/src'
+import { AnimatedFlex, useSporeColors } from 'ui/src'
 import HeartIcon from 'ui/src/assets/icons/heart.svg'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 
 interface FavoriteButtonProps {
   isFavorited: boolean
diff --git a/apps/mobile/src/components/buttons/LinkButton.tsx b/apps/mobile/src/components/buttons/LinkButton.tsx
index 1ab18c7ec67..5758c5aa34c 100644
--- a/apps/mobile/src/components/buttons/LinkButton.tsx
+++ b/apps/mobile/src/components/buttons/LinkButton.tsx
@@ -1,8 +1,8 @@
 import React, { useMemo } from 'react'
+import { openUri } from 'src/utils/linking'
 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 'wallet/src/utils/linking'
+import { iconSizes, TextVariantTokens } from 'ui/src/theme'
 
 interface LinkButtonProps extends Omit<TouchableAreaProps, 'onPress'> {
   label: string
diff --git a/packages/wallet/src/components/buttons/PasteButton.tsx b/apps/mobile/src/components/buttons/PasteButton.tsx
similarity index 71%
rename from packages/wallet/src/components/buttons/PasteButton.tsx
rename to apps/mobile/src/components/buttons/PasteButton.tsx
index e6c3f45d4b8..59f8630d102 100644
--- a/packages/wallet/src/components/buttons/PasteButton.tsx
+++ b/apps/mobile/src/components/buttons/PasteButton.tsx
@@ -1,6 +1,7 @@
+import React from 'react'
 import { useTranslation } from 'react-i18next'
-import { Flex, Icons, Text, TouchableArea } from 'ui/src'
-import { getClipboard } from 'wallet/src/utils/clipboard'
+import { getClipboard } from 'src/utils/clipboard'
+import { Button, Flex, Icons, Text, TouchableArea } from 'ui/src'
 
 export default function PasteButton({
   inline,
@@ -40,18 +41,13 @@ export default function PasteButton({
   }
 
   return (
-    <TouchableArea
-      backgroundColor="$accent2"
-      borderRadius="$rounded12"
-      p="$spacing8"
+    <Button
+      icon={<Icons.Paste color="$neutral1" size="$icon.16" />}
+      size="small"
+      theme="tertiary"
       onPress={onPressButton}
       onPressIn={beforePress}>
-      <Flex centered row gap="$spacing4">
-        <Text color="$accent1" variant="buttonLabel4">
-          {label}
-        </Text>
-        <Icons.StickyNoteSquare color="$accent1" size="$icon.16" />
-      </Flex>
-    </TouchableArea>
+      {label}
+    </Button>
   )
 }
diff --git a/packages/wallet/src/components/buttons/PlusMinusButton.tsx b/apps/mobile/src/components/buttons/PlusMinusButton.tsx
similarity index 97%
rename from packages/wallet/src/components/buttons/PlusMinusButton.tsx
rename to apps/mobile/src/components/buttons/PlusMinusButton.tsx
index 060562243d8..080c97d6f76 100644
--- a/packages/wallet/src/components/buttons/PlusMinusButton.tsx
+++ b/apps/mobile/src/components/buttons/PlusMinusButton.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import { Flex, Icons, TouchableArea } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 
diff --git a/packages/wallet/src/components/buttons/Switch.tsx b/apps/mobile/src/components/buttons/Switch.tsx
similarity index 97%
rename from packages/wallet/src/components/buttons/Switch.tsx
rename to apps/mobile/src/components/buttons/Switch.tsx
index e9ddb35976b..14baa344c51 100644
--- a/packages/wallet/src/components/buttons/Switch.tsx
+++ b/apps/mobile/src/components/buttons/Switch.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import { Switch as BaseSwitch, SwitchProps, ViewProps } from 'react-native'
 import { Flex, useSporeColors } from 'ui/src'
 import { isAndroid } from 'wallet/src/utils/platform'
diff --git a/packages/wallet/src/components/buttons/TransferArrowButton.tsx b/apps/mobile/src/components/buttons/TransferArrowButton.tsx
similarity index 90%
rename from packages/wallet/src/components/buttons/TransferArrowButton.tsx
rename to apps/mobile/src/components/buttons/TransferArrowButton.tsx
index 62fccd8b5bb..fe9b7301a9e 100644
--- a/packages/wallet/src/components/buttons/TransferArrowButton.tsx
+++ b/apps/mobile/src/components/buttons/TransferArrowButton.tsx
@@ -1,6 +1,6 @@
-import { ComponentProps } from 'react'
+import React, { ComponentProps } from 'react'
+import { Arrow } from 'src/components/icons/Arrow'
 import { Flex, TouchableArea, useSporeColors } from 'ui/src'
-import { Arrow } from 'wallet/src/components/icons/Arrow'
 
 const ICON_SIZE = 20
 
diff --git a/apps/mobile/src/components/explore/ExploreSections.tsx b/apps/mobile/src/components/explore/ExploreSections.tsx
index a1a014e92d6..21de5918169 100644
--- a/apps/mobile/src/components/explore/ExploreSections.tsx
+++ b/apps/mobile/src/components/explore/ExploreSections.tsx
@@ -9,6 +9,7 @@ import { FavoriteWalletsGrid } from 'src/components/explore/FavoriteWalletsGrid'
 import { SortButton } from 'src/components/explore/SortButton'
 import { TokenItem, TokenItemData } from 'src/components/explore/TokenItem'
 import { AnimatedBottomSheetFlatList } from 'src/components/layout/AnimatedFlatList'
+import { Loader } from 'src/components/loading'
 import { AutoScrollProps } from 'src/components/sortableGrid'
 import {
   getClientTokensOrderByCompareFn,
@@ -16,7 +17,7 @@ import {
   getTokensOrderByValues,
 } from 'src/features/explore/utils'
 import { usePollOnFocusOnly } from 'src/utils/hooks'
-import { Flex, Loader, Text, useDeviceInsets } from 'ui/src'
+import { Flex, Text, useDeviceInsets } from 'ui/src'
 import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
 import { getWrappedNativeAddress } from 'wallet/src/constants/addresses'
 import { ChainId } from 'wallet/src/constants/chains'
diff --git a/apps/mobile/src/components/explore/FavoriteHeaderRow.tsx b/apps/mobile/src/components/explore/FavoriteHeaderRow.tsx
index c9149287594..91aa5d71bcd 100644
--- a/apps/mobile/src/components/explore/FavoriteHeaderRow.tsx
+++ b/apps/mobile/src/components/explore/FavoriteHeaderRow.tsx
@@ -1,8 +1,8 @@
 import { default as React } from 'react'
 import { useTranslation } from 'react-i18next'
+import { ElementName } from 'src/features/telemetry/constants'
 import { Flex, Icons, Text, TouchableArea } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 export function FavoriteHeaderRow({
   title,
diff --git a/apps/mobile/src/components/explore/FavoriteTokenCard.tsx b/apps/mobile/src/components/explore/FavoriteTokenCard.tsx
index 4fa2b05d4a6..dd3625ff456 100644
--- a/apps/mobile/src/components/explore/FavoriteTokenCard.tsx
+++ b/apps/mobile/src/components/explore/FavoriteTokenCard.tsx
@@ -4,17 +4,19 @@ import { ViewProps } from 'react-native'
 import ContextMenu from 'react-native-context-menu-view'
 import {
   FadeIn,
-  SharedValue,
+  FadeOut,
   interpolate,
+  SharedValue,
   useAnimatedReaction,
   useAnimatedStyle,
   useSharedValue,
 } from 'react-native-reanimated'
 import { useAppDispatch } from 'src/app/hooks'
-import { useTokenDetailsNavigation } from 'src/components/TokenDetails/hooks'
-import RemoveButton from 'src/components/explore/RemoveButton'
 import { useExploreTokenContextMenu } from 'src/components/explore/hooks'
+import RemoveButton from 'src/components/explore/RemoveButton'
 import { Loader } from 'src/components/loading'
+import { useTokenDetailsNavigation } from 'src/components/TokenDetails/hooks'
+import { SectionName } from 'src/features/telemetry/constants'
 import { disableOnPress } from 'src/utils/disableOnPress'
 import { usePollOnFocusOnly } from 'src/utils/hooks'
 import { AnimatedFlex, AnimatedTouchableArea, Flex, Text } from 'ui/src'
@@ -25,13 +27,12 @@ import { TokenLogo } from 'wallet/src/components/CurrencyLogo/TokenLogo'
 import { RelativeChange } from 'wallet/src/components/text/RelativeChange'
 import { ChainId } from 'wallet/src/constants/chains'
 import { PollingInterval } from 'wallet/src/constants/misc'
-import { useFavoriteTokenCardQuery } from 'wallet/src/data/__generated__/types-and-hooks'
 import { isNonPollingRequestInFlight } from 'wallet/src/data/utils'
+import { useFavoriteTokenCardQuery } from 'wallet/src/data/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'wallet/src/features/chains/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'
-import { SectionName } from 'wallet/src/telemetry/constants'
 import { getSymbolDisplayText } from 'wallet/src/utils/currency'
 
 export const FAVORITE_TOKEN_CARD_LOADER_HEIGHT = 114
@@ -153,6 +154,7 @@ function FavoriteTokenCard({
           bg="$surface2"
           borderRadius="$rounded16"
           entering={FadeIn}
+          exiting={FadeOut}
           hapticFeedback={!isEditing}
           hapticStyle={ImpactFeedbackStyle.Light}
           m="$spacing4"
@@ -172,7 +174,11 @@ function FavoriteTokenCard({
                   />
                   <Text variant="body1">{getSymbolDisplayText(token?.symbol)}</Text>
                 </Flex>
-                <RemoveButton visible={isEditing} onPress={onRemove} />
+                {isEditing ? (
+                  <RemoveButton onPress={onRemove} />
+                ) : (
+                  <Flex height={imageSizes.image24} />
+                )}
               </Flex>
               <Flex gap="$spacing2">
                 <Text adjustsFontSizeToFit numberOfLines={1} variant="heading3">
diff --git a/apps/mobile/src/components/explore/FavoriteWalletCard.tsx b/apps/mobile/src/components/explore/FavoriteWalletCard.tsx
index e4f2fc1f4de..ed855388e01 100644
--- a/apps/mobile/src/components/explore/FavoriteWalletCard.tsx
+++ b/apps/mobile/src/components/explore/FavoriteWalletCard.tsx
@@ -5,16 +5,15 @@ import { ViewProps } from 'react-native'
 import ContextMenu from 'react-native-context-menu-view'
 import { useAppDispatch } from 'src/app/hooks'
 import { useEagerExternalProfileNavigation } from 'src/app/navigation/hooks'
+import { AccountIcon } from 'src/components/AccountIcon'
 import RemoveButton from 'src/components/explore/RemoveButton'
 import { disableOnPress } from 'src/utils/disableOnPress'
-import { Flex, TouchableArea } from 'ui/src'
-import { borderRadii, iconSizes } from 'ui/src/theme'
-import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
-import { DisplayNameText } from 'wallet/src/components/accounts/DisplayNameText'
+import { Flex, flexStyles, Text, TouchableArea } from 'ui/src'
+import { borderRadii, iconSizes, imageSizes } from 'ui/src/theme'
 import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
+import { useENSAvatar } from 'wallet/src/features/ens/api'
 import { removeWatchedAddress } from 'wallet/src/features/favorites/slice'
-import { useAvatar, useDisplayName } from 'wallet/src/features/wallet/hooks'
-import { DisplayNameType } from 'wallet/src/features/wallet/types'
+import { useDisplayName } from 'wallet/src/features/wallet/hooks'
 
 type FavoriteWalletCardProps = {
   address: Address
@@ -33,7 +32,7 @@ export default function FavoriteWalletCard({
   const { preload, navigate } = useEagerExternalProfileNavigation()
 
   const displayName = useDisplayName(address)
-  const { avatar } = useAvatar(address)
+  const { data: avatar } = useENSAvatar(address)
 
   const icon = useMemo(() => {
     return <AccountIcon address={address} avatarUri={avatar} size={iconSizes.icon20} />
@@ -84,15 +83,16 @@ export default function FavoriteWalletCard({
           <Flex row gap="$spacing4" justifyContent="space-between">
             <Flex row shrink alignItems="center" gap="$spacing8">
               {icon}
-              <DisplayNameText
-                displayName={displayName}
-                textProps={{
-                  adjustsFontSizeToFit: displayName?.type === DisplayNameType.Address,
-                  variant: 'body1',
-                }}
-              />
+              <Text
+                adjustsFontSizeToFit={displayName?.type === 'address'}
+                color="$neutral1"
+                numberOfLines={1}
+                style={flexStyles.shrink}
+                variant="body1">
+                {displayName?.name}
+              </Text>
             </Flex>
-            <RemoveButton visible={isEditing} onPress={onRemove} />
+            {isEditing ? <RemoveButton onPress={onRemove} /> : <Flex height={imageSizes.image24} />}
           </Flex>
         </BaseCard.Shadow>
       </TouchableArea>
diff --git a/apps/mobile/src/components/explore/RemoveButton.tsx b/apps/mobile/src/components/explore/RemoveButton.tsx
index 5d0d24c30c4..a2cac94ee63 100644
--- a/apps/mobile/src/components/explore/RemoveButton.tsx
+++ b/apps/mobile/src/components/explore/RemoveButton.tsx
@@ -1,28 +1,22 @@
-import { useAnimatedStyle, withTiming } from 'react-native-reanimated'
+import React from 'react'
+import { FadeIn, FadeOut } from 'react-native-reanimated'
 import { AnimatedTouchableArea, Flex, TouchableAreaProps } from 'ui/src'
 import { imageSizes } from 'ui/src/theme'
 
-type RemoveButtonProps = TouchableAreaProps & {
-  visible?: boolean
-}
-
-export default function RemoveButton({ visible = true, ...rest }: RemoveButtonProps): JSX.Element {
-  const animatedVisibilityStyle = useAnimatedStyle(() => ({
-    opacity: visible ? withTiming(1) : withTiming(0),
-  }))
-
+export default function RemoveButton(props: TouchableAreaProps): JSX.Element {
   return (
     <AnimatedTouchableArea
+      {...props}
       hapticFeedback
       alignItems="center"
       backgroundColor="$neutral3"
       borderRadius="$roundedFull"
+      entering={FadeIn}
+      exiting={FadeOut}
       height={imageSizes.image24}
       justifyContent="center"
-      style={animatedVisibilityStyle}
       width={imageSizes.image24}
-      zIndex="$tooltip"
-      {...rest}>
+      zIndex="$tooltip">
       <Flex backgroundColor="$surface1" borderRadius="$rounded12" height={2} width={10} />
     </AnimatedTouchableArea>
   )
diff --git a/apps/mobile/src/components/explore/SortButton.tsx b/apps/mobile/src/components/explore/SortButton.tsx
index af7051f89fb..219da632992 100644
--- a/apps/mobile/src/components/explore/SortButton.tsx
+++ b/apps/mobile/src/components/explore/SortButton.tsx
@@ -9,10 +9,11 @@ import {
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
 import { MobileEventName } from 'src/features/telemetry/constants'
 import { disableOnPress } from 'src/utils/disableOnPress'
-import { Flex, Icons, Text, TouchableArea, useIsDarkMode } from 'ui/src'
+import { Flex, Icons, Text, TouchableArea } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { logger } from 'utilities/src/logger/logger'
 import { TokenSortableField } from 'wallet/src/data/__generated__/types-and-hooks'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { setTokensOrderBy } from 'wallet/src/features/wallet/slice'
 import { ClientTokensOrderBy, TokensOrderBy } from 'wallet/src/features/wallet/types'
 interface FilterGroupProps {
@@ -62,7 +63,7 @@ function _SortButton({ orderBy }: FilterGroupProps): JSX.Element {
         const selectedMenuAction = menuActions[e.nativeEvent.index]
         // Handle switching selected sort option
         if (!selectedMenuAction) {
-          logger.error(new Error('Unexpected context menu index selected'), {
+          logger.error('Unexpected context menu index selected', {
             tags: { file: 'SortButton', function: 'SortButtonContextMenu:onPress' },
           })
           return
diff --git a/apps/mobile/src/components/explore/TokenItem.tsx b/apps/mobile/src/components/explore/TokenItem.tsx
index 88bb2a60e1a..98138665158 100644
--- a/apps/mobile/src/components/explore/TokenItem.tsx
+++ b/apps/mobile/src/components/explore/TokenItem.tsx
@@ -6,7 +6,7 @@ import { useExploreTokenContextMenu } from 'src/components/explore/hooks'
 import { useTokenDetailsNavigation } from 'src/components/TokenDetails/hooks'
 import { TokenMetadata } from 'src/components/tokens/TokenMetadata'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
-import { MobileEventName } from 'src/features/telemetry/constants'
+import { MobileEventName, SectionName } from 'src/features/telemetry/constants'
 import { disableOnPress } from 'src/utils/disableOnPress'
 import { AnimatedFlex, Flex, Text, TouchableArea } from 'ui/src'
 import { NumberType } from 'utilities/src/format/types'
@@ -15,7 +15,6 @@ import { RelativeChange } from 'wallet/src/components/text/RelativeChange'
 import { ChainId } from 'wallet/src/constants/chains'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { TokenMetadataDisplayType } from 'wallet/src/features/wallet/types'
-import { SectionName } from 'wallet/src/telemetry/constants'
 import {
   buildCurrencyId,
   buildNativeCurrencyId,
diff --git a/apps/mobile/src/components/explore/hooks.test.ts b/apps/mobile/src/components/explore/hooks.test.ts
index 188b43e66dc..4d1eccea01a 100644
--- a/apps/mobile/src/components/explore/hooks.test.ts
+++ b/apps/mobile/src/components/explore/hooks.test.ts
@@ -3,11 +3,11 @@ import { ContextMenuAction, ContextMenuOnPressNativeEvent } from 'react-native-c
 import { act } from 'react-test-renderer'
 import configureMockStore from 'redux-mock-store'
 import { useExploreTokenContextMenu } from 'src/components/explore/hooks'
+import { SectionName } from 'src/features/telemetry/constants'
 import { renderHookWithProviders } from 'src/test/render'
 import { Resolvers } from 'wallet/src/data/__generated__/types-and-hooks'
 import { FavoritesState } from 'wallet/src/features/favorites/slice'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import { SectionName } from 'wallet/src/telemetry/constants'
 import { DaiAsset } from 'wallet/src/test/gqlFixtures'
 
 const tokenId = DaiAsset.address?.toLowerCase() ?? ''
@@ -49,7 +49,7 @@ describe(useExploreTokenContextMenu, () => {
           onPress: expect.any(Function),
         }),
         expect.objectContaining({
-          title: 'Receive',
+          title: 'Copy contract address',
           onPress: expect.any(Function),
         }),
         expect.objectContaining({
@@ -84,7 +84,7 @@ describe(useExploreTokenContextMenu, () => {
           onPress: expect.any(Function),
         }),
         expect.objectContaining({
-          title: 'Receive',
+          title: 'Copy contract address',
           onPress: expect.any(Function),
         }),
       ])
@@ -138,7 +138,7 @@ describe(useExploreTokenContextMenu, () => {
           onPress: expect.any(Function),
         }),
         expect.objectContaining({
-          title: 'Receive',
+          title: 'Copy contract address',
           onPress: expect.any(Function),
         }),
         expect.objectContaining({
@@ -149,7 +149,7 @@ describe(useExploreTokenContextMenu, () => {
     })
 
     it("dispatches add to favorites redux action when 'Favorite token' is pressed", async () => {
-      const store = mockStore({ favorites: { tokens: [] }, appearance: { theme: 'system' } })
+      const store = mockStore({ favorites: { tokens: [] } })
       const { result } = renderHookWithProviders(
         () => useExploreTokenContextMenu(tokenMenuParams),
         { resolvers, store }
@@ -178,7 +178,6 @@ describe(useExploreTokenContextMenu, () => {
     it("dispatches remove from favorites redux action when 'Remove favorite' is pressed", async () => {
       const store = mockStore({
         favorites: { tokens: [tokenMenuParams.currencyId.toLowerCase()] },
-        appearance: { theme: 'system' },
       })
       const { result } = renderHookWithProviders(
         () => useExploreTokenContextMenu(tokenMenuParams),
@@ -207,10 +206,7 @@ describe(useExploreTokenContextMenu, () => {
   })
 
   it('dispatches swap redux action when swap is pressed', async () => {
-    const store = mockStore({
-      favorites: { tokens: [] },
-      selectedAppearanceSettings: { theme: 'system' },
-    })
+    const store = mockStore({ favorites: { tokens: [] } })
     const { result } = renderHookWithProviders(() => useExploreTokenContextMenu(tokenMenuParams), {
       store,
       resolvers,
diff --git a/apps/mobile/src/components/explore/hooks.ts b/apps/mobile/src/components/explore/hooks.ts
index e3beb0276c7..817da05f623 100644
--- a/apps/mobile/src/components/explore/hooks.ts
+++ b/apps/mobile/src/components/explore/hooks.ts
@@ -3,11 +3,18 @@ import { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { NativeSyntheticEvent, Share } from 'react-native'
 import { ContextMenuAction, ContextMenuOnPressNativeEvent } from 'react-native-context-menu-view'
-import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import { useSelectHasTokenFavorited, useToggleFavoriteCallback } from 'src/features/favorites/hooks'
 import { openModal } from 'src/features/modals/modalSlice'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
-import { MobileEventName, ShareableEntity } from 'src/features/telemetry/constants'
+import {
+  ElementName,
+  MobileEventName,
+  ModalName,
+  SectionName,
+  ShareableEntity,
+} from 'src/features/telemetry/constants'
+import { useCopyTokenAddressCallback } from 'src/features/tokens/hooks'
+import { getTokenUrl } from 'src/utils/linking'
 import { logger } from 'utilities/src/logger/logger'
 import { ChainId } from 'wallet/src/constants/chains'
 import { AssetType } from 'wallet/src/entities/assets'
@@ -16,14 +23,13 @@ import {
   TransactionState,
 } from 'wallet/src/features/transactions/transactionState/types'
 import { useAppDispatch } from 'wallet/src/state'
-import { ElementName, ModalName, SectionNameType } from 'wallet/src/telemetry/constants'
+
 import { CurrencyId, currencyIdToAddress } from 'wallet/src/utils/currencyId'
-import { getTokenUrl } from 'wallet/src/utils/linking'
 
 interface TokenMenuParams {
   currencyId: CurrencyId
   chainId: ChainId
-  analyticsSection: SectionNameType
+  analyticsSection: SectionName
   // token, which are in favorite section would have it defined
   onEditFavorites?: () => void
 }
@@ -46,13 +52,7 @@ export function useExploreTokenContextMenu({
   // currencyId, where we have hardcoded addresses for native currencies
   const currencyAddress = currencyIdToAddress(currencyId)
 
-  const onPressReceive = useCallback(
-    () =>
-      dispatch(
-        openModal({ name: ModalName.WalletConnectScan, initialState: ScannerModalState.WalletQr })
-      ),
-    [dispatch]
-  )
+  const onPressCopyContractAddress = useCopyTokenAddressCallback(currencyAddress)
 
   const onPressShare = useCallback(async () => {
     const tokenUrl = getTokenUrl(currencyId)
@@ -114,9 +114,9 @@ export function useExploreTokenContextMenu({
         : []),
       { title: t('Swap'), systemIcon: 'arrow.2.squarepath', onPress: onPressSwap },
       {
-        title: t('Receive'),
-        systemIcon: 'qrcode',
-        onPress: onPressReceive,
+        title: t('Copy contract address'),
+        systemIcon: 'doc.on.doc',
+        onPress: onPressCopyContractAddress,
       },
       ...(!onEditFavorites
         ? [
@@ -134,7 +134,7 @@ export function useExploreTokenContextMenu({
       onPressToggleFavorite,
       onEditFavorites,
       onPressSwap,
-      onPressReceive,
+      onPressCopyContractAddress,
       onPressShare,
     ]
   )
diff --git a/packages/wallet/src/features/search/SearchContext.tsx b/apps/mobile/src/components/explore/search/SearchContext.tsx
similarity index 100%
rename from packages/wallet/src/features/search/SearchContext.tsx
rename to apps/mobile/src/components/explore/search/SearchContext.tsx
diff --git a/apps/mobile/src/components/explore/search/SearchEmptySection.tsx b/apps/mobile/src/components/explore/search/SearchEmptySection.tsx
index 2c6ad9a3a5a..14e4e045d8b 100644
--- a/apps/mobile/src/components/explore/search/SearchEmptySection.tsx
+++ b/apps/mobile/src/components/explore/search/SearchEmptySection.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { FlatList } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
@@ -7,28 +7,22 @@ import { SearchPopularNFTCollections } from 'src/components/explore/search/Searc
 import { SearchPopularTokens } from 'src/components/explore/search/SearchPopularTokens'
 import { renderSearchItem } from 'src/components/explore/search/SearchResultsSection'
 import { SectionHeaderText } from 'src/components/explore/search/SearchSectionHeader'
+import { clearSearchHistory } from 'src/features/explore/searchHistorySlice'
+import { SearchResultType, WalletSearchResult } from 'src/features/explore/SearchResult'
+import { selectSearchHistory } from 'src/features/explore/selectSearchHistory'
 import { AnimatedFlex, Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
 import ClockIcon from 'ui/src/assets/icons/clock.svg'
 import TrendArrowIcon from 'ui/src/assets/icons/trend-up.svg'
 import { iconSizes } from 'ui/src/theme'
-import { FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
-import { useFeatureFlag } from 'wallet/src/features/experiments/hooks'
-import { clearSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
-import {
-  SearchResult,
-  SearchResultType,
-  WalletSearchResult,
-} from 'wallet/src/features/search/SearchResult'
-import { selectSearchHistory } from 'wallet/src/features/search/selectSearchHistory'
 
 export const SUGGESTED_WALLETS: WalletSearchResult[] = [
   {
-    type: SearchResultType.ENSAddress,
+    type: SearchResultType.Wallet,
     address: '0xd8dA6BF26964aF9D7eEd9e03E53415D37aA96045',
     ensName: 'vitalik.eth',
   },
   {
-    type: SearchResultType.ENSAddress,
+    type: SearchResultType.Wallet,
     address: '0x50EC05ADe8280758E2077fcBC08D878D4aef79C3',
     ensName: 'hayden.eth',
   },
@@ -38,28 +32,11 @@ export function SearchEmptySection(): JSX.Element {
   const { t } = useTranslation()
   const dispatch = useAppDispatch()
   const searchHistory = useAppSelector(selectSearchHistory)
-  const unitagFeatureFlagEnabled = useFeatureFlag(FEATURE_FLAGS.Unitags)
 
   const onPressClearSearchHistory = (): void => {
     dispatch(clearSearchHistory())
   }
 
-  const modifiedHistory: SearchResult[] = useMemo(
-    () =>
-      searchHistory.map((historyItem: SearchResult) => {
-        if (!unitagFeatureFlagEnabled && historyItem.type === SearchResultType.Unitag) {
-          return {
-            type: SearchResultType.ENSAddress,
-            address: historyItem.address,
-            searchId: historyItem.searchId,
-          }
-        } else {
-          return historyItem
-        }
-      }),
-    [searchHistory, unitagFeatureFlagEnabled]
-  )
-
   // Show search history (if applicable), trending tokens, and wallets
   return (
     <AnimatedFlex entering={FadeIn} exiting={FadeOut} gap="$spacing12">
@@ -81,7 +58,7 @@ export function SearchEmptySection(): JSX.Element {
                 </TouchableArea>
               </Flex>
             }
-            data={modifiedHistory}
+            data={searchHistory}
             renderItem={(props): JSX.Element | null =>
               renderSearchItem({ ...props, searchContext: { isHistory: true } })
             }
diff --git a/apps/mobile/src/components/explore/search/SearchPopularNFTCollections.tsx b/apps/mobile/src/components/explore/search/SearchPopularNFTCollections.tsx
index 7a310c03f7b..11642c787ad 100644
--- a/apps/mobile/src/components/explore/search/SearchPopularNFTCollections.tsx
+++ b/apps/mobile/src/components/explore/search/SearchPopularNFTCollections.tsx
@@ -5,12 +5,10 @@ import {
   getSearchResultId,
   gqlNFTToNFTCollectionSearchResult,
 } from 'src/components/explore/search/utils'
-import { Inset, Loader } from 'ui/src'
+import { Loader } from 'src/components/loading'
+import { NFTCollectionSearchResult, SearchResultType } from 'src/features/explore/SearchResult'
+import { Inset } from 'ui/src'
 import { useSearchPopularNftCollectionsQuery } from 'wallet/src/data/__generated__/types-and-hooks'
-import {
-  NFTCollectionSearchResult,
-  SearchResultType,
-} from 'wallet/src/features/search/SearchResult'
 
 function isNFTCollectionSearchResult(
   result: NFTCollectionSearchResult | null
diff --git a/apps/mobile/src/components/explore/search/SearchPopularTokens.test.tsx b/apps/mobile/src/components/explore/search/SearchPopularTokens.test.tsx
index 12ba3db5494..e2f1c26d602 100644
--- a/apps/mobile/src/components/explore/search/SearchPopularTokens.test.tsx
+++ b/apps/mobile/src/components/explore/search/SearchPopularTokens.test.tsx
@@ -7,7 +7,7 @@ import { EthToken, TopTokens } from 'wallet/src/test/gqlFixtures'
 const resolvers: Resolvers = {
   Query: {
     topTokens: () => TopTokens,
-    tokens: () => [{ ...EthToken, address: null }],
+    tokens: () => [EthToken],
   },
 }
 
diff --git a/apps/mobile/src/components/explore/search/SearchPopularTokens.tsx b/apps/mobile/src/components/explore/search/SearchPopularTokens.tsx
index fb83fb2bea8..872f7c4162f 100644
--- a/apps/mobile/src/components/explore/search/SearchPopularTokens.tsx
+++ b/apps/mobile/src/components/explore/search/SearchPopularTokens.tsx
@@ -2,10 +2,11 @@ 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 { Inset, Loader } from 'ui/src'
+import { Loader } from 'src/components/loading'
+import { SearchResultType, TokenSearchResult } from 'src/features/explore/SearchResult'
+import { TopToken, usePopularTokens } from 'src/features/tokens/hooks'
+import { Inset } from 'ui/src'
 import { fromGraphQLChain } from 'wallet/src/features/chains/utils'
-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 {
   if (!token || !token.project) {
diff --git a/apps/mobile/src/components/explore/search/SearchResultsLoader.tsx b/apps/mobile/src/components/explore/search/SearchResultsLoader.tsx
index 4164b79d84e..4664821d13d 100644
--- a/apps/mobile/src/components/explore/search/SearchResultsLoader.tsx
+++ b/apps/mobile/src/components/explore/search/SearchResultsLoader.tsx
@@ -2,7 +2,8 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
 import { SectionHeaderText } from 'src/components/explore/search/SearchSectionHeader'
-import { AnimatedFlex, Flex, Loader } from 'ui/src'
+import { Loader } from 'src/components/loading'
+import { AnimatedFlex, Flex } from 'ui/src'
 
 export const SearchResultsLoader = (): JSX.Element => {
   const { t } = useTranslation()
diff --git a/apps/mobile/src/components/explore/search/SearchResultsSection.tsx b/apps/mobile/src/components/explore/search/SearchResultsSection.tsx
index dc91e2619c6..0b7aa369c4d 100644
--- a/apps/mobile/src/components/explore/search/SearchResultsSection.tsx
+++ b/apps/mobile/src/components/explore/search/SearchResultsSection.tsx
@@ -2,36 +2,34 @@ import React, { useCallback, useMemo } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
 import { FlatList, ListRenderItemInfo } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
-import { SearchResultsLoader } from 'src/components/explore/search/SearchResultsLoader'
-import { SectionHeaderText } from 'src/components/explore/search/SearchSectionHeader'
-import { SearchENSAddressItem } from 'src/components/explore/search/items/SearchENSAddressItem'
 import { SearchEtherscanItem } from 'src/components/explore/search/items/SearchEtherscanItem'
 import { SearchNFTCollectionItem } from 'src/components/explore/search/items/SearchNFTCollectionItem'
 import { SearchTokenItem } from 'src/components/explore/search/items/SearchTokenItem'
-import { SearchUnitagItem } from 'src/components/explore/search/items/SearchUnitagItem'
+import { SearchWalletItem } from 'src/components/explore/search/items/SearchWalletItem'
+import { SearchResultsLoader } from 'src/components/explore/search/SearchResultsLoader'
+import { SectionHeaderText } from 'src/components/explore/search/SearchSectionHeader'
 import {
   formatNFTCollectionSearchResults,
   formatTokenSearchResults,
   getSearchResultId,
 } from 'src/components/explore/search/utils'
-import { AnimatedFlex, Flex, Text } from 'ui/src'
-import { logger } from 'utilities/src/logger/logger'
-import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
-import { CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
-import { SafetyLevel, useExploreSearchQuery } from 'wallet/src/data/__generated__/types-and-hooks'
-import { useENS } from 'wallet/src/features/ens/useENS'
-import { SearchContext } from 'wallet/src/features/search/SearchContext'
 import {
   NFTCollectionSearchResult,
   SearchResultType,
   TokenSearchResult,
   WalletSearchResult,
-} from 'wallet/src/features/search/SearchResult'
-import { useIsSmartContractAddress } from 'wallet/src/features/transactions/transfer/hooks/useIsSmartContractAddress'
-import { useUnitagByAddress, useUnitagByName } from 'wallet/src/features/unitags/hooks'
+} from 'src/features/explore/SearchResult'
+import { useIsSmartContractAddress } from 'src/features/transactions/transfer/hooks'
+import { AnimatedFlex, Flex, Text } from 'ui/src'
+import { logger } from 'utilities/src/logger/logger'
+import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
+import { ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
+import { SafetyLevel, useExploreSearchQuery } from 'wallet/src/data/__generated__/types-and-hooks'
+import { useENS } from 'wallet/src/features/ens/useENS'
 import i18n from 'wallet/src/i18n/i18n'
 import { getValidAddress } from 'wallet/src/utils/addresses'
 import { SEARCH_RESULT_HEADER_KEY } from './constants'
+import { SearchContext } from './SearchContext'
 import { SearchResultOrHeader } from './types'
 
 const WalletHeaderItem: SearchResultOrHeader = {
@@ -89,23 +87,15 @@ export function SearchResultsSection({ searchQuery }: { searchQuery: string }):
     loading: ensLoading,
   } = useENS(ChainId.Mainnet, searchQuery, true)
 
-  // Search for matching Unitag by name
-  const { unitag: unitagByName, loading: unitagLoading } = useUnitagByName(searchQuery)
-
-  const validAddress: Address | undefined = getValidAddress(searchQuery, true, false)
+  const validAddress: Address | null = getValidAddress(searchQuery, true, false)
     ? searchQuery
-    : undefined
-
-  // Search for matching Unitag by address
-  const { unitag: unitagByAddress, loading: unitagByAddressLoading } =
-    useUnitagByAddress(validAddress)
+    : null
 
   // Search for matching EOA wallet address
   const { isSmartContractAddress, loading: loadingIsSmartContractAddress } =
-    useIsSmartContractAddress(validAddress, ChainId.Mainnet)
+    useIsSmartContractAddress(validAddress ?? undefined, ChainId.Mainnet)
 
-  const walletsLoading =
-    ensLoading || loadingIsSmartContractAddress || unitagLoading || unitagByAddressLoading
+  const walletsLoading = ensLoading || loadingIsSmartContractAddress
 
   const onRetry = useCallback(async () => {
     await refetch()
@@ -114,48 +104,30 @@ export function SearchResultsSection({ searchQuery }: { searchQuery: string }):
   const hasENSResult = ensName && ensAddress
   const hasEOAResult = validAddress && !isSmartContractAddress
   const walletSearchResults: WalletSearchResult[] = useMemo(() => {
-    const results: WalletSearchResult[] = []
-
-    if (unitagByName?.address?.address && unitagByName?.username) {
-      results.push({
-        type: SearchResultType.Unitag,
-        address: unitagByName.address.address,
-        unitag: unitagByName.username,
-      })
+    if (hasENSResult) {
+      return [
+        {
+          type: SearchResultType.Wallet,
+          address: ensAddress,
+          ensName,
+        },
+      ]
     }
-
-    // Do not show ENS result if it is the same as the Unitag result
-    if (hasENSResult && ensAddress !== unitagByName?.address?.address) {
-      results.push({
-        type: SearchResultType.ENSAddress,
-        address: ensAddress,
-        ensName,
-      })
+    if (hasEOAResult) {
+      return [
+        {
+          type: SearchResultType.Wallet,
+          address: validAddress,
+        },
+      ]
     }
-
-    if (unitagByAddress?.username && validAddress) {
-      results.push({
-        type: SearchResultType.Unitag,
-        address: validAddress,
-        unitag: unitagByAddress.username,
-      })
-    }
-
-    // Do not show EOA address result if there is a Unitag result by address
-    if (hasEOAResult && !unitagByAddress) {
-      results.push({
-        type: SearchResultType.ENSAddress,
-        address: validAddress,
-      })
-    }
-
-    return results as WalletSearchResult[]
-  }, [ensAddress, ensName, unitagByName, unitagByAddress, hasENSResult, hasEOAResult, validAddress])
+    return []
+  }, [ensAddress, ensName, hasENSResult, hasEOAResult, validAddress])
 
   const countTokenResults = tokenResults?.length ?? 0
   const countNftCollectionResults = nftCollectionResults?.length ?? 0
-  const countWalletResults = walletSearchResults.length
-  const countTotalResults = countTokenResults + countNftCollectionResults + countWalletResults
+  const countENSResults = hasENSResult || hasEOAResult ? 1 : 0
+  const countTotalResults = countTokenResults + countNftCollectionResults + countENSResults
 
   // Only consider queries with the .eth suffix as an exact ENS match
   const exactENSMatch =
@@ -174,8 +146,7 @@ export function SearchResultsSection({ searchQuery }: { searchQuery: string }):
 
   const hasVerifiedNFTResults = Boolean(nftCollectionResults?.some((res) => res.isVerified))
 
-  const showWalletSectionFirst =
-    unitagByName || unitagByAddress || (exactENSMatch && !prefixTokenMatch)
+  const showWalletSectionFirst = exactENSMatch && !prefixTokenMatch
   const showNftCollectionsBeforeTokens = hasVerifiedNFTResults && !hasVerifiedTokenResults
 
   const sortedSearchResults: SearchResultOrHeader[] = useMemo(() => {
@@ -274,7 +245,6 @@ export function SearchResultsSection({ searchQuery }: { searchQuery: string }):
 }
 
 // Render function for FlatList of SearchResult items
-
 export const renderSearchItem = ({
   item: searchResult,
   searchContext,
@@ -289,10 +259,8 @@ export const renderSearchItem = ({
       )
     case SearchResultType.Token:
       return <SearchTokenItem searchContext={searchContext} token={searchResult} />
-    case SearchResultType.ENSAddress:
-      return <SearchENSAddressItem searchContext={searchContext} searchResult={searchResult} />
-    case SearchResultType.Unitag:
-      return <SearchUnitagItem searchContext={searchContext} searchResult={searchResult} />
+    case SearchResultType.Wallet:
+      return <SearchWalletItem searchContext={searchContext} wallet={searchResult} />
     case SearchResultType.NFTCollection:
       return <SearchNFTCollectionItem collection={searchResult} searchContext={searchContext} />
     case SearchResultType.Etherscan:
diff --git a/apps/mobile/src/components/explore/search/__snapshots__/SearchPopularTokens.test.tsx.snap b/apps/mobile/src/components/explore/search/__snapshots__/SearchPopularTokens.test.tsx.snap
index 18278525205..55dd8b3cc1c 100644
--- a/apps/mobile/src/components/explore/search/__snapshots__/SearchPopularTokens.test.tsx.snap
+++ b/apps/mobile/src/components/explore/search/__snapshots__/SearchPopularTokens.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`SearchPopularTokens renders without error 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "flexDirection": "column",
       "paddingBottom": 8,
       "paddingLeft": 8,
@@ -16,6 +17,7 @@ exports[`SearchPopularTokens renders without error 1`] = `
     onLayout={[Function]}
     style={
       {
+        "alignItems": "stretch",
         "flexDirection": "column",
         "opacity": 0,
       }
@@ -25,6 +27,7 @@ exports[`SearchPopularTokens renders without error 1`] = `
     <View
       style={
         {
+          "alignItems": "stretch",
           "flexDirection": "column",
           "flexGrow": 1,
           "gap": 4,
@@ -58,6 +61,7 @@ exports[`SearchPopularTokens renders without error 1`] = `
           <View
             style={
               {
+                "alignItems": "stretch",
                 "backgroundColor": "#CECECE",
                 "borderBottomLeftRadius": 999999,
                 "borderBottomRightRadius": 999999,
@@ -121,6 +125,7 @@ exports[`SearchPopularTokens renders without error 1`] = `
                 <View
                   style={
                     {
+                      "alignItems": "stretch",
                       "backgroundColor": "#F9F9F9",
                       "borderBottomLeftRadius": 4,
                       "borderBottomRightRadius": 4,
@@ -190,6 +195,7 @@ exports[`SearchPopularTokens renders without error 1`] = `
                   <View
                     style={
                       {
+                        "alignItems": "stretch",
                         "backgroundColor": "#F9F9F9",
                         "borderBottomLeftRadius": 4,
                         "borderBottomRightRadius": 4,
@@ -237,6 +243,7 @@ exports[`SearchPopularTokens renders without error 1`] = `
           <View
             style={
               {
+                "alignItems": "stretch",
                 "backgroundColor": "#CECECE",
                 "borderBottomLeftRadius": 999999,
                 "borderBottomRightRadius": 999999,
@@ -300,6 +307,7 @@ exports[`SearchPopularTokens renders without error 1`] = `
                 <View
                   style={
                     {
+                      "alignItems": "stretch",
                       "backgroundColor": "#F9F9F9",
                       "borderBottomLeftRadius": 4,
                       "borderBottomRightRadius": 4,
@@ -369,6 +377,7 @@ exports[`SearchPopularTokens renders without error 1`] = `
                   <View
                     style={
                       {
+                        "alignItems": "stretch",
                         "backgroundColor": "#F9F9F9",
                         "borderBottomLeftRadius": 4,
                         "borderBottomRightRadius": 4,
@@ -404,7 +413,7 @@ exports[`SearchPopularTokens renders without error 2`] = `
         "logoUrl": "https://loremflickr.com/640/480",
         "name": "Ethereum",
         "symbol": "ETH",
-        "type": 2,
+        "type": 1,
       },
       {
         "address": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
@@ -412,7 +421,7 @@ exports[`SearchPopularTokens renders without error 2`] = `
         "logoUrl": "https://loremflickr.com/640/480",
         "name": "USD Coin",
         "symbol": "USDC",
-        "type": 2,
+        "type": 1,
       },
     ]
   }
@@ -453,8 +462,8 @@ exports[`SearchPopularTokens renders without error 2`] = `
             },
             {
               "onPress": [Function],
-              "systemIcon": "qrcode",
-              "title": "Receive",
+              "systemIcon": "doc.on.doc",
+              "title": "Copy contract address",
             },
             {
               "onPress": [Function],
@@ -577,6 +586,7 @@ exports[`SearchPopularTokens renders without error 2`] = `
                 <View
                   style={
                     {
+                      "alignItems": "stretch",
                       "flexDirection": "column",
                       "flexShrink": 1,
                     }
@@ -652,8 +662,8 @@ exports[`SearchPopularTokens renders without error 2`] = `
             },
             {
               "onPress": [Function],
-              "systemIcon": "qrcode",
-              "title": "Receive",
+              "systemIcon": "doc.on.doc",
+              "title": "Copy contract address",
             },
             {
               "onPress": [Function],
@@ -776,6 +786,7 @@ exports[`SearchPopularTokens renders without error 2`] = `
                 <View
                   style={
                     {
+                      "alignItems": "stretch",
                       "flexDirection": "column",
                       "flexShrink": 1,
                     }
@@ -828,6 +839,7 @@ exports[`SearchPopularTokens renders without error 2`] = `
                 <View
                   style={
                     {
+                      "alignItems": "stretch",
                       "flexDirection": "column",
                       "flexShrink": 1,
                     }
diff --git a/apps/mobile/src/components/explore/search/items/SearchENSAddressItem.tsx b/apps/mobile/src/components/explore/search/items/SearchENSAddressItem.tsx
deleted file mode 100644
index 5fde7f30aad..00000000000
--- a/apps/mobile/src/components/explore/search/items/SearchENSAddressItem.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import React from 'react'
-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 { 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'
-import { sanitizeAddressText, shortenAddress } from 'wallet/src/utils/addresses'
-
-type SearchENSAddressItemProps = {
-  searchResult: ENSAddressSearchResult
-  searchContext?: SearchContext
-}
-
-export function SearchENSAddressItem({
-  searchResult,
-  searchContext,
-}: SearchENSAddressItemProps): JSX.Element {
-  const { t } = useTranslation()
-
-  // Use `savedPrimaryEnsName` for WalletSearchResults that are stored in the search history
-  // so that we don't have to do an additional ENS fetch when loading search history
-  const { address, ensName, primaryENSName: savedPrimaryENSName } = searchResult
-  const formattedAddress = sanitizeAddressText(shortenAddress(address))
-
-  /*
-   * Fetch primary ENS associated with `address` since it may resolve to an
-   * ENS different than the `ensName` searched
-   * ex. if searching `uni.eth` resolves to 0x123, and the primary ENS for 0x123
-   * is `uniswap.eth`, then we should show "uni.eth | owned by uniswap.eth"
-   */
-  const completedENSName = getCompletedENSName(ensName ?? null)
-  const { data: fetchedPrimaryENSName, loading: isFetchingPrimaryENSName } = useENSName(
-    savedPrimaryENSName ? undefined : address
-  )
-
-  const primaryENSName = savedPrimaryENSName ?? fetchedPrimaryENSName
-  const isPrimaryENSName = completedENSName === primaryENSName
-  const showOwnedBy = !isFetchingPrimaryENSName && !isPrimaryENSName
-
-  const { data: avatar } = useENSAvatar(address)
-
-  return (
-    <SearchWalletItemBase searchContext={searchContext} searchResult={searchResult}>
-      <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">
-            {completedENSName || formattedAddress}
-          </Text>
-          {showOwnedBy ? (
-            <Text color="$neutral2" ellipsizeMode="tail" numberOfLines={1} variant="subheading2">
-              {t('Owned by {{owner}}', {
-                owner: primaryENSName || formattedAddress,
-              })}
-            </Text>
-          ) : null}
-        </Flex>
-      </Flex>
-    </SearchWalletItemBase>
-  )
-}
diff --git a/apps/mobile/src/components/explore/search/items/SearchEtherscanItem.tsx b/apps/mobile/src/components/explore/search/items/SearchEtherscanItem.tsx
index 420e0b792cf..b00f0c53369 100644
--- a/apps/mobile/src/components/explore/search/items/SearchEtherscanItem.tsx
+++ b/apps/mobile/src/components/explore/search/items/SearchEtherscanItem.tsx
@@ -1,16 +1,16 @@
 import { ImpactFeedbackStyle } from 'expo-haptics'
 import { default as React } from 'react'
 import { useAppDispatch } from 'src/app/hooks'
+import { Arrow } from 'src/components/icons/Arrow'
 import { getBlockExplorerIcon } from 'src/components/icons/BlockExplorerIcon'
+import { addToSearchHistory } from 'src/features/explore/searchHistorySlice'
+import { EtherscanSearchResult } from 'src/features/explore/SearchResult'
+import { ElementName } from 'src/features/telemetry/constants'
+import { ExplorerDataType, getExplorerLink, openUri } from 'src/utils/linking'
 import { Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
-import { Arrow } from 'wallet/src/components/icons/Arrow'
 import { ChainId } from 'wallet/src/constants/chains'
-import { addToSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
-import { EtherscanSearchResult } from 'wallet/src/features/search/SearchResult'
-import { ElementName } from 'wallet/src/telemetry/constants'
 import { shortenAddress } from 'wallet/src/utils/addresses'
-import { ExplorerDataType, getExplorerLink, openUri } from 'wallet/src/utils/linking'
 
 type SearchEtherscanItemProps = {
   etherscanResult: EtherscanSearchResult
diff --git a/apps/mobile/src/components/explore/search/items/SearchNFTCollectionItem.tsx b/apps/mobile/src/components/explore/search/items/SearchNFTCollectionItem.tsx
index a4dc732159a..a7ce5512dce 100644
--- a/apps/mobile/src/components/explore/search/items/SearchNFTCollectionItem.tsx
+++ b/apps/mobile/src/components/explore/search/items/SearchNFTCollectionItem.tsx
@@ -2,19 +2,15 @@ import { ImpactFeedbackStyle } from 'expo-haptics'
 import { default as React } from 'react'
 import { useAppDispatch } from 'src/app/hooks'
 import { useAppStackNavigation } from 'src/app/navigation/types'
+import { SearchContext } from 'src/components/explore/search/SearchContext'
+import { addToSearchHistory } from 'src/features/explore/searchHistorySlice'
+import { NFTCollectionSearchResult, SearchResultType } from 'src/features/explore/SearchResult'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
-import { MobileEventName } from 'src/features/telemetry/constants'
+import { ElementName, MobileEventName } from 'src/features/telemetry/constants'
 import { Screens } from 'src/screens/Screens'
 import { Flex, Icons, Text, TouchableArea } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { NFTViewer } from 'wallet/src/features/images/NFTViewer'
-import { SearchContext } from 'wallet/src/features/search/SearchContext'
-import { addToSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
-import {
-  NFTCollectionSearchResult,
-  SearchResultType,
-} from 'wallet/src/features/search/SearchResult'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 type NFTCollectionItemProps = {
   collection: NFTCollectionSearchResult
diff --git a/apps/mobile/src/components/explore/search/items/SearchTokenItem.tsx b/apps/mobile/src/components/explore/search/items/SearchTokenItem.tsx
index bf66ce706c6..1d704c0fe7f 100644
--- a/apps/mobile/src/components/explore/search/items/SearchTokenItem.tsx
+++ b/apps/mobile/src/components/explore/search/items/SearchTokenItem.tsx
@@ -3,19 +3,19 @@ import { default as React } from 'react'
 import ContextMenu from 'react-native-context-menu-view'
 import { useAppDispatch } from 'src/app/hooks'
 import { useExploreTokenContextMenu } from 'src/components/explore/hooks'
+import { SearchContext } from 'src/components/explore/search/SearchContext'
 import { useTokenDetailsNavigation } from 'src/components/TokenDetails/hooks'
+import WarningIcon from 'src/components/tokens/WarningIcon'
+import { addToSearchHistory } from 'src/features/explore/searchHistorySlice'
+import { SearchResultType, TokenSearchResult } from 'src/features/explore/SearchResult'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
-import { MobileEventName } from 'src/features/telemetry/constants'
+import { ElementName, MobileEventName, SectionName } from 'src/features/telemetry/constants'
 import { disableOnPress } from 'src/utils/disableOnPress'
-import { Flex, Text, TouchableArea, useIsDarkMode } from 'ui/src'
+import { Flex, Text, TouchableArea } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { TokenLogo } from 'wallet/src/components/CurrencyLogo/TokenLogo'
-import WarningIcon from 'wallet/src/components/icons/WarningIcon'
 import { SafetyLevel } from 'wallet/src/data/__generated__/types-and-hooks'
-import { SearchContext } from 'wallet/src/features/search/SearchContext'
-import { addToSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
-import { SearchResultType, TokenSearchResult } from 'wallet/src/features/search/SearchResult'
-import { ElementName, SectionName } from 'wallet/src/telemetry/constants'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { shortenAddress } from 'wallet/src/utils/addresses'
 import { buildCurrencyId, buildNativeCurrencyId } from 'wallet/src/utils/currencyId'
 
diff --git a/apps/mobile/src/components/explore/search/items/SearchUnitagItem.tsx b/apps/mobile/src/components/explore/search/items/SearchUnitagItem.tsx
deleted file mode 100644
index bcfc2baab2e..00000000000
--- a/apps/mobile/src/components/explore/search/items/SearchUnitagItem.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react'
-import { SearchWalletItemBase } from 'src/components/explore/search/items/SearchWalletItemBase'
-import { Flex } from 'ui/src'
-import { imageSizes } from 'ui/src/theme'
-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'
-
-type SearchUnitagItemProps = {
-  searchResult: UnitagSearchResult
-  searchContext?: SearchContext
-}
-
-export function SearchUnitagItem({
-  searchResult,
-  searchContext,
-}: SearchUnitagItemProps): JSX.Element {
-  const { address, unitag } = searchResult
-  const { avatar } = useAvatar(address)
-
-  const displayName = { name: unitag, type: DisplayNameType.Unitag }
-
-  return (
-    <SearchWalletItemBase searchContext={searchContext} searchResult={searchResult}>
-      <Flex row alignItems="center" gap="$spacing12" px="$spacing8" py="$spacing12">
-        <AccountIcon address={address} avatarUri={avatar} size={imageSizes.image40} />
-        <DisplayNameText displayName={displayName} textProps={{ variant: 'body1' }} />
-      </Flex>
-    </SearchWalletItemBase>
-  )
-}
diff --git a/apps/mobile/src/components/explore/search/items/SearchWalletItem.tsx b/apps/mobile/src/components/explore/search/items/SearchWalletItem.tsx
new file mode 100644
index 00000000000..7e2a9fd67ce
--- /dev/null
+++ b/apps/mobile/src/components/explore/search/items/SearchWalletItem.tsx
@@ -0,0 +1,117 @@
+import { ImpactFeedbackStyle } from 'expo-haptics'
+import React, { useMemo } from 'react'
+import { useTranslation } from 'react-i18next'
+import ContextMenu from 'react-native-context-menu-view'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { useEagerExternalProfileNavigation } from 'src/app/navigation/hooks'
+import { AccountIcon } from 'src/components/AccountIcon'
+import { SearchContext } from 'src/components/explore/search/SearchContext'
+import { addToSearchHistory } from 'src/features/explore/searchHistorySlice'
+import { WalletSearchResult } from 'src/features/explore/SearchResult'
+import { useToggleWatchedWalletCallback } from 'src/features/favorites/hooks'
+import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
+import { MobileEventName } from 'src/features/telemetry/constants'
+import { disableOnPress } from 'src/utils/disableOnPress'
+import { Flex, Text, TouchableArea } from 'ui/src'
+import { imageSizes } from 'ui/src/theme'
+import { useENSAvatar, useENSName } from 'wallet/src/features/ens/api'
+import { getCompletedENSName } from 'wallet/src/features/ens/useENS'
+import { selectWatchedAddressSet } from 'wallet/src/features/favorites/selectors'
+import { sanitizeAddressText, shortenAddress } from 'wallet/src/utils/addresses'
+
+type SearchWalletItemProps = {
+  wallet: WalletSearchResult
+  searchContext?: SearchContext
+}
+
+export function SearchWalletItem({ wallet, searchContext }: SearchWalletItemProps): JSX.Element {
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+  const { preload, navigate } = useEagerExternalProfileNavigation()
+
+  // Use `savedPrimaryEnsName` for WalletSearchResults that are stored in the search history
+  // so that we don't have to do an additional ENS fetch when loading search history
+  const { address, ensName, primaryENSName: savedPrimaryENSName } = wallet
+  const formattedAddress = sanitizeAddressText(shortenAddress(address))
+
+  /*
+   * Fetch primary ENS associated with `address` since it may resolve to an
+   * ENS different than the `ensName` searched
+   * ex. if searching `uni.eth` resolves to 0x123, and the primary ENS for 0x123
+   * is `uniswap.eth`, then we should show "uni.eth | owned by uniswap.eth"
+   */
+  const completedENSName = getCompletedENSName(ensName ?? null)
+  const { data: fetchedPrimaryENSName, loading: isFetchingPrimaryENSName } = useENSName(
+    savedPrimaryENSName ? undefined : address
+  )
+
+  const primaryENSName = savedPrimaryENSName ?? fetchedPrimaryENSName
+  const isPrimaryENSName = completedENSName === primaryENSName
+  const showOwnedBy = !isFetchingPrimaryENSName && !isPrimaryENSName
+
+  const { data: avatar } = useENSAvatar(address)
+
+  const isFavorited = useAppSelector(selectWatchedAddressSet).has(address)
+
+  const onPress = (): void => {
+    navigate(address)
+    if (searchContext) {
+      sendMobileAnalyticsEvent(MobileEventName.ExploreSearchResultClicked, {
+        query: searchContext.query,
+        name: ensName ?? address,
+        address,
+        type: 'address',
+        suggestion_count: searchContext.suggestionCount,
+        position: searchContext.position,
+        isHistory: searchContext.isHistory,
+      })
+    }
+    dispatch(
+      addToSearchHistory({
+        searchResult: { ...wallet, primaryENSName: primaryENSName ?? undefined },
+      })
+    )
+  }
+
+  const toggleFavoriteWallet = useToggleWatchedWalletCallback(address)
+
+  const menuActions = useMemo(() => {
+    return isFavorited
+      ? [{ title: t('Remove favorite'), systemIcon: 'heart.fill' }]
+      : [{ title: t('Favorite wallet'), systemIcon: 'heart' }]
+  }, [isFavorited, t])
+
+  return (
+    <ContextMenu actions={menuActions} onPress={toggleFavoriteWallet}>
+      <TouchableArea
+        hapticFeedback
+        hapticStyle={ImpactFeedbackStyle.Light}
+        testID={`wallet-item-${address}`}
+        onLongPress={disableOnPress}
+        onPress={onPress}
+        onPressIn={async (): Promise<void> => {
+          await preload(address)
+        }}>
+        <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">
+              {completedENSName || formattedAddress}
+            </Text>
+            {showOwnedBy ? (
+              <Text color="$neutral2" ellipsizeMode="tail" numberOfLines={1} variant="subheading2">
+                {t('Owned by {{owner}}', {
+                  owner: primaryENSName || formattedAddress,
+                })}
+              </Text>
+            ) : null}
+          </Flex>
+        </Flex>
+      </TouchableArea>
+    </ContextMenu>
+  )
+}
diff --git a/apps/mobile/src/components/explore/search/items/SearchWalletItemBase.tsx b/apps/mobile/src/components/explore/search/items/SearchWalletItemBase.tsx
deleted file mode 100644
index 07f7ecf76fe..00000000000
--- a/apps/mobile/src/components/explore/search/items/SearchWalletItemBase.tsx
+++ /dev/null
@@ -1,89 +0,0 @@
-import { ImpactFeedbackStyle } from 'expo-haptics'
-import React, { PropsWithChildren, useMemo } from 'react'
-import { useTranslation } from 'react-i18next'
-import ContextMenu from 'react-native-context-menu-view'
-import { useAppDispatch, useAppSelector } from 'src/app/hooks'
-import { useEagerExternalProfileNavigation } from 'src/app/navigation/hooks'
-import { useToggleWatchedWalletCallback } from 'src/features/favorites/hooks'
-import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
-import { MobileEventName } from 'src/features/telemetry/constants'
-import { disableOnPress } from 'src/utils/disableOnPress'
-import { TouchableArea } from 'ui/src'
-import { selectWatchedAddressSet } from 'wallet/src/features/favorites/selectors'
-import { SearchContext } from 'wallet/src/features/search/SearchContext'
-import { addToSearchHistory } from 'wallet/src/features/search/searchHistorySlice'
-import { SearchResultType, WalletSearchResult } from 'wallet/src/features/search/SearchResult'
-
-type SearchWalletItemBaseProps = {
-  searchResult: WalletSearchResult
-  searchContext?: SearchContext
-}
-
-export function SearchWalletItemBase({
-  children,
-  searchResult,
-  searchContext,
-}: PropsWithChildren<SearchWalletItemBaseProps>): JSX.Element {
-  const { t } = useTranslation()
-  const dispatch = useAppDispatch()
-  const { preload, navigate } = useEagerExternalProfileNavigation()
-  const { address, type } = searchResult
-  const isFavorited = useAppSelector(selectWatchedAddressSet).has(address)
-
-  const onPress = (): void => {
-    navigate(address)
-    if (searchContext) {
-      sendMobileAnalyticsEvent(MobileEventName.ExploreSearchResultClicked, {
-        query: searchContext.query,
-        name:
-          type === SearchResultType.Unitag ? searchResult.unitag : searchResult.ensName ?? address,
-        address,
-        type: 'address',
-        suggestion_count: searchContext.suggestionCount,
-        position: searchContext.position,
-        isHistory: searchContext.isHistory,
-      })
-    }
-
-    if (type === SearchResultType.Unitag) {
-      dispatch(
-        addToSearchHistory({
-          searchResult,
-        })
-      )
-    } else {
-      dispatch(
-        addToSearchHistory({
-          searchResult: {
-            ...searchResult,
-            primaryENSName: searchResult.primaryENSName ?? undefined,
-          },
-        })
-      )
-    }
-  }
-
-  const toggleFavoriteWallet = useToggleWatchedWalletCallback(address)
-
-  const menuActions = useMemo(() => {
-    return isFavorited
-      ? [{ title: t('Remove favorite'), systemIcon: 'heart.fill' }]
-      : [{ title: t('Favorite wallet'), systemIcon: 'heart' }]
-  }, [isFavorited, t])
-
-  return (
-    <ContextMenu actions={menuActions} onPress={toggleFavoriteWallet}>
-      <TouchableArea
-        hapticFeedback
-        hapticStyle={ImpactFeedbackStyle.Light}
-        testID={`wallet-item-${type}-${address}`}
-        onLongPress={disableOnPress}
-        onPress={onPress}
-        onPressIn={async (): Promise<void> => {
-          await preload(address)
-        }}>
-        {children}
-      </TouchableArea>
-    </ContextMenu>
-  )
-}
diff --git a/apps/mobile/src/components/explore/search/types.tsx b/apps/mobile/src/components/explore/search/types.tsx
index 464e2749aa1..b4e5b97599a 100644
--- a/apps/mobile/src/components/explore/search/types.tsx
+++ b/apps/mobile/src/components/explore/search/types.tsx
@@ -1,4 +1,4 @@
-import { SearchResult } from 'wallet/src/features/search/SearchResult'
+import { SearchResult } from 'src/features/explore/SearchResult'
 import { SEARCH_RESULT_HEADER_KEY } from './constants'
 
 // Header type used to render header text instead of SearchResult item
diff --git a/apps/mobile/src/components/explore/search/utils.test.ts b/apps/mobile/src/components/explore/search/utils.test.ts
index 510548e6814..e5c3dd4074b 100644
--- a/apps/mobile/src/components/explore/search/utils.test.ts
+++ b/apps/mobile/src/components/explore/search/utils.test.ts
@@ -4,9 +4,9 @@ import {
   formatTokenSearchResults,
   gqlNFTToNFTCollectionSearchResult,
 } from 'src/components/explore/search/utils'
+import { SearchResultType } from 'src/features/explore/SearchResult'
 import { Chain, ExploreSearchQuery } from 'wallet/src/data/__generated__/types-and-hooks'
 import { fromGraphQLChain } from 'wallet/src/features/chains/utils'
-import { SearchResultType } from 'wallet/src/features/search/SearchResult'
 import { SearchTokens, TopNFTCollections } from 'wallet/src/test/gqlFixtures'
 
 type ExploreSearchResult = NonNullable<ExploreSearchQuery>
diff --git a/apps/mobile/src/components/explore/search/utils.ts b/apps/mobile/src/components/explore/search/utils.ts
index 0b4a806231c..75a2ad9e9b4 100644
--- a/apps/mobile/src/components/explore/search/utils.ts
+++ b/apps/mobile/src/components/explore/search/utils.ts
@@ -1,11 +1,11 @@
-import { Chain, ExploreSearchQuery } from 'wallet/src/data/__generated__/types-and-hooks'
-import { fromGraphQLChain } from 'wallet/src/features/chains/utils'
+import { searchResultId } from 'src/features/explore/searchHistorySlice'
 import {
   NFTCollectionSearchResult,
   SearchResultType,
   TokenSearchResult,
-} from 'wallet/src/features/search/SearchResult'
-import { searchResultId } from 'wallet/src/features/search/searchHistorySlice'
+} from 'src/features/explore/SearchResult'
+import { Chain, ExploreSearchQuery } from 'wallet/src/data/__generated__/types-and-hooks'
+import { fromGraphQLChain } from 'wallet/src/features/chains/utils'
 import { SEARCH_RESULT_HEADER_KEY } from './constants'
 import { SearchResultOrHeader } from './types'
 
diff --git a/apps/mobile/src/components/fiatOnRamp/CtaButton.tsx b/apps/mobile/src/components/fiatOnRamp/CtaButton.tsx
index c70db1ba625..2d031655400 100644
--- a/apps/mobile/src/components/fiatOnRamp/CtaButton.tsx
+++ b/apps/mobile/src/components/fiatOnRamp/CtaButton.tsx
@@ -1,17 +1,16 @@
 import React from 'react'
 import { useTranslation } from 'react-i18next'
+import { SpinningLoader } from 'src/components/loading/SpinningLoader'
 import Trace from 'src/components/Trace/Trace'
-import { MobileEventName } from 'src/features/telemetry/constants'
+import { ElementName, MobileEventName } from 'src/features/telemetry/constants'
 import { Button, Icons } from 'ui/src'
-import { SpinningLoader } from 'wallet/src/components/loading/SpinningLoader'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 interface FiatOnRampCtaButtonProps {
   onPress: () => void
-  isLoading?: boolean
+  isLoading: boolean
   eligible: boolean
   disabled: boolean
-  analyticsProperties?: Record<string, unknown>
+  analyticsProperties: Record<string, unknown>
   continueButtonText: string
 }
 
diff --git a/apps/mobile/src/components/fiatOnRamp/QuoteItem.tsx b/apps/mobile/src/components/fiatOnRamp/QuoteItem.tsx
deleted file mode 100644
index 313c8ea2002..00000000000
--- a/apps/mobile/src/components/fiatOnRamp/QuoteItem.tsx
+++ /dev/null
@@ -1,155 +0,0 @@
-import { Currency } from '@uniswap/sdk-core'
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { StyleSheet } from 'react-native'
-import { useMeldLogoUrl } from 'src/components/fiatOnRamp/hooks'
-import { Loader } from 'src/components/loading'
-import { useFormatExactCurrencyAmount } from 'src/features/fiatOnRamp/hooks'
-import { Flex, Icons, Text, TouchableArea } from 'ui/src'
-import { fonts, iconSizes } from 'ui/src/theme'
-import { FiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
-import { FORQuote, FORServiceProvider } from 'wallet/src/features/fiatOnRamp/types'
-import { ImageUri } from 'wallet/src/features/images/ImageUri'
-import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { getSymbolDisplayText } from 'wallet/src/utils/currency'
-
-export function FORQuoteItem({
-  quote,
-  serviceProvider,
-  currency,
-  loading,
-  baseCurrency,
-  onPress,
-  showCarret,
-  active,
-}: {
-  quote: FORQuote | undefined
-  serviceProvider: FORServiceProvider | undefined
-  currency: Maybe<Currency>
-  loading: boolean
-  baseCurrency: FiatCurrencyInfo
-  onPress: () => void
-  showCarret?: boolean
-  active?: boolean
-}): JSX.Element {
-  const { t } = useTranslation()
-  const { addFiatSymbolToNumber } = useLocalizationContext()
-
-  const quoteAmount = useFormatExactCurrencyAmount(
-    (quote?.destinationAmount || 0).toString(),
-    currency
-  )
-
-  const quoteEquivalentInSourceCurrencyAmount = addFiatSymbolToNumber({
-    value: quote?.sourceAmount || 0,
-    currencyCode: baseCurrency.code,
-    currencySymbol: baseCurrency.symbol,
-  })
-
-  const logoUrl = useMeldLogoUrl(serviceProvider?.logos)
-
-  return (
-    <TouchableArea onPress={onPress}>
-      <Flex
-        backgroundColor={active ? '$surface2' : '$surface1'}
-        borderColor="$surface3"
-        borderRadius="$rounded20"
-        borderWidth="$spacing1"
-        pl="$spacing16"
-        pr="$spacing8"
-        py="$spacing16">
-        {loading ? (
-          <QuoteLoader showCarret={showCarret} />
-        ) : (
-          <Flex row alignItems="center" gap="$spacing12">
-            <Loader.Box
-              borderRadius="$roundedFull"
-              height={iconSizes.icon40}
-              width={iconSizes.icon40}
-            />
-            <Flex shrink gap="$spacing4">
-              <Text color="$neutral1" variant="subheading2">
-                {serviceProvider?.name}
-              </Text>
-            </Flex>
-            <Flex grow row alignItems="center" gap="$spacing8" justifyContent="flex-end">
-              <Flex alignItems="flex-end" gap="$spacing4">
-                {quoteAmount && (
-                  <Text color="$neutral1" variant="body3">
-                    {t('Receive {{amount}}', {
-                      amount: `${quoteAmount + getSymbolDisplayText(currency?.symbol)}`,
-                    })}
-                  </Text>
-                )}
-                <Text color="$neutral2" variant="body3">
-                  {t('{{amount}} after fees', { amount: quoteEquivalentInSourceCurrencyAmount })}
-                </Text>
-              </Flex>
-              {showCarret ? (
-                <Icons.RotatableChevron
-                  color="$neutral3"
-                  direction="right"
-                  height={iconSizes.icon20}
-                  width={iconSizes.icon20}
-                />
-              ) : (
-                <Flex />
-              )}
-            </Flex>
-            {
-              // TODO: Enable once https://linear.app/uniswap/issue/MOB-2565/implement-service-providers-logo-once-meld-has-added-them-on-their is unblocked
-              false && logoUrl && (
-                <ImageUri
-                  fallback={
-                    <Loader.Box
-                      borderRadius="$roundedFull"
-                      height={iconSizes.icon40}
-                      width={iconSizes.icon40}
-                    />
-                  }
-                  imageStyle={ServiceProviderLogoStyles.icon}
-                  resizeMode="contain"
-                  uri={logoUrl}
-                />
-              )
-            }
-          </Flex>
-        )}
-      </Flex>
-    </TouchableArea>
-  )
-}
-
-function QuoteLoader({ showCarret }: { showCarret?: boolean }): JSX.Element {
-  return (
-    <Flex row alignItems="center" gap="$spacing12">
-      <Loader.Box borderRadius="$roundedFull" height={iconSizes.icon40} width={iconSizes.icon40} />
-      <Flex shrink gap="$spacing4">
-        <Loader.Box borderRadius="$rounded4" height={fonts.subheading2.lineHeight} width={100} />
-      </Flex>
-      <Flex grow row alignItems="center" gap="$spacing8" justifyContent="flex-end">
-        <Flex alignItems="flex-end" gap="$spacing4">
-          <Loader.Box borderRadius="$rounded4" height={fonts.body3.lineHeight} width={80} />
-          <Loader.Box borderRadius="$rounded4" height={fonts.body3.lineHeight} width={70} />
-        </Flex>
-        {showCarret ? (
-          <Icons.RotatableChevron
-            color="$neutral3"
-            direction="right"
-            height={iconSizes.icon20}
-            width={iconSizes.icon20}
-          />
-        ) : (
-          <Flex />
-        )}
-      </Flex>
-    </Flex>
-  )
-}
-
-const ServiceProviderLogoStyles = StyleSheet.create({
-  icon: {
-    height: iconSizes.icon40,
-    width: iconSizes.icon40,
-  },
-})
diff --git a/apps/mobile/src/components/fiatOnRamp/hooks.ts b/apps/mobile/src/components/fiatOnRamp/hooks.ts
index 2d237df7674..03790273c04 100644
--- a/apps/mobile/src/components/fiatOnRamp/hooks.ts
+++ b/apps/mobile/src/components/fiatOnRamp/hooks.ts
@@ -1,4 +1,5 @@
-import { useIsDarkMode } from 'ui/src'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
+
 import { MeldLogos } from 'wallet/src/features/fiatOnRamp/meld'
 
 export function useMeldLogoUrl(logos: MeldLogos | undefined): string | undefined {
diff --git a/apps/mobile/src/components/forceUpgrade/ForceUpgradeModal.tsx b/apps/mobile/src/components/forceUpgrade/ForceUpgradeModal.tsx
index f7e27a452f1..63e04393e6c 100644
--- a/apps/mobile/src/components/forceUpgrade/ForceUpgradeModal.tsx
+++ b/apps/mobile/src/components/forceUpgrade/ForceUpgradeModal.tsx
@@ -2,18 +2,18 @@ import React, { useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { BackButtonView } from 'src/components/layout/BackButtonView'
 import { SeedPhraseDisplay } from 'src/components/mnemonic/SeedPhraseDisplay'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
+import { WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
 import { APP_STORE_LINK } from 'src/constants/urls'
 import { UpgradeStatus } from 'src/features/forceUpgrade/types'
+import { ModalName } from 'src/features/telemetry/constants'
+import { openUri } from 'src/utils/linking'
 import { Statsig } from 'statsig-react-native'
 import { Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
 import { DYNAMIC_CONFIGS } from 'wallet/src/features/experiments/constants'
-import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
 import { SignerMnemonicAccount } from 'wallet/src/features/wallet/accounts/types'
 import { useNonPendingSignerAccounts } from 'wallet/src/features/wallet/hooks'
-import { ModalName } from 'wallet/src/telemetry/constants'
-import { openUri } from 'wallet/src/utils/linking'
 
 export function ForceUpgradeModal(): JSX.Element {
   const { t } = useTranslation()
diff --git a/apps/mobile/src/components/gradients/LandingBackground.tsx b/apps/mobile/src/components/gradients/LandingBackground.tsx
index 72005d16607..192067e366b 100644
--- a/apps/mobile/src/components/gradients/LandingBackground.tsx
+++ b/apps/mobile/src/components/gradients/LandingBackground.tsx
@@ -3,10 +3,11 @@ import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { Image, Platform, ViewStyle } from 'react-native'
 import Rive, { Alignment, Fit, RiveRef } from 'rive-react-native'
 import { useAppStackNavigation } from 'src/app/navigation/types'
-import { useIsDarkMode, useMedia } from 'ui/src'
+import { useMedia } from 'ui/src'
 import { ONBOARDING_LANDING_DARK, ONBOARDING_LANDING_LIGHT } from 'ui/src/assets'
 import { useDeviceDimensions } from 'ui/src/hooks/useDeviceDimensions'
 import { useTimeout } from 'utilities/src/time/timing'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { Language } from 'wallet/src/features/language/constants'
 import { useCurrentLanguage } from 'wallet/src/features/language/hooks'
 import { isAndroid } from 'wallet/src/utils/platform'
@@ -82,11 +83,7 @@ export const LandingBackground = (): JSX.Element | null => {
   }
 
   // Android 9 and 10 have issues with Rive, so we fallback on image
-  if (
-    // Android Platform.Version is always a number
-    (isAndroid && typeof Platform.Version === 'number' && Platform.Version < 30) ||
-    language !== Language.English
-  ) {
+  if ((isAndroid && Platform.Version < 30) || language !== Language.English) {
     return <OnboardingStaticImage />
   }
 
diff --git a/apps/mobile/src/components/gradients/UniconThemedGradient.tsx b/apps/mobile/src/components/gradients/UniconThemedGradient.tsx
index e5c1c0ee3fd..ba791cd46ee 100644
--- a/apps/mobile/src/components/gradients/UniconThemedGradient.tsx
+++ b/apps/mobile/src/components/gradients/UniconThemedGradient.tsx
@@ -1,6 +1,6 @@
 import React, { memo } from 'react'
 import Svg, { Defs, LinearGradient, Rect, Stop } from 'react-native-svg'
-import { Tokens, getTokenValue } from 'ui/src'
+import { getTokenValue, Tokens } from 'ui/src'
 
 function _UniconThemedGradient({
   gradientStartColor,
diff --git a/apps/mobile/src/components/home/ActivityTab.tsx b/apps/mobile/src/components/home/ActivityTab.tsx
index e82732485c4..4c3338f2f11 100644
--- a/apps/mobile/src/components/home/ActivityTab.tsx
+++ b/apps/mobile/src/components/home/ActivityTab.tsx
@@ -3,32 +3,32 @@ import { useTranslation } from 'react-i18next'
 import { FlatList, RefreshControl } from 'react-native'
 import Animated from 'react-native-reanimated'
 import { useAppDispatch } from 'src/app/hooks'
-import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import { useAdaptiveFooter } from 'src/components/home/hooks'
+import { NoTransactions } from 'src/components/icons/NoTransactions'
 import {
   AnimatedBottomSheetFlatList,
   AnimatedFlatList,
 } from 'src/components/layout/AnimatedFlatList'
-import { TAB_BAR_HEIGHT, TabProps } from 'src/components/layout/TabHelpers'
+import { TabProps, TAB_BAR_HEIGHT } from 'src/components/layout/TabHelpers'
 import { Loader } from 'src/components/loading'
-import { useBiometricAppSettings, useBiometricPrompt } from 'src/features/biometrics/hooks'
+import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import { openModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
+import {
+  useCreateSwapFormState,
+  useMergeLocalAndRemoteTransactions,
+} from 'src/features/transactions/hooks'
+import TransactionSummaryLayout from 'src/features/transactions/SummaryCards/TransactionSummaryLayout'
+import { useMostRecentSwapTx } from 'src/features/transactions/swap/hooks'
 import { removePendingSession } from 'src/features/walletConnect/walletConnectSlice'
-import { Flex, Icons, Text, useDeviceInsets, useSporeColors } from 'ui/src'
+import { Flex, Text, useDeviceInsets, useSporeColors } from 'ui/src'
 import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
 import { GQLQueries } from 'wallet/src/data/queries'
 import { useFormattedTransactionDataForActivity } from 'wallet/src/features/activity/hooks'
-import TransactionSummaryLayout from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout'
 import { SwapSummaryCallbacks } from 'wallet/src/features/transactions/SummaryCards/types'
 import { 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'
 import { TransactionState } from 'wallet/src/features/transactions/transactionState/types'
 import { useHideSpamTokensSetting } from 'wallet/src/features/wallet/hooks'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 export const ACTIVITY_TAB_DATA_DEPENDENCIES = [GQLQueries.TransactionList]
@@ -62,9 +62,6 @@ export const ActivityTab = memo(
     const colors = useSporeColors()
     const insets = useDeviceInsets()
 
-    const { trigger: biometricsTrigger } = useBiometricPrompt()
-    const { requiredForTransactions: requiresBiometrics } = useBiometricAppSettings()
-
     const { onContentSizeChange, adaptiveFooter } = useAdaptiveFooter(
       containerProps?.contentContainerStyle
     )
@@ -89,10 +86,9 @@ export const ActivityTab = memo(
         TransactionSummaryLayout,
         <Loader.Transaction />,
         SectionTitle,
-        swapCallbacks,
-        requiresBiometrics ? biometricsTrigger : undefined
+        swapCallbacks
       )
-    }, [swapCallbacks, requiresBiometrics, biometricsTrigger])
+    }, [swapCallbacks])
 
     const { onRetry, hasData, isLoading, isError, sectionData, keyExtractor } =
       useFormattedTransactionDataForActivity(
@@ -130,7 +126,7 @@ export const ActivityTab = memo(
                   'When you approve, trade, or transfer tokens or NFTs, your transactions will appear here.'
                 )
           }
-          icon={<Icons.NoTransactions size="$icon.100" />}
+          icon={<NoTransactions />}
           title={t('No activity yet')}
           onPress={onPressReceive}
         />
diff --git a/apps/mobile/src/components/home/FeedTab.tsx b/apps/mobile/src/components/home/FeedTab.tsx
index 930a7ceaf8d..f6794ba32fb 100644
--- a/apps/mobile/src/components/home/FeedTab.tsx
+++ b/apps/mobile/src/components/home/FeedTab.tsx
@@ -3,23 +3,23 @@ import { useTranslation } from 'react-i18next'
 import { FlatList, RefreshControl } from 'react-native'
 import Animated from 'react-native-reanimated'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
-import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import { useAdaptiveFooter } from 'src/components/home/hooks'
+import { NoTransactions } from 'src/components/icons/NoTransactions'
 import { AnimatedFlatList } from 'src/components/layout/AnimatedFlatList'
-import { TAB_BAR_HEIGHT, TabProps } from 'src/components/layout/TabHelpers'
+import { TabProps, TAB_BAR_HEIGHT } from 'src/components/layout/TabHelpers'
 import { Loader } from 'src/components/loading'
+import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import { openModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
+import TransactionSummaryLayout from 'src/features/transactions/SummaryCards/TransactionSummaryLayout'
 import { removePendingSession } from 'src/features/walletConnect/walletConnectSlice'
 import { Flex, Text, useDeviceInsets, useSporeColors } from 'ui/src'
-import { NoTransactions } from 'ui/src/components/icons/NoTransactions'
 import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
 import { GQLQueries } from 'wallet/src/data/queries'
 import { useFormattedTransactionDataForFeed } from 'wallet/src/features/activity/hooks'
 import { selectWatchedAddressSet } from 'wallet/src/features/favorites/selectors'
-import TransactionSummaryLayout from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout'
 import { generateActivityItemRenderer } from 'wallet/src/features/transactions/SummaryCards/utils'
 import { useHideSpamTokensSetting } from 'wallet/src/features/wallet/hooks'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 export const FEED_TAB_DATA_DEPENDENCIES = [GQLQueries.FeedTransactionList]
@@ -56,9 +56,7 @@ export const FeedTab = memo(
       return generateActivityItemRenderer(
         TransactionSummaryLayout,
         <Loader.Transaction />,
-        SectionTitle,
-        undefined,
-        undefined
+        SectionTitle
       )
     }, [])
 
diff --git a/apps/mobile/src/components/home/NftsTab.tsx b/apps/mobile/src/components/home/NftsTab.tsx
index 74cdf95a1a3..226181d0958 100644
--- a/apps/mobile/src/components/home/NftsTab.tsx
+++ b/apps/mobile/src/components/home/NftsTab.tsx
@@ -4,17 +4,17 @@ import { RefreshControl } from 'react-native'
 import { useAppDispatch } from 'src/app/hooks'
 import { useAppStackNavigation } from 'src/app/navigation/types'
 import { useAdaptiveFooter } from 'src/components/home/hooks'
-import { TAB_BAR_HEIGHT, TabProps } from 'src/components/layout/TabHelpers'
+import { TabProps, TAB_BAR_HEIGHT } from 'src/components/layout/TabHelpers'
 import { NftView } from 'src/components/NFT/NftView'
 import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import { openModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { removePendingSession } from 'src/features/walletConnect/walletConnectSlice'
 import { Screens } from 'src/screens/Screens'
 import { Flex, useDeviceInsets, useSporeColors } from 'ui/src'
 import { NftsList } from 'wallet/src/components/nfts/NftsList'
 import { GQLQueries } from 'wallet/src/data/queries'
 import { NFTItem } from 'wallet/src/features/nfts/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 export const NFTS_TAB_DATA_DEPENDENCIES = [GQLQueries.NftsTab]
diff --git a/apps/mobile/src/components/home/TokensTab.tsx b/apps/mobile/src/components/home/TokensTab.tsx
index a95e0ad1ce0..35074b0d9f3 100644
--- a/apps/mobile/src/components/home/TokensTab.tsx
+++ b/apps/mobile/src/components/home/TokensTab.tsx
@@ -8,14 +8,14 @@ import { NoTokens } from 'src/components/icons/NoTokens'
 import { TabContentProps, TabProps } from 'src/components/layout/TabHelpers'
 import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import { TokenBalanceList } from 'src/components/TokenBalanceList/TokenBalanceList'
+import { TokenBalanceListRow } from 'src/components/TokenBalanceList/TokenBalanceListContext'
 import { useTokenDetailsNavigation } from 'src/components/TokenDetails/hooks'
 import { openModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { Screens } from 'src/screens/Screens'
 import { Flex } from 'ui/src'
 import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
 import { GQLQueries } from 'wallet/src/data/queries'
-import { TokenBalanceListRow } from 'wallet/src/features/portfolio/TokenBalanceListContext'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { CurrencyId } from 'wallet/src/utils/currencyId'
 
 export const TOKENS_TAB_DATA_DEPENDENCIES = [GQLQueries.PortfolioBalances]
diff --git a/apps/mobile/src/components/home/WalletEmptyState.tsx b/apps/mobile/src/components/home/WalletEmptyState.tsx
index a2398838cdd..7473188bb56 100644
--- a/apps/mobile/src/components/home/WalletEmptyState.tsx
+++ b/apps/mobile/src/components/home/WalletEmptyState.tsx
@@ -4,12 +4,12 @@ import { useAppDispatch } from 'src/app/hooks'
 import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import Trace from 'src/components/Trace/Trace'
 import { openModal } from 'src/features/modals/modalSlice'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { Flex, Icons, Text, TouchableArea } from 'ui/src'
 import PaperStackIcon from 'ui/src/assets/icons/paper-stack.svg'
-import { iconSizes, colors as rawColors } from 'ui/src/theme'
+import { colors as rawColors, iconSizes } from 'ui/src/theme'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
-import { ElementName, ElementNameType, ModalName } from 'wallet/src/telemetry/constants'
 import { opacify } from 'wallet/src/utils/colors'
 
 interface ActionCardItem {
@@ -17,7 +17,7 @@ interface ActionCardItem {
   blurb: string
   icon: JSX.Element
   onPress: () => void
-  elementName: ElementNameType
+  elementName: ElementName
   badgeText?: string
 }
 
diff --git a/packages/wallet/src/components/icons/Arrow.tsx b/apps/mobile/src/components/icons/Arrow.tsx
similarity index 96%
rename from packages/wallet/src/components/icons/Arrow.tsx
rename to apps/mobile/src/components/icons/Arrow.tsx
index e9417007baa..1b226aa6096 100644
--- a/packages/wallet/src/components/icons/Arrow.tsx
+++ b/apps/mobile/src/components/icons/Arrow.tsx
@@ -1,4 +1,4 @@
-import { memo } from 'react'
+import React, { memo } from 'react'
 import ArrowDown from 'ui/src/assets/icons/arrow-down.svg'
 
 type Props = {
diff --git a/apps/mobile/src/components/icons/BlockExplorerIcon.tsx b/apps/mobile/src/components/icons/BlockExplorerIcon.tsx
index 10db05edc71..58a23dd6a77 100644
--- a/apps/mobile/src/components/icons/BlockExplorerIcon.tsx
+++ b/apps/mobile/src/components/icons/BlockExplorerIcon.tsx
@@ -1,8 +1,8 @@
 import React from 'react'
 import { SvgProps } from 'react-native-svg'
-import { useIsDarkMode } from 'ui/src'
 import { IconSizeTokens } from 'ui/src/theme'
-import { CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
+import { ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 
 type IconComponentProps = SvgProps & { size?: IconSizeTokens | number }
 
diff --git a/packages/wallet/src/components/icons/CheckmarkCircle.tsx b/apps/mobile/src/components/icons/CheckmarkCircle.tsx
similarity index 95%
rename from packages/wallet/src/components/icons/CheckmarkCircle.tsx
rename to apps/mobile/src/components/icons/CheckmarkCircle.tsx
index 097e3225e27..7c305673b5f 100644
--- a/packages/wallet/src/components/icons/CheckmarkCircle.tsx
+++ b/apps/mobile/src/components/icons/CheckmarkCircle.tsx
@@ -1,4 +1,4 @@
-import { memo } from 'react'
+import React, { memo } from 'react'
 import { Flex, FlexProps, useSporeColors } from 'ui/src'
 import Checkmark from 'ui/src/assets/icons/checkmark.svg'
 
diff --git a/apps/mobile/src/components/icons/NoTransactions.tsx b/apps/mobile/src/components/icons/NoTransactions.tsx
new file mode 100644
index 00000000000..26119935544
--- /dev/null
+++ b/apps/mobile/src/components/icons/NoTransactions.tsx
@@ -0,0 +1,19 @@
+import React, { memo } from 'react'
+import OverlayIcon from 'src/components/icons/OverlayIcon'
+import { Flex, useSporeColors } from 'ui/src'
+import NoTransactionFgIcon from 'ui/src/assets/icons/empty-state-coin.svg'
+import NoTransactionBgIcon from 'ui/src/assets/icons/empty-state-transaction.svg'
+
+export const NoTransactions = memo(function _NoTransactions() {
+  const colors = useSporeColors()
+  return (
+    <Flex mb="$spacing24">
+      <OverlayIcon
+        bottom={-23}
+        icon={<NoTransactionBgIcon color={colors.neutral3.get()} />}
+        left={5}
+        overlay={<NoTransactionFgIcon color={colors.neutral3.get()} />}
+      />
+    </Flex>
+  )
+})
diff --git a/packages/wallet/src/components/input/AmountInput.test.tsx b/apps/mobile/src/components/input/AmountInput.test.tsx
similarity index 98%
rename from packages/wallet/src/components/input/AmountInput.test.tsx
rename to apps/mobile/src/components/input/AmountInput.test.tsx
index 0db833309a9..f67b1909938 100644
--- a/packages/wallet/src/components/input/AmountInput.test.tsx
+++ b/apps/mobile/src/components/input/AmountInput.test.tsx
@@ -1,4 +1,4 @@
-import { parseValue, replaceSeparators } from './AmountInput'
+import { parseValue, replaceSeparators } from 'src/components/input/AmountInput'
 
 describe(replaceSeparators, () => {
   describe('it can strip grouping separators', () => {
diff --git a/packages/wallet/src/components/input/AmountInput.tsx b/apps/mobile/src/components/input/AmountInput.tsx
similarity index 88%
rename from packages/wallet/src/components/input/AmountInput.tsx
rename to apps/mobile/src/components/input/AmountInput.tsx
index 35bc62abcc4..bb96a7ea703 100644
--- a/packages/wallet/src/components/input/AmountInput.tsx
+++ b/apps/mobile/src/components/input/AmountInput.tsx
@@ -1,15 +1,15 @@
-import { forwardRef, useCallback, useEffect, useMemo } from 'react'
+import React, { forwardRef, useCallback, useEffect, useMemo } from 'react'
 import { AppState, Keyboard, KeyboardTypeOptions, TextInput as NativeTextInput } from 'react-native'
 import { getNumberFormatSettings } from 'react-native-localize'
-import { TextInput, TextInputProps } from 'wallet/src/components/input/TextInput'
-import { FiatCurrencyInfo, useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
+import { TextInput, TextInputProps } from 'src/components/input/TextInput'
+import { useMoonpayFiatCurrencySupportInfo } from 'src/features/fiatOnRamp/hooks'
+import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 
 const numericInputRegex = RegExp('^\\d*(\\.\\d*)?$') // Matches only numeric values without commas
 
 type Props = {
   showCurrencySign: boolean
-  fiatCurrencyInfo?: FiatCurrencyInfo
   dimTextColor?: boolean
   maxDecimals?: number
 } & TextInputProps
@@ -94,7 +94,6 @@ export const AmountInput = forwardRef<NativeTextInput, Props>(function _AmountIn
     dimTextColor,
     showSoftInputOnFocus,
     maxDecimals,
-    fiatCurrencyInfo,
     ...rest
   },
   ref
@@ -105,7 +104,7 @@ export const AmountInput = forwardRef<NativeTextInput, Props>(function _AmountIn
   const invalidInput = value && !numericInputRegex.test(value)
 
   useEffect(() => {
-    // Resets input if non-numeric value is passed
+    // Resets input if non-numberic value is passed
     if (invalidInput) {
       onChangeText?.('')
     }
@@ -136,6 +135,7 @@ export const AmountInput = forwardRef<NativeTextInput, Props>(function _AmountIn
     ]
   )
 
+  const { moonpaySupportedFiatCurrency: currency } = useMoonpayFiatCurrencySupportInfo()
   const { addFiatSymbolToNumber } = useLocalizationContext()
 
   let formattedValue = replaceSeparators({
@@ -145,14 +145,13 @@ export const AmountInput = forwardRef<NativeTextInput, Props>(function _AmountIn
     groupingOverride: '',
     decimalOverride: decimalSeparator,
   })
-  formattedValue =
-    showCurrencySign && fiatCurrencyInfo
-      ? addFiatSymbolToNumber({
-          value: formattedValue,
-          currencyCode: fiatCurrencyInfo.code,
-          currencySymbol: fiatCurrencyInfo.symbol,
-        })
-      : formattedValue
+  formattedValue = showCurrencySign
+    ? addFiatSymbolToNumber({
+        value: formattedValue,
+        currencyCode: currency.code,
+        currencySymbol: currency.symbol,
+      })
+    : formattedValue
 
   const textInputProps: TextInputProps = useMemo(
     () => ({
@@ -172,7 +171,7 @@ export const AmountInput = forwardRef<NativeTextInput, Props>(function _AmountIn
         return
       }
       // Dismiss keyboard when app is foregrounded (showSoftInputOnFocus doesn't
-      // work when the app activates from the background)
+      // wotk when the app activates from the background)
       Keyboard.dismiss()
     })
 
diff --git a/packages/wallet/src/components/legacy/CurrencyInputPanelLegacy.tsx b/apps/mobile/src/components/input/CurrencyInputPanel.tsx
similarity index 93%
rename from packages/wallet/src/components/legacy/CurrencyInputPanelLegacy.tsx
rename to apps/mobile/src/components/input/CurrencyInputPanel.tsx
index 6c9dbe18288..fa13d010df3 100644
--- a/packages/wallet/src/components/legacy/CurrencyInputPanelLegacy.tsx
+++ b/apps/mobile/src/components/input/CurrencyInputPanel.tsx
@@ -1,5 +1,5 @@
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
-import { memo, useCallback, useEffect, useMemo, useRef } from 'react'
+import React, { memo, useCallback, useEffect, useMemo, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import {
   NativeSyntheticEvent,
@@ -7,16 +7,16 @@ import {
   TextInputProps,
   TextInputSelectionChangeEventData,
 } from 'react-native'
+import { useDynamicFontSizing } from 'src/app/hooks'
+import { AmountInput } from 'src/components/input/AmountInput'
+import { MaxAmountButton } from 'src/components/input/MaxAmountButton'
+import { Warning, WarningLabel } from 'src/components/modals/WarningModal/types'
+import { SelectTokenButton } from 'src/components/TokenSelector/SelectTokenButton'
 import { Flex, FlexProps, SpaceTokens, Text } from 'ui/src'
 import { fonts } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
-import { AmountInput } from 'wallet/src/components/input/AmountInput'
-import { MaxAmountButton } from 'wallet/src/components/input/MaxAmountButton'
-import { SelectTokenButton } from 'wallet/src/components/TokenSelector/SelectTokenButton'
 import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { Warning, WarningLabel } from 'wallet/src/features/transactions/WarningModal/types'
-import { useDynamicFontSizing } from 'wallet/src/utils/useDynamicFontSizing'
 
 type CurrentInputPanelProps = {
   currencyInfo: Maybe<CurrencyInfo>
@@ -285,9 +285,4 @@ export function _CurrencyInputPanel(props: CurrentInputPanelProps): JSX.Element
   )
 }
 
-/**
- * @deprecated
- * Flows should use the new CurrencyInputPanel component instead of this one.
- * Requires small changes in the props.
- */
-export const CurrencyInputPanelLegacy = memo(_CurrencyInputPanel)
+export const CurrencyInputPanel = memo(_CurrencyInputPanel)
diff --git a/packages/wallet/src/components/legacy/DecimalPadLegacy.tsx b/apps/mobile/src/components/input/DecimalPad.tsx
similarity index 95%
rename from packages/wallet/src/components/legacy/DecimalPadLegacy.tsx
rename to apps/mobile/src/components/input/DecimalPad.tsx
index bc30059450c..c9009c4f31b 100644
--- a/packages/wallet/src/components/legacy/DecimalPadLegacy.tsx
+++ b/apps/mobile/src/components/input/DecimalPad.tsx
@@ -1,5 +1,5 @@
 import { ImpactFeedbackStyle } from 'expo-haptics'
-import { memo, useMemo } from 'react'
+import React, { memo, useMemo } from 'react'
 import { I18nManager, TextInputProps } from 'react-native'
 import { AnimatedFlex, Flex, Icons, Text, TouchableArea } from 'ui/src'
 import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
@@ -43,11 +43,6 @@ interface DecimalPadProps {
   hasCurrencyPrefix?: boolean
 }
 
-/**
- * TODO:
- * This component is depracted and should be replaced with DecimalPadInput, which is being used
- * int he new swap components.
- */
 export function _DecimalPad({
   setValue,
   value = '',
@@ -243,8 +238,4 @@ function KeyButton({
   )
 }
 
-/**
- * @deprecated Use DecimalPadInput instead.
- * Mostly similar but requires a few prop changes.
- */
-export const DecimalPadLegacy = memo(_DecimalPad)
+export const DecimalPad = memo(_DecimalPad)
diff --git a/packages/wallet/src/components/input/MaxAmountButton.tsx b/apps/mobile/src/components/input/MaxAmountButton.tsx
similarity index 87%
rename from packages/wallet/src/components/input/MaxAmountButton.tsx
rename to apps/mobile/src/components/input/MaxAmountButton.tsx
index b05f19bd2e3..0a7d3532f7a 100644
--- a/packages/wallet/src/components/input/MaxAmountButton.tsx
+++ b/apps/mobile/src/components/input/MaxAmountButton.tsx
@@ -1,10 +1,11 @@
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleProp, ViewStyle } from 'react-native'
+import Trace from 'src/components/Trace/Trace'
+import { ElementName } from 'src/features/telemetry/constants'
+import { maxAmountSpend } from 'src/utils/balance'
 import { Text, TouchableArea } from 'ui/src'
-import { Trace } from 'utilities/src/telemetry/trace/Trace'
-import { ElementName } from 'wallet/src/telemetry/constants'
-import { maxAmountSpend } from 'wallet/src/utils/balance'
 
 interface MaxAmountButtonProps {
   currencyAmount: CurrencyAmount<Currency> | null | undefined
diff --git a/apps/mobile/src/components/input/PasswordInput.tsx b/apps/mobile/src/components/input/PasswordInput.tsx
index c20427024e6..4a909f9c258 100644
--- a/apps/mobile/src/components/input/PasswordInput.tsx
+++ b/apps/mobile/src/components/input/PasswordInput.tsx
@@ -1,10 +1,10 @@
 import React, { forwardRef, useState } from 'react'
 import { TextInput as NativeTextInput } from 'react-native'
+import { TextInput, TextInputProps } from 'src/components/input/TextInput'
 import { AnimatedFlex, Flex, TouchableArea, useSporeColors } from 'ui/src'
 import EyeOffIcon from 'ui/src/assets/icons/eye-off.svg'
 import EyeIcon from 'ui/src/assets/icons/eye.svg'
 import { iconSizes } from 'ui/src/theme'
-import { TextInput, TextInputProps } from 'wallet/src/components/input/TextInput'
 
 export const PasswordInput = forwardRef<NativeTextInput, TextInputProps>(function _PasswordInput(
   props,
@@ -23,11 +23,10 @@ export const PasswordInput = forwardRef<NativeTextInput, TextInputProps>(functio
     <Flex
       centered
       row
-      backgroundColor="$surface1"
+      backgroundColor="$surface2"
       borderColor="$surface3"
-      borderRadius="$rounded16"
-      borderWidth={1}
-      p="$spacing4">
+      borderRadius="$rounded12"
+      borderWidth={1}>
       <AnimatedFlex fill grow row alignItems="center" minHeight={48}>
         <TextInput
           ref={ref}
diff --git a/packages/wallet/src/components/input/RecipientInputPanel.tsx b/apps/mobile/src/components/input/RecipientInputPanel.tsx
similarity index 78%
rename from packages/wallet/src/components/input/RecipientInputPanel.tsx
rename to apps/mobile/src/components/input/RecipientInputPanel.tsx
index 81165ab5361..107fb8a30fe 100644
--- a/packages/wallet/src/components/input/RecipientInputPanel.tsx
+++ b/apps/mobile/src/components/input/RecipientInputPanel.tsx
@@ -1,9 +1,10 @@
+import React from 'react'
 import { useTranslation } from 'react-i18next'
+import { AddressDisplay } from 'src/components/AddressDisplay'
+import { ElementName } from 'src/features/telemetry/constants'
+import { useAllTransactionsBetweenAddresses } from 'src/features/transactions/hooks'
 import { Flex, Icons, Text, TouchableArea } from 'ui/src'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
-import { useAllTransactionsBetweenAddresses } from 'wallet/src/features/transactions/hooks/useAllTransactionsBetweenAddresses'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 interface RecipientInputPanelProps {
   recipientAddress: string
@@ -26,12 +27,7 @@ export function RecipientInputPanel({
       onPress={onToggleShowRecipientSelector}>
       <Flex gap="$spacing8" py="$spacing24">
         <Flex centered row gap="$spacing4">
-          <AddressDisplay
-            hideAddressInSubtitle
-            includeUnitagSuffix
-            address={recipientAddress}
-            variant="heading3"
-          />
+          <AddressDisplay hideAddressInSubtitle address={recipientAddress} variant="heading3" />
           <Icons.RotatableChevron color="$neutral1" direction="end" />
         </Flex>
 
diff --git a/packages/wallet/src/features/search/SearchTextInput.tsx b/apps/mobile/src/components/input/SearchTextInput.tsx
similarity index 95%
rename from packages/wallet/src/features/search/SearchTextInput.tsx
rename to apps/mobile/src/components/input/SearchTextInput.tsx
index ab556b061ef..d656f8d7be1 100644
--- a/packages/wallet/src/features/search/SearchTextInput.tsx
+++ b/apps/mobile/src/components/input/SearchTextInput.tsx
@@ -1,4 +1,4 @@
-import { forwardRef, useCallback, useState } from 'react'
+import React, { forwardRef, useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import {
   Keyboard,
@@ -7,6 +7,8 @@ import {
   TextInput as NativeTextInput,
   TextInputFocusEventData,
 } from 'react-native'
+import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
+import { MobileEventName } from 'src/features/telemetry/constants'
 import {
   AnimatePresence,
   Button,
@@ -21,8 +23,6 @@ import {
 } from 'ui/src'
 import { fonts, spacing } from 'ui/src/theme'
 import { SHADOW_OFFSET_SMALL } from 'wallet/src/components/BaseCard/BaseCard'
-import { sendWalletAnalyticsEvent } from 'wallet/src/telemetry'
-import { WalletEventName } from 'wallet/src/telemetry/constants'
 
 export const springConfig = {
   stiffness: 1000,
@@ -71,7 +71,7 @@ export const SearchTextInput = forwardRef<NativeTextInput, SearchTextInputProps>
       setIsFocus(false)
       setShowClearButton(false)
       Keyboard.dismiss()
-      sendWalletAnalyticsEvent(WalletEventName.ExploreSearchCancel, { query: value })
+      sendMobileAnalyticsEvent(MobileEventName.ExploreSearchCancel, { query: value })
       onChangeText?.('')
       onCancel?.()
     }
diff --git a/packages/wallet/src/components/input/TextInput.tsx b/apps/mobile/src/components/input/TextInput.tsx
similarity index 95%
rename from packages/wallet/src/components/input/TextInput.tsx
rename to apps/mobile/src/components/input/TextInput.tsx
index a6d2193836a..b2cacf81ab2 100644
--- a/packages/wallet/src/components/input/TextInput.tsx
+++ b/apps/mobile/src/components/input/TextInput.tsx
@@ -1,4 +1,4 @@
-import { forwardRef } from 'react'
+import React, { forwardRef } from 'react'
 import { TextInput as TextInputBase } from 'react-native'
 import { Input, InputProps, useSporeColors } from 'ui/src'
 
diff --git a/apps/mobile/src/components/input/__snapshots__/SelectionCircle.test.tsx.snap b/apps/mobile/src/components/input/__snapshots__/SelectionCircle.test.tsx.snap
index 3bc395c4674..f8f9feaa7b6 100644
--- a/apps/mobile/src/components/input/__snapshots__/SelectionCircle.test.tsx.snap
+++ b/apps/mobile/src/components/input/__snapshots__/SelectionCircle.test.tsx.snap
@@ -28,6 +28,7 @@ exports[`renders selection circle 1`] = `
   <View
     style={
       {
+        "alignItems": "stretch",
         "backgroundColor": "#FC72FF",
         "borderBottomLeftRadius": 999999,
         "borderBottomRightRadius": 999999,
diff --git a/apps/mobile/src/components/layout/screens/HeaderScrollScreen.tsx b/apps/mobile/src/components/layout/screens/HeaderScrollScreen.tsx
index 5fe6061e343..877c304abee 100644
--- a/apps/mobile/src/components/layout/screens/HeaderScrollScreen.tsx
+++ b/apps/mobile/src/components/layout/screens/HeaderScrollScreen.tsx
@@ -6,9 +6,9 @@ import { Screen } from 'src/components/layout/Screen'
 import { HorizontalEdgeGestureTarget } from 'src/components/layout/screens/EdgeGestureTarget'
 import { ScrollHeader } from 'src/components/layout/screens/ScrollHeader'
 import { VirtualizedList } from 'src/components/layout/VirtualizedList'
+import { HandleBar } from 'src/components/modals/HandleBar'
 import { ColorTokens, Flex, flexStyles, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
-import { HandleBar } from 'wallet/src/components/modals/HandleBar'
 
 // Distance to scroll to show scrolled state header elements
 const SHOW_HEADER_SCROLL_Y_DISTANCE = 50
diff --git a/apps/mobile/src/components/layout/screens/ScrollHeader.tsx b/apps/mobile/src/components/layout/screens/ScrollHeader.tsx
index e6f500bff61..c571e3d4ae5 100644
--- a/apps/mobile/src/components/layout/screens/ScrollHeader.tsx
+++ b/apps/mobile/src/components/layout/screens/ScrollHeader.tsx
@@ -3,8 +3,8 @@ import React, { ReactElement, useMemo } from 'react'
 import { StyleProp, ViewStyle } from 'react-native'
 import Animated, {
   Extrapolate,
-  SharedValue,
   interpolate,
+  SharedValue,
   useAnimatedStyle,
 } from 'react-native-reanimated'
 import { BackButton } from 'src/components/buttons/BackButton'
diff --git a/packages/wallet/src/components/loading/SpinningLoader.tsx b/apps/mobile/src/components/loading/SpinningLoader.tsx
similarity index 94%
rename from packages/wallet/src/components/loading/SpinningLoader.tsx
rename to apps/mobile/src/components/loading/SpinningLoader.tsx
index 560788b6555..132f0d74f73 100644
--- a/packages/wallet/src/components/loading/SpinningLoader.tsx
+++ b/apps/mobile/src/components/loading/SpinningLoader.tsx
@@ -1,4 +1,4 @@
-import { useEffect } from 'react'
+import React, { useEffect } from 'react'
 import {
   cancelAnimation,
   Easing,
@@ -28,7 +28,7 @@ export function SpinningLoader({
         },
       ],
     }
-  }, [rotation])
+  }, [rotation.value])
 
   useEffect(() => {
     rotation.value = withRepeat(
diff --git a/packages/ui/src/loading/TokenLoader.tsx b/apps/mobile/src/components/loading/TokenLoader.tsx
similarity index 88%
rename from packages/ui/src/loading/TokenLoader.tsx
rename to apps/mobile/src/components/loading/TokenLoader.tsx
index 3f0e8782490..f5f7abea82b 100644
--- a/packages/ui/src/loading/TokenLoader.tsx
+++ b/apps/mobile/src/components/loading/TokenLoader.tsx
@@ -1,13 +1,12 @@
-import { Flex } from 'ui/src/components/layout'
-import { Text } from 'ui/src/components/text'
+import React from 'react'
+import { Flex, Text } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
+import { TOKEN_BALANCE_ITEM_HEIGHT } from 'wallet/src/features/portfolio/TokenBalanceItem'
 
 interface TokenLoaderProps {
   opacity: number
 }
 
-const TOKEN_BALANCE_ITEM_HEIGHT = 56
-
 export function TokenLoader({ opacity }: TokenLoaderProps): JSX.Element {
   return (
     <Flex
diff --git a/apps/mobile/src/components/loading/__snapshots__/WalletLoader.test.tsx.snap b/apps/mobile/src/components/loading/__snapshots__/WalletLoader.test.tsx.snap
index d39184aca0a..394dfbb2950 100644
--- a/apps/mobile/src/components/loading/__snapshots__/WalletLoader.test.tsx.snap
+++ b/apps/mobile/src/components/loading/__snapshots__/WalletLoader.test.tsx.snap
@@ -43,6 +43,7 @@ exports[`renders wallet loader 1`] = `
     <View
       style={
         {
+          "alignItems": "stretch",
           "backgroundColor": "#CECECE",
           "borderBottomLeftRadius": 999999,
           "borderBottomRightRadius": 999999,
@@ -67,6 +68,7 @@ exports[`renders wallet loader 1`] = `
         onLayout={[Function]}
         style={
           {
+            "alignItems": "stretch",
             "flexDirection": "column",
             "opacity": 0,
           }
@@ -115,6 +117,7 @@ exports[`renders wallet loader 1`] = `
             <View
               style={
                 {
+                  "alignItems": "stretch",
                   "backgroundColor": "#F9F9F9",
                   "borderBottomLeftRadius": 4,
                   "borderBottomRightRadius": 4,
@@ -136,6 +139,7 @@ exports[`renders wallet loader 1`] = `
         onLayout={[Function]}
         style={
           {
+            "alignItems": "stretch",
             "flexDirection": "column",
             "opacity": 0,
           }
@@ -184,6 +188,7 @@ exports[`renders wallet loader 1`] = `
             <View
               style={
                 {
+                  "alignItems": "stretch",
                   "backgroundColor": "#F9F9F9",
                   "borderBottomLeftRadius": 4,
                   "borderBottomRightRadius": 4,
diff --git a/apps/mobile/src/components/loading/index.tsx b/apps/mobile/src/components/loading/index.tsx
index 237674e36e9..e8fac1092d1 100644
--- a/apps/mobile/src/components/loading/index.tsx
+++ b/apps/mobile/src/components/loading/index.tsx
@@ -1,4 +1,5 @@
 import React, { memo } from 'react'
+import { TokenLoader } from 'src/components/loading/TokenLoader'
 import { TransactionLoader } from 'src/components/loading/TransactionLoader'
 import { WalletLoader } from 'src/components/loading/WalletLoader'
 import { WaveLoader } from 'src/components/loading/WaveLoader'
@@ -26,6 +27,20 @@ function Wallets({ repeat = 1 }: { repeat?: number }): JSX.Element {
   )
 }
 
+function Token({ repeat = 1, contrast }: { repeat?: number; contrast?: boolean }): JSX.Element {
+  return (
+    <Skeleton contrast={contrast}>
+      <Flex grow gap="$spacing4">
+        {new Array(repeat).fill(null).map((_, i, { length }) => (
+          <React.Fragment key={i}>
+            <TokenLoader opacity={(length - i) / length} />
+          </React.Fragment>
+        ))}
+      </Flex>
+    </Skeleton>
+  )
+}
+
 export const Transaction = memo(function _Transaction({
   repeat = 1,
 }: {
@@ -71,6 +86,7 @@ function Favorite({ height, contrast }: { height?: number; contrast?: boolean })
 
 export const Loader = {
   Box,
+  Token,
   Transaction,
   Wallets,
   Graph,
diff --git a/apps/mobile/src/components/mnemonic/SeedPhraseDisplay.tsx b/apps/mobile/src/components/mnemonic/SeedPhraseDisplay.tsx
index 8af6474b970..349283bee1a 100644
--- a/apps/mobile/src/components/mnemonic/SeedPhraseDisplay.tsx
+++ b/apps/mobile/src/components/mnemonic/SeedPhraseDisplay.tsx
@@ -4,12 +4,12 @@ import { useTranslation } from 'react-i18next'
 import { usePrevious } from 'react-native-wagmi-charts'
 import { HiddenMnemonicWordView } from 'src/components/mnemonic/HiddenMnemonicWordView'
 import { MnemonicDisplay } from 'src/components/mnemonic/MnemonicDisplay'
+import { WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
 import { useBiometricAppSettings, useBiometricPrompt } from 'src/features/biometrics/hooks'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { useWalletRestore } from 'src/features/wallet/hooks'
 import { Button, Flex } from 'ui/src'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 
 type Props = {
   mnemonicId: string
diff --git a/packages/wallet/src/components/modals/ActionSheetModal.tsx b/apps/mobile/src/components/modals/ActionSheetModal.tsx
similarity index 91%
rename from packages/wallet/src/components/modals/ActionSheetModal.tsx
rename to apps/mobile/src/components/modals/ActionSheetModal.tsx
index 6039e6100c5..93c1045a69c 100644
--- a/packages/wallet/src/components/modals/ActionSheetModal.tsx
+++ b/apps/mobile/src/components/modals/ActionSheetModal.tsx
@@ -1,9 +1,9 @@
-import { ReactNode } from 'react'
+import React, { ReactNode } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ScrollView } from 'react-native-gesture-handler'
+import { BottomSheetDetachedModal } from 'src/components/modals/BottomSheetModal'
+import { ModalName } from 'src/features/telemetry/constants'
 import { Flex, flexStyles, Text, TouchableArea, useDeviceDimensions } from 'ui/src'
-import { BottomSheetDetachedModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { ModalNameType } from 'wallet/src/telemetry/constants'
 
 export interface MenuItemProp {
   key: string
@@ -62,7 +62,7 @@ export function ActionSheetModalContent(props: ActionSheetModalContentProps): JS
 
 interface ActionSheetModalProps extends ActionSheetModalContentProps {
   isVisible: boolean
-  name: ModalNameType
+  name: ModalName
 }
 
 export function ActionSheetModal({
diff --git a/packages/wallet/src/components/modals/BottomSheetContext.tsx b/apps/mobile/src/components/modals/BottomSheetContext.tsx
similarity index 100%
rename from packages/wallet/src/components/modals/BottomSheetContext.tsx
rename to apps/mobile/src/components/modals/BottomSheetContext.tsx
diff --git a/apps/mobile/src/components/modals/BottomSheetModal.tsx b/apps/mobile/src/components/modals/BottomSheetModal.tsx
new file mode 100644
index 00000000000..0499fb2c8e3
--- /dev/null
+++ b/apps/mobile/src/components/modals/BottomSheetModal.tsx
@@ -0,0 +1,438 @@
+import {
+  BottomSheetBackdrop,
+  BottomSheetBackdropProps,
+  BottomSheetHandleProps,
+  BottomSheetModal as BaseModal,
+  BottomSheetView,
+  useBottomSheetDynamicSnapPoints,
+} from '@gorhom/bottom-sheet'
+import { BlurView } from 'expo-blur'
+import React, {
+  ComponentProps,
+  forwardRef,
+  PropsWithChildren,
+  useCallback,
+  useEffect,
+  useImperativeHandle,
+  useRef,
+  useState,
+} from 'react'
+import {
+  BackHandler,
+  Keyboard,
+  LayoutChangeEvent,
+  StyleProp,
+  StyleSheet,
+  ViewStyle,
+} from 'react-native'
+import Animated, {
+  Extrapolate,
+  interpolate,
+  useAnimatedStyle,
+  useSharedValue,
+} from 'react-native-reanimated'
+import { BottomSheetContextProvider } from 'src/components/modals/BottomSheetContext'
+import { HandleBar } from 'src/components/modals/HandleBar'
+import Trace from 'src/components/Trace/Trace'
+import { ModalName } from 'src/features/telemetry/constants'
+import { useKeyboardLayout } from 'src/utils/useKeyboardLayout'
+import {
+  DynamicColor,
+  Flex,
+  useDeviceDimensions,
+  useDeviceInsets,
+  useMedia,
+  useSporeColors,
+} from 'ui/src'
+import { borderRadii, spacing } from 'ui/src/theme'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
+import { isAndroid, isIOS } from 'wallet/src/utils/platform'
+
+/**
+ * (android only)
+ * Adds a back handler to the modal that dismisses it when the back button is pressed.
+ *
+ * @param modalRef - ref to the modal
+ * @param enabled - whether to enable the back handler
+ */
+function useModalBackHandler(modalRef: React.RefObject<BaseModal>, enabled: boolean): void {
+  useEffect(() => {
+    if (enabled) {
+      const subscription = BackHandler.addEventListener('hardwareBackPress', () => {
+        modalRef.current?.close()
+        return true
+      })
+
+      return subscription.remove
+    }
+  }, [modalRef, enabled])
+}
+
+type Props = PropsWithChildren<{
+  animatedPosition?: Animated.SharedValue<number>
+  hideHandlebar?: boolean
+  name: ModalName
+  onClose?: () => void
+  snapPoints?: Array<string | number>
+  stackBehavior?: ComponentProps<typeof BaseModal>['stackBehavior']
+  containerComponent?: ComponentProps<typeof BaseModal>['containerComponent']
+  footerComponent?: ComponentProps<typeof BaseModal>['footerComponent']
+  fullScreen?: boolean
+  backgroundColor?: DynamicColor
+  blurredBackground?: boolean
+  dismissOnBackPress?: boolean
+  isDismissible?: boolean
+  overrideInnerContainer?: boolean
+  renderBehindTopInset?: boolean
+  renderBehindBottomInset?: boolean
+  hideKeyboardOnDismiss?: boolean
+  hideKeyboardOnSwipeDown?: boolean
+  // extend the sheet to its maximum snap point when keyboard is visible
+  extendOnKeyboardVisible?: boolean
+}>
+
+const BACKDROP_APPEARS_ON_INDEX = 0
+const DISAPPEARS_ON_INDEX = -1
+const DRAG_ACTIVATION_OFFSET = 40
+
+const Backdrop = (props: BottomSheetBackdropProps): JSX.Element => {
+  return (
+    <BottomSheetBackdrop
+      {...props}
+      appearsOnIndex={BACKDROP_APPEARS_ON_INDEX}
+      disappearsOnIndex={DISAPPEARS_ON_INDEX}
+      opacity={0.4}
+    />
+  )
+}
+
+const CONTENT_HEIGHT_SNAP_POINTS = ['CONTENT_HEIGHT']
+
+export type BottomSheetModalRef = {
+  handleContentLayout: (event: LayoutChangeEvent) => void
+}
+
+export const BottomSheetModal = forwardRef<BottomSheetModalRef, Props>(function BottomSheetModal(
+  {
+    children,
+    name,
+    onClose,
+    snapPoints = CONTENT_HEIGHT_SNAP_POINTS,
+    stackBehavior = 'push',
+    animatedPosition: providedAnimatedPosition,
+    containerComponent,
+    footerComponent,
+    fullScreen,
+    hideHandlebar,
+    backgroundColor,
+    blurredBackground = false,
+    dismissOnBackPress = true,
+    isDismissible = true,
+    overrideInnerContainer = false,
+    renderBehindTopInset = false,
+    renderBehindBottomInset = false,
+    hideKeyboardOnDismiss = false,
+    hideKeyboardOnSwipeDown = false,
+    // keyboardBehavior="extend" does not work and it's hard to figure why,
+    // probably it requires usage of <BottomSheetTextInput>
+    extendOnKeyboardVisible = false,
+  },
+  ref
+): JSX.Element {
+  const dimensions = useDeviceDimensions()
+  const insets = useDeviceInsets()
+  const modalRef = useRef<BaseModal>(null)
+  const keyboard = useKeyboardLayout()
+
+  const { animatedHandleHeight, animatedSnapPoints, animatedContentHeight, handleContentLayout } =
+    useBottomSheetDynamicSnapPoints(snapPoints)
+  const [isSheetReady, setIsSheetReady] = useState(false)
+
+  useModalBackHandler(modalRef, isDismissible && dismissOnBackPress)
+
+  useEffect(() => {
+    modalRef.current?.present()
+    // Close modal when it is unmounted
+    return modalRef.current?.close
+  }, [modalRef])
+
+  useEffect(() => {
+    if (extendOnKeyboardVisible && keyboard.isVisible) {
+      modalRef.current?.expand()
+    }
+  }, [extendOnKeyboardVisible, keyboard.isVisible])
+
+  const internalAnimatedPosition = useSharedValue(0)
+  const animatedPosition = providedAnimatedPosition ?? internalAnimatedPosition
+
+  const colors = useSporeColors()
+  const isDarkMode = useIsDarkMode()
+  const media = useMedia()
+
+  const backgroundColorValue = blurredBackground
+    ? colors.transparent.val
+    : backgroundColor ?? colors.surface1.get()
+
+  const renderBackdrop = useCallback(
+    (props: BottomSheetBackdropProps) => (
+      <BottomSheetBackdrop
+        {...props}
+        appearsOnIndex={BACKDROP_APPEARS_ON_INDEX}
+        disappearsOnIndex={DISAPPEARS_ON_INDEX}
+        opacity={blurredBackground ? 0.2 : 0.4}
+        pressBehavior={isDismissible ? 'close' : 'none'}
+      />
+    ),
+    [blurredBackground, isDismissible]
+  )
+
+  const renderHandleBar = useCallback(
+    (props: BottomSheetHandleProps) => {
+      // This adds an extra gap of unwanted space
+      if (renderBehindTopInset && hideHandlebar) {
+        return null
+      }
+      return (
+        <HandleBar
+          {...props}
+          backgroundColor={backgroundColorValue}
+          containerFlexStyles={{
+            paddingBottom: spacing.spacing12,
+            paddingTop: spacing.spacing16,
+          }}
+          hidden={hideHandlebar}
+        />
+      )
+    },
+    [backgroundColorValue, hideHandlebar, renderBehindTopInset]
+  )
+
+  const animatedBorderRadius = useAnimatedStyle(() => {
+    const interpolatedRadius = interpolate(
+      animatedPosition.value,
+      [0, insets.top],
+      [0, borderRadius ?? borderRadii.rounded24],
+      Extrapolate.CLAMP
+    )
+    return { borderTopLeftRadius: interpolatedRadius, borderTopRightRadius: interpolatedRadius }
+  })
+
+  const renderBlurredBg = useCallback(
+    () => (
+      <Animated.View style={[blurViewStyle.base, animatedBorderRadius]}>
+        {isIOS ? (
+          <BlurView
+            intensity={90}
+            style={blurViewStyle.base}
+            tint={isDarkMode ? 'dark' : 'light'}
+          />
+        ) : (
+          <Flex fill bg="$surface2" />
+        )}
+      </Animated.View>
+    ),
+    [isDarkMode, animatedBorderRadius]
+  )
+
+  // onAnimate is called when the sheet is about to animate to a new position.
+  // `About to` is crucial here, because we want to trigger these actions as soon as possible.
+  // See here: https://gorhom.github.io/react-native-bottom-sheet/props#onanimate
+  const onAnimate = useCallback(
+    // We want to start hiding the keyboard during the process of hiding the sheet.
+    (fromIndex: number, toIndex: number): void => {
+      if (
+        (hideKeyboardOnDismiss && toIndex === DISAPPEARS_ON_INDEX) ||
+        (hideKeyboardOnSwipeDown && toIndex < fromIndex)
+      ) {
+        Keyboard.dismiss()
+      }
+
+      // When a sheet has too much content it can lag and take a while to begin opening, so we want to delay rendering some of the content until the sheet is ready.
+      // We consider the sheet to be "ready" as soon as it starts animating from the bottom to the top.
+      // We add a short delay given that this callback is called when the sheet is "about to" animate.
+      if (!isSheetReady && fromIndex === -1 && toIndex === 0) {
+        setTimeout(() => setIsSheetReady(true), 50)
+      }
+    },
+    [hideKeyboardOnDismiss, hideKeyboardOnSwipeDown, isSheetReady]
+  )
+
+  // on screens < xs (iPhone SE), assume no rounded corners on screen and remove rounded corners from fullscreen modal
+  const borderRadius = media.short ? borderRadii.none : borderRadii.rounded24
+
+  const hiddenHandlebarStyle = {
+    borderTopLeftRadius: borderRadius,
+    borderTopRightRadius: borderRadius,
+  }
+
+  const background = blurredBackground ? { backgroundComponent: renderBlurredBg } : undefined
+  const backdrop = { backdropComponent: renderBackdrop }
+
+  const backgroundStyle = {
+    backgroundColor: backgroundColorValue,
+  }
+
+  const bottomSheetViewStyles: StyleProp<ViewStyle> = [{ backgroundColor: backgroundColorValue }]
+
+  const handleBarHeight = hideHandlebar
+    ? 0
+    : spacing.spacing12 + spacing.spacing16 + spacing.spacing4
+  let fullContentHeight = dimensions.fullHeight - insets.top - handleBarHeight
+
+  if (renderBehindTopInset) {
+    bottomSheetViewStyles.push(bottomSheetStyle.behindInset)
+    if (hideHandlebar) {
+      bottomSheetViewStyles.push(animatedBorderRadius)
+    }
+    fullContentHeight += insets.top
+  } else if (hideHandlebar) {
+    bottomSheetViewStyles.push(hiddenHandlebarStyle)
+  }
+  if (!renderBehindBottomInset) {
+    bottomSheetViewStyles.push({ paddingBottom: insets.bottom })
+  }
+  // Add the calculated height only if the sheet is full screen
+  // (otherwise, rely on the dynamic sizing of the sheet)
+  if (fullScreen) {
+    bottomSheetViewStyles.push({ height: fullContentHeight })
+  }
+
+  useImperativeHandle(
+    ref,
+    () => ({
+      handleContentLayout,
+    }),
+    [handleContentLayout]
+  )
+
+  return (
+    <BaseModal
+      {...background}
+      {...backdrop}
+      ref={modalRef}
+      // This is required for android to make scrollable containers work
+      // and allow closing the modal by dragging the content
+      // (adding this property on iOS breaks closing the modal by dragging the content)
+      activeOffsetY={isAndroid ? [-DRAG_ACTIVATION_OFFSET, DRAG_ACTIVATION_OFFSET] : undefined}
+      animatedPosition={animatedPosition}
+      backgroundStyle={backgroundStyle}
+      containerComponent={containerComponent}
+      contentHeight={animatedContentHeight}
+      enableContentPanningGesture={isDismissible}
+      enableHandlePanningGesture={isDismissible}
+      footerComponent={footerComponent}
+      handleComponent={renderHandleBar}
+      handleHeight={animatedHandleHeight}
+      snapPoints={animatedSnapPoints}
+      stackBehavior={stackBehavior}
+      topInset={renderBehindTopInset ? 0 : insets.top}
+      onAnimate={onAnimate}
+      onDismiss={onClose}>
+      <Trace logImpression modal={name}>
+        {overrideInnerContainer ? (
+          children
+        ) : (
+          <BottomSheetView style={bottomSheetViewStyles} onLayout={handleContentLayout}>
+            <BottomSheetContextProvider isSheetReady={isSheetReady}>
+              {children}
+            </BottomSheetContextProvider>
+          </BottomSheetView>
+        )}
+      </Trace>
+    </BaseModal>
+  )
+})
+
+export function BottomSheetDetachedModal({
+  children,
+  name,
+  onClose,
+  snapPoints = CONTENT_HEIGHT_SNAP_POINTS,
+  stackBehavior = 'push',
+  isDismissible = true,
+  dismissOnBackPress = true,
+  fullScreen,
+  hideHandlebar,
+  backgroundColor,
+}: Props): JSX.Element {
+  const insets = useDeviceInsets()
+  const dimensions = useDeviceDimensions()
+  const modalRef = useRef<BaseModal>(null)
+  const colors = useSporeColors()
+
+  const { animatedHandleHeight, animatedSnapPoints, animatedContentHeight, handleContentLayout } =
+    useBottomSheetDynamicSnapPoints(snapPoints)
+
+  useModalBackHandler(modalRef, isDismissible && dismissOnBackPress)
+
+  useEffect(() => {
+    modalRef.current?.present()
+    // Close modal when it is unmounted
+    return modalRef.current?.close
+  }, [modalRef])
+
+  const renderHandleBar = useCallback(
+    (props: BottomSheetHandleProps) => {
+      return <HandleBar {...props} backgroundColor={backgroundColor} hidden={hideHandlebar} />
+    },
+    [backgroundColor, hideHandlebar]
+  )
+
+  const backgroundStyle = hideHandlebar
+    ? bottomSheetStyle.modalTransparent
+    : {
+        backgroundColor: backgroundColor ?? colors.surface1.get(),
+      }
+  const handleBarHeight = hideHandlebar ? 0 : spacing.spacing4
+  const fullContentHeight = dimensions.fullHeight - insets.top - handleBarHeight
+
+  return (
+    <BaseModal
+      ref={modalRef}
+      // This is required for android to make scrollable containers work
+      // and allow closing the modal by dragging the content
+      // (adding this property on iOS breaks closing the modal by dragging the content)
+      activeOffsetY={isAndroid ? [-DRAG_ACTIVATION_OFFSET, DRAG_ACTIVATION_OFFSET] : undefined}
+      backdropComponent={Backdrop}
+      backgroundStyle={backgroundStyle}
+      bottomInset={insets.bottom}
+      contentHeight={animatedContentHeight}
+      detached={true}
+      enableContentPanningGesture={isDismissible}
+      handleComponent={renderHandleBar}
+      handleHeight={animatedHandleHeight}
+      snapPoints={animatedSnapPoints}
+      stackBehavior={stackBehavior}
+      style={bottomSheetStyle.detached}
+      topInset={insets.top}
+      onDismiss={onClose}>
+      <Trace logImpression modal={name}>
+        <BottomSheetView
+          style={fullScreen ? { height: fullContentHeight } : undefined}
+          onLayout={handleContentLayout}>
+          {children}
+        </BottomSheetView>
+      </Trace>
+    </BaseModal>
+  )
+}
+
+const bottomSheetStyle = StyleSheet.create({
+  behindInset: {
+    overflow: 'hidden',
+  },
+  detached: {
+    marginHorizontal: spacing.spacing12,
+  },
+  modalTransparent: {
+    backgroundColor: 'transparent',
+    borderRadius: 0,
+  },
+})
+
+const blurViewStyle = StyleSheet.create({
+  base: {
+    ...StyleSheet.absoluteFillObject,
+    overflow: 'hidden',
+  },
+})
diff --git a/packages/wallet/src/components/modals/HandleBar.tsx b/apps/mobile/src/components/modals/HandleBar.tsx
similarity index 98%
rename from packages/wallet/src/components/modals/HandleBar.tsx
rename to apps/mobile/src/components/modals/HandleBar.tsx
index 5613c7fa5c0..4c4cec6405d 100644
--- a/packages/wallet/src/components/modals/HandleBar.tsx
+++ b/apps/mobile/src/components/modals/HandleBar.tsx
@@ -1,3 +1,4 @@
+import React from 'react'
 import { ColorValue, FlexStyle } from 'react-native'
 import { Flex, useSporeColors } from 'ui/src'
 import { spacing } from 'ui/src/theme'
diff --git a/apps/mobile/src/components/modals/WarningModal/BlockedAddressModal.tsx b/apps/mobile/src/components/modals/WarningModal/BlockedAddressModal.tsx
new file mode 100644
index 00000000000..aac40d31933
--- /dev/null
+++ b/apps/mobile/src/components/modals/WarningModal/BlockedAddressModal.tsx
@@ -0,0 +1,22 @@
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
+import { ModalName } from 'src/features/telemetry/constants'
+
+export function BlockedAddressModal({ onClose }: { onClose: () => void }): JSX.Element {
+  const { t } = useTranslation()
+
+  return (
+    <WarningModal
+      caption={t(`This address is blocked on Uniswap Wallet because it is associated with one or more blocked activities. 
+
+If you believe this is an error, please email compliance@uniswap.org.`)}
+      closeText={t('I understand')}
+      modalName={ModalName.BlockedAddress}
+      severity={WarningSeverity.None}
+      title={t('Blocked address')}
+      onClose={onClose}
+    />
+  )
+}
diff --git a/packages/wallet/src/components/modals/WarningModal/WarningModal.tsx b/apps/mobile/src/components/modals/WarningModal/WarningModal.tsx
similarity index 74%
rename from packages/wallet/src/components/modals/WarningModal/WarningModal.tsx
rename to apps/mobile/src/components/modals/WarningModal/WarningModal.tsx
index 8327a74aa46..d205adbb468 100644
--- a/packages/wallet/src/components/modals/WarningModal/WarningModal.tsx
+++ b/apps/mobile/src/components/modals/WarningModal/WarningModal.tsx
@@ -1,20 +1,22 @@
-import { PropsWithChildren, ReactNode } from 'react'
+import React, { PropsWithChildren, ReactNode } from 'react'
 import { ColorValue } from 'react-native'
-import { Button, Flex, Icons, Text, useSporeColors } from 'ui/src'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
+import { WarningColor, WarningSeverity } from 'src/components/modals/WarningModal/types'
+import { useBiometricAppSettings, useBiometricPrompt } from 'src/features/biometrics/hooks'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
+import { Button, Flex, Icons, Text, ThemeKeys, useSporeColors } from 'ui/src'
 import { opacify } from 'ui/src/theme'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { WarningColor, WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
-import { ElementName, ModalNameType } from 'wallet/src/telemetry/constants'
 
 export type WarningModalProps = {
   onClose?: () => void
   onCancel?: () => void
   onConfirm?: () => void
-  modalName: ModalNameType
+  modalName: ModalName
   title: string
   caption?: string
   closeText?: string
   confirmText?: string
+  useBiometric?: boolean
   severity?: WarningSeverity
   isDismissible?: boolean
   hideHandlebar?: boolean
@@ -26,7 +28,7 @@ export type WarningModalProps = {
 
 const WARNING_MODAL_BG_SIZE = 48
 
-export function WarningModal({
+export default function WarningModal({
   onClose,
   onCancel,
   onConfirm,
@@ -37,12 +39,24 @@ export function WarningModal({
   confirmText,
   severity = WarningSeverity.Medium,
   children,
+  useBiometric = false,
   isDismissible = true,
   hideHandlebar = false,
   icon,
   hideIcon,
   backgroundIconColor,
 }: PropsWithChildren<WarningModalProps>): JSX.Element {
+  const { requiredForTransactions } = useBiometricAppSettings()
+  const { trigger } = useBiometricPrompt(onConfirm)
+
+  const onPressConfirm = async (): Promise<void> => {
+    if (requiredForTransactions && useBiometric) {
+      await trigger()
+    } else {
+      onConfirm?.()
+    }
+  }
+
   const colors = useSporeColors()
   const alertColor = getAlertColor(severity)
   const alertColorValue = alertColor.text as keyof typeof colors
@@ -68,7 +82,13 @@ export function WarningModal({
             mb="$spacing8"
             minWidth={WARNING_MODAL_BG_SIZE}
             style={{
-              backgroundColor: backgroundIconColor ?? opacify(12, colors[alertColorValue].val),
+              backgroundColor:
+                backgroundIconColor ??
+                opacify(
+                  12,
+                  // TODO(MOB-1420): clean up types
+                  colors[alertColorValue as ThemeKeys].val
+                ),
             }}>
             {icon ?? <Icons.AlertTriangle color={alertColor.text} size="$icon.24" />}
           </Flex>
@@ -93,7 +113,7 @@ export function WarningModal({
               fill
               testID={ElementName.Confirm}
               theme={alertColor.buttonTheme}
-              onPress={onConfirm}>
+              onPress={onPressConfirm}>
               {confirmText}
             </Button>
           )}
diff --git a/packages/wallet/src/features/transactions/WarningModal/getNetworkWarning.ts b/apps/mobile/src/components/modals/WarningModal/constants.ts
similarity index 90%
rename from packages/wallet/src/features/transactions/WarningModal/getNetworkWarning.ts
rename to apps/mobile/src/components/modals/WarningModal/constants.ts
index 3f673ae9d73..f218b2435ff 100644
--- a/packages/wallet/src/features/transactions/WarningModal/getNetworkWarning.ts
+++ b/apps/mobile/src/components/modals/WarningModal/constants.ts
@@ -1,11 +1,11 @@
-import WifiIcon from 'ui/src/assets/icons/wifi-slash.svg'
-import { AppTFunction } from 'ui/src/i18n/types'
 import {
   Warning,
   WarningAction,
   WarningLabel,
   WarningSeverity,
-} from 'wallet/src/features/transactions/WarningModal/types'
+} from 'src/components/modals/WarningModal/types'
+import WifiIcon from 'ui/src/assets/icons/wifi-slash.svg'
+import { AppTFunction } from 'ui/src/i18n/types'
 
 export const getNetworkWarning = (t: AppTFunction): Warning => ({
   type: WarningLabel.NetworkError,
diff --git a/packages/wallet/src/features/transactions/WarningModal/types.ts b/apps/mobile/src/components/modals/WarningModal/types.ts
similarity index 100%
rename from packages/wallet/src/features/transactions/WarningModal/types.ts
rename to apps/mobile/src/components/modals/WarningModal/types.ts
diff --git a/packages/wallet/src/components/modals/hooks.ts b/apps/mobile/src/components/modals/hooks.ts
similarity index 100%
rename from packages/wallet/src/components/modals/hooks.ts
rename to apps/mobile/src/components/modals/hooks.ts
diff --git a/apps/mobile/src/components/notifications/Badge.tsx b/apps/mobile/src/components/notifications/Badge.tsx
index ddfeab6a0d2..2477a64ca4b 100644
--- a/apps/mobile/src/components/notifications/Badge.tsx
+++ b/apps/mobile/src/components/notifications/Badge.tsx
@@ -1,6 +1,6 @@
 import React, { memo, PropsWithChildren } from 'react'
+import { useSelectAddressHasNotifications } from 'src/features/notifications/hooks'
 import { Flex } from 'ui/src'
-import { useSelectAddressHasNotifications } from 'wallet/src/features/notifications/hooks'
 
 type Props = PropsWithChildren<{
   address: Address
diff --git a/apps/mobile/src/components/sortableGrid/SortableGrid.tsx b/apps/mobile/src/components/sortableGrid/SortableGrid.tsx
index 5224ada1f47..c2441572e5f 100644
--- a/apps/mobile/src/components/sortableGrid/SortableGrid.tsx
+++ b/apps/mobile/src/components/sortableGrid/SortableGrid.tsx
@@ -1,9 +1,9 @@
 import { memo, useRef } from 'react'
 import { LayoutChangeEvent, MeasureLayoutOnSuccessCallback, View } from 'react-native'
 import { Flex, FlexProps } from 'ui/src'
+import { useStableCallback } from './hooks'
 import SortableGridItem from './SortableGridItem'
 import SortableGridProvider, { useSortableGridContext } from './SortableGridProvider'
-import { useStableCallback } from './hooks'
 import { AutoScrollProps, SortableGridChangeEvent, SortableGridRenderItem } from './types'
 import { defaultKeyExtractor } from './utils'
 
diff --git a/apps/mobile/src/components/sortableGrid/SortableGridItem.tsx b/apps/mobile/src/components/sortableGrid/SortableGridItem.tsx
index e631e9f2967..40db9a18768 100644
--- a/apps/mobile/src/components/sortableGrid/SortableGridItem.tsx
+++ b/apps/mobile/src/components/sortableGrid/SortableGridItem.tsx
@@ -12,9 +12,9 @@ import Animated, {
   withTiming,
 } from 'react-native-reanimated'
 import ActiveItemDecoration from './ActiveItemDecoration'
-import { useSortableGridContext } from './SortableGridProvider'
 import { TIME_TO_ACTIVATE_PAN } from './constants'
 import { useAnimatedZIndex, useItemOrderUpdater } from './hooks'
+import { useSortableGridContext } from './SortableGridProvider'
 import { SortableGridRenderItem } from './types'
 
 type SortableGridItemProps<I> = {
diff --git a/apps/mobile/src/components/sortableGrid/hooks.ts b/apps/mobile/src/components/sortableGrid/hooks.ts
index 0536737186a..473bf9f89fb 100644
--- a/apps/mobile/src/components/sortableGrid/hooks.ts
+++ b/apps/mobile/src/components/sortableGrid/hooks.ts
@@ -1,8 +1,8 @@
 import { useCallback, useRef } from 'react'
 import { FlatList, ScrollView } from 'react-native'
-import { SharedValue, runOnJS, useAnimatedReaction, useSharedValue } from 'react-native-reanimated'
-import { useSortableGridContext } from './SortableGridProvider'
+import { runOnJS, SharedValue, useAnimatedReaction, useSharedValue } from 'react-native-reanimated'
 import { AUTO_SCROLL_THRESHOLD } from './constants'
+import { useSortableGridContext } from './SortableGridProvider'
 import { ItemMeasurements } from './types'
 
 export function useStableCallback<
diff --git a/apps/mobile/src/components/text/AnimatedText.test.tsx b/apps/mobile/src/components/text/AnimatedText.test.tsx
index a8054984170..5136e2db5ef 100644
--- a/apps/mobile/src/components/text/AnimatedText.test.tsx
+++ b/apps/mobile/src/components/text/AnimatedText.test.tsx
@@ -1,13 +1,12 @@
-import { fireEvent } from '@testing-library/react-native'
+import { fireEvent, render } from '@testing-library/react-native'
 import React from 'react'
 import { makeMutable } from 'react-native-reanimated'
 import { act } from 'react-test-renderer'
 import { AnimatedText } from 'src/components/text/AnimatedText'
-import { renderWithProviders } from 'src/test/render'
 
 describe(AnimatedText, () => {
   it('renders without error', () => {
-    const tree = renderWithProviders(<AnimatedText text={makeMutable('Rendered')} />)
+    const tree = render(<AnimatedText text={{ value: 'Rendered' }} />)
 
     expect(tree).toMatchInlineSnapshot(`
       <TextInput
@@ -37,7 +36,7 @@ describe(AnimatedText, () => {
 
   describe('when text is in the loading state', () => {
     it('displays text placeholder with loading shimmer when the loading property is true', async () => {
-      const tree = renderWithProviders(<AnimatedText loading={true} />)
+      const tree = render(<AnimatedText loading={true} />)
 
       const shimmerPlaceholder = tree.getByTestId('shimmer-placeholder')
 
@@ -58,7 +57,7 @@ describe(AnimatedText, () => {
     })
 
     it('displays the loading placeholder without shimmer when the loading property has "no-shimmer" value', () => {
-      const tree = renderWithProviders(<AnimatedText loading="no-shimmer" />)
+      const tree = render(<AnimatedText loading="no-shimmer" />)
 
       const shimmerPlaceholder = tree.queryByTestId('shimmer-placeholder')
       expect(shimmerPlaceholder).toBeFalsy()
@@ -74,7 +73,7 @@ describe(AnimatedText, () => {
   describe('when text is not in the loading state', () => {
     it('updates text when text value is modified', async () => {
       const textValue = makeMutable('Initial')
-      const tree = renderWithProviders(<AnimatedText text={textValue} />)
+      const tree = render(<AnimatedText text={textValue} />)
 
       expect(tree.queryByDisplayValue('Initial')).toBeTruthy()
 
diff --git a/apps/mobile/src/components/text/AnimatedText.tsx b/apps/mobile/src/components/text/AnimatedText.tsx
index a1a12bbc169..e7dba9a511e 100644
--- a/apps/mobile/src/components/text/AnimatedText.tsx
+++ b/apps/mobile/src/components/text/AnimatedText.tsx
@@ -1,13 +1,13 @@
 import React from 'react'
 import {
-  TextProps as RNTextProps,
   StyleSheet,
   TextInput,
   TextInputProps,
+  TextProps as RNTextProps,
   useWindowDimensions,
 } from 'react-native'
 import Animated, { useAnimatedProps } from 'react-native-reanimated'
-import { Flex, TextProps as TamaTextProps, TextFrame, usePropsAndStyle } from 'ui/src'
+import { Flex, TextFrame, TextProps as TamaTextProps, usePropsAndStyle } from 'ui/src'
 import { TextLoaderWrapper } from 'ui/src/components/text/Text'
 import { fonts } from 'ui/src/theme'
 
diff --git a/packages/wallet/src/components/text/LearnMoreLink.tsx b/apps/mobile/src/components/text/LearnMoreLink.tsx
similarity index 90%
rename from packages/wallet/src/components/text/LearnMoreLink.tsx
rename to apps/mobile/src/components/text/LearnMoreLink.tsx
index 8a693846d9f..aa7d52b6b85 100644
--- a/packages/wallet/src/components/text/LearnMoreLink.tsx
+++ b/apps/mobile/src/components/text/LearnMoreLink.tsx
@@ -1,6 +1,6 @@
 import { useTranslation } from 'react-i18next'
+import { openUri } from 'src/utils/linking'
 import { Text, TouchableArea } from 'ui/src'
-import { openUri } from 'wallet/src/utils/linking'
 
 const onPressLearnMore = async (url: string): Promise<void> => {
   await openUri(url)
diff --git a/apps/mobile/src/components/text/LongMarkdownText.test.tsx b/apps/mobile/src/components/text/LongMarkdownText.test.tsx
index c6adee187cd..f7dd5401f79 100644
--- a/apps/mobile/src/components/text/LongMarkdownText.test.tsx
+++ b/apps/mobile/src/components/text/LongMarkdownText.test.tsx
@@ -101,6 +101,7 @@ describe(LongMarkdownText, () => {
         const readMoreButton = tree.queryByTestId('read-more-button')
 
         expect(readMoreButton).toBeTruthy()
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         expect(within(readMoreButton!).getByText('Read more')).toBeTruthy()
       })
     })
@@ -128,7 +129,7 @@ describe(LongMarkdownText, () => {
         fireEvent.press(readMoreButton)
 
         expect(readMoreButton).toBeTruthy()
-
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         expect(within(readMoreButton!).getByText('Read less')).toBeTruthy()
       })
     })
diff --git a/apps/mobile/src/components/text/LongMarkdownText.tsx b/apps/mobile/src/components/text/LongMarkdownText.tsx
index 79fe4a81b8d..362c712adf9 100644
--- a/apps/mobile/src/components/text/LongMarkdownText.tsx
+++ b/apps/mobile/src/components/text/LongMarkdownText.tsx
@@ -2,9 +2,9 @@ import React, { useCallback, useReducer, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { LayoutChangeEvent } from 'react-native'
 import Markdown, { MarkdownProps } from 'react-native-markdown-display'
+import { openUri } from 'src/utils/linking'
 import { Flex, SpaceTokens, Text, useSporeColors } from 'ui/src'
 import { fonts } from 'ui/src/theme'
-import { openUri } from 'wallet/src/utils/linking'
 
 type LongMarkdownTextProps = {
   initialDisplayedLines?: number
diff --git a/apps/mobile/src/components/text/LongText.test.tsx b/apps/mobile/src/components/text/LongText.test.tsx
index 4ace94ece88..821b2a41b20 100644
--- a/apps/mobile/src/components/text/LongText.test.tsx
+++ b/apps/mobile/src/components/text/LongText.test.tsx
@@ -66,6 +66,7 @@ describe(LongText, () => {
         const readMoreButton = tree.queryByTestId('read-more-button')
 
         expect(readMoreButton).toBeTruthy()
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         expect(within(readMoreButton!).getByText('Read more')).toBeTruthy()
       })
     })
diff --git a/packages/wallet/src/components/text/Pill.test.tsx b/apps/mobile/src/components/text/Pill.test.tsx
similarity index 78%
rename from packages/wallet/src/components/text/Pill.test.tsx
rename to apps/mobile/src/components/text/Pill.test.tsx
index 6c12904aebf..0a8da661d94 100644
--- a/packages/wallet/src/components/text/Pill.test.tsx
+++ b/apps/mobile/src/components/text/Pill.test.tsx
@@ -1,6 +1,7 @@
+import React from 'react'
+import { Pill } from 'src/components/text/Pill'
+import { render } from 'src/test/test-utils'
 import { Text } from 'ui/src'
-import { render } from 'wallet/src/test/test-utils'
-import { Pill } from './Pill'
 
 it('renders a Pill without image', () => {
   const tree = render(
diff --git a/packages/wallet/src/components/text/Pill.tsx b/apps/mobile/src/components/text/Pill.tsx
similarity index 95%
rename from packages/wallet/src/components/text/Pill.tsx
rename to apps/mobile/src/components/text/Pill.tsx
index 16dfb725d61..a693fd14bdd 100644
--- a/packages/wallet/src/components/text/Pill.tsx
+++ b/apps/mobile/src/components/text/Pill.tsx
@@ -28,7 +28,7 @@ export function Pill({
   return (
     <Flex
       alignItems="center"
-      borderColor={!customBorderColor ? '$transparent' : undefined}
+      borderColor="$transparent"
       borderRadius={borderRadius}
       borderWidth={1}
       flexDirection={flexDirection}
diff --git a/apps/mobile/src/components/text/__snapshots__/LongMarkdownText.test.tsx.snap b/apps/mobile/src/components/text/__snapshots__/LongMarkdownText.test.tsx.snap
index 8536d0bc954..3727e86495e 100644
--- a/apps/mobile/src/components/text/__snapshots__/LongMarkdownText.test.tsx.snap
+++ b/apps/mobile/src/components/text/__snapshots__/LongMarkdownText.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`LongMarkdownText renders without error 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "flexDirection": "column",
       "gap": 8,
     }
@@ -13,6 +14,7 @@ exports[`LongMarkdownText renders without error 1`] = `
     onLayout={[Function]}
     style={
       {
+        "alignItems": "stretch",
         "flexDirection": "column",
       }
     }
@@ -23,6 +25,7 @@ exports[`LongMarkdownText renders without error 1`] = `
       pointerEvents="none"
       style={
         {
+          "alignItems": "stretch",
           "flexDirection": "column",
           "opacity": 0,
           "position": "absolute",
diff --git a/apps/mobile/src/components/text/__snapshots__/LongText.test.tsx.snap b/apps/mobile/src/components/text/__snapshots__/LongText.test.tsx.snap
index 7f43af2bc63..57fa13bfccd 100644
--- a/apps/mobile/src/components/text/__snapshots__/LongText.test.tsx.snap
+++ b/apps/mobile/src/components/text/__snapshots__/LongText.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`LongText renders without error 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "flexDirection": "column",
       "gap": 8,
     }
diff --git a/packages/wallet/src/components/text/__snapshots__/Pill.test.tsx.snap b/apps/mobile/src/components/text/__snapshots__/Pill.test.tsx.snap
similarity index 100%
rename from packages/wallet/src/components/text/__snapshots__/Pill.test.tsx.snap
rename to apps/mobile/src/components/text/__snapshots__/Pill.test.tsx.snap
diff --git a/apps/mobile/src/components/text/__snapshots__/TextWithFuseMatches.test.tsx.snap b/apps/mobile/src/components/text/__snapshots__/TextWithFuseMatches.test.tsx.snap
index f6a3234342a..c552c3e2c5f 100644
--- a/apps/mobile/src/components/text/__snapshots__/TextWithFuseMatches.test.tsx.snap
+++ b/apps/mobile/src/components/text/__snapshots__/TextWithFuseMatches.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`renders text with few matches 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "flexDirection": "row",
       "gap": 16,
     }
diff --git a/packages/wallet/src/features/tokens/TokenWarningModal.tsx b/apps/mobile/src/components/tokens/TokenWarningModal.tsx
similarity index 88%
rename from packages/wallet/src/features/tokens/TokenWarningModal.tsx
rename to apps/mobile/src/components/tokens/TokenWarningModal.tsx
index 3623726a100..178a3ea0c0b 100644
--- a/packages/wallet/src/features/tokens/TokenWarningModal.tsx
+++ b/apps/mobile/src/components/tokens/TokenWarningModal.tsx
@@ -1,16 +1,17 @@
+import React from 'react'
 import { useTranslation } from 'react-i18next'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
+import { LearnMoreLink } from 'src/components/text/LearnMoreLink'
+import { getTokenSafetyHeaderText } from 'src/components/tokens/utils'
+import WarningIcon from 'src/components/tokens/WarningIcon'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
+import { useTokenSafetyLevelColors } from 'src/features/tokens/safetyHooks'
 import { Button, Flex, Text, useSporeColors } from 'ui/src'
 import { AppTFunction } from 'ui/src/i18n/types'
-import { ThemeNames, iconSizes, imageSizes, opacify } from 'ui/src/theme'
+import { iconSizes, imageSizes, opacify, ThemeNames } from 'ui/src/theme'
 import { TokenLogo } from 'wallet/src/components/CurrencyLogo/TokenLogo'
-import WarningIcon from 'wallet/src/components/icons/WarningIcon'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'wallet/src/constants/urls'
 import { SafetyLevel } from 'wallet/src/data/__generated__/types-and-hooks'
-import { useTokenSafetyLevelColors } from 'wallet/src/features/tokens/safetyHooks'
-import { getTokenSafetyHeaderText } from 'wallet/src/features/tokens/utils'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 
 function getTokenSafetyBodyText(safetyLevel: Maybe<SafetyLevel>, t: AppTFunction): string {
   switch (safetyLevel) {
diff --git a/packages/wallet/src/components/icons/WarningIcon.tsx b/apps/mobile/src/components/tokens/WarningIcon.tsx
similarity index 89%
rename from packages/wallet/src/components/icons/WarningIcon.tsx
rename to apps/mobile/src/components/tokens/WarningIcon.tsx
index ed17db78912..d009e3dae21 100644
--- a/packages/wallet/src/components/icons/WarningIcon.tsx
+++ b/apps/mobile/src/components/tokens/WarningIcon.tsx
@@ -1,9 +1,10 @@
+import React from 'react'
 import { SvgProps } from 'react-native-svg'
+import { useTokenSafetyLevelColors } from 'src/features/tokens/safetyHooks'
 import { useSporeColors } from 'ui/src'
 import AlertTriangle from 'ui/src/assets/icons/alert-triangle.svg'
 import XOctagon from 'ui/src/assets/icons/x-octagon.svg'
 import { SafetyLevel } from 'wallet/src/data/__generated__/types-and-hooks'
-import { useTokenSafetyLevelColors } from 'wallet/src/features/tokens/safetyHooks'
 
 interface Props {
   safetyLevel: Maybe<SafetyLevel>
diff --git a/packages/wallet/src/features/tokens/utils.ts b/apps/mobile/src/components/tokens/utils.ts
similarity index 100%
rename from packages/wallet/src/features/tokens/utils.ts
rename to apps/mobile/src/components/tokens/utils.ts
diff --git a/apps/mobile/src/components/tooltip/TooltipButton.tsx b/apps/mobile/src/components/tooltip/TooltipButton.tsx
index 67328552951..b659d81d4d7 100644
--- a/apps/mobile/src/components/tooltip/TooltipButton.tsx
+++ b/apps/mobile/src/components/tooltip/TooltipButton.tsx
@@ -1,10 +1,10 @@
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { ColorValue, Keyboard } from 'react-native'
+import { ColorValue } from 'react-native'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
+import { ModalName } from 'src/features/telemetry/constants'
 import { TouchableArea, TouchableAreaProps, useSporeColors } from 'ui/src'
 import InfoCircle from 'ui/src/assets/icons/info-circle.svg'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 const DEFAULT_ICON_SIZE = 20
 
@@ -33,12 +33,7 @@ export function TooltipInfoButton({
   const { t } = useTranslation()
   return (
     <>
-      <TouchableArea
-        onPress={(): void => {
-          Keyboard.dismiss()
-          setShowModal(true)
-        }}
-        {...rest}>
+      <TouchableArea onPress={(): void => setShowModal(true)} {...rest}>
         <InfoCircle
           color={colors.neutral2.get()}
           height={size ?? DEFAULT_ICON_SIZE}
diff --git a/packages/ui/src/components/Unicon/Container.native.ts b/apps/mobile/src/components/unicons/Container.ts
similarity index 99%
rename from packages/ui/src/components/Unicon/Container.native.ts
rename to apps/mobile/src/components/unicons/Container.ts
index c97c7aa7a48..231b14dd5ba 100644
--- a/packages/ui/src/components/Unicon/Container.native.ts
+++ b/apps/mobile/src/components/unicons/Container.ts
@@ -1,5 +1,5 @@
 import { PathProps } from './svgTypes'
-export const containerSvgPaths: PathProps[][] = [
+export const svgPaths: PathProps[][] = [
   [
     {
       path: 'M35.9146 19.765L29.9428 19.1838C29.9805 18.796 30 18.4012 30 18C30 17.5988 29.9805 17.204 29.9428 16.8162L35.9146 16.235C35.9711 16.8157 36 17.4045 36 18C36 18.5955 35.9711 19.1843 35.9146 19.765ZM35.2294 12.7731L29.4871 14.5128C29.2582 13.7572 28.9562 13.0324 28.5887 12.3463L33.8778 9.51335C34.4298 10.544 34.8845 11.6347 35.2294 12.7731ZM31.9147 6.58074L27.2788 10.3897C26.7784 9.78072 26.2193 9.22156 25.6103 8.7212L29.4193 4.08528C30.3302 4.8337 31.1663 5.66983 31.9147 6.58074ZM26.4867 2.12222L23.6537 7.41131C22.9676 7.04381 22.2428 6.74181 21.4872 6.51288L23.2269 0.770639C24.3653 1.11554 25.456 1.57016 26.4867 2.12222ZM19.765 0.0854343L19.1838 6.05722C18.796 6.01948 18.4012 6 18 6C17.5988 6 17.204 6.01948 16.8162 6.05722L16.235 0.0854339C16.8157 0.0289206 17.4045 0 18 0C18.5955 0 19.1843 0.0289207 19.765 0.0854343ZM12.7731 0.770638L14.5128 6.51288C13.7572 6.74181 13.0324 7.04381 12.3463 7.41131L9.51335 2.12222C10.544 1.57016 11.6347 1.11553 12.7731 0.770638ZM6.58074 4.08528L10.3897 8.7212C9.78072 9.22156 9.22156 9.78072 8.7212 10.3897L4.08528 6.58074C4.8337 5.66983 5.66983 4.8337 6.58074 4.08528ZM2.12222 9.51335L7.41131 12.3463C7.04381 13.0324 6.74181 13.7572 6.51288 14.5128L0.770639 12.7731C1.11554 11.6347 1.57016 10.544 2.12222 9.51335ZM0.0854342 16.235C0.0289207 16.8157 0 17.4045 0 18C0 18.5955 0.0289206 19.1843 0.0854339 19.765L6.05722 19.1838C6.01948 18.796 6 18.4012 6 18C6 17.5988 6.01948 17.204 6.05722 16.8162L0.0854342 16.235ZM0.770638 23.2269L6.51288 21.4872C6.74181 22.2428 7.04381 22.9676 7.41131 23.6537L2.12222 26.4867C1.57016 25.456 1.11554 24.3653 0.770638 23.2269ZM4.08528 29.4193L8.7212 25.6103C9.22156 26.2193 9.78072 26.7784 10.3897 27.2788L6.58074 31.9147C5.66983 31.1663 4.8337 30.3302 4.08528 29.4193ZM9.51335 33.8778L12.3463 28.5887C13.0324 28.9562 13.7572 29.2582 14.5128 29.4871L12.7731 35.2294C11.6347 34.8845 10.544 34.4298 9.51335 33.8778ZM16.235 35.9146L16.8162 29.9428C17.204 29.9805 17.5988 30 18 30C18.4012 30 18.796 29.9805 19.1838 29.9428L19.765 35.9146C19.1843 35.9711 18.5955 36 18 36C17.4045 36 16.8157 35.9711 16.235 35.9146ZM23.2269 35.2294C24.3653 34.8845 25.456 34.4298 26.4867 33.8778L23.6537 28.5887C22.9676 28.9562 22.2428 29.2582 21.4872 29.4871L23.2269 35.2294ZM29.4193 31.9147L25.6103 27.2788C26.2193 26.7784 26.7784 26.2193 27.2788 25.6103L31.9147 29.4193C31.1663 30.3302 30.3302 31.1663 29.4193 31.9147ZM33.8778 26.4867L28.5887 23.6537C28.9562 22.9676 29.2582 22.2428 29.4871 21.4872L35.2294 23.2269C34.8845 24.3653 34.4298 25.456 33.8778 26.4867Z',
diff --git a/packages/ui/src/components/Unicon/Emblem.native.ts b/apps/mobile/src/components/unicons/Emblem.ts
similarity index 99%
rename from packages/ui/src/components/Unicon/Emblem.native.ts
rename to apps/mobile/src/components/unicons/Emblem.ts
index f7033d0fd52..6c9e101114b 100644
--- a/packages/ui/src/components/Unicon/Emblem.native.ts
+++ b/apps/mobile/src/components/unicons/Emblem.ts
@@ -1,7 +1,7 @@
 // allow long constants file
 /* eslint-disable max-lines */
 import { PathProps } from './svgTypes'
-export const emblemSvgPaths: PathProps[][] = [
+export const svgPaths: PathProps[][] = [
   [
     {
       path: 'M0 8C0 3.58172 3.58172 0 8 0V4C5.79086 4 4 5.79086 4 8H0ZM8 8L4 8C4 10.2091 5.79086 12 8 12V16C12.4183 16 16 12.4183 16 8H12C12 5.79086 10.2091 4 8 4L8 8ZM8 8L12 8C12 10.2091 10.2091 12 8 12L8 8Z',
diff --git a/apps/mobile/src/components/unicons/Unicon.test.tsx b/apps/mobile/src/components/unicons/Unicon.test.tsx
index dd9f37844f1..9cc5f76ab2e 100644
--- a/apps/mobile/src/components/unicons/Unicon.test.tsx
+++ b/apps/mobile/src/components/unicons/Unicon.test.tsx
@@ -1,6 +1,8 @@
 import React from 'react'
+import { UniconAttributes } from 'src/components/unicons/types'
+import { Unicon } from 'src/components/unicons/Unicon'
+import { deriveUniconAttributeIndices, isEthAddress } from 'src/components/unicons/utils'
 import { render } from 'src/test/test-utils'
-import { deriveUniconAttributeIndices, isEthAddress, Unicon, UniconAttributes } from 'ui/src'
 
 it('renders a Unicon', () => {
   const tree = render(
diff --git a/packages/ui/src/components/Unicon/index.native.tsx b/apps/mobile/src/components/unicons/Unicon.tsx
similarity index 95%
rename from packages/ui/src/components/Unicon/index.native.tsx
rename to apps/mobile/src/components/unicons/Unicon.tsx
index 5a33bf05a4b..d1d272bcb6f 100644
--- a/packages/ui/src/components/Unicon/index.native.tsx
+++ b/apps/mobile/src/components/unicons/Unicon.tsx
@@ -10,17 +10,21 @@ import {
   Rect,
   vec,
 } from '@shopify/react-native-skia'
-import { memo, useMemo } from 'react'
+import React, { memo, useMemo } from 'react'
 import 'react-native-reanimated'
-import { Flex, flexStyles } from 'ui/src/components/layout'
-import { useIsDarkMode } from 'ui/src/hooks/useIsDarkMode'
 import {
+  blurs,
   UniconAttributeData,
   UniconAttributes,
   UniconAttributesToIndices,
-  blurs,
-} from './types.native'
-import { deriveUniconAttributeIndices, getUniconAttributeData, isEthAddress } from './utils.native'
+} from 'src/components/unicons/types'
+import {
+  deriveUniconAttributeIndices,
+  getUniconAttributeData,
+  isEthAddress,
+} from 'src/components/unicons/utils'
+import { Flex, flexStyles } from 'ui/src'
+import { useSelectedColorScheme } from 'wallet/src/features/appearance/hooks'
 
 // HACK: Add 1 to effectively increase margin between svg and surrounding box, otherwise get a cropping issue
 const ORIGINAL_SVG_SIZE = 36 + 1
@@ -251,7 +255,7 @@ export function _Unicon({
   showBorder = false,
 }: Props): JSX.Element | null {
   // TODO(MOB-75): move this into a mandatory boolean prop for the Unicon component (e.g. `lightModeOverlay`) so that any consumer of the Unicon component has to decide whether or not to show the light mode overlay (presumably based on whether the current theme is light or dark)
-  const isLightMode = !useIsDarkMode()
+  const isLightMode = useSelectedColorScheme() === 'light'
 
   // Renders a Unicon inside a (size) x (size) pixel square Box
   const attributeIndices = useMemo(
diff --git a/apps/mobile/src/components/unicons/__snapshots__/Unicon.test.tsx.snap b/apps/mobile/src/components/unicons/__snapshots__/Unicon.test.tsx.snap
index 3b520e6d3a9..d7bc0150492 100644
--- a/apps/mobile/src/components/unicons/__snapshots__/Unicon.test.tsx.snap
+++ b/apps/mobile/src/components/unicons/__snapshots__/Unicon.test.tsx.snap
@@ -6,6 +6,7 @@ exports[`renders a Unicon 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "flexDirection": "column",
       "height": 36,
       "width": 36,
@@ -15,6 +16,7 @@ exports[`renders a Unicon 1`] = `
   <View
     style={
       {
+        "alignItems": "stretch",
         "flexDirection": "column",
         "height": 36,
         "width": 36,
diff --git a/packages/ui/src/components/Unicon/svgTypes.ts b/apps/mobile/src/components/unicons/svgTypes.ts
similarity index 100%
rename from packages/ui/src/components/Unicon/svgTypes.ts
rename to apps/mobile/src/components/unicons/svgTypes.ts
diff --git a/packages/ui/src/components/Unicon/types.native.ts b/apps/mobile/src/components/unicons/types.ts
similarity index 84%
rename from packages/ui/src/components/Unicon/types.native.ts
rename to apps/mobile/src/components/unicons/types.ts
index 48c2b57c54d..abff6cd9a55 100644
--- a/packages/ui/src/components/Unicon/types.native.ts
+++ b/apps/mobile/src/components/unicons/types.ts
@@ -1,6 +1,6 @@
 import { Color } from '@shopify/react-native-skia'
-import { containerSvgPaths } from 'ui/src/components/Unicon/Container.native'
-import { emblemSvgPaths } from 'ui/src/components/Unicon/Emblem.native'
+import { svgPaths as containerPaths } from 'src/components/unicons/Container'
+import { svgPaths as emblemPaths } from 'src/components/unicons/Emblem'
 import { PathProps } from './svgTypes'
 
 export enum UniconAttributes {
@@ -73,6 +73,6 @@ export const gradientEnds = [
 export const UniconNumOptions = {
   [UniconAttributes.GradientStart]: gradientStarts.length,
   [UniconAttributes.GradientEnd]: gradientEnds.length,
-  [UniconAttributes.Container]: containerSvgPaths.length,
-  [UniconAttributes.Shape]: emblemSvgPaths.length,
+  [UniconAttributes.Container]: containerPaths.length,
+  [UniconAttributes.Shape]: emblemPaths.length,
 }
diff --git a/packages/ui/src/components/Unicon/utils.native.ts b/apps/mobile/src/components/unicons/utils.ts
similarity index 85%
rename from packages/ui/src/components/Unicon/utils.native.ts
rename to apps/mobile/src/components/unicons/utils.ts
index 425ece722fb..024fee5e14d 100644
--- a/packages/ui/src/components/Unicon/utils.native.ts
+++ b/apps/mobile/src/components/unicons/utils.ts
@@ -1,7 +1,6 @@
 import { isAddress } from 'ethers/lib/utils'
-import { useSporeColors } from 'ui/src/'
-import { containerSvgPaths } from './Container.native'
-import { emblemSvgPaths } from './Emblem.native'
+import { svgPaths as containerPaths } from 'src/components/unicons/Container'
+import { svgPaths as emblemPaths } from 'src/components/unicons/Emblem'
 import {
   blurs,
   gradientEnds,
@@ -11,7 +10,8 @@ import {
   UniconAttributesArray,
   UniconAttributesToIndices,
   UniconNumOptions,
-} from './types.native'
+} from 'src/components/unicons/types'
+import { useSporeColors } from 'ui/src'
 
 const NUM_CHARS_TO_USE_PER_ATTRIBUTE = 2
 
@@ -53,8 +53,8 @@ export const getUniconAttributeData = (
     [UniconAttributes.GradientStart]:
       gradientStarts[attributeIndices[UniconAttributes.GradientStart]],
     [UniconAttributes.GradientEnd]: gradientEnds[attributeIndices[UniconAttributes.GradientEnd]],
-    [UniconAttributes.Container]: containerSvgPaths[attributeIndices[UniconAttributes.Container]],
-    [UniconAttributes.Shape]: emblemSvgPaths[attributeIndices[UniconAttributes.Shape]],
+    [UniconAttributes.Container]: containerPaths[attributeIndices[UniconAttributes.Container]],
+    [UniconAttributes.Shape]: emblemPaths[attributeIndices[UniconAttributes.Shape]],
   } as UniconAttributeData
 }
 
diff --git a/apps/mobile/src/components/unitags/ChangeUnitagModal.tsx b/apps/mobile/src/components/unitags/ChangeUnitagModal.tsx
deleted file mode 100644
index 36ff57bd32a..00000000000
--- a/apps/mobile/src/components/unitags/ChangeUnitagModal.tsx
+++ /dev/null
@@ -1,217 +0,0 @@
-import { useNavigation } from '@react-navigation/native'
-import { useEffect, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { EmitterSubscription, Keyboard, KeyboardAvoidingView, StyleSheet } from 'react-native'
-import { getUniqueId } from 'react-native-device-info'
-import { Button, Flex, Text } from 'ui/src'
-import { fonts } from 'ui/src/theme'
-import { logger } from 'utilities/src/logger/logger'
-import { useAsyncData } from 'utilities/src/react/hooks'
-import { ONE_SECOND_MS } from 'utilities/src/time/time'
-import { useDebounce } from 'utilities/src/time/timing'
-import { TextInput } from 'wallet/src/components/input/TextInput'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { pushNotification } from 'wallet/src/features/notifications/slice'
-import { AppNotificationType } from 'wallet/src/features/notifications/types'
-import { useUnitagChangeMutation } from 'wallet/src/features/unitags/api'
-import { UNITAG_SUFFIX } from 'wallet/src/features/unitags/constants'
-import { useUnitagUpdater } from 'wallet/src/features/unitags/context'
-import { useCanClaimUnitagName } from 'wallet/src/features/unitags/hooks'
-import { parseUnitagErrorCode } from 'wallet/src/features/unitags/utils'
-import { useAppDispatch } from 'wallet/src/state'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
-import { isIOS } from 'wallet/src/utils/platform'
-
-export function ChangeUnitagModal({
-  unitag,
-  address,
-  onClose,
-}: {
-  unitag: string
-  address: Address
-  onClose: () => void
-}): JSX.Element {
-  const { t } = useTranslation()
-  const navigation = useNavigation()
-  const dispatch = useAppDispatch()
-  const { data: deviceId } = useAsyncData(getUniqueId)
-  const [changeUnitagMutation] = useUnitagChangeMutation()
-  const [newUnitag, setNewUnitag] = useState(unitag)
-  const [keyboardHeight, setKeyboardHeight] = useState(0)
-  const debouncedInputValue = useDebounce(newUnitag, ONE_SECOND_MS)
-  const { error, loading } = useCanClaimUnitagName(address, debouncedInputValue)
-  const { triggerRefetchUnitags } = useUnitagUpdater()
-
-  const isUnitagEdited = unitag !== newUnitag
-  const isUnitagValid = isUnitagEdited && !error && !loading && !!newUnitag
-
-  const onFinishEditing = (): void => {
-    Keyboard.dismiss()
-  }
-
-  const onChangeSubmit = async (): Promise<void> => {
-    if (!deviceId) {
-      logger.error(new Error('DeviceId is undefined'), {
-        tags: { file: 'ChangeUnitagModal', function: 'onChangeSubmit' },
-      })
-      return // Should never hit this condition. Button is disabled if deviceId is undefined
-    }
-
-    onFinishEditing()
-    try {
-      // Change unitag backend call
-      const { data: changeResponse } = await changeUnitagMutation({
-        username: newUnitag,
-        address,
-        deviceId,
-      })
-
-      // If change failed and returns an error code, display the error message
-      if (!changeResponse?.data.success && !!changeResponse?.data.errorCode) {
-        dispatch(
-          pushNotification({
-            type: AppNotificationType.Error,
-            errorMessage: parseUnitagErrorCode(t, newUnitag, changeResponse?.data.errorCode),
-          })
-        )
-        return
-      }
-
-      // If change succeeded, exit the modal and display a success message
-      if (changeResponse?.data.success) {
-        triggerRefetchUnitags()
-        dispatch(
-          pushNotification({
-            type: AppNotificationType.Success,
-            title: t('Username changed'),
-          })
-        )
-        navigation.goBack()
-        onClose()
-      }
-    } catch (e) {
-      // If some other error occurs, display a generic error message
-      dispatch(
-        pushNotification({
-          type: AppNotificationType.Error,
-          errorMessage: t('Could not change username. Try again later.'),
-        })
-      )
-      onClose()
-    }
-  }
-
-  // This useEffect makes KeyboardAvoidingView work when inside a BottomSheetModal
-  // Dynamically add bottom padding equal to keyboard height so that elements have room to shift up
-  useEffect(() => {
-    let showSubscription: EmitterSubscription
-    let hideSubscription: EmitterSubscription
-
-    if (isIOS) {
-      // Using keyboardWillShow makes it feel more responsive, but only available on iOS
-      showSubscription = Keyboard.addListener('keyboardWillShow', (e) => {
-        setKeyboardHeight(e.endCoordinates.height)
-      })
-      hideSubscription = Keyboard.addListener('keyboardWillHide', () => {
-        setKeyboardHeight(0)
-      })
-    } else {
-      // keyboardDidShow only emits after the keyboard has fully appeared
-      showSubscription = Keyboard.addListener('keyboardDidShow', (e) => {
-        setKeyboardHeight(e.endCoordinates.height)
-      })
-      hideSubscription = Keyboard.addListener('keyboardDidHide', () => {
-        setKeyboardHeight(0)
-      })
-    }
-
-    return () => {
-      showSubscription.remove()
-      hideSubscription.remove()
-    }
-  }, [])
-
-  return (
-    <BottomSheetModal isDismissible name={ModalName.UnitagsChange} onClose={onClose}>
-      <KeyboardAvoidingView
-        enabled
-        behavior={isIOS ? 'padding' : undefined}
-        contentContainerStyle={styles.expand}
-        style={styles.base}>
-        <Flex
-          centered
-          gap="$spacing12"
-          pb={keyboardHeight > 0 ? keyboardHeight : '$spacing12'}
-          pt="$spacing12"
-          px="$spacing24">
-          <Text textAlign="center" variant="subheading1">
-            {t('Edit username')}
-          </Text>
-          <Flex
-            row
-            alignItems="center"
-            borderColor="$surface3"
-            borderRadius="$rounded16"
-            borderWidth="$spacing1"
-            px="$spacing24">
-            <TextInput
-              autoFocus
-              autoCapitalize="none"
-              color="$neutral1"
-              fontFamily="$subHeading"
-              fontSize={fonts.subheading1.fontSize}
-              margin="$none"
-              maxLength={20}
-              numberOfLines={1}
-              px="$none"
-              py="$spacing20"
-              returnKeyType="done"
-              value={newUnitag}
-              width="100%"
-              onChangeText={setNewUnitag}
-              onSubmitEditing={onFinishEditing}
-            />
-            <Flex position="absolute" right="$spacing20" top="$spacing20">
-              <Text color="$neutral3" variant="subheading1">
-                {UNITAG_SUFFIX}
-              </Text>
-            </Flex>
-          </Flex>
-          {isUnitagEdited && !loading && error && (
-            <Flex centered row gap="$spacing8">
-              <Text color="$statusCritical" textAlign="center" variant="body2">
-                {error}
-              </Text>
-            </Flex>
-          )}
-
-          <Text color="$neutral2" textAlign="center" variant="body2">
-            {t(
-              'You only get two username changes per address. Once you change your username, you can’t change it back.'
-            )}
-          </Text>
-          <Flex centered row gap="$spacing12" pt="$spacing24">
-            <Button
-              fill
-              disabled={!isUnitagValid || !deviceId}
-              testID={ElementName.Confirm}
-              theme="primary"
-              onPress={onChangeSubmit}>
-              {t('Save changes')}
-            </Button>
-          </Flex>
-        </Flex>
-      </KeyboardAvoidingView>
-    </BottomSheetModal>
-  )
-}
-
-const styles = StyleSheet.create({
-  base: {
-    flex: 1,
-    justifyContent: 'flex-end',
-  },
-  expand: {
-    flexGrow: 1,
-  },
-})
diff --git a/apps/mobile/src/components/unitags/ChooseNftModal.tsx b/apps/mobile/src/components/unitags/ChooseNftModal.tsx
index 2949a660781..06ce2ba9760 100644
--- a/apps/mobile/src/components/unitags/ChooseNftModal.tsx
+++ b/apps/mobile/src/components/unitags/ChooseNftModal.tsx
@@ -1,9 +1,9 @@
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { NftView } from 'src/components/NFT/NftView'
+import { ModalName } from 'src/features/telemetry/constants'
 import { Flex, useSporeColors } from 'ui/src'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
 import { NftsList } from 'wallet/src/components/nfts/NftsList'
 import { NFTItem } from 'wallet/src/features/nfts/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 type ChooseNftProps = {
   address: string
diff --git a/apps/mobile/src/components/unitags/ChoosePhotoOptionsModal.tsx b/apps/mobile/src/components/unitags/ChoosePhotoOptionsModal.tsx
index fd6bb7152cc..a8b85da09a3 100644
--- a/apps/mobile/src/components/unitags/ChoosePhotoOptionsModal.tsx
+++ b/apps/mobile/src/components/unitags/ChoosePhotoOptionsModal.tsx
@@ -1,11 +1,11 @@
 import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ImageLibraryOptions, launchImageLibrary } from 'react-native-image-picker'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { ChooseNftModal } from 'src/components/unitags/ChooseNftModal'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { Button, Flex, Icons, Text, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 
 // Selected image will be shrunk to max width/height
 // URI will then be for an image of those dimensions
diff --git a/apps/mobile/src/components/unitags/DeleteUnitagModal.tsx b/apps/mobile/src/components/unitags/DeleteUnitagModal.tsx
deleted file mode 100644
index 612fbaa0b98..00000000000
--- a/apps/mobile/src/components/unitags/DeleteUnitagModal.tsx
+++ /dev/null
@@ -1,88 +0,0 @@
-import { useNavigation } from '@react-navigation/native'
-import { useTranslation } from 'react-i18next'
-import { Button, Flex, Icons, Text } from 'ui/src'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { pushNotification } from 'wallet/src/features/notifications/slice'
-import { AppNotificationType } from 'wallet/src/features/notifications/types'
-import { deleteUnitag } from 'wallet/src/features/unitags/api'
-import { useUnitagUpdater } from 'wallet/src/features/unitags/context'
-import { useAppDispatch } from 'wallet/src/state'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
-
-export function DeleteUnitagModal({
-  unitag,
-  address,
-  onClose,
-}: {
-  unitag: string
-  address: Address
-  onClose: () => void
-}): JSX.Element {
-  const { t } = useTranslation()
-  const navigation = useNavigation()
-  const dispatch = useAppDispatch()
-  const { triggerRefetchUnitags } = useUnitagUpdater()
-
-  const handleDeleteError = (): void => {
-    dispatch(
-      pushNotification({
-        type: AppNotificationType.Error,
-        errorMessage: t('Could not delete username. Try again later.'),
-      })
-    )
-    onClose()
-  }
-
-  const onDelete = async (): Promise<void> => {
-    try {
-      const { data: deleteResponse } = await deleteUnitag(unitag, address)
-      if (!deleteResponse?.success) {
-        handleDeleteError()
-        return
-      }
-
-      if (deleteResponse?.success) {
-        triggerRefetchUnitags()
-        dispatch(
-          pushNotification({
-            type: AppNotificationType.Success,
-            title: t('Username deleted'),
-          })
-        )
-        navigation.goBack()
-        onClose()
-      }
-    } catch (e) {
-      handleDeleteError()
-    }
-  }
-
-  return (
-    <BottomSheetModal isDismissible name={ModalName.UnitagsDelete} onClose={onClose}>
-      <Flex centered gap="$spacing12" pb="$spacing12" pt="$spacing12" px="$spacing24">
-        <Flex
-          centered
-          backgroundColor="$DEP_accentCriticalSoft"
-          borderRadius="$rounded12"
-          height="$spacing48"
-          mb="$spacing8"
-          minWidth="$spacing48">
-          <Icons.AlertTriangle color="$statusCritical" size="$icon.24" />
-        </Flex>
-        <Text textAlign="center" variant="subheading1">
-          {t('Are you sure?')}
-        </Text>
-        <Text color="$neutral2" textAlign="center" variant="body2">
-          {t(
-            'You’re about to delete your username and customizable profile details. You will not be able to reclaim it.'
-          )}
-        </Text>
-        <Flex centered row gap="$spacing12" pt="$spacing24">
-          <Button fill testID={ElementName.Remove} theme="detrimental" onPress={onDelete}>
-            {t('Delete')}
-          </Button>
-        </Flex>
-      </Flex>
-    </BottomSheetModal>
-  )
-}
diff --git a/apps/mobile/src/components/unitags/HeaderRow.tsx b/apps/mobile/src/components/unitags/ScreenRow.tsx
similarity index 96%
rename from apps/mobile/src/components/unitags/HeaderRow.tsx
rename to apps/mobile/src/components/unitags/ScreenRow.tsx
index 0cd097ffe36..18c57e3c816 100644
--- a/apps/mobile/src/components/unitags/HeaderRow.tsx
+++ b/apps/mobile/src/components/unitags/ScreenRow.tsx
@@ -3,7 +3,7 @@ import { BackButton } from 'src/components/buttons/BackButton'
 import { Flex, Text, TouchableArea } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 
-export function HeaderRow({
+export function ScreenRow({
   headingText,
   tooltipButton,
 }: {
diff --git a/apps/mobile/src/components/unitags/UnitagBanner.tsx b/apps/mobile/src/components/unitags/UnitagBanner.tsx
index fe21fca0e1d..cfcefe2cab2 100644
--- a/apps/mobile/src/components/unitags/UnitagBanner.tsx
+++ b/apps/mobile/src/components/unitags/UnitagBanner.tsx
@@ -2,22 +2,21 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { useAppDispatch } from 'src/app/hooks'
 import { openModal } from 'src/features/modals/modalSlice'
-import { Button, Flex, Image, Text, useDeviceDimensions, useIsDarkMode } from 'ui/src'
-import { UNITAGS_BANNER_VERTICAL_DARK, UNITAGS_BANNER_VERTICAL_LIGHT } from 'ui/src/assets'
-import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
-import { markAccountDismissedUnitagPrompt } from 'wallet/src/features/wallet/slice'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
+import { Button, Flex, Image, Text, useDeviceDimensions } from 'ui/src'
+import { UNITAGS_BANNER_VERTICAL } from 'ui/src/assets'
 
-const IMAGE_ASPECT_RATIO = 0.4
+const IMAGE_ASPECT_RATIO = 0.35
 const IMAGE_SCREEN_WIDTH_PROPORTION = 0.2
 const COMPACT_IMAGE_SCREEN_WIDTH_PROPORTION = 0.16
+const COMPACT_IMAGE_TOP_SHIFT = -0.17
+const REGULAR_IMAGE_TOP_SHIFT = -0.12
+const SHORT_IMAGE_TOP_SHIFT = -0.07
 
 export function UnitagBanner({ compact }: { compact?: boolean }): JSX.Element {
   const dispatch = useAppDispatch()
   const { t } = useTranslation()
   const { fullWidth } = useDeviceDimensions()
-  const isDarkMode = useIsDarkMode()
-  const activeAddress = useActiveAccountAddressWithThrow()
   const imageWidth = compact
     ? COMPACT_IMAGE_SCREEN_WIDTH_PROPORTION * fullWidth
     : IMAGE_SCREEN_WIDTH_PROPORTION * fullWidth
@@ -28,7 +27,7 @@ export function UnitagBanner({ compact }: { compact?: boolean }): JSX.Element {
   }
 
   const onPressMaybeLater = (): void => {
-    dispatch(markAccountDismissedUnitagPrompt(activeAddress))
+    // TODO (MOB-1554): set a flag in redux to not show this again
   }
 
   return (
@@ -66,10 +65,12 @@ export function UnitagBanner({ compact }: { compact?: boolean }): JSX.Element {
           <Flex gap="$spacing8">
             <Text variant="subheading2">{t('Claim your Uniswap username')}</Text>
             <Text color="$neutral2" variant="body3">
-              {t('Sharing your address and connecting with friends has never been easier.')}
+              {t(
+                'Get a free username and personalized profile so people can find your across web3'
+              )}
             </Text>
           </Flex>
-          <Flex row gap="$spacing8">
+          <Flex row gap="$spacing8" pb="$spacing16">
             <Button
               borderRadius="$rounded24"
               fontSize="$small"
@@ -79,9 +80,8 @@ export function UnitagBanner({ compact }: { compact?: boolean }): JSX.Element {
               {t('Claim now')}
             </Button>
             <Button
-              backgroundless
               borderRadius="$rounded24"
-              color="$neutral3"
+              color="$neutral2"
               fontSize="$small"
               testID={ElementName.Cancel}
               theme="secondary"
@@ -91,16 +91,20 @@ export function UnitagBanner({ compact }: { compact?: boolean }): JSX.Element {
           </Flex>
         </Flex>
       )}
-      <Flex justifyContent={compact ? 'flex-start' : 'center'} width={imageWidth}>
+      <Flex aspectRatio={IMAGE_ASPECT_RATIO} maxWidth={imageWidth}>
         <Image
-          alignSelf="center"
-          position="absolute"
-          resizeMode="cover"
-          source={{
-            width: imageWidth,
-            height: imageHeight,
-            uri: isDarkMode ? UNITAGS_BANNER_VERTICAL_DARK : UNITAGS_BANNER_VERTICAL_LIGHT,
+          $short={{
+            top: SHORT_IMAGE_TOP_SHIFT * imageHeight,
           }}
+          height={imageHeight}
+          position="absolute"
+          resizeMode="center"
+          right={0}
+          source={UNITAGS_BANNER_VERTICAL}
+          top={
+            compact ? COMPACT_IMAGE_TOP_SHIFT * imageHeight : REGULAR_IMAGE_TOP_SHIFT * imageHeight
+          } // Shift image up otherwise it's not fully visible
+          width={imageWidth}
         />
       </Flex>
     </Flex>
diff --git a/apps/mobile/src/components/unitags/UnitagProfilePicture.tsx b/apps/mobile/src/components/unitags/UnitagProfilePicture.tsx
index f06fbc123fa..ddfbc8ea329 100644
--- a/apps/mobile/src/components/unitags/UnitagProfilePicture.tsx
+++ b/apps/mobile/src/components/unitags/UnitagProfilePicture.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
+import { Unicon } from 'src/components/unicons/Unicon'
 import { Flex, useSporeColors } from 'ui/src'
 import { isSVGUri } from 'utilities/src/format/urls'
-import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
 import { ImageUri } from 'wallet/src/features/images/ImageUri'
 import { RemoteSvg } from 'wallet/src/features/images/RemoteSvg'
 
@@ -17,16 +17,7 @@ export function UnitagProfilePicture({
   const colors = useSporeColors()
 
   return profilePictureUri ? (
-    <Flex
-      shrink
-      bg="$surface1"
-      borderRadius="$roundedFull"
-      height={size}
-      overflow="hidden"
-      shadowColor="$neutral3"
-      shadowOpacity={0.4}
-      shadowRadius="$spacing4"
-      width={size}>
+    <Flex shrink borderRadius="$roundedFull" height={size} overflow="hidden" width={size}>
       {isSVGUri(profilePictureUri) ? (
         <RemoteSvg
           backgroundColor={colors.surface1.val}
@@ -39,11 +30,6 @@ export function UnitagProfilePicture({
       )}
     </Flex>
   ) : (
-    <AccountIcon
-      address={address}
-      avatarUri={profilePictureUri}
-      showBackground={true}
-      size={size}
-    />
+    <Unicon address={address} size={size} />
   )
 }
diff --git a/apps/mobile/src/components/unitags/UnitagWithProfilePicture.tsx b/apps/mobile/src/components/unitags/UnitagWithProfilePicture.tsx
deleted file mode 100644
index 0c500d4b6e6..00000000000
--- a/apps/mobile/src/components/unitags/UnitagWithProfilePicture.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-import { UnitagProfilePicture } from 'src/components/unitags/UnitagProfilePicture'
-import { Flex, Text } from 'ui/src'
-import { imageSizes, spacing } from 'ui/src/theme'
-import { UNITAG_SUFFIX } from 'wallet/src/features/unitags/constants'
-
-export const UnitagWithProfilePicture = ({
-  unitag,
-  address,
-  profilePictureUri,
-}: {
-  unitag: string
-  address: Address
-  profilePictureUri?: string
-}): JSX.Element => {
-  return (
-    <Flex centered gap={-spacing.spacing24}>
-      <UnitagProfilePicture
-        address={address}
-        profilePictureUri={profilePictureUri}
-        size={imageSizes.image100}
-      />
-      <Flex
-        row
-        backgroundColor="$surface1"
-        borderRadius="$rounded32"
-        px="$spacing12"
-        py="$spacing8"
-        shadowColor="$neutral3"
-        shadowOpacity={0.4}
-        shadowRadius="$spacing4"
-        transform={[{ rotateZ: '-2deg' }]}
-        zIndex="$popover">
-        <Text color="$accent1" variant="buttonLabel1">
-          {unitag}
-          <Text color="$neutral2" variant="buttonLabel1">
-            {UNITAG_SUFFIX}
-          </Text>
-        </Text>
-      </Flex>
-    </Flex>
-  )
-}
diff --git a/apps/mobile/src/components/unitags/UnitagsIntroModal.tsx b/apps/mobile/src/components/unitags/UnitagsIntroModal.tsx
index 9f4cbf20006..559e8adb308 100644
--- a/apps/mobile/src/components/unitags/UnitagsIntroModal.tsx
+++ b/apps/mobile/src/components/unitags/UnitagsIntroModal.tsx
@@ -3,19 +3,16 @@ import { useTranslation } from 'react-i18next'
 import 'react-native-reanimated'
 import { useAppDispatch } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { closeModal } from 'src/features/modals/modalSlice'
-import { TermsOfService } from 'src/screens/Onboarding/TermsOfService'
+import { ModalName } from 'src/features/telemetry/constants'
 import { Screens, UnitagScreens } from 'src/screens/Screens'
-import { Button, Flex, GeneratedIcon, Icons, Image, Text, useIsDarkMode } from 'ui/src'
-import { UNITAGS_INTRO_BANNER_DARK, UNITAGS_INTRO_BANNER_LIGHT } from 'ui/src/assets'
+import { Button, Flex, GeneratedIcon, Icons, Image, Text } from 'ui/src'
+import { UNITAGS_BANNER_HORIZONTAL } from 'ui/src/assets'
 import { iconSizes } from 'ui/src/theme'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { ImportType } from 'wallet/src/features/onboarding/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export function UnitagsIntroModal(): JSX.Element {
   const { t } = useTranslation()
-  const isDarkMode = useIsDarkMode()
   const appDispatch = useAppDispatch()
 
   const onClose = (): void => {
@@ -27,57 +24,79 @@ export function UnitagsIntroModal(): JSX.Element {
       screen: UnitagScreens.ClaimUnitag,
       params: {
         entryPoint: Screens.Home,
-        // While technically not a new wallet, required for type consistency.
-        // The entryPoint being Screens.Home ensures this value is not used to ever create a wallet.
-        importType: ImportType.CreateNew,
       },
     })
     onClose()
   }
 
+  const onPressMaybeLater = (): void => {
+    onClose()
+  }
+
   return (
     <BottomSheetModal name={ModalName.UnitagsIntro} onClose={onClose}>
-      <Flex gap="$spacing24" px="$spacing24" py="$spacing16">
+      <Flex $short={{ gap: '$spacing16' }} gap="$spacing24" px="$spacing24" py="$spacing16">
         <Flex alignItems="center" gap="$spacing12">
-          <Text variant="subheading1">{t('Introducing Usernames')}</Text>
-          <Text color="$neutral2" textAlign="center" variant="body3">
-            {t(
-              'Say goodbye to 0x addresses. Usernames are readable addresses that make it easier to receive crypto and connect with friends.'
-            )}
-          </Text>
+          <Flex maxHeight={70}>
+            <Image maxHeight={70} resizeMode="contain" source={UNITAGS_BANNER_HORIZONTAL} />
+          </Flex>
+          <Text variant="heading3">{t('Introducing Usernames')}</Text>
         </Flex>
-        <Flex alignItems="center" maxHeight={100}>
-          <Image
-            maxHeight={100}
-            resizeMode="contain"
-            source={isDarkMode ? UNITAGS_INTRO_BANNER_DARK : UNITAGS_INTRO_BANNER_LIGHT}
+        <Flex gap="$spacing16" px="$spacing12">
+          <BodyItem
+            Icon={Icons.Quotes}
+            subtitle={t('Say goodbye to copying, pasting, and triple-checking 0x addresses.')}
+            title={t('Human readable')}
+          />
+          <BodyItem
+            Icon={Icons.Photo}
+            subtitle={t('Upload an avatar, create a bio, and link your socials.')}
+            title={t('Customizable profile')}
+          />
+          <BodyItem
+            Icon={Icons.Ticket}
+            subtitle={t('Create your unique username for free, no network fees involved.')}
+            title={t('Free to claim')}
+          />
+          <BodyItem
+            Icon={Icons.Lightning}
+            subtitle={t('Uniswap usernames are built on top of ENS subdomains.')}
+            title={t('Powered by ENS')}
           />
-        </Flex>
-        <Flex gap="$spacing16" px="$spacing20">
-          <BodyItem Icon={Icons.UserSquare} title={t('Customizable profiles')} />
-          <BodyItem Icon={Icons.Ticket} title={t('Free to claim')} />
-          <BodyItem Icon={Icons.Lightning} title={t('Powered by ENS subdomains')} />
         </Flex>
         <Flex gap="$spacing8" mt="$spacing16">
           <Button size="medium" theme="primary" onPress={onPressClaimOneNow}>
-            {t('Continue')}
+            {t('Claim one now')}
+          </Button>
+          <Button size="medium" theme="secondary" onPress={onPressMaybeLater}>
+            {t('Maybe later')}
           </Button>
-        </Flex>
-        <Flex $short={{ py: '$none', mx: '$spacing12' }} mx="$spacing24">
-          <TermsOfService />
         </Flex>
       </Flex>
     </BottomSheetModal>
   )
 }
 
-function BodyItem({ Icon, title }: { Icon: GeneratedIcon; title: string }): JSX.Element {
+function BodyItem({
+  Icon,
+  title,
+  subtitle,
+}: {
+  Icon: GeneratedIcon
+  title: string
+  subtitle: string
+}): JSX.Element {
   return (
-    <Flex row alignItems="center" gap="$spacing16">
-      <Icon color="$accent1" size={iconSizes.icon20} strokeWidth={2} />
-      <Text color="$neutral2" variant="body3">
-        {title}
-      </Text>
+    <Flex row alignItems="center" gap="$spacing24">
+      <Icon color="$accent1" size={iconSizes.icon24} strokeWidth={2} />
+      <Flex fill $short={{ gap: '$spacing2' }} gap="$spacing4">
+        <Text color="$accent1" variant="subheading2">
+          {title}
+        </Text>
+        <Text color="$neutral2" variant="body3">
+          {subtitle}
+        </Text>
+      </Flex>
     </Flex>
   )
 }
diff --git a/apps/mobile/src/components/unitags/WalletSelectorModal.tsx b/apps/mobile/src/components/unitags/WalletSelectorModal.tsx
new file mode 100644
index 00000000000..1d462bc8a5d
--- /dev/null
+++ b/apps/mobile/src/components/unitags/WalletSelectorModal.tsx
@@ -0,0 +1,159 @@
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { useAppDispatch } from 'src/app/hooks'
+import { navigate } from 'src/app/navigation/rootNavigation'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
+import { Unicon } from 'src/components/unicons/Unicon'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
+import { OnboardingScreens, Screens } from 'src/screens/Screens'
+import { Button, Flex, Icons, Separator, Text, useSporeColors } from 'ui/src'
+import { iconSizes } from 'ui/src/theme'
+import { ImportType, OnboardingEntryPoint } from 'wallet/src/features/onboarding/types'
+import { Account } from 'wallet/src/features/wallet/accounts/types'
+import { createAccountActions } from 'wallet/src/features/wallet/create/createAccountSaga'
+import {
+  PendingAccountActions,
+  pendingAccountActions,
+} from 'wallet/src/features/wallet/create/pendingAccountsSaga'
+import {
+  useDisplayName,
+  useNativeAccountExists,
+  useSignerAccounts,
+} from 'wallet/src/features/wallet/hooks'
+import { shortenAddress } from 'wallet/src/utils/addresses'
+type WalletSelectorModalProps = {
+  activeAccount: Account | null
+  onPressAccount: (account: Account) => void
+  onClose: () => void
+}
+
+export const WalletSelectorModal = ({
+  activeAccount,
+  onPressAccount,
+  onClose,
+}: WalletSelectorModalProps): JSX.Element => {
+  const colors = useSporeColors()
+  const { t } = useTranslation()
+  const signerAccounts = useSignerAccounts()
+  const dispatch = useAppDispatch()
+  const hasImportedSeedPhrase = useNativeAccountExists()
+
+  const options = signerAccounts.map((account) => {
+    return {
+      key: `${ElementName.AccountCard}-${account.address}`,
+      onPress: () => onPressAccount(account),
+      render: () => <SwitchAccountOption account={account} activeAccount={activeAccount} />,
+    }
+  })
+
+  const onPressNewWallet = (): void => {
+    // Clear any existing pending accounts first.
+    dispatch(pendingAccountActions.trigger(PendingAccountActions.Delete))
+    dispatch(createAccountActions.trigger())
+
+    navigate(Screens.OnboardingStack, {
+      screen: OnboardingScreens.EditName,
+      params: {
+        importType: hasImportedSeedPhrase ? ImportType.CreateAdditional : ImportType.CreateNew,
+        entryPoint: OnboardingEntryPoint.Sidebar,
+      },
+    })
+    onClose()
+  }
+
+  return (
+    <BottomSheetModal
+      isDismissible
+      backgroundColor={colors.surface1.get()}
+      hideHandlebar={false}
+      name={ModalName.AccountSwitcher}
+      onClose={onClose}>
+      <Flex centered gap="$spacing16" px="$spacing24">
+        <Flex centered gap="$spacing8" py="$spacing16">
+          <Text variant="subheading1">{t('Choose a wallet to map to')}</Text>
+          <Text color="$neutral2" textAlign="center" variant="body2">
+            {t(
+              'Choose which wallet you want to assign your username to. You can only claim on 1 wallet, so choose wisely.'
+            )}
+          </Text>
+        </Flex>
+        <Flex gap="$spacing12" width="100%">
+          {options.map((option) => (
+            <Flex key={option.key} onPress={option.onPress}>
+              {option.render()}
+            </Flex>
+          ))}
+          <Flex row justifyContent="center">
+            <Separator borderColor="$surface3" pt="$spacing12" />
+            <Text color="$neutral3" px="$spacing12" variant="body2">
+              {t('or')}
+            </Text>
+            <Separator borderColor="$surface3" pt="$spacing12" />
+          </Flex>
+        </Flex>
+        <Flex centered row gap="$spacing12">
+          <Button
+            fill
+            gap="$spacing16"
+            justifyContent="flex-start"
+            px="$spacing24"
+            py="$spacing16"
+            theme="secondary"
+            onPress={onPressNewWallet}>
+            <Flex centered backgroundColor="$accentSoft" borderRadius="$roundedFull" p="$spacing8">
+              <Icons.WalletFilled color="$accent1" size={iconSizes.icon20} />
+            </Flex>
+            <Text variant="subheading1">{t('Create a new wallet')}</Text>
+          </Button>
+        </Flex>
+        <Flex centered row gap="$spacing12" pt="$spacing12">
+          <Button
+            fill
+            backgroundColor="$surface1"
+            color="$accent1"
+            theme="secondary"
+            onPress={onClose}>
+            {t('Close')}
+          </Button>
+        </Flex>
+      </Flex>
+    </BottomSheetModal>
+  )
+}
+
+export const SwitchAccountOption = ({
+  account,
+  activeAccount,
+}: {
+  account: Account
+  activeAccount: Account | null
+}): JSX.Element => {
+  const displayName = useDisplayName(account.address)
+  return (
+    <Flex
+      row
+      alignItems="center"
+      backgroundColor="$surface3"
+      borderColor="$accent1"
+      borderRadius="$rounded20"
+      borderWidth={activeAccount?.address === account.address ? 1 : undefined}
+      gap="$spacing16"
+      justifyContent="flex-start"
+      px="$spacing24"
+      py="$spacing12">
+      <Unicon address={account.address} size={iconSizes.icon40} />
+      <Flex shrink alignItems="flex-start">
+        <Text
+          color="$neutral1"
+          numberOfLines={1}
+          testID={`address-display/name/${displayName?.name}`}
+          variant="body1">
+          {displayName?.name}
+        </Text>
+        <Text color="$neutral2" variant="subheading2">
+          {shortenAddress(account.address)}
+        </Text>
+      </Flex>
+    </Flex>
+  )
+}
diff --git a/apps/mobile/src/data/cache.ts b/apps/mobile/src/data/cache.ts
index 64855c07ab7..a06a194e961 100644
--- a/apps/mobile/src/data/cache.ts
+++ b/apps/mobile/src/data/cache.ts
@@ -1,7 +1,7 @@
 import { InMemoryCache } from '@apollo/client'
 import { MMKVWrapper, persistCache } from 'apollo3-cache-persist'
 import { logger } from 'utilities/src/logger/logger'
-import { setupWalletCache } from 'wallet/src/data/cache'
+import { setupCache } from 'wallet/src/data/cache'
 
 const MAX_CACHE_SIZE_IN_BYTES = 1024 * 1024 * 25 // 25 MB
 
@@ -11,7 +11,7 @@ const MAX_CACHE_SIZE_IN_BYTES = 1024 * 1024 * 25 // 25 MB
  * @returns
  */
 export async function initAndPersistCache(storage: MMKVWrapper): Promise<InMemoryCache> {
-  const cache = setupWalletCache()
+  const cache = setupCache()
 
   try {
     await persistCache({
diff --git a/apps/mobile/src/features/CloudBackup/CloudBackupPasswordForm.tsx b/apps/mobile/src/features/CloudBackup/CloudBackupPasswordForm.tsx
index 8fcaa1996bc..879c93b845c 100644
--- a/apps/mobile/src/features/CloudBackup/CloudBackupPasswordForm.tsx
+++ b/apps/mobile/src/features/CloudBackup/CloudBackupPasswordForm.tsx
@@ -3,9 +3,8 @@ 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, Icons, Text } from 'ui/src'
-import { iconSizes } from 'ui/src/theme'
-import { ElementName } from 'wallet/src/telemetry/constants'
+import { ElementName } from 'src/features/telemetry/constants'
+import { Button, CheckBox, Flex } from 'ui/src'
 import { validatePassword } from 'wallet/src/utils/password'
 
 export enum PasswordErrors {
@@ -29,9 +28,10 @@ export function CloudBackupPasswordForm({
   const passwordInputRef = useRef<TextInput>(null)
   const [password, setPassword] = useState('')
 
+  const [consentChecked, setConsentChecked] = useState(false)
   const [error, setError] = useState<PasswordErrors | string | undefined>(undefined)
 
-  const isButtonDisabled = !!error || password.length === 0
+  const isButtonDisabled = (!isConfirmation && !consentChecked) || !!error || password.length === 0
 
   const onPasswordChangeText = (newPassword: string): void => {
     if (isConfirmation && newPassword === password) {
@@ -44,6 +44,10 @@ export function CloudBackupPasswordForm({
     setPassword(newPassword)
   }
 
+  const onPressConsent = (): void => {
+    setConsentChecked(!consentChecked)
+  }
+
   const onPasswordSubmitEditing = (): void => {
     const { valid, validationErrorString } = validatePassword(password)
     if (!isConfirmation && !valid) {
@@ -102,14 +106,13 @@ export function CloudBackupPasswordForm({
           {error ? <PasswordError errorText={errorText} /> : null}
         </Flex>
         {!isConfirmation && (
-          <Flex centered row gap="$spacing12" px="$spacing16">
-            <Icons.DiamondExclamation color="$neutral2" size={iconSizes.icon20} />
-            <Text color="$neutral2" variant="body3">
-              {t(
-                'Uniswap Labs does not store your password and can’t recover it, so it’s crucial you remember it.'
-              )}
-            </Text>
-          </Flex>
+          <CheckBox
+            checked={consentChecked}
+            text={t(
+              'I understand that if I forget my password, Uniswap Labs cannot retrieve my recovery phrase.'
+            )}
+            onCheckPressed={onPressConsent}
+          />
         )}
       </Flex>
       <Button disabled={isButtonDisabled} testID={ElementName.Next} onPress={onPressNext}>
diff --git a/apps/mobile/src/features/CloudBackup/CloudBackupProcessingAnimation.tsx b/apps/mobile/src/features/CloudBackup/CloudBackupProcessingAnimation.tsx
index ad9290a2d9b..121ad709776 100644
--- a/apps/mobile/src/features/CloudBackup/CloudBackupProcessingAnimation.tsx
+++ b/apps/mobile/src/features/CloudBackup/CloudBackupProcessingAnimation.tsx
@@ -5,6 +5,7 @@ import { useTranslation } from 'react-i18next'
 import { ActivityIndicator, Alert } from 'react-native'
 import { useAppDispatch } from 'src/app/hooks'
 import { OnboardingStackParamList, SettingsStackParamList } from 'src/app/navigation/types'
+import { CheckmarkCircle } from 'src/components/icons/CheckmarkCircle'
 import { backupMnemonicToCloudStorage } from 'src/features/CloudBackup/RNCloudStorageBackupsManager'
 import { OnboardingScreens, Screens } from 'src/screens/Screens'
 import { Flex, Text, useSporeColors } from 'ui/src'
@@ -12,7 +13,6 @@ import { iconSizes } from 'ui/src/theme'
 import { logger } from 'utilities/src/logger/logger'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { promiseMinDelay } from 'utilities/src/time/timing'
-import { CheckmarkCircle } from 'wallet/src/components/icons/CheckmarkCircle'
 import {
   EditAccountAction,
   editAccountActions,
diff --git a/apps/mobile/src/features/appRating/saga.ts b/apps/mobile/src/features/appRating/saga.ts
index f851166a98f..193980dbf93 100644
--- a/apps/mobile/src/features/appRating/saga.ts
+++ b/apps/mobile/src/features/appRating/saga.ts
@@ -4,6 +4,7 @@ import { APP_FEEDBACK_LINK } from 'src/constants/urls'
 import { hasConsecutiveRecentSwapsSelector } from 'src/features/appRating/selectors'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
 import { MobileEventName } from 'src/features/telemetry/constants'
+import { openUri } from 'src/utils/linking'
 import { call, delay, put, select, takeLatest } from 'typed-redux-saga'
 import { logger } from 'utilities/src/logger/logger'
 import { ONE_DAY_MS, ONE_SECOND_MS } from 'utilities/src/time/time'
@@ -12,7 +13,6 @@ 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'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 // at most once per reminder period (120 days)
@@ -61,22 +61,18 @@ function* maybeRequestAppRating() {
       return
     } // avoids prompting again
 
-    const appRatingPromptedMs = yield* appSelect((state) => state.wallet.appRatingPromptedMs)
+    const appRatingPromptedMs = yield* appSelect((state) => state.wallet.appRatingPromptedMs ?? 0)
     const appRatingFeedbackProvidedMs = yield* appSelect(
-      (state) => state.wallet.appRatingFeedbackProvidedMs
+      (state) => state.wallet.appRatingFeedbackProvidedMs ?? 0
     )
-
     const consecutiveSwapsCondition = yield* appSelect(hasConsecutiveRecentSwapsSelector)
 
     // prompt if enough time has passed since last prompt or last feedback provided
     const reminderCondition =
-      (appRatingPromptedMs !== undefined &&
-        Date.now() - appRatingPromptedMs > MIN_PROMPT_REMINDER_MS) ||
-      (appRatingFeedbackProvidedMs !== undefined &&
-        Date.now() - appRatingFeedbackProvidedMs > MIN_FEEDBACK_REMINDER_MS)
+      Date.now() - appRatingPromptedMs > MIN_PROMPT_REMINDER_MS ||
+      Date.now() - appRatingFeedbackProvidedMs > MIN_FEEDBACK_REMINDER_MS
 
-    const hasNeverPrompted = appRatingPromptedMs === undefined
-    const shouldPrompt = consecutiveSwapsCondition && (hasNeverPrompted || reminderCondition)
+    const shouldPrompt = consecutiveSwapsCondition && reminderCondition
 
     if (!shouldPrompt) {
       logger.debug(
diff --git a/apps/mobile/src/features/authentication/LockScreenModal.tsx b/apps/mobile/src/features/authentication/LockScreenModal.tsx
index f93aedbc1bf..61ded465b2f 100644
--- a/apps/mobile/src/features/authentication/LockScreenModal.tsx
+++ b/apps/mobile/src/features/authentication/LockScreenModal.tsx
@@ -3,8 +3,9 @@ import { Image, StyleSheet } from 'react-native'
 import { Modal } from 'src/components/modals/Modal'
 import { useLockScreenContext } from 'src/features/authentication/lockScreenContext'
 import { useBiometricPrompt } from 'src/features/biometrics/hooks'
-import { Flex, TouchableArea, useDeviceDimensions, useDeviceInsets, useIsDarkMode } from 'ui/src'
+import { Flex, TouchableArea, useDeviceDimensions, useDeviceInsets } from 'ui/src'
 import { UNISWAP_LOGO_LARGE } from 'ui/src/assets'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 export const SPLASH_SCREEN = { uri: 'SplashScreen' }
diff --git a/apps/mobile/src/features/balances/hooks.ts b/apps/mobile/src/features/balances/hooks.ts
index a9acdb62976..add37939cb0 100644
--- a/apps/mobile/src/features/balances/hooks.ts
+++ b/apps/mobile/src/features/balances/hooks.ts
@@ -3,11 +3,12 @@ import { useTranslation } from 'react-i18next'
 import { NativeSyntheticEvent, Share } from 'react-native'
 import { ContextMenuAction, ContextMenuOnPressNativeEvent } from 'react-native-context-menu-view'
 import { useAppDispatch } from 'src/app/hooks'
-import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
-import { openModal } from 'src/features/modals/modalSlice'
+import { useNavigateToSend } from 'src/features/send/hooks'
 import { useNavigateToSwap } from 'src/features/swap/hooks'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
 import { MobileEventName, ShareableEntity } from 'src/features/telemetry/constants'
+import { useCopyTokenAddressCallback } from 'src/features/tokens/hooks'
+import { getTokenUrl } from 'src/utils/linking'
 import { logger } from 'utilities/src/logger/logger'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { ChainId } from 'wallet/src/constants/chains'
@@ -18,14 +19,12 @@ 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 { ModalName } from 'wallet/src/telemetry/constants'
 import {
-  CurrencyId,
   areCurrencyIdsEqual,
+  CurrencyId,
   currencyIdToAddress,
   currencyIdToChain,
 } from 'wallet/src/utils/currencyId'
-import { getTokenUrl } from 'wallet/src/utils/linking'
 
 interface TokenMenuParams {
   currencyId: CurrencyId
@@ -46,6 +45,7 @@ export function useTokenContextMenu({
   const dispatch = useAppDispatch()
   const activeAccountAddress = useActiveAccountAddressWithThrow()
   const navigateToSwap = useNavigateToSwap()
+  const navigateToSend = useNavigateToSend()
 
   const activeAccountHoldsToken =
     portfolioBalance && areCurrencyIdsEqual(currencyId, portfolioBalance?.currencyInfo.currencyId)
@@ -54,13 +54,7 @@ export function useTokenContextMenu({
   const currencyAddress = currencyIdToAddress(currencyId)
   const currencyChainId = currencyIdToChain(currencyId) ?? ChainId.Mainnet
 
-  const onPressReceive = useCallback(
-    () =>
-      dispatch(
-        openModal({ name: ModalName.WalletConnectScan, initialState: ScannerModalState.WalletQr })
-      ),
-    [dispatch]
-  )
+  const onPressCopyContractAddress = useCopyTokenAddressCallback(currencyAddress)
 
   const onPressSwap = useCallback(
     (currencyField: CurrencyField) => {
@@ -70,6 +64,11 @@ export function useTokenContextMenu({
     [currencyAddress, currencyChainId, navigateToSwap]
   )
 
+  const onPressSend = useCallback(() => {
+    // Do not show warning modal speedbump if user is trying to send tokens they own
+    navigateToSend(currencyAddress, currencyChainId)
+  }, [currencyAddress, currencyChainId, navigateToSend])
+
   const onPressShare = useCallback(async () => {
     const tokenUrl = getTokenUrl(currencyId)
     if (!tokenUrl) {
@@ -139,15 +138,20 @@ export function useTokenContextMenu({
         onPress: () => onPressSwap(CurrencyField.INPUT),
       },
       {
-        title: t('Receive'),
-        systemIcon: 'qrcode',
-        onPress: onPressReceive,
+        title: t('Send'),
+        systemIcon: 'paperplane',
+        onPress: onPressSend,
       },
       {
         title: t('Share'),
         systemIcon: 'square.and.arrow.up',
         onPress: onPressShare,
       },
+      {
+        title: t('Copy contract address'),
+        systemIcon: 'doc.on.doc',
+        onPress: onPressCopyContractAddress,
+      },
       ...(activeAccountHoldsToken
         ? [
             {
@@ -161,7 +165,8 @@ export function useTokenContextMenu({
     ],
     [
       t,
-      onPressReceive,
+      onPressSend,
+      onPressCopyContractAddress,
       onPressShare,
       activeAccountHoldsToken,
       isHidden,
diff --git a/apps/mobile/src/features/behaviorHistory/selectors.ts b/apps/mobile/src/features/behaviorHistory/selectors.ts
new file mode 100644
index 00000000000..91717f8e955
--- /dev/null
+++ b/apps/mobile/src/features/behaviorHistory/selectors.ts
@@ -0,0 +1,7 @@
+import { MobileState } from 'src/app/reducer'
+
+export const selectHasViewedReviewScreen = (state: MobileState): boolean =>
+  state.behaviorHistory.hasViewedReviewScreen
+
+export const selectHasSubmittedHoldToSwap = (state: MobileState): boolean =>
+  state.behaviorHistory.hasSubmittedHoldToSwap
diff --git a/packages/wallet/src/features/behaviorHistory/slice.ts b/apps/mobile/src/features/behaviorHistory/slice.ts
similarity index 100%
rename from packages/wallet/src/features/behaviorHistory/slice.ts
rename to apps/mobile/src/features/behaviorHistory/slice.ts
diff --git a/apps/mobile/src/features/biometrics/hooks.tsx b/apps/mobile/src/features/biometrics/hooks.tsx
index 9bb82027b70..8f9677ed2e8 100644
--- a/apps/mobile/src/features/biometrics/hooks.tsx
+++ b/apps/mobile/src/features/biometrics/hooks.tsx
@@ -11,66 +11,31 @@ import { BiometricSettingsState } from 'src/features/biometrics/slice'
 import { useAsyncData } from 'utilities/src/react/hooks'
 import { isAndroid } from 'wallet/src/utils/platform'
 
-type TriggerArgs<T> = {
-  params?: T
-  successCallback?: (params?: T) => void
-  failureCallback?: () => void
-}
-
 /**
  * Hook shortcut to use the biometric prompt.
- *
- * It can be used by either declaring the success/failure callbacks at the time you call the hook,
- * or by declaring them when you call the trigger function:
- *
- * Example 1:
- *
- * ```ts
- * const { trigger } = useBiometricPrompt(() => { success() }, () => { failure() })
- * triger({
- *   params: { ... },
- * })
- * ```
- *
- * Example 2:
- *
- * ```ts
- * const { trigger } = useBiometricPrompt()
- * triger({
- *  successCallback: () => { success() },
- *  failureCallback: () => { success() },
- *  params: { ... },
- * })
- * ```
- *
- * TODO(MOB-2523): standardize usage of this hook and remove the style of Example 1.
- *
  * @returns trigger Trigger the OS biometric flow and invokes successCallback on success.
  */
 export function useBiometricPrompt<T = undefined>(
   successCallback?: (params?: T) => void,
   failureCallback?: () => void
 ): {
-  trigger: (args?: TriggerArgs<T>) => Promise<void>
+  trigger: (params?: T) => Promise<void>
 } {
   const { setAuthenticationStatus } = useBiometricContext()
 
-  const trigger = async (args?: TriggerArgs<T>): Promise<void> => {
+  const trigger = async (params?: T): Promise<void> => {
     setAuthenticationStatus(BiometricAuthenticationStatus.Authenticating)
     const authStatus = await tryLocalAuthenticate()
 
     setAuthenticationStatus(authStatus)
 
-    const _successCallback = args?.successCallback ?? successCallback
-    const _failureCallback = args?.failureCallback ?? failureCallback
-
     if (
       biometricAuthenticationSuccessful(authStatus) ||
       biometricAuthenticationDisabledByOS(authStatus)
     ) {
-      _successCallback?.(args?.params)
+      successCallback?.(params)
     } else {
-      _failureCallback?.()
+      failureCallback?.()
     }
   }
 
diff --git a/apps/mobile/src/features/dataApi/balances.test.ts b/apps/mobile/src/features/dataApi/balances.test.ts
deleted file mode 100644
index 94b48b3eaf0..00000000000
--- a/apps/mobile/src/features/dataApi/balances.test.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { act, renderHook, waitFor } from 'src/test/test-utils'
-import {
-  SAMPLE_CURRENCY_ID_1,
-  SAMPLE_CURRENCY_ID_2,
-  mockWalletPreloadedState,
-} from 'wallet/src/test/fixtures'
-import { Portfolio, PortfolioBalancesById } from 'wallet/src/test/gqlFixtures'
-import { useBalances } from './balances'
-
-describe(useBalances, () => {
-  it('returns null if no currency was specified', async () => {
-    const { result } = renderHook(() => useBalances(undefined), {
-      preloadedState: mockWalletPreloadedState,
-    })
-
-    await act(() => undefined)
-
-    expect(result.current).toEqual(null)
-  })
-
-  it('returns empty array if no balances are available', async () => {
-    const { result } = renderHook(() => useBalances([SAMPLE_CURRENCY_ID_1]), {
-      preloadedState: mockWalletPreloadedState,
-    })
-
-    expect(result.current).toEqual(null) // null while data is loading
-
-    await act(() => undefined)
-
-    expect(result.current).toEqual([]) // empty array when data is loaded
-  })
-
-  it('returns balances for specified currencies if they exist in the portfolio', async () => {
-    const { result } = renderHook(() => useBalances([SAMPLE_CURRENCY_ID_1, SAMPLE_CURRENCY_ID_2]), {
-      preloadedState: mockWalletPreloadedState,
-      resolvers: {
-        Query: {
-          portfolios: () => [Portfolio],
-        },
-      },
-    })
-
-    await waitFor(() => {
-      // The response contains only the first currency as the second one is not in the portfolio
-      expect(result.current).toEqual([PortfolioBalancesById[SAMPLE_CURRENCY_ID_1]])
-    })
-  })
-})
diff --git a/packages/wallet/src/features/dataApi/searchTokens.test.ts b/apps/mobile/src/features/dataApi/searchTokens.test.ts
similarity index 89%
rename from packages/wallet/src/features/dataApi/searchTokens.test.ts
rename to apps/mobile/src/features/dataApi/searchTokens.test.ts
index 7f5a5af63a5..ef236cae046 100644
--- a/packages/wallet/src/features/dataApi/searchTokens.test.ts
+++ b/apps/mobile/src/features/dataApi/searchTokens.test.ts
@@ -1,9 +1,10 @@
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { Resolvers } from '@apollo/client'
 import { waitFor } from '@testing-library/react-native'
-import { useTokenProjects } from 'wallet/src/features/dataApi/tokenProjects'
+import { useTokenProjects } from 'src/features/dataApi/tokenProjects'
+import { renderHook } from 'src/test/test-utils'
 import { gqlTokenToCurrencyInfo } from 'wallet/src/features/dataApi/utils'
 import { SearchTokens } from 'wallet/src/test/gqlFixtures'
-import { renderHook } from 'wallet/src/test/test-utils'
 import { useSearchTokens } from './searchTokens'
 
 const resolvers: Resolvers = {
diff --git a/packages/wallet/src/features/dataApi/searchTokens.ts b/apps/mobile/src/features/dataApi/searchTokens.ts
similarity index 100%
rename from packages/wallet/src/features/dataApi/searchTokens.ts
rename to apps/mobile/src/features/dataApi/searchTokens.ts
diff --git a/packages/wallet/src/features/dataApi/tokenProject.test.tsx b/apps/mobile/src/features/dataApi/tokenProject.test.tsx
similarity index 88%
rename from packages/wallet/src/features/dataApi/tokenProject.test.tsx
rename to apps/mobile/src/features/dataApi/tokenProject.test.tsx
index 0b84b9ef21d..68cad2fc389 100644
--- a/packages/wallet/src/features/dataApi/tokenProject.test.tsx
+++ b/apps/mobile/src/features/dataApi/tokenProject.test.tsx
@@ -1,9 +1,9 @@
 import { waitFor } from '@testing-library/react-native'
-import { useTokenProjects } from 'wallet/src/features/dataApi/tokenProjects'
+import { useTokenProjects } from 'src/features/dataApi/tokenProjects'
+import { renderHook } from 'src/test/test-utils'
 import { tokenProjectToCurrencyInfos } from 'wallet/src/features/dataApi/utils'
 import { SAMPLE_CURRENCY_ID_1 } from 'wallet/src/test/fixtures'
 import { TokenProjects } from 'wallet/src/test/gqlFixtures'
-import { renderHook } from 'wallet/src/test/test-utils'
 
 describe(useTokenProjects, () => {
   it('returns undefined when there is no data', async () => {
diff --git a/packages/wallet/src/features/dataApi/tokenProjects.ts b/apps/mobile/src/features/dataApi/tokenProjects.ts
similarity index 100%
rename from packages/wallet/src/features/dataApi/tokenProjects.ts
rename to apps/mobile/src/features/dataApi/tokenProjects.ts
diff --git a/packages/wallet/src/features/dataApi/topTokens.ts b/apps/mobile/src/features/dataApi/topTokens.ts
similarity index 100%
rename from packages/wallet/src/features/dataApi/topTokens.ts
rename to apps/mobile/src/features/dataApi/topTokens.ts
diff --git a/apps/mobile/src/features/dataApi/types.ts b/apps/mobile/src/features/dataApi/types.ts
new file mode 100644
index 00000000000..ef57e6f9b1a
--- /dev/null
+++ b/apps/mobile/src/features/dataApi/types.ts
@@ -0,0 +1,26 @@
+import { QueryResult } from '@apollo/client'
+import { Currency } from '@uniswap/sdk-core'
+import { SafetyLevel } from 'wallet/src/data/__generated__/types-and-hooks'
+import { CurrencyId } from 'wallet/src/utils/currencyId'
+
+export type CurrencyInfo = {
+  currency: Currency
+  currencyId: CurrencyId
+  safetyLevel: Maybe<SafetyLevel>
+  logoUrl: Maybe<string>
+  isSpam?: Maybe<boolean>
+}
+
+// Portfolio balance as exposed to the app
+export type PortfolioBalance = {
+  quantity: number // float representation of balance
+  balanceUSD: Maybe<number>
+  currencyInfo: CurrencyInfo
+  relativeChange24: Maybe<number>
+}
+
+// Query result does not have a refetch property so add it here in case it needs to get returned
+export type GqlResult<T> = Pick<QueryResult<T>, 'data' | 'loading' | 'error'> &
+  Partial<Pick<QueryResult<T>, 'networkStatus'>> & {
+    refetch?: () => void // TODO: [MOB-222] figure out the proper type for this from a QueryResult
+  }
diff --git a/apps/mobile/src/features/deepLinking/handleDeepLinkSaga.test.ts b/apps/mobile/src/features/deepLinking/handleDeepLinkSaga.test.ts
index 3a32e58ef68..406058555c4 100644
--- a/apps/mobile/src/features/deepLinking/handleDeepLinkSaga.test.ts
+++ b/apps/mobile/src/features/deepLinking/handleDeepLinkSaga.test.ts
@@ -12,12 +12,11 @@ import {
 import { handleTransactionLink } from 'src/features/deepLinking/handleTransactionLinkSaga'
 import { openModal, OpenModalParams } from 'src/features/modals/modalSlice'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
-import { MobileEventName } from 'src/features/telemetry/constants'
+import { MobileEventName, ModalName } from 'src/features/telemetry/constants'
 import { waitForWcWeb3WalletIsReady } from 'src/features/walletConnect/saga'
 import { Screens } from 'src/screens/Screens'
 import { UNISWAP_APP_HOSTNAME } from 'wallet/src/constants/urls'
 import { setAccountAsActive } from 'wallet/src/features/wallet/slice'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import {
   account,
   SAMPLE_CURRENCY_ID_1,
diff --git a/apps/mobile/src/features/deepLinking/handleDeepLinkSaga.ts b/apps/mobile/src/features/deepLinking/handleDeepLinkSaga.ts
index bb372a3a114..644278f1cd2 100644
--- a/apps/mobile/src/features/deepLinking/handleDeepLinkSaga.ts
+++ b/apps/mobile/src/features/deepLinking/handleDeepLinkSaga.ts
@@ -9,15 +9,16 @@ import { handleSwapLink } from 'src/features/deepLinking/handleSwapLinkSaga'
 import { handleTransactionLink } from 'src/features/deepLinking/handleTransactionLinkSaga'
 import { openModal } from 'src/features/modals/modalSlice'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
-import { MobileEventName, ShareableEntity } from 'src/features/telemetry/constants'
+import { MobileEventName, ModalName, ShareableEntity } from 'src/features/telemetry/constants'
 import { waitForWcWeb3WalletIsReady } from 'src/features/walletConnect/saga'
 import { pairWithWalletConnectURI } from 'src/features/walletConnect/utils'
 import { setDidOpenFromDeepLink } from 'src/features/walletConnect/walletConnectSlice'
 import { WidgetType } from 'src/features/widgets/widgets'
 import { Screens } from 'src/screens/Screens'
+import { openUri, UNISWAP_APP_NATIVE_TOKEN } from 'src/utils/linking'
 import { call, put, takeLatest } from 'typed-redux-saga'
 import { logger } from 'utilities/src/logger/logger'
-import { UNISWAP_APP_HOSTNAME, uniswapUrls } from 'wallet/src/constants/urls'
+import { uniswapUrls, UNISWAP_APP_HOSTNAME } from 'wallet/src/constants/urls'
 import { fromUniswapWebAppLink } from 'wallet/src/features/chains/utils'
 import {
   selectAccounts,
@@ -27,9 +28,7 @@ import {
 } from 'wallet/src/features/wallet/selectors'
 import { setAccountAsActive } from 'wallet/src/features/wallet/slice'
 import i18n from 'wallet/src/i18n/i18n'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { buildCurrencyId, buildNativeCurrencyId } from 'wallet/src/utils/currencyId'
-import { UNISWAP_APP_NATIVE_TOKEN, openUri } from 'wallet/src/utils/linking'
 
 export interface DeepLink {
   url: string
diff --git a/apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.test.ts b/apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.test.ts
index a8cdeed0558..4ef86c6b176 100644
--- a/apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.test.ts
+++ b/apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.test.ts
@@ -4,8 +4,8 @@ import { navigate } from 'src/app/navigation/rootNavigation'
 import { handleMoonpayReturnLink } from 'src/features/deepLinking/handleMoonpayReturnLinkSaga'
 import { HomeScreenTabIndex } from 'src/screens/HomeScreenTabIndex'
 import { Screens } from 'src/screens/Screens'
+import { dismissInAppBrowser } from 'src/utils/linking'
 import { forceFetchFiatOnRampTransactions } from 'wallet/src/features/transactions/slice'
-import { dismissInAppBrowser } from 'wallet/src/utils/linking'
 
 describe(handleMoonpayReturnLink, () => {
   it('Navigates to the home screen activity tab when coming back from moonpay', () => {
diff --git a/apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.ts b/apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.ts
index a609152d3f7..b9014a6f835 100644
--- a/apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.ts
+++ b/apps/mobile/src/features/deepLinking/handleMoonpayReturnLinkSaga.ts
@@ -1,9 +1,9 @@
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { HomeScreenTabIndex } from 'src/screens/HomeScreenTabIndex'
 import { Screens } from 'src/screens/Screens'
+import { dismissInAppBrowser } from 'src/utils/linking'
 import { call, put } from 'typed-redux-saga'
 import { forceFetchFiatOnRampTransactions } from 'wallet/src/features/transactions/slice'
-import { dismissInAppBrowser } from 'wallet/src/utils/linking'
 
 export function* handleMoonpayReturnLink() {
   yield* put(forceFetchFiatOnRampTransactions())
diff --git a/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.test.ts b/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.test.ts
index f4e45787ebd..42c4237e606 100644
--- a/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.test.ts
+++ b/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.test.ts
@@ -2,6 +2,7 @@ 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 { ModalName } from 'src/features/telemetry/constants'
 import { ChainId } from 'wallet/src/constants/chains'
 import { DAI, UNI } from 'wallet/src/constants/tokens'
 import { AssetType } from 'wallet/src/entities/assets'
@@ -9,7 +10,6 @@ import {
   CurrencyField,
   TransactionState,
 } from 'wallet/src/features/transactions/transactionState/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { account } from 'wallet/src/test/fixtures'
 
 const formSwapUrl = (
diff --git a/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.ts b/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.ts
index 7c7a2798e98..0674169d607 100644
--- a/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.ts
+++ b/apps/mobile/src/features/deepLinking/handleSwapLinkSaga.ts
@@ -1,5 +1,6 @@
 import { BigNumber } from 'ethers'
 import { openModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { put } from 'typed-redux-saga'
 import { logger } from 'utilities/src/logger/logger'
 import { ALL_SUPPORTED_CHAIN_IDS } from 'wallet/src/constants/chains'
@@ -8,7 +9,6 @@ import {
   CurrencyField,
   TransactionState,
 } from 'wallet/src/features/transactions/transactionState/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { getValidAddress } from 'wallet/src/utils/addresses'
 import { currencyIdToAddress, currencyIdToChain } from 'wallet/src/utils/currencyId'
 
diff --git a/packages/wallet/src/features/search/SearchResult.ts b/apps/mobile/src/features/explore/SearchResult.ts
similarity index 75%
rename from packages/wallet/src/features/search/SearchResult.ts
rename to apps/mobile/src/features/explore/SearchResult.ts
index 06f7fcac9c0..c019017bf2c 100644
--- a/packages/wallet/src/features/search/SearchResult.ts
+++ b/apps/mobile/src/features/explore/SearchResult.ts
@@ -8,8 +8,7 @@ export type SearchResult =
   | NFTCollectionSearchResult
 
 export enum SearchResultType {
-  ENSAddress,
-  Unitag,
+  Wallet,
   Token,
   Etherscan,
   NFTCollection,
@@ -20,21 +19,13 @@ export interface SearchResultBase {
   searchId?: string
 }
 
-export type WalletSearchResult = ENSAddressSearchResult | UnitagSearchResult
-
-export interface ENSAddressSearchResult extends SearchResultBase {
-  type: SearchResultType.ENSAddress
+export interface WalletSearchResult extends SearchResultBase {
+  type: SearchResultType.Wallet
   address: Address
   ensName?: string
   primaryENSName?: string
 }
 
-export interface UnitagSearchResult extends SearchResultBase {
-  type: SearchResultType.Unitag
-  address: Address
-  unitag: string
-}
-
 export interface TokenSearchResult extends SearchResultBase {
   type: SearchResultType.Token
   chainId: ChainId
diff --git a/packages/wallet/src/features/search/searchHistorySlice.ts b/apps/mobile/src/features/explore/searchHistorySlice.ts
similarity index 93%
rename from packages/wallet/src/features/search/searchHistorySlice.ts
rename to apps/mobile/src/features/explore/searchHistorySlice.ts
index 05ce7160740..9d9b08a627d 100644
--- a/packages/wallet/src/features/search/searchHistorySlice.ts
+++ b/apps/mobile/src/features/explore/searchHistorySlice.ts
@@ -7,10 +7,8 @@ export function searchResultId(searchResult: SearchResult): string {
   switch (searchResult.type) {
     case SearchResultType.Token:
       return `token-${searchResult.chainId}-${searchResult.address}`
-    case SearchResultType.ENSAddress:
+    case SearchResultType.Wallet:
       return `wallet-${searchResult.address}`
-    case SearchResultType.Unitag:
-      return `unitag-${searchResult.address}`
     case SearchResultType.Etherscan:
       return `etherscan-${searchResult.address}`
     case SearchResultType.NFTCollection:
diff --git a/apps/mobile/src/features/explore/selectSearchHistory.ts b/apps/mobile/src/features/explore/selectSearchHistory.ts
new file mode 100644
index 00000000000..61b1247fd6e
--- /dev/null
+++ b/apps/mobile/src/features/explore/selectSearchHistory.ts
@@ -0,0 +1,6 @@
+import { MobileState } from 'src/app/reducer'
+import { SearchResult } from './SearchResult'
+
+export const selectSearchHistory = (state: MobileState): SearchResult[] => {
+  return state.searchHistory.results
+}
diff --git a/apps/mobile/src/features/externalProfile/ProfileContextMenu.tsx b/apps/mobile/src/features/externalProfile/ProfileContextMenu.tsx
index c0218bfc50f..5ae61300c6b 100644
--- a/apps/mobile/src/features/externalProfile/ProfileContextMenu.tsx
+++ b/apps/mobile/src/features/externalProfile/ProfileContextMenu.tsx
@@ -7,22 +7,19 @@ import { useAppDispatch } from 'src/app/hooks'
 import { TripleDot } from 'src/components/icons/TripleDot'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
 import { MobileEventName, ShareableEntity } from 'src/features/telemetry/constants'
+import { setClipboard } from 'src/utils/clipboard'
 import { disableOnPress } from 'src/utils/disableOnPress'
+import { ExplorerDataType, getExplorerLink, getProfileUrl, openUri } from 'src/utils/linking'
 import { Flex, TouchableArea } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { logger } from 'utilities/src/logger/logger'
-import { CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
-import { uniswapUrls } from 'wallet/src/constants/urls'
+import { ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
-import { useUnitagByAddress } from 'wallet/src/features/unitags/hooks'
-import { setClipboard } from 'wallet/src/utils/clipboard'
-import { ExplorerDataType, getExplorerLink, getProfileUrl, openUri } from 'wallet/src/utils/linking'
 
 export function ProfileContextMenu({ address }: { address: Address }): JSX.Element {
   const { t } = useTranslation()
   const dispatch = useAppDispatch()
-  const unitag = useUnitagByAddress(address)
 
   const onPressCopyAddress = useCallback(async () => {
     if (!address) {
@@ -39,12 +36,6 @@ export function ProfileContextMenu({ address }: { address: Address }): JSX.Eleme
     await openUri(getExplorerLink(ChainId.Mainnet, address, ExplorerDataType.ADDRESS))
   }, [address])
 
-  const onReportProfile = useCallback(async () => {
-    openUri(uniswapUrls.reportUnitagUrl).catch((e) =>
-      logger.error(e, { tags: { file: 'ProfileContextMenu', function: 'reportProfileLink' } })
-    )
-  }, [])
-
   const onPressShare = useCallback(async () => {
     if (!address) {
       return
@@ -63,8 +54,8 @@ export function ProfileContextMenu({ address }: { address: Address }): JSX.Eleme
     }
   }, [address])
 
-  const menuActions = useMemo(() => {
-    const options = [
+  const menuActions = useMemo(
+    () => [
       {
         title: t('View on {{ blockExplorerName }}', {
           blockExplorerName: CHAIN_INFO[ChainId.Mainnet].explorer.name,
@@ -82,16 +73,9 @@ export function ProfileContextMenu({ address }: { address: Address }): JSX.Eleme
         action: onPressShare,
         systemIcon: 'square.and.arrow.up',
       },
-    ]
-    if (unitag.unitag) {
-      options.push({
-        title: t('Report profile'),
-        action: onReportProfile,
-        systemIcon: 'flag',
-      })
-    }
-    return options
-  }, [onPressCopyAddress, onPressShare, onReportProfile, openExplorerLink, t, unitag.unitag])
+    ],
+    [onPressCopyAddress, onPressShare, openExplorerLink, t]
+  )
 
   return (
     <ContextMenu
diff --git a/apps/mobile/src/features/externalProfile/ProfileHeader.tsx b/apps/mobile/src/features/externalProfile/ProfileHeader.tsx
index ef2706b944b..12300ce3177 100644
--- a/apps/mobile/src/features/externalProfile/ProfileHeader.tsx
+++ b/apps/mobile/src/features/externalProfile/ProfileHeader.tsx
@@ -1,39 +1,25 @@
+import { LinearGradient } from 'expo-linear-gradient'
 import React, { memo, useCallback, useMemo } from 'react'
 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 Svg, { Defs, RadialGradient, Rect, Stop } from 'react-native-svg'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { AddressDisplay } from 'src/components/AddressDisplay'
 import { BackButton } from 'src/components/buttons/BackButton'
 import { Favorite } from 'src/components/icons/Favorite'
-import { LongText } from 'src/components/text/LongText'
+import { useUniconColors } from 'src/components/unicons/utils'
 import { ProfileContextMenu } from 'src/features/externalProfile/ProfileContextMenu'
 import { useToggleWatchedWalletCallback } from 'src/features/favorites/hooks'
 import { openModal } from 'src/features/modals/modalSlice'
-import {
-  AnimatedFlex,
-  Flex,
-  Icons,
-  Image,
-  LinearGradient,
-  ScrollView,
-  Text,
-  TouchableArea,
-  useIsDarkMode,
-  useSporeColors,
-  useUniconColors,
-} from 'ui/src'
-import { ENS_LOGO } from 'ui/src/assets'
-import { iconSizes, imageSizes, spacing } from 'ui/src/theme'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
-import { useENSDescription, useENSName, useENSTwitterUsername } from 'wallet/src/features/ens/api'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
+import { AnimatedFlex, Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
+import { iconSizes } from 'ui/src/theme'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
+import { useENSAvatar } 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 { ElementName, ModalName } from 'wallet/src/telemetry/constants'
-import { useExtractedColors } from 'wallet/src/utils/colors'
-import { openUri } from 'wallet/src/utils/linking'
+import { passesContrast, useExtractedColors } from 'wallet/src/utils/colors'
 
 const HEADER_GRADIENT_HEIGHT = 144
 const HEADER_ICON_SIZE = 72
@@ -50,24 +36,10 @@ export const ProfileHeader = memo(function ProfileHeader({
   const isDarkMode = useIsDarkMode()
   const isFavorited = useAppSelector(selectWatchedAddressSet).has(address)
 
-  const displayName = useDisplayName(address, { includeUnitagSuffix: true })
-
-  // Note that if a user has a Unitag AND ENS, this prioritizes the Unitag's metadata over the ENS metadata
-  const nameToFetchENSMetadata =
-    (displayName?.type === DisplayNameType.ENS || displayName?.type === DisplayNameType.Unitag) &&
-    displayName?.name
-      ? displayName.name
-      : undefined
-
   // ENS avatar and avatar colors
-  const { avatar, loading: avatarLoading } = useAvatar(address)
-  const { data: primaryENSName } = useENSName(address)
-  const { data: twitter } = useENSTwitterUsername(nameToFetchENSMetadata)
-  const { data: bio } = useENSDescription(nameToFetchENSMetadata)
-  const showENSName = primaryENSName && primaryENSName !== displayName?.name
-
+  const { data: avatar, loading } = useENSAvatar(address)
   const { colors: avatarColors } = useExtractedColors(avatar)
-  const hasAvatar = !!avatar && !avatarLoading
+  const hasAvatar = !!avatar && !loading
 
   // Unicon colors
   const { gradientStart: uniconGradientStart, gradientEnd: uniconGradientEnd } =
@@ -75,21 +47,14 @@ export const ProfileHeader = memo(function ProfileHeader({
 
   // Wait for avatar, then render avatar extracted colors or unicon colors if no avatar
   const fixedGradientColors = useMemo(() => {
-    if (avatarLoading || (hasAvatar && !avatarColors)) {
+    if (loading || (hasAvatar && !avatarColors)) {
       return [colors.surface1.val, colors.surface1.val]
     }
     if (hasAvatar && avatarColors && avatarColors.base) {
       return [avatarColors.base, avatarColors.base]
     }
     return [uniconGradientStart, uniconGradientEnd]
-  }, [
-    avatarColors,
-    hasAvatar,
-    avatarLoading,
-    colors.surface1,
-    uniconGradientEnd,
-    uniconGradientStart,
-  ])
+  }, [avatarColors, hasAvatar, loading, colors.surface1, uniconGradientEnd, uniconGradientStart])
 
   const onPressFavorite = useToggleWatchedWalletCallback(address)
 
@@ -113,22 +78,18 @@ export const ProfileHeader = memo(function ProfileHeader({
     )
   }, [dispatch, initialSendState])
 
-  const onPressTwitter = useCallback(async () => {
-    if (twitter) {
-      await openUri(`https://twitter.com/${twitter}`)
-    }
-  }, [twitter])
-
   const { t } = useTranslation()
 
+  const showLightStatusBar = passesContrast('white', uniconGradientStart, 2)
+
   return (
-    <Flex bg="$surface1" gap="$spacing16" pt="$spacing60">
+    <Flex bg="$surface1" gap="$spacing16" pt="$spacing60" px="$spacing24">
       <StatusBar
         translucent
         backgroundColor="transparent"
-        barStyle={isDarkMode ? 'light-content' : 'dark-content'}
+        barStyle={showLightStatusBar ? 'light-content' : 'dark-content'}
       />
-      {/* fixed gradient at 0.2 opacity overlaid on surface1 */}
+      {/* fixed gradient */}
       <AnimatedFlex
         bottom={0}
         entering={FadeIn}
@@ -137,21 +98,18 @@ export const ProfileHeader = memo(function ProfileHeader({
         position="absolute"
         right={0}
         top={0}>
-        <Flex bg="$surface1" bottom={0} left={0} position="absolute" right={0} top={0} />
-        <Flex grow opacity={0.2}>
-          <LinearGradient
-            colors={fixedGradientColors}
-            end={{ x: 1, y: 1 }}
-            start={{ x: 0, y: 1 }}
-            style={StyleSheet.absoluteFill}
-          />
-        </Flex>
+        <LinearGradient
+          colors={fixedGradientColors}
+          end={{ x: 1, y: 1 }}
+          start={{ x: 0, y: 1 }}
+          style={StyleSheet.absoluteFill}
+        />
         {hasAvatar && avatarColors?.primary ? <HeaderRadial color={avatarColors.primary} /> : null}
       </AnimatedFlex>
 
       {/* header row */}
-      <Flex row alignItems="center" justifyContent="space-between" mx="$spacing4" px="$spacing24">
-        <Flex centered bg="$surface3" borderRadius="$roundedFull" p="$spacing4">
+      <Flex row alignItems="center" justifyContent="space-between" mx="$spacing4">
+        <Flex height={iconSizes.icon16} width={iconSizes.icon16}>
           <BackButton color="$sporeWhite" size={iconSizes.icon24} />
         </Flex>
         <ProfileContextMenu address={address} />
@@ -159,59 +117,18 @@ export const ProfileHeader = memo(function ProfileHeader({
 
       {/* button content */}
       <Flex row alignItems="flex-start" justifyContent="space-between">
-        <Flex gap="$spacing8">
-          <Flex gap="$spacing8" px="$spacing24">
-            <AddressDisplay
-              showCopy
-              showIconBackground
-              showIconBorder
-              address={address}
-              captionTextColor="$neutral3"
-              captionVariant="body3"
-              contentAlign="flex-start"
-              direction="column"
-              size={HEADER_ICON_SIZE}
-              textAlign="flex-start"
-              variant="heading3"
-            />
-            {bio ? (
-              <LongText color={colors.neutral2.val} initialDisplayedLines={2} text={bio} />
-            ) : null}
-          </Flex>
-          {(twitter || showENSName) && (
-            <ScrollView
-              horizontal
-              contentContainerStyle={{ paddingHorizontal: spacing.spacing24 }}
-              showsHorizontalScrollIndicator={false}>
-              <Flex row gap="$spacing16">
-                {twitter ? (
-                  <TouchableArea onPress={onPressTwitter}>
-                    <Flex centered row gap="$spacing4">
-                      <Icons.XTwitter color={colors.neutral1.val} size={iconSizes.icon16} />
-                      <Text color="$neutral1" variant="buttonLabel3">
-                        {twitter}
-                      </Text>
-                    </Flex>
-                  </TouchableArea>
-                ) : null}
-                {showENSName ? (
-                  <Flex centered row gap="$spacing4">
-                    <Image
-                      height={imageSizes.image16}
-                      resizeMode="contain"
-                      source={ENS_LOGO}
-                      width={imageSizes.image16}
-                    />
-                    <Text color="$blue400" variant="buttonLabel3">
-                      {primaryENSName}
-                    </Text>
-                  </Flex>
-                ) : null}
-              </Flex>
-            </ScrollView>
-          )}
-        </Flex>
-        <Flex position="absolute" px="$spacing24" right={0}>
+        <AddressDisplay
+          showCopy
+          showIconBackground
+          address={address}
+          captionVariant="body2"
+          contentAlign="flex-start"
+          direction="column"
+          size={HEADER_ICON_SIZE}
+          textAlign="flex-start"
+          variant="heading3"
+        />
+        <Flex position="absolute" right={0}>
           <Flex centered row gap="$spacing8" mt="$spacing12">
             <TouchableArea
               hapticFeedback
@@ -222,7 +139,7 @@ export const ProfileHeader = memo(function ProfileHeader({
               borderWidth={1}
               height={46}
               p="$spacing12"
-              shadowColor="$neutral1"
+              shadowColor={isDarkMode ? '$surface2' : '$neutral3'}
               style={styles.buttonShadow}
               testID={ElementName.Favorite}
               onPress={onPressFavorite}>
@@ -260,32 +177,16 @@ export const ProfileHeader = memo(function ProfileHeader({
   )
 })
 
-export const HeaderRadial = memo(function HeaderRadial({
-  color,
-  borderRadius,
-}: {
-  color: string
-  borderRadius?: number
-}): JSX.Element {
+export const HeaderRadial = memo(function HeaderRadial({ color }: { color: string }): JSX.Element {
   return (
     <Svg height="100%" width="100%">
       <Defs>
-        <ClipPath id="clip">
-          <Rect height="100%" rx={borderRadius} width="100%" />
-        </ClipPath>
         <RadialGradient cy="-0.1" id="background" rx="0.8" ry="1.1">
           <Stop offset="0" stopColor={color} stopOpacity="0.6" />
           <Stop offset="1" stopColor={color} stopOpacity="0" />
         </RadialGradient>
       </Defs>
-      <Rect
-        clipPath={borderRadius ? 'url(#clip)' : undefined}
-        fill="url(#background)"
-        height="100%"
-        width="100%"
-        x="0"
-        y="0"
-      />
+      <Rect fill="url(#background)" height="100%" opacity={0.6} width="100%" x="0" y="0" />
     </Svg>
   )
 })
@@ -297,7 +198,7 @@ const styles = StyleSheet.create({
       height: 2,
       width: 0,
     },
-    shadowOpacity: 0.04,
+    shadowOpacity: 0.25,
     shadowRadius: 4,
   },
 })
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampAggregatorModal.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampAggregatorModal.tsx
new file mode 100644
index 00000000000..a6232d67baa
--- /dev/null
+++ b/apps/mobile/src/features/fiatOnRamp/FiatOnRampAggregatorModal.tsx
@@ -0,0 +1,116 @@
+import React, { ComponentProps, useCallback, useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { FadeIn, FadeOut } from 'react-native-reanimated'
+import { useAppDispatch } from 'src/app/hooks'
+import { useBottomSheetContext } from 'src/components/modals/BottomSheetContext'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
+import { HandleBar } from 'src/components/modals/HandleBar'
+import { closeModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
+import { AnimatedFlex, Flex, Text, useDeviceInsets, useSporeColors } from 'ui/src'
+import { pushNotification } from 'wallet/src/features/notifications/slice'
+import { AppNotificationType } from 'wallet/src/features/notifications/types'
+import { FiatOnRampCountryListModal } from './FiatOnRampCountryListModal'
+import { FiatOnRampCountryPicker } from './FiatOnRampCountryPicker'
+
+export function FiatOnRampAggregatorModal(): JSX.Element {
+  const colors = useSporeColors()
+
+  const dispatch = useAppDispatch()
+  const onClose = useCallback((): void => {
+    dispatch(closeModal({ name: ModalName.FiatOnRampAggregator }))
+  }, [dispatch])
+
+  return (
+    <BottomSheetModal
+      fullScreen
+      hideHandlebar
+      hideKeyboardOnDismiss
+      renderBehindTopInset
+      backgroundColor={colors.surface1.get()}
+      name={ModalName.FiatOnRampAggregator}
+      onClose={onClose}>
+      <FiatOnRampAggregatorContent />
+    </BottomSheetModal>
+  )
+}
+
+// TODO: Implement it
+// https://linear.app/uniswap/issue/MOB-1942/identify-region-by-the-ip-address-of-the-device
+function useFiatOnRampAggregatorDeviceCountryCodeQuery(): { data: string } {
+  return { data: 'DE' }
+}
+
+function FiatOnRampAggregatorContent(): JSX.Element {
+  const { t } = useTranslation()
+  const dispatch = useAppDispatch()
+
+  const [selectingCountry, setSelectingCountry] = useState(false)
+
+  const { data: deviceCountryCode } = useFiatOnRampAggregatorDeviceCountryCodeQuery()
+
+  const [currentCountryCode, setCurrentCountryCode] = useState<undefined | string>()
+
+  useEffect(() => {
+    if (!currentCountryCode && deviceCountryCode) {
+      setCurrentCountryCode(deviceCountryCode)
+    }
+  }, [currentCountryCode, deviceCountryCode])
+
+  const { isSheetReady } = useBottomSheetContext()
+
+  const insets = useDeviceInsets()
+
+  const onSelectCountry: ComponentProps<typeof FiatOnRampCountryListModal>['onSelectCountry'] = (
+    country
+  ): void => {
+    dispatch(
+      pushNotification({
+        type: AppNotificationType.ChooseCountry,
+        countryName: country.displayName,
+        countryCode: country.countryCode,
+      })
+    )
+    setSelectingCountry(false)
+    setCurrentCountryCode(country.countryCode)
+  }
+
+  return (
+    <>
+      <Flex style={{ marginTop: insets.top }}>
+        <HandleBar backgroundColor="none" />
+        <AnimatedFlex row height="100%" pt="$spacing12">
+          {isSheetReady && (
+            <AnimatedFlex
+              entering={FadeIn}
+              exiting={FadeOut}
+              gap="$spacing16"
+              pb="$spacing16"
+              px="$spacing24"
+              style={{ marginBottom: insets.bottom }}
+              width="100%">
+              <Flex row alignItems="center" justifyContent="space-between">
+                <Text variant="subheading1">{t('Buy')}</Text>
+                <FiatOnRampCountryPicker
+                  currentCountryCode={currentCountryCode}
+                  onPress={(): void => {
+                    setSelectingCountry(true)
+                  }}
+                />
+              </Flex>
+            </AnimatedFlex>
+          )}
+        </AnimatedFlex>
+      </Flex>
+      {Boolean(selectingCountry) && currentCountryCode && (
+        <FiatOnRampCountryListModal
+          currentCountryCode={currentCountryCode}
+          onClose={(): void => {
+            setSelectingCountry(false)
+          }}
+          onSelectCountry={onSelectCountry}
+        />
+      )}
+    </>
+  )
+}
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampAggregatorTokenSelector.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampAggregatorTokenSelector.tsx
index a4af7c76d8d..d56e54c18bb 100644
--- a/apps/mobile/src/features/fiatOnRamp/FiatOnRampAggregatorTokenSelector.tsx
+++ b/apps/mobile/src/features/fiatOnRamp/FiatOnRampAggregatorTokenSelector.tsx
@@ -3,14 +3,13 @@ import { FadeIn, FadeOut } from 'react-native-reanimated'
 import { TokenFiatOnRampList } from 'src/components/TokenSelector/TokenFiatOnRampList'
 import Trace from 'src/components/Trace/Trace'
 import { FiatOnRampCurrency } from 'src/features/fiatOnRamp/types'
+import { ElementName, SectionName } from 'src/features/telemetry/constants'
 import { AnimatedFlex } from 'ui/src'
-import { SectionName } from 'wallet/src/telemetry/constants'
 
-import { useAllCommonBaseCurrencies } from 'wallet/src/components/TokenSelector/hooks'
+import { useAllCommonBaseCurrencies } from 'src/components/TokenSelector/hooks'
 import { CurrencyInfo, GqlResult } from 'wallet/src/features/dataApi/types'
 import { useFiatOnRampAggregatorSupportedTokensQuery } from 'wallet/src/features/fiatOnRamp/api'
-import { FORSupportedToken } from 'wallet/src/features/fiatOnRamp/types'
-import { ElementName } from 'wallet/src/telemetry/constants'
+import { MeldCryptoCurrency } from 'wallet/src/features/fiatOnRamp/meld'
 
 interface Props {
   onBack: () => void
@@ -19,20 +18,20 @@ interface Props {
   countryCode: string
 }
 
-const findTokenOptionForFiatOnRampToken = (
+const findTokenOptionForMeldCurrency = (
   commonBaseCurrencies: CurrencyInfo[] | undefined,
-  fiatOnRampToken: FORSupportedToken
+  meldCurrency: MeldCryptoCurrency
 ): Maybe<CurrencyInfo> => {
   return (commonBaseCurrencies || []).find(
     (item) =>
       item &&
-      fiatOnRampToken.cryptoCurrencyCode.toLowerCase() === item.currency.symbol?.toLowerCase() &&
-      fiatOnRampToken.chainId === item.currency.chainId.toString()
+      meldCurrency.cryptoCurrencyCode.toLowerCase() === item.currency.symbol?.toLowerCase() &&
+      meldCurrency.chainId === item.currency.chainId.toString()
   )
 }
 
 function useFiatOnRampTokenList(
-  supportedTokens: FORSupportedToken[] | undefined
+  supportedTokens: MeldCryptoCurrency[] | undefined
 ): GqlResult<FiatOnRampCurrency[]> {
   const {
     data: commonBaseCurrencies,
@@ -44,8 +43,8 @@ function useFiatOnRampTokenList(
   const data = useMemo(
     () =>
       (supportedTokens || [])
-        .map((fiatOnRampToken) => ({
-          currencyInfo: findTokenOptionForFiatOnRampToken(commonBaseCurrencies, fiatOnRampToken),
+        .map((meldCurrency) => ({
+          currencyInfo: findTokenOptionForMeldCurrency(commonBaseCurrencies, meldCurrency),
         }))
         .filter((item) => !!item.currencyInfo),
     [commonBaseCurrencies, supportedTokens]
@@ -66,7 +65,7 @@ function _FiatOnRampAggregatorTokenSelector({
   countryCode,
 }: Props): JSX.Element {
   const {
-    data: supportedTokensResponse,
+    data: supportedTokens,
     isLoading: supportedTokensLoading,
     error: supportedTokensQueryError,
     refetch: supportedTokensQueryRefetch,
@@ -77,7 +76,7 @@ function _FiatOnRampAggregatorTokenSelector({
     loading: tokenListLoading,
     error: tokenListError,
     refetch: tokenListRefetch,
-  } = useFiatOnRampTokenList(supportedTokensResponse?.supportedTokens)
+  } = useFiatOnRampTokenList(supportedTokens)
 
   const loading = supportedTokensLoading || tokenListLoading
   const error = Boolean(supportedTokensQueryError || tokenListError)
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampAmountSection.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampAmountSection.tsx
index 8e83e7bae89..1adcf30f513 100644
--- a/apps/mobile/src/features/fiatOnRamp/FiatOnRampAmountSection.tsx
+++ b/apps/mobile/src/features/fiatOnRamp/FiatOnRampAmountSection.tsx
@@ -1,5 +1,4 @@
-import { impactAsync } from 'expo-haptics'
-import React, { useEffect } from 'react'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import {
   LayoutChangeEvent,
@@ -9,25 +8,23 @@ import {
   TextInputSelectionChangeEventData,
 } from 'react-native'
 import { TouchableOpacity } from 'react-native-gesture-handler'
-import { useAnimatedStyle, useSharedValue } from 'react-native-reanimated'
-import { useFormatExactCurrencyAmount } from 'src/features/fiatOnRamp/hooks'
+import { useDynamicFontSizing } from 'src/app/hooks'
+import { AmountInput } from 'src/components/input/AmountInput'
+import { SpinningLoader } from 'src/components/loading/SpinningLoader'
+import { Pill } from 'src/components/text/Pill'
+import {
+  useFormatExactCurrencyAmount,
+  useMoonpayFiatCurrencySupportInfo,
+} from 'src/features/fiatOnRamp/hooks'
 import { FiatOnRampCurrency } from 'src/features/fiatOnRamp/types'
-import { AnimatedFlex, ColorTokens, Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
+import { ElementName } from 'src/features/telemetry/constants'
+import { ColorTokens, Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { fonts, iconSizes, spacing } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
-import { usePrevious } from 'utilities/src/react/hooks'
-import { DEFAULT_DELAY, useDebounce } from 'utilities/src/time/timing'
 import { CurrencyLogo } from 'wallet/src/components/CurrencyLogo/CurrencyLogo'
-import { AmountInput } from 'wallet/src/components/input/AmountInput'
-import { SpinningLoader } from 'wallet/src/components/loading/SpinningLoader'
-import { Pill } from 'wallet/src/components/text/Pill'
 import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
-import { FiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { ElementName } from 'wallet/src/telemetry/constants'
-import { errorShakeAnimation } from 'wallet/src/utils/animations'
 import { getSymbolDisplayText } from 'wallet/src/utils/currency'
-import { useDynamicFontSizing } from 'wallet/src/utils/useDynamicFontSizing'
 
 const MAX_INPUT_FONT_SIZE = 56
 const MIN_INPUT_FONT_SIZE = 32
@@ -44,7 +41,7 @@ interface Props {
   showNativeKeyboard: boolean
   onInputPanelLayout: (event: LayoutChangeEvent) => void
   inputRef: React.RefObject<TextInput>
-  disabled?: boolean
+  disabled: boolean
   showSoftInputOnFocus: boolean
   value: string
   setSelection: (selection: TextInputProps['selection']) => void
@@ -58,8 +55,6 @@ interface Props {
   selectTokenLoading: boolean
   onTokenSelectorPress: () => void
   predefinedAmountsSupported: boolean
-  appFiatCurrencySupported: boolean
-  fiatCurrencyInfo: FiatCurrencyInfo
 }
 
 export function FiatOnRampAmountSection({
@@ -80,8 +75,6 @@ export function FiatOnRampAmountSection({
   selectTokenLoading,
   onTokenSelectorPress,
   predefinedAmountsSupported,
-  appFiatCurrencySupported,
-  fiatCurrencyInfo,
 }: Props): JSX.Element {
   const { t } = useTranslation()
   const {
@@ -89,7 +82,6 @@ export function FiatOnRampAmountSection({
     fontSize,
     onSetFontSize,
   } = useDynamicFontSizing(MAX_CHAR_PIXEL_WIDTH, MAX_INPUT_FONT_SIZE, MIN_INPUT_FONT_SIZE)
-  const prevErrorText = usePrevious(errorText)
 
   const onChangeValue =
     (next: OnChangeAmount) =>
@@ -106,75 +98,47 @@ export function FiatOnRampAmountSection({
     setSelection({ start, end })
   }
 
+  const { appFiatCurrencySupportedInMoonpay, moonpaySupportedFiatCurrency } =
+    useMoonpayFiatCurrencySupportInfo()
   const { formatNumberOrString } = useLocalizationContext()
 
-  const inputShakeX = useSharedValue(0)
-  const inputAnimatedStyle = useAnimatedStyle(() => ({
-    transform: [{ translateX: inputShakeX.value }],
-  }))
-
-  useEffect(() => {
-    async function shake(): Promise<void> {
-      inputShakeX.value = errorShakeAnimation(inputShakeX)
-      await impactAsync()
-    }
-    if (errorText && prevErrorText !== errorText) {
-      shake().catch(() => undefined)
-    }
-  }, [errorText, inputShakeX, prevErrorText])
-
-  // Design has asked to make it around 100ms and DEFAULT_DELAY is 200ms
-  const debouncedErrorText = useDebounce(errorText, DEFAULT_DELAY / 2)
-
   return (
     <Flex gap="$spacing16" onLayout={onInputPanelLayout}>
       <Flex
         grow
         alignItems="center"
-        gap="$spacing8"
+        gap="$spacing16"
         justifyContent="center"
         onLayout={onInputLayout}>
-        <AnimatedFlex
-          height={spacing.spacing24}
-          /* We want to reserve the space here, so when error occurs - layout does not jump */
-          mt="$spacing48">
-          {debouncedErrorText && errorColor && (
-            <Text color={errorColor} textAlign="center" variant="buttonLabel4">
-              {debouncedErrorText}
-            </Text>
-          )}
-        </AnimatedFlex>
-        <AnimatedFlex style={inputAnimatedStyle}>
-          <AmountInput
-            ref={inputRef}
-            autoFocus
-            alignSelf="stretch"
-            backgroundColor="$transparent"
-            borderWidth={0}
-            caretHidden={!showNativeKeyboard}
-            disabled={disabled}
-            fiatCurrencyInfo={fiatCurrencyInfo}
-            fontFamily="$heading"
-            fontSize={fontSize}
-            maxFontSizeMultiplier={fonts.heading2.maxFontSizeMultiplier}
-            minHeight={MAX_INPUT_FONT_SIZE}
-            placeholder={formatNumberOrString({
-              value: 0,
-              type: NumberType.FiatStandard,
-              currencyCode: fiatCurrencyInfo.code,
-            })}
-            placeholderTextColor="$neutral3"
-            px="$none"
-            py="$none"
-            returnKeyType={showSoftInputOnFocus ? 'done' : undefined}
-            showCurrencySign={value !== ''}
-            showSoftInputOnFocus={showSoftInputOnFocus}
-            textAlign="center"
-            value={value}
-            onChangeText={onChangeValue(onEnterAmount)}
-            onSelectionChange={onSelectionChange}
-          />
-        </AnimatedFlex>
+        <AmountInput
+          ref={inputRef}
+          autoFocus
+          alignSelf="stretch"
+          backgroundColor="$transparent"
+          borderWidth={0}
+          caretHidden={!showNativeKeyboard}
+          disabled={disabled}
+          fontFamily="$heading"
+          fontSize={fontSize}
+          maxFontSizeMultiplier={fonts.heading2.maxFontSizeMultiplier}
+          minHeight={MAX_INPUT_FONT_SIZE}
+          mt="$spacing48"
+          placeholder={formatNumberOrString({
+            value: 0,
+            type: NumberType.FiatStandard,
+            currencyCode: moonpaySupportedFiatCurrency.code,
+          })}
+          placeholderTextColor="$neutral3"
+          px="$none"
+          py="$none"
+          returnKeyType={showSoftInputOnFocus ? 'done' : undefined}
+          showCurrencySign={value !== ''}
+          showSoftInputOnFocus={showSoftInputOnFocus}
+          textAlign="center"
+          value={value}
+          onChangeText={onChangeValue(onEnterAmount)}
+          onSelectionChange={onSelectionChange}
+        />
         {currency.currencyInfo && (
           <SelectTokenButton
             amount={quoteAmount}
@@ -184,20 +148,28 @@ export function FiatOnRampAmountSection({
             onPress={onTokenSelectorPress}
           />
         )}
+        <Flex
+          /* We want to reserve the space here, so when error occurs - layout does not jump */
+          height={spacing.spacing24}>
+          {errorText && errorColor && (
+            <Text color={errorColor} textAlign="center" variant="buttonLabel4">
+              {errorText}
+            </Text>
+          )}
+        </Flex>
         {predefinedAmountsSupported ? (
-          <Flex centered row gap="$spacing12" mt="$spacing16" pb="$spacing4">
+          <Flex centered row gap="$spacing12" pb="$spacing4">
             {PREDEFINED_AMOUNTS.map((amount) => (
               <PredefinedAmount
                 key={amount}
                 amount={amount}
                 currentAmount={value}
-                fiatCurrencyInfo={fiatCurrencyInfo}
                 onPress={onChoosePredifendAmount}
               />
             ))}
           </Flex>
         ) : null}
-        {!appFiatCurrencySupported ? (
+        {!appFiatCurrencySupportedInMoonpay ? (
           <Flex centered>
             <Text color="$neutral3" variant="body3">
               {t('Only available to purchase in USD')}
@@ -228,7 +200,7 @@ function SelectTokenButton({
     amount.toString(),
     selectedCurrencyInfo.currency
   )
-  const textColor = disabled || loading ? '$neutral3' : '$neutral2'
+  const textColor = disabled ? '$neutral3' : '$neutral2'
 
   return (
     <TouchableArea
@@ -236,7 +208,7 @@ function SelectTokenButton({
       borderRadius="$roundedFull"
       testID={ElementName.TokenSelectorToggle}
       onPress={onPress}>
-      <Flex centered row flexDirection="row" gap="$none" p="$spacing4">
+      <Flex centered row flexDirection="row" gap="$spacing4" p="$spacing4">
         {loading ? (
           <SpinningLoader />
         ) : (
@@ -246,7 +218,7 @@ function SelectTokenButton({
             size={iconSizes.icon24}
           />
         )}
-        <Text color={textColor} pl="$spacing8" variant="body1">
+        <Text color={textColor} pl="$spacing4" variant="body1">
           {formattedAmount}
         </Text>
         <Text color={textColor} pl="$spacing1" variant="body1">
@@ -263,33 +235,27 @@ function PredefinedAmount({
   amount,
   onPress,
   currentAmount,
-  fiatCurrencyInfo,
 }: {
   amount: number
   currentAmount: string
   onPress: (amount: string) => void
-  fiatCurrencyInfo: FiatCurrencyInfo
 }): JSX.Element {
   const colors = useSporeColors()
+  const { moonpaySupportedFiatCurrency } = useMoonpayFiatCurrencySupportInfo()
   const { addFiatSymbolToNumber } = useLocalizationContext()
   const formattedAmount = addFiatSymbolToNumber({
     value: amount,
-    currencyCode: fiatCurrencyInfo.code,
-    currencySymbol: fiatCurrencyInfo.symbol,
+    currencyCode: moonpaySupportedFiatCurrency.code,
+    currencySymbol: moonpaySupportedFiatCurrency.symbol,
   })
 
-  const highlighted = currentAmount === amount.toString()
+  const highlighted = currentAmount === formattedAmount
 
   return (
-    <TouchableOpacity
-      onPress={async (): Promise<void> => {
-        await impactAsync()
-        onPress(amount.toString())
-      }}>
+    <TouchableOpacity onPress={(): void => onPress(amount.toString())}>
       <Pill
-        backgroundColor={highlighted ? '$surface2' : '$surface1'}
-        customBorderColor={colors.surface3.val}
-        foregroundColor={colors[highlighted ? 'neutral1' : 'neutral2'].val}
+        backgroundColor={highlighted ? '$DEP_backgroundActionButton' : '$surface2'}
+        foregroundColor={colors[highlighted ? 'accent1' : 'neutral2'].val}
         label={formattedAmount}
         px="$spacing16"
         textVariant="buttonLabel3"
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampBanner.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampBanner.tsx
index 753269546b1..c35031bc523 100644
--- a/apps/mobile/src/features/fiatOnRamp/FiatOnRampBanner.tsx
+++ b/apps/mobile/src/features/fiatOnRamp/FiatOnRampBanner.tsx
@@ -3,11 +3,10 @@ import { useTranslation } from 'react-i18next'
 import { useAppDispatch } from 'src/app/hooks'
 import Trace from 'src/components/Trace/Trace'
 import { openModal } from 'src/features/modals/modalSlice'
-import { MobileEventName } from 'src/features/telemetry/constants'
+import { MobileEventName, ModalName } from 'src/features/telemetry/constants'
 import { Flex, Icons, Text, TouchableArea, TouchableAreaProps, useSporeColors } from 'ui/src'
 import FiatOnRampBackground from 'ui/src/assets/backgrounds/fiat-onramp-banner.svg'
 import { iconSizes } from 'ui/src/theme'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export function FiatOnRampBanner(props: TouchableAreaProps): JSX.Element {
   const { t } = useTranslation()
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampConnecting.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampConnecting.tsx
index c3481948866..436b5eda9f4 100644
--- a/apps/mobile/src/features/fiatOnRamp/FiatOnRampConnecting.tsx
+++ b/apps/mobile/src/features/fiatOnRamp/FiatOnRampConnecting.tsx
@@ -2,13 +2,14 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { Image, ImageBackground, StyleSheet } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
-import { AnimatedFlex, Flex, Text, useDeviceInsets, useIsDarkMode } from 'ui/src'
+import { AnimatedFlex, Flex, Text, useDeviceInsets } from 'ui/src'
 import {
   FOR_CONNECTING_BACKGROUND_DARK,
   FOR_CONNECTING_BACKGROUND_LIGHT,
   UNISWAP_LOGO_LARGE,
 } from 'ui/src/assets'
 import { iconSizes } from 'ui/src/theme'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 
 export const SERVICE_PROVIDER_ICON_SIZE = 90
 
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampContext.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampContext.tsx
deleted file mode 100644
index b728ee1ca44..00000000000
--- a/apps/mobile/src/features/fiatOnRamp/FiatOnRampContext.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * This context is used to persist Fiat On Ramp related data between Fiat On Ramp screens.
- */
-import React, { createContext, useContext, useState } from 'react'
-import { SectionListData } from 'react-native'
-import { getCountry } from 'react-native-localize'
-import { FiatOnRampCurrency } from 'src/features/fiatOnRamp/types'
-import { getNativeAddress } from 'wallet/src/constants/addresses'
-import { ChainId } from 'wallet/src/constants/chains'
-import { FiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
-import { FORQuote, FORServiceProvider } from 'wallet/src/features/fiatOnRamp/types'
-import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
-import { buildCurrencyId } from 'wallet/src/utils/currencyId'
-
-interface FiatOnRampContextType {
-  quotesSections?: SectionListData<FORQuote>[] | undefined
-  setQuotesSections: (quotesSections: SectionListData<FORQuote>[] | undefined) => void
-  selectedQuote?: FORQuote
-  setSelectedQuote: (quote: FORQuote | undefined) => void
-  countryCode: string
-  setCountryCode: (countryCode: string) => void
-  baseCurrencyInfo?: FiatCurrencyInfo
-  setBaseCurrencyInfo: (baseCurrency: FiatCurrencyInfo | undefined) => void
-  quoteCurrency: FiatOnRampCurrency
-  setQuoteCurrency: (quoteCurrency: FiatOnRampCurrency) => void
-  amount?: number
-  setAmount: (amount: number | undefined) => void
-  serviceProviders?: FORServiceProvider[]
-  setServiceProviders: (serviceProviders: FORServiceProvider[] | undefined) => void
-}
-
-const initialState: FiatOnRampContextType = {
-  setQuotesSections: () => undefined,
-  setSelectedQuote: () => undefined,
-  setCountryCode: () => undefined,
-  setBaseCurrencyInfo: () => undefined,
-  setQuoteCurrency: () => undefined,
-  setAmount: () => undefined,
-  setServiceProviders: () => undefined,
-  countryCode: '',
-  quoteCurrency: { currencyInfo: undefined },
-}
-
-const FiatOnRampContext = createContext<FiatOnRampContextType>(initialState)
-
-export function useFiatOnRampContext(): FiatOnRampContextType {
-  return useContext(FiatOnRampContext)
-}
-
-export function FiatOnRampProvider({ children }: { children: React.ReactNode }): JSX.Element {
-  const [quotesSections, setQuotesSections] = useState<FiatOnRampContextType['quotesSections']>()
-  const [selectedQuote, setSelectedQuote] = useState<FORQuote | undefined>()
-  const [countryCode, setCountryCode] = useState<string>(getCountry())
-  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(
-    buildCurrencyId(ChainId.Mainnet, getNativeAddress(ChainId.Mainnet))
-  )
-  const [quoteCurrency, setQuoteCurrency] = useState<FiatOnRampCurrency>({
-    currencyInfo: ethCurrencyInfo,
-  })
-
-  return (
-    <FiatOnRampContext.Provider
-      value={{
-        selectedQuote,
-        setSelectedQuote,
-        quotesSections,
-        setQuotesSections,
-        countryCode,
-        setCountryCode,
-        baseCurrencyInfo,
-        setBaseCurrencyInfo,
-        quoteCurrency,
-        setQuoteCurrency,
-        amount,
-        setAmount,
-        serviceProviders,
-        setServiceProviders,
-      }}>
-      {children}
-    </FiatOnRampContext.Provider>
-  )
-}
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampCountryListModal.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampCountryListModal.tsx
index 188e948cc1f..455f5467d73 100644
--- a/apps/mobile/src/features/fiatOnRamp/FiatOnRampCountryListModal.tsx
+++ b/apps/mobile/src/features/fiatOnRamp/FiatOnRampCountryListModal.tsx
@@ -4,7 +4,11 @@ import { useTranslation } from 'react-i18next'
 import { ListRenderItemInfo } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
 import { SvgUri } from 'react-native-svg'
+import { SearchTextInput } from 'src/components/input/SearchTextInput'
 import { Loader } from 'src/components/loading'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
+import { useBottomSheetFocusHook } from 'src/components/modals/hooks'
+import { ModalName } from 'src/features/telemetry/constants'
 import {
   AnimatedFlex,
   Flex,
@@ -18,29 +22,28 @@ import Check from 'ui/src/assets/icons/check.svg'
 import { fonts, iconSizes } from 'ui/src/theme'
 import { bubbleToTop } from 'utilities/src/primitives/array'
 import { useDebounce } from 'utilities/src/time/timing'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
 import { useFiatOnRampAggregatorCountryListQuery } from 'wallet/src/features/fiatOnRamp/api'
-import { getCountryFlagSvgUrl } from 'wallet/src/features/fiatOnRamp/meld'
-import { FORSupportedCountry } from 'wallet/src/features/fiatOnRamp/types'
-import { SearchTextInput } from 'wallet/src/features/search/SearchTextInput'
-import { ModalName } from 'wallet/src/telemetry/constants'
+import {
+  getCountryFlagSvgUrl,
+  MeldCountryPaymentMethodsResponse,
+} from 'wallet/src/features/fiatOnRamp/meld'
 import { isIOS } from 'wallet/src/utils/platform'
 
 const ICON_SIZE = 32 // design prefers a custom value here
 
 interface CountrySelectorProps {
-  onSelectCountry: (country: FORSupportedCountry) => void
-  countryCode: string
+  onSelectCountry: (country: NonNullable<MeldCountryPaymentMethodsResponse[0]>['country']) => void
+  currentCountryCode: string
 }
 
-function key(item: FORSupportedCountry): string {
+function key(item: NonNullable<MeldCountryPaymentMethodsResponse[0]>): string {
   // item.country.countryCode is already a string, but for some reason eslint thinks it's any, so we cast it
-  return item.countryCode as string
+  return item.country.countryCode as string
 }
 
 function CountrySelectorContent({
   onSelectCountry,
-  countryCode,
+  currentCountryCode,
 }: CountrySelectorProps): JSX.Element {
   const { t } = useTranslation()
 
@@ -52,23 +55,25 @@ function CountrySelectorContent({
 
   const debouncedSearchText = useDebounce(searchText)
 
-  const filteredData: FORSupportedCountry[] = useMemo(() => {
+  const filtredeData = useMemo(() => {
     if (!data) {
       return []
     }
-    return bubbleToTop(data.supportedCountries, (c) => c.countryCode === countryCode).filter(
+    return bubbleToTop(data, (c) => c.country.countryCode === currentCountryCode).filter(
       (item) =>
         !debouncedSearchText ||
-        item.displayName.toLowerCase().startsWith(debouncedSearchText.toLowerCase())
+        item.country.displayName.toLowerCase().startsWith(debouncedSearchText.toLowerCase())
     )
-  }, [countryCode, data, debouncedSearchText])
+  }, [currentCountryCode, data, debouncedSearchText])
 
   const renderItem = useCallback(
-    ({ item }: ListRenderItemInfo<FORSupportedCountry>): JSX.Element => {
-      const countryFlagUrl = getCountryFlagSvgUrl(item.countryCode)
+    ({
+      item,
+    }: ListRenderItemInfo<NonNullable<MeldCountryPaymentMethodsResponse[0]>>): JSX.Element => {
+      const countryFlagUrl = getCountryFlagSvgUrl(item.country.countryCode)
 
       return (
-        <TouchableArea onPress={(): void => onSelectCountry(item)}>
+        <TouchableArea onPress={(): void => onSelectCountry(item.country)}>
           <Flex row alignItems="center" gap="$spacing12" p="$spacing12">
             <Flex
               borderRadius="$roundedFull"
@@ -77,8 +82,8 @@ function CountrySelectorContent({
               width={ICON_SIZE}>
               <SvgUri height={ICON_SIZE} uri={countryFlagUrl} width={ICON_SIZE} />
             </Flex>
-            <Text>{item.displayName}</Text>
-            {item.countryCode === countryCode && (
+            <Text>{item.country.displayName}</Text>
+            {item.country.countryCode === currentCountryCode && (
               <Flex grow alignItems="flex-end" justifyContent="center">
                 <Check
                   color={colors.accent1.get()}
@@ -91,7 +96,7 @@ function CountrySelectorContent({
         </TouchableArea>
       )
     },
-    [colors.accent1, countryCode, onSelectCountry]
+    [colors.accent1, currentCountryCode, onSelectCountry]
   )
 
   return (
@@ -116,7 +121,8 @@ function CountrySelectorContent({
                 ListEmptyComponent={<Flex />}
                 ListFooterComponent={<Inset all="$spacing36" />}
                 bounces={true}
-                data={filteredData}
+                data={filtredeData}
+                focusHook={useBottomSheetFocusHook}
                 keyExtractor={key}
                 keyboardDismissMode="on-drag"
                 keyboardShouldPersistTaps="always"
@@ -153,7 +159,7 @@ const CountryListPlaceholder = React.memo(function CountryListPlaceholder({
 export function FiatOnRampCountryListModal({
   onClose,
   onSelectCountry,
-  countryCode,
+  currentCountryCode,
 }: {
   onClose: () => void
 } & CountrySelectorProps): JSX.Element {
@@ -169,7 +175,10 @@ export function FiatOnRampCountryListModal({
       name={ModalName.FiatOnRampCountryList}
       snapPoints={['70%', '100%']}
       onClose={onClose}>
-      <CountrySelectorContent countryCode={countryCode} onSelectCountry={onSelectCountry} />
+      <CountrySelectorContent
+        currentCountryCode={currentCountryCode}
+        onSelectCountry={onSelectCountry}
+      />
     </BottomSheetModal>
   )
 }
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampCountryPicker.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampCountryPicker.tsx
index 60ab8743e5e..ed56e7a0c39 100644
--- a/apps/mobile/src/features/fiatOnRamp/FiatOnRampCountryPicker.tsx
+++ b/apps/mobile/src/features/fiatOnRamp/FiatOnRampCountryPicker.tsx
@@ -1,25 +1,25 @@
 import React from 'react'
 import { SvgUri } from 'react-native-svg'
 import Trace from 'src/components/Trace/Trace'
+import { ElementName } from 'src/features/telemetry/constants'
 import { Flex, Icons, TouchableArea } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { getCountryFlagSvgUrl } from 'wallet/src/features/fiatOnRamp/meld'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 const ICON_SIZE = iconSizes.icon16
 
 export function FiatOnRampCountryPicker({
   onPress,
-  countryCode,
+  currentCountryCode,
 }: {
   onPress: () => void
-  countryCode: Maybe<string>
+  currentCountryCode: Maybe<string>
 }): JSX.Element | null {
-  if (!countryCode) {
+  if (!currentCountryCode) {
     return null
   }
 
-  const countryFlagUrl = getCountryFlagSvgUrl(countryCode)
+  const countryFlagUrl = getCountryFlagSvgUrl(currentCountryCode)
 
   return (
     <Trace logPress element={ElementName.FiatOnRampCountryPicker}>
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampModal.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampModal.tsx
index 9e5bb5772c8..5b379b99806 100644
--- a/apps/mobile/src/features/fiatOnRamp/FiatOnRampModal.tsx
+++ b/apps/mobile/src/features/fiatOnRamp/FiatOnRampModal.tsx
@@ -11,35 +11,36 @@ import {
 } from 'react-native-reanimated'
 import { useAppDispatch, useShouldShowNativeKeyboard } from 'src/app/hooks'
 import { FiatOnRampCtaButton } from 'src/components/fiatOnRamp/CtaButton'
+import { DecimalPad } from 'src/components/input/DecimalPad'
+import { TextInputProps } from 'src/components/input/TextInput'
+import { useBottomSheetContext } from 'src/components/modals/BottomSheetContext'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { FiatOnRampAmountSection } from 'src/features/fiatOnRamp/FiatOnRampAmountSection'
 import {
   FiatOnRampConnectingView,
   SERVICE_PROVIDER_ICON_SIZE,
 } from 'src/features/fiatOnRamp/FiatOnRampConnecting'
 import { FiatOnRampTokenSelector } from 'src/features/fiatOnRamp/FiatOnRampTokenSelector'
-import { useMoonpayFiatOnRamp } from 'src/features/fiatOnRamp/hooks'
+import {
+  useMoonpayFiatCurrencySupportInfo,
+  useMoonpayFiatOnRamp,
+} from 'src/features/fiatOnRamp/hooks'
 import { FiatOnRampCurrency } from 'src/features/fiatOnRamp/types'
 import { closeModal } from 'src/features/modals/modalSlice'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
-import { MobileEventName } from 'src/features/telemetry/constants'
+import { MobileEventName, ModalName } from 'src/features/telemetry/constants'
 import { MobileEventProperties } from 'src/features/telemetry/types'
+import { openUri } from 'src/utils/linking'
 import { AnimatedFlex, Flex, Text, useDeviceDimensions, useSporeColors } from 'ui/src'
 import MoonpayLogo from 'ui/src/assets/logos/svg/moonpay.svg'
 import { NumberType } from 'utilities/src/format/types'
 import { useTimeout } from 'utilities/src/time/timing'
-import { TextInputProps } from 'wallet/src/components/input/TextInput'
-import { DecimalPadLegacy } from 'wallet/src/components/legacy/DecimalPadLegacy'
-import { useBottomSheetContext } from 'wallet/src/components/modals/BottomSheetContext'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
 import { getNativeAddress } from 'wallet/src/constants/addresses'
 import { ChainId } from 'wallet/src/constants/chains'
-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 { ANIMATE_SPRING_CONFIG } from 'wallet/src/features/transactions/utils'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { buildCurrencyId } from 'wallet/src/utils/currencyId'
-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-'
@@ -199,12 +200,10 @@ function FiatOnRampContent({ onClose }: { onClose: () => void }): JSX.Element {
               width="100%">
               <Text variant="subheading1">{t('Buy')}</Text>
               <FiatOnRampAmountSection
-                appFiatCurrencySupported={appFiatCurrencySupportedInMoonpay}
                 currency={currency}
                 disabled={!eligible}
                 errorColor={errorColor}
                 errorText={errorText}
-                fiatCurrencyInfo={moonpaySupportedFiatCurrency}
                 inputRef={inputRef}
                 predefinedAmountsSupported={predefinedAmountsSupported}
                 quoteAmount={quoteAmount}
@@ -232,7 +231,7 @@ function FiatOnRampContent({ onClose }: { onClose: () => void }): JSX.Element {
                 right={0}
                 onLayout={onDecimalPadLayout}>
                 {!showNativeKeyboard && (
-                  <DecimalPadLegacy
+                  <DecimalPad
                     resetSelection={resetSelection}
                     selection={selection}
                     setValue={onChangeValue('textInput')}
diff --git a/apps/mobile/src/features/fiatOnRamp/FiatOnRampTokenSelector.tsx b/apps/mobile/src/features/fiatOnRamp/FiatOnRampTokenSelector.tsx
index 8e70a708378..3492ae8c170 100644
--- a/apps/mobile/src/features/fiatOnRamp/FiatOnRampTokenSelector.tsx
+++ b/apps/mobile/src/features/fiatOnRamp/FiatOnRampTokenSelector.tsx
@@ -4,14 +4,13 @@ import { TokenFiatOnRampList } from 'src/components/TokenSelector/TokenFiatOnRam
 import Trace from 'src/components/Trace/Trace'
 import { useFiatOnRampSupportedTokens } from 'src/features/fiatOnRamp/hooks'
 import { FiatOnRampCurrency } from 'src/features/fiatOnRamp/types'
+import { ElementName, SectionName } from 'src/features/telemetry/constants'
 import { AnimatedFlex } from 'ui/src'
-import { SectionName } from 'wallet/src/telemetry/constants'
 
-import { useAllCommonBaseCurrencies } from 'wallet/src/components/TokenSelector/hooks'
+import { useAllCommonBaseCurrencies } from 'src/components/TokenSelector/hooks'
 import { fromMoonpayNetwork } from 'wallet/src/features/chains/utils'
 import { CurrencyInfo, GqlResult } from 'wallet/src/features/dataApi/types'
 import { MoonpayCurrency } from 'wallet/src/features/fiatOnRamp/types'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 interface Props {
   onBack: () => void
diff --git a/apps/mobile/src/features/fiatOnRamp/hooks.ts b/apps/mobile/src/features/fiatOnRamp/hooks.ts
index 6c4d5a0d3a8..68c3ba3200c 100644
--- a/apps/mobile/src/features/fiatOnRamp/hooks.ts
+++ b/apps/mobile/src/features/fiatOnRamp/hooks.ts
@@ -8,6 +8,12 @@ import { ColorTokens, useSporeColors } from 'ui/src'
 import { useDebounce } from 'utilities/src/time/timing'
 import { ChainId } from 'wallet/src/constants/chains'
 import { uniswapUrls } from 'wallet/src/constants/urls'
+import { FiatCurrency } from 'wallet/src/features/fiatCurrency/constants'
+import {
+  FiatCurrencyInfo,
+  useAppFiatCurrencyInfo,
+  useFiatCurrencyInfo,
+} from 'wallet/src/features/fiatCurrency/hooks'
 import {
   useFiatOnRampBuyQuoteQuery,
   useFiatOnRampIpAddressQuery,
@@ -15,7 +21,6 @@ import {
   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'
@@ -48,8 +53,7 @@ export function useFormatExactCurrencyAmount(
     ValueType.Exact
   )
 
-  // when formattedAmount is not empty it has an empty space in the end
-  return formattedAmount === '' ? '0 ' : formattedAmount
+  return formattedAmount === '' ? '0' : formattedAmount
 }
 
 /** Returns a new externalTransactionId and a callback to store the transaction. */
@@ -82,7 +86,66 @@ export function useFiatOnRampTransactionCreator(ownerAddress: string): {
 }
 
 const MOONPAY_FEES_INCLUDED = true
+// 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,
+  }
+}
 /**
  * Hook to provide data from Moonpay for Fiat On Ramp Input Amount screen.
  */
diff --git a/apps/mobile/src/features/fiatOnRamp/meldHooks.ts b/apps/mobile/src/features/fiatOnRamp/meldHooks.ts
deleted file mode 100644
index d72439ee6dc..00000000000
--- a/apps/mobile/src/features/fiatOnRamp/meldHooks.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-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 { useDebounce } from 'utilities/src/time/timing'
-import { FiatCurrency } from 'wallet/src/features/fiatCurrency/constants'
-import {
-  FiatCurrencyInfo,
-  useAppFiatCurrencyInfo,
-  useFiatCurrencyInfo,
-} from 'wallet/src/features/fiatCurrency/hooks'
-import { useFiatOnRampAggregatorCryptoQuoteQuery } from 'wallet/src/features/fiatOnRamp/api'
-import { extractCurrencyAmountFromError, isMeldApiError } from 'wallet/src/features/fiatOnRamp/meld'
-import { FORQuote } from 'wallet/src/features/fiatOnRamp/types'
-import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-
-// TODO: https://linear.app/uniswap/issue/MOB-2532/implement-fetching-of-available-fiat-currencies-from-meld
-const MELD_FIAT_CURRENCY_CODES = ['usd', 'eur']
-
-export function useMeldFiatCurrencySupportInfo(): {
-  appFiatCurrencySupportedInMeld: boolean
-  meldSupportedFiatCurrency: FiatCurrencyInfo
-} {
-  // 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 appFiatCurrencySupported = MELD_FIAT_CURRENCY_CODES.includes(appFiatCurrencyCode)
-  const currency = appFiatCurrencySupported ? appFiatCurrencyInfo : fallbackCurrencyInfo
-
-  return {
-    appFiatCurrencySupportedInMeld: appFiatCurrencySupported,
-    meldSupportedFiatCurrency: currency,
-  }
-}
-
-/**
- * Hook to load quotes
- */
-export function useFiatOnRampQuotes({
-  baseCurrencyAmount,
-  baseCurrencyCode,
-  quoteCurrencyCode,
-  countryCode,
-}: {
-  baseCurrencyAmount?: number
-  baseCurrencyCode: string | undefined
-  quoteCurrencyCode: string | undefined
-  countryCode: string | undefined
-}): {
-  loading: boolean
-  error?: FetchBaseQueryError | SerializedError
-  quotes: FORQuote[] | undefined
-} {
-  const debouncedBaseCurrencyAmount = useDebounce(baseCurrencyAmount, Delay.Short)
-
-  const {
-    currentData: quotesResponse,
-    isFetching: quotesFetching,
-    error: quotesError,
-  } = useFiatOnRampAggregatorCryptoQuoteQuery(
-    baseCurrencyAmount && countryCode && quoteCurrencyCode && baseCurrencyCode
-      ? {
-          sourceAmount: baseCurrencyAmount,
-          sourceCurrencyCode: baseCurrencyCode,
-          destinationCurrencyCode: quoteCurrencyCode,
-          countryCode,
-        }
-      : 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 useParseMeldError(error: unknown): {
-  errorText: string | undefined
-  errorColor: ColorTokens | undefined
-} {
-  const { t } = useTranslation()
-  const { formatNumberOrString } = useLocalizationContext()
-
-  let errorText, errorColor: ColorTokens | undefined
-
-  if (!isMeldApiError(error)) {
-    return { errorText, errorColor }
-  }
-
-  if (error.data.code === 'INVALID_AMOUNT_TOO_LOW') {
-    const formattedAmount = extractCurrencyAmountFromError(error.data.message, formatNumberOrString)
-    errorText = t('Minimum {{amount}}', { amount: formattedAmount })
-    errorColor = '$statusCritical'
-  } else if (error.data.code === 'INVALID_AMOUNT_TOO_HIGH') {
-    const formattedAmount = extractCurrencyAmountFromError(error.data.message, formatNumberOrString)
-    errorText = t('Maximum {{amount}}', { amount: formattedAmount })
-    errorColor = '$statusCritical'
-  } else {
-    errorText = t('Something went wrong.')
-    errorColor = '$DEP_accentWarning'
-  }
-
-  return { errorText, errorColor }
-}
diff --git a/apps/mobile/src/features/fiatOnRamp/meldUtils.ts b/apps/mobile/src/features/fiatOnRamp/meldUtils.ts
deleted file mode 100644
index 8b7d39c314b..00000000000
--- a/apps/mobile/src/features/fiatOnRamp/meldUtils.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { FORQuote, FORServiceProvider } from 'wallet/src/features/fiatOnRamp/types'
-
-export function getServiceProviderForQuote(
-  quote: FORQuote | undefined,
-  serviceProviders: FORServiceProvider[] | undefined
-): FORServiceProvider | undefined {
-  return serviceProviders?.find((sp) => sp.serviceProvider === quote?.serviceProvider)
-}
diff --git a/apps/mobile/src/features/fiatOnRamp/types.ts b/apps/mobile/src/features/fiatOnRamp/types.ts
index d8d154f0127..5f4c98ef8c9 100644
--- a/apps/mobile/src/features/fiatOnRamp/types.ts
+++ b/apps/mobile/src/features/fiatOnRamp/types.ts
@@ -4,8 +4,3 @@ export type FiatOnRampCurrency = {
   currencyInfo: Maybe<CurrencyInfo>
   moonpayCurrencyCode?: string
 }
-
-export enum InitialQuoteSelection {
-  MostRecent,
-  Best,
-}
diff --git a/apps/mobile/src/features/firebase/firebaseDataSaga.ts b/apps/mobile/src/features/firebase/firebaseDataSaga.ts
index d8a748c9e02..0039e9198b9 100644
--- a/apps/mobile/src/features/firebase/firebaseDataSaga.ts
+++ b/apps/mobile/src/features/firebase/firebaseDataSaga.ts
@@ -16,8 +16,8 @@ import { getLocale } from 'wallet/src/features/language/hooks'
 import { selectCurrentLanguage, setCurrentLanguage } from 'wallet/src/features/language/slice'
 import {
   EditAccountAction,
-  TogglePushNotificationParams,
   editAccountActions,
+  TogglePushNotificationParams,
 } from 'wallet/src/features/wallet/accounts/editAccountSaga'
 import { Account, AccountType } from 'wallet/src/features/wallet/accounts/types'
 import {
diff --git a/packages/wallet/src/features/gas/adjustGasFee.ts b/apps/mobile/src/features/gas/adjustGasFee.ts
similarity index 96%
rename from packages/wallet/src/features/gas/adjustGasFee.ts
rename to apps/mobile/src/features/gas/adjustGasFee.ts
index 22073d0bedb..9963f582468 100644
--- a/packages/wallet/src/features/gas/adjustGasFee.ts
+++ b/apps/mobile/src/features/gas/adjustGasFee.ts
@@ -1,6 +1,6 @@
 import { BigNumber, BigNumberish, providers } from 'ethers'
+import { BigNumberMax } from 'src/utils/number'
 import { FeeType, GasFeeResult } from 'wallet/src/features/gas/types'
-import { BigNumberMax } from 'wallet/src/utils/number'
 
 export type FeeDetails =
   | { type: FeeType.Legacy; params: { gasPrice: string } }
diff --git a/apps/mobile/src/features/gas/hooks.ts b/apps/mobile/src/features/gas/hooks.ts
new file mode 100644
index 00000000000..0a066c93a26
--- /dev/null
+++ b/apps/mobile/src/features/gas/hooks.ts
@@ -0,0 +1,62 @@
+import { BigNumber, providers } from 'ethers'
+import { useMemo } from 'react'
+import { FeeDetails, getAdjustedGasFeeDetails } from 'src/features/gas/adjustGasFee'
+import { TRANSACTION_CANCELLATION_GAS_FACTOR } from 'wallet/src/constants/transactions'
+import { useTransactionGasFee } from 'wallet/src/features/gas/hooks'
+import { FeeType, GasSpeed } from 'wallet/src/features/gas/types'
+import { TransactionDetails } from 'wallet/src/features/transactions/types'
+
+type CancelationGasFeeDetails = {
+  cancelRequest: providers.TransactionRequest
+  cancelationGasFee: string
+}
+
+/**
+ * Construct cancelation transaction with increased gas (based on current network conditions),
+ * then use it to compute new gas info.
+ */
+export function useCancelationGasFeeInfo(
+  transaction: TransactionDetails
+): CancelationGasFeeDetails | undefined {
+  const cancelationRequest = useMemo(() => {
+    return {
+      chainId: transaction.chainId,
+      from: transaction.from,
+      to: transaction.from,
+      value: '0x0',
+    }
+  }, [transaction])
+
+  const baseTxGasFee = useTransactionGasFee(cancelationRequest, GasSpeed.Urgent)
+  return useMemo(() => {
+    if (!baseTxGasFee.params) {
+      return
+    }
+
+    const adjustedFeeDetails = getAdjustedGasFeeDetails(
+      transaction.options.request,
+      baseTxGasFee.params,
+      TRANSACTION_CANCELLATION_GAS_FACTOR
+    )
+
+    const cancelRequest = {
+      ...cancelationRequest,
+      ...adjustedFeeDetails.params,
+      gasLimit: baseTxGasFee.params.gasLimit,
+    }
+
+    return {
+      cancelRequest,
+      cancelationGasFee: getCancelationGasFee(adjustedFeeDetails, baseTxGasFee.params.gasLimit),
+    }
+  }, [baseTxGasFee, cancelationRequest, transaction.options.request])
+}
+
+function getCancelationGasFee(adjustedFeeDetails: FeeDetails, gasLimit: string): string {
+  // doing object destructuring here loses ts checks based on FeeDetails.type >:(
+  if (adjustedFeeDetails.type === FeeType.Legacy) {
+    return BigNumber.from(gasLimit).mul(adjustedFeeDetails.params.gasPrice).toString()
+  }
+
+  return BigNumber.from(adjustedFeeDetails.params.maxFeePerGas).mul(gasLimit).toString()
+}
diff --git a/apps/mobile/src/features/import/GenericImportForm.tsx b/apps/mobile/src/features/import/GenericImportForm.tsx
index fe88f694d8b..9351a1f0428 100644
--- a/apps/mobile/src/features/import/GenericImportForm.tsx
+++ b/apps/mobile/src/features/import/GenericImportForm.tsx
@@ -3,15 +3,16 @@ import {
   Keyboard,
   LayoutChangeEvent,
   LayoutRectangle,
-  TextInput as NativeTextInput,
   StyleSheet,
+  TextInput as NativeTextInput,
 } from 'react-native'
+import PasteButton from 'src/components/buttons/PasteButton'
 import Trace from 'src/components/Trace/Trace'
 import InputWithSuffix from 'src/features/import/InputWithSuffix'
-import { Flex, Text, useMedia } from 'ui/src'
+import { SectionName } from 'src/features/telemetry/constants'
+import { Flex, Text, useSporeColors } from 'ui/src'
+import AlertTriangle from 'ui/src/assets/icons/alert-triangle.svg'
 import { fonts } from 'ui/src/theme'
-import PasteButton from 'wallet/src/components/buttons/PasteButton'
-import { SectionName } from 'wallet/src/telemetry/constants'
 
 interface Props {
   value: string | undefined
@@ -19,6 +20,7 @@ interface Props {
   onChange: (text: string | undefined) => void
   placeholderLabel: string
   onSubmit?: () => void
+  showSuccess?: boolean // show success indicator
   inputSuffix?: string //text to auto to end of input string
   liveCheck?: boolean
   autoCorrect?: boolean
@@ -29,7 +31,6 @@ interface Props {
   afterPasteButtonPress?: () => void
   blurOnSubmit?: boolean
   textAlign?: 'left' | 'right' | 'center'
-  shouldUseMinHeight?: boolean
 }
 
 export function GenericImportForm({
@@ -38,6 +39,7 @@ export function GenericImportForm({
   errorMessage,
   placeholderLabel,
   onSubmit,
+  showSuccess,
   inputSuffix,
   liveCheck,
   autoCorrect,
@@ -48,16 +50,15 @@ export function GenericImportForm({
   blurOnSubmit,
   textAlign,
   inputAlignment = 'center',
-  shouldUseMinHeight = true,
 }: Props): JSX.Element {
+  const colors = useSporeColors()
   const [focused, setFocused] = useState(false)
   const [layout, setLayout] = useState<LayoutRectangle | null>()
   const textInputRef = useRef<NativeTextInput>(null)
   const isKeyboardVisibleRef = useRef(false)
-  const media = useMedia()
 
-  const INPUT_FONT_SIZE = media.short ? fonts.subheading2.fontSize : fonts.subheading2.fontSize
-  const INPUT_MAX_FONT_SIZE_MULTIPLIER = fonts.subheading2.maxFontSizeMultiplier
+  const INPUT_FONT_SIZE = fonts.body1.fontSize
+  const INPUT_MAX_FONT_SIZE_MULTIPLIER = fonts.body1.maxFontSizeMultiplier
 
   const handleBlur = (): void => {
     setFocused(false)
@@ -97,14 +98,10 @@ export function GenericImportForm({
   const INPUT_MIN_HEIGHT = 120
   const INPUT_MIN_HEIGHT_SHORT = 90
 
-  // Absolutely positioned paste button needs top padding to be vertically centered on bottom border of Flex
-  const PASTE_BUTTON_TOP_PADDING = INPUT_MIN_HEIGHT / 2 + 4
-  const SHORT_PASTE_BUTTON_TOP_PADDING = INPUT_MIN_HEIGHT_SHORT / 2 - 12
-
   return (
     <Trace section={SectionName.ImportAccountForm}>
       <Flex
-        gap="$spacing12"
+        gap="$spacing16"
         onStartShouldSetResponder={(): boolean => {
           // Disable touch events when keyboard is visible (it prevents dismissing the keyboard
           // when this component is pressed while the keyboard is visible)
@@ -112,18 +109,21 @@ export function GenericImportForm({
         }}
         onTouchEnd={handleFocus}>
         <Flex
+          centered
           shrink
-          $short={{
-            px: '$spacing24',
-            py: '$spacing16',
-            minHeight: shouldUseMinHeight ? INPUT_MIN_HEIGHT_SHORT : undefined,
-          }}
-          backgroundColor="$surface1"
-          borderColor="$surface3"
+          $short={{ px: '$spacing24', py: '$spacing8', minHeight: INPUT_MIN_HEIGHT_SHORT }}
+          backgroundColor="$surface2"
+          borderColor={
+            showSuccess
+              ? '$statusSuccess'
+              : errorMessage && (liveCheck || !focused) && value
+              ? '$statusCritical'
+              : '$surface2'
+          }
           borderRadius="$rounded20"
           borderWidth={1}
-          minHeight={shouldUseMinHeight ? INPUT_MIN_HEIGHT : undefined}
-          px="$spacing24"
+          minHeight={INPUT_MIN_HEIGHT}
+          px="$spacing36"
           py="$spacing16"
           width="100%">
           {/* TODO: [MOB-225] make Box press re-focus TextInput. Fine for now since TexInput has autoFocus */}
@@ -145,37 +145,22 @@ export function GenericImportForm({
           />
           {!value && (
             <Flex
+              centered
               grow
               row
-              alignItems="center"
               gap="$spacing8"
               position="absolute"
-              pt="$spacing16"
-              px="$spacing24"
-              width="100%"
+              pt="$spacing4"
               onLayout={(event: LayoutChangeEvent): void => setLayout(event.nativeEvent.layout)}>
               <Text
                 adjustsFontSizeToFit
-                $short={{ variant: 'body3' }}
                 color="$neutral2"
                 maxFontSizeMultiplier={INPUT_MAX_FONT_SIZE_MULTIPLIER}
                 numberOfLines={1}
                 style={styles.placeholderLabelStyle}
-                variant="subheading2">
+                variant="body1">
                 {placeholderLabel}
               </Text>
-            </Flex>
-          )}
-          {!value && !shouldUseMinHeight && (
-            <Flex
-              row
-              alignItems="flex-end"
-              justifyContent="flex-end"
-              position="absolute"
-              pr="$spacing12"
-              pt="$spacing12"
-              right={0}
-              width="100%">
               <PasteButton
                 afterClipboardReceived={afterPasteButtonPress}
                 beforePress={beforePasteButtonPress}
@@ -183,26 +168,12 @@ export function GenericImportForm({
               />
             </Flex>
           )}
-          {!value && shouldUseMinHeight && (
-            <Flex centered width="100%">
-              <Flex
-                $short={{ pt: SHORT_PASTE_BUTTON_TOP_PADDING }}
-                position="absolute"
-                pt={PASTE_BUTTON_TOP_PADDING}
-                top={0}>
-                <PasteButton
-                  afterClipboardReceived={afterPasteButtonPress}
-                  beforePress={beforePasteButtonPress}
-                  onPress={onChange}
-                />
-              </Flex>
-            </Flex>
-          )}
         </Flex>
         <Flex>
           {errorMessage && value && (liveCheck || !focused) && (
             <Flex centered row gap="$spacing12">
-              <Text color="$statusCritical" variant="body3">
+              <AlertTriangle color={colors.statusCritical.val} />
+              <Text color="$statusCritical" variant="body1">
                 {errorMessage}
               </Text>
             </Flex>
diff --git a/apps/mobile/src/features/import/InputWithSuffix.tsx b/apps/mobile/src/features/import/InputWithSuffix.tsx
index dc0c4f277d7..e043dfdc36f 100644
--- a/apps/mobile/src/features/import/InputWithSuffix.tsx
+++ b/apps/mobile/src/features/import/InputWithSuffix.tsx
@@ -5,9 +5,9 @@ import {
   TextInput as NativeTextInput,
   TextInputContentSizeChangeEventData,
 } from 'react-native'
+import { TextInput } from 'src/components/input/TextInput'
 import { ColorTokens, Flex, useSporeColors } from 'ui/src'
 import { spacing } from 'ui/src/theme'
-import { TextInput } from 'wallet/src/components/input/TextInput'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 interface Props {
diff --git a/apps/mobile/src/features/import/WalletPreviewCard.tsx b/apps/mobile/src/features/import/WalletPreviewCard.tsx
index ad7e24473db..304b6173412 100644
--- a/apps/mobile/src/features/import/WalletPreviewCard.tsx
+++ b/apps/mobile/src/features/import/WalletPreviewCard.tsx
@@ -1,18 +1,21 @@
 import React from 'react'
-import { Flex, Icons, Text, TouchableArea, Unicon } from 'ui/src'
-import { iconSizes } from 'ui/src/theme'
+import { SelectionCircle } from 'src/components/input/SelectionCircle'
+import { Unicon } from 'src/components/unicons/Unicon'
+import { ElementName } from 'src/features/telemetry/constants'
+import { Flex, Text, TouchableArea } from 'ui/src'
 import { NumberType } from 'utilities/src/format/types'
-import { DisplayNameText } from 'wallet/src/components/accounts/DisplayNameText'
+import { ChainId } from 'wallet/src/constants/chains'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
+import { useENS } from 'wallet/src/features/ens/useENS'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { useDisplayName } from 'wallet/src/features/wallet/hooks'
-import { ElementNameType } from 'wallet/src/telemetry/constants'
+import { shortenAddress } from 'wallet/src/utils/addresses'
 
 interface Props {
   address: string
   selected: boolean
   balance?: number | null
   onSelect: (address: string) => void
-  name?: ElementNameType
+  name?: ElementName
   testID?: string
   hideSelectionCircle?: boolean
 }
@@ -28,15 +31,17 @@ export default function WalletPreviewCard({
   hideSelectionCircle,
   ...rest
 }: Props): JSX.Element {
-  const displayName = useDisplayName(address, { showLocalName: true })
+  const { name: ensName } = useENS(ChainId.Mainnet, address)
+  const isDarkMode = useIsDarkMode()
   const { convertFiatAmountFormatted } = useLocalizationContext()
 
   const balanceFormatted = convertFiatAmountFormatted(balance, NumberType.FiatTokenQuantity)
+  const unselectedBorderColor = isDarkMode ? '$transparent' : '$surface3'
 
   return (
     <TouchableArea
-      backgroundColor={selected ? '$surface1' : '$surface2'}
-      borderColor={selected ? '$surface3' : '$surface2'}
+      backgroundColor="$surface2"
+      borderColor={selected ? '$accent1' : unselectedBorderColor}
       borderRadius="$rounded20"
       borderWidth={1}
       px="$spacing16"
@@ -47,7 +52,7 @@ export default function WalletPreviewCard({
         <Flex row ai="center" gap="$spacing12" height={ADDRESS_WRAPPER_HEIGHT} jc="flex-start">
           <Unicon address={address} size={UNICON_SIZE} />
           <Flex ai="flex-start">
-            <DisplayNameText displayName={displayName} textProps={{ variant: 'body1' }} />
+            <Text variant="body1">{ensName ?? shortenAddress(address)}</Text>
             {balance ? (
               <Text color="$neutral2" variant="subheading2">
                 {balanceFormatted}
@@ -55,8 +60,8 @@ export default function WalletPreviewCard({
             ) : null}
           </Flex>
         </Flex>
-        {!hideSelectionCircle && selected && (
-          <Icons.Check color="$accent1" size={iconSizes.icon20} />
+        {!hideSelectionCircle && (
+          <SelectionCircle selected={selected} size="icon16" unselectedColor="$neutral2" />
         )}
       </Flex>
     </TouchableArea>
diff --git a/apps/mobile/src/features/import/__snapshots__/GenericImportForm.test.tsx.snap b/apps/mobile/src/features/import/__snapshots__/GenericImportForm.test.tsx.snap
index d98c8ee97f1..654fb7fcf27 100644
--- a/apps/mobile/src/features/import/__snapshots__/GenericImportForm.test.tsx.snap
+++ b/apps/mobile/src/features/import/__snapshots__/GenericImportForm.test.tsx.snap
@@ -6,34 +6,37 @@ exports[`GenericImportForm renders a placeholder when there is no value 1`] = `
   onTouchEnd={[Function]}
   style={
     {
+      "alignItems": "stretch",
       "flexDirection": "column",
-      "gap": 12,
+      "gap": 16,
     }
   }
 >
   <View
     style={
       {
-        "backgroundColor": "#FFFFFF",
-        "borderBottomColor": "#2222220D",
+        "alignItems": "center",
+        "backgroundColor": "#F9F9F9",
+        "borderBottomColor": "#F9F9F9",
         "borderBottomLeftRadius": 20,
         "borderBottomRightRadius": 20,
         "borderBottomWidth": 1,
-        "borderLeftColor": "#2222220D",
+        "borderLeftColor": "#F9F9F9",
         "borderLeftWidth": 1,
-        "borderRightColor": "#2222220D",
+        "borderRightColor": "#F9F9F9",
         "borderRightWidth": 1,
         "borderStyle": "solid",
-        "borderTopColor": "#2222220D",
+        "borderTopColor": "#F9F9F9",
         "borderTopLeftRadius": 20,
         "borderTopRightRadius": 20,
         "borderTopWidth": 1,
         "flexDirection": "column",
         "flexShrink": 1,
+        "justifyContent": "center",
         "minHeight": 120,
         "paddingBottom": 16,
-        "paddingLeft": 24,
-        "paddingRight": 24,
+        "paddingLeft": 36,
+        "paddingRight": 36,
         "paddingTop": 16,
         "width": "100%",
       }
@@ -55,6 +58,7 @@ exports[`GenericImportForm renders a placeholder when there is no value 1`] = `
         autoCorrect={false}
         autoFocus={true}
         blurOnSubmit={false}
+        editable={true}
         focusable={true}
         maxFontSizeMultiplier={1.4}
         multiline={true}
@@ -86,10 +90,10 @@ exports[`GenericImportForm renders a placeholder when there is no value 1`] = `
             "borderTopWidth": 1,
             "color": "#222222",
             "fontFamily": "Basel-Book",
-            "fontSize": 17,
+            "fontSize": 19,
             "height": "auto",
             "justifyContent": "center",
-            "lineHeight": 17,
+            "lineHeight": 19,
             "minWidth": 0,
             "paddingBottom": 0,
             "paddingLeft": 0,
@@ -111,11 +115,9 @@ exports[`GenericImportForm renders a placeholder when there is no value 1`] = `
           "flexDirection": "row",
           "flexGrow": 1,
           "gap": 8,
-          "paddingLeft": 24,
-          "paddingRight": 24,
-          "paddingTop": 16,
+          "justifyContent": "center",
+          "paddingTop": 4,
           "position": "absolute",
-          "width": "100%",
         }
       }
     >
@@ -129,7 +131,7 @@ exports[`GenericImportForm renders a placeholder when there is no value 1`] = `
             "color": "#7D7D7D",
             "flexShrink": 1,
             "fontFamily": "Basel-Book",
-            "fontSize": 17,
+            "fontSize": 19,
             "lineHeight": 24,
           }
         }
@@ -137,174 +139,162 @@ exports[`GenericImportForm renders a placeholder when there is no value 1`] = `
       >
         seed phrase
       </Text>
-    </View>
-    <View
-      style={
-        {
-          "alignItems": "center",
-          "flexDirection": "column",
-          "justifyContent": "center",
-          "width": "100%",
-        }
-      }
-    >
       <View
+        cancelable={true}
+        focusable={true}
+        minPressDuration={0}
+        onBlur={[Function]}
+        onFocus={[Function]}
+        onMouseEnter={[Function]}
+        onMouseLeave={[Function]}
+        onPress={[Function]}
+        onPressIn={[Function]}
+        onPressOut={[Function]}
         style={
           {
-            "flexDirection": "column",
-            "paddingTop": 64,
-            "position": "absolute",
-            "top": 0,
+            "alignItems": "center",
+            "backgroundColor": "#2222220D",
+            "borderBottomColor": "transparent",
+            "borderBottomLeftRadius": 8,
+            "borderBottomRightRadius": 8,
+            "borderBottomWidth": 1,
+            "borderLeftColor": "transparent",
+            "borderLeftWidth": 1,
+            "borderRightColor": "transparent",
+            "borderRightWidth": 1,
+            "borderStyle": "solid",
+            "borderTopColor": "transparent",
+            "borderTopLeftRadius": 8,
+            "borderTopRightRadius": 8,
+            "borderTopWidth": 1,
+            "flexDirection": "row",
+            "gap": 4,
+            "height": "auto",
+            "justifyContent": "center",
+            "opacity": 1,
+            "paddingBottom": 8,
+            "paddingLeft": 8,
+            "paddingRight": 8,
+            "paddingTop": 8,
           }
         }
       >
-        <View
-          accessibilityState={
-            {
-              "busy": undefined,
-              "checked": undefined,
-              "disabled": undefined,
-              "expanded": undefined,
-              "selected": undefined,
-            }
-          }
-          accessibilityValue={
-            {
-              "max": undefined,
-              "min": undefined,
-              "now": undefined,
-              "text": undefined,
-            }
-          }
-          accessible={true}
-          collapsable={false}
-          focusable={true}
-          hitSlop={
-            {
-              "bottom": 5,
-              "left": 5,
-              "right": 5,
-              "top": 5,
-            }
-          }
-          onClick={[Function]}
-          onResponderGrant={[Function]}
-          onResponderMove={[Function]}
-          onResponderRelease={[Function]}
-          onResponderTerminate={[Function]}
-          onResponderTerminationRequest={[Function]}
-          onStartShouldSetResponder={[Function]}
+        <RNSVGSvgView
+          align="xMidYMid"
+          bbHeight="16"
+          bbWidth="16"
+          fill="none"
+          focusable={false}
+          meetOrSlice={0}
+          minX={0}
+          minY={0}
+          strokeWidth={8}
           style={
-            {
-              "backgroundColor": "#FFEFFF",
-              "borderBottomLeftRadius": 12,
-              "borderBottomRightRadius": 12,
-              "borderTopLeftRadius": 12,
-              "borderTopRightRadius": 12,
-              "onPressIn": undefined,
-              "opacity": 1,
-              "paddingBottom": 8,
-              "paddingLeft": 8,
-              "paddingRight": 8,
-              "paddingTop": 8,
-            }
+            [
+              {
+                "backgroundColor": "transparent",
+                "borderWidth": 0,
+              },
+              {
+                "color": "#222222",
+                "height": 16,
+                "width": 16,
+              },
+              {
+                "flex": 0,
+                "height": 16,
+                "width": 16,
+              },
+            ]
           }
+          tintColor="#222222"
+          vbHeight={14}
+          vbWidth={15}
         >
-          <View
-            style={
-              {
-                "alignItems": "center",
-                "flexDirection": "row",
-                "gap": 4,
-                "justifyContent": "center",
-              }
+          <RNSVGGroup
+            fill={null}
+            propList={
+              [
+                "fill",
+                "strokeWidth",
+              ]
             }
+            strokeWidth="8"
           >
-            <Text
-              allowFontScaling={true}
-              maxFontSizeMultiplier={1.2}
-              style={
+            <RNSVGPath
+              d="M8.0835 1.16602H4.00016C3.69074 1.16602 3.394 1.28893 3.1752 1.50772C2.95641 1.72652 2.8335 2.02326 2.8335 2.33268V11.666C2.8335 11.9754 2.95641 12.2722 3.1752 12.491C3.394 12.7098 3.69074 12.8327 4.00016 12.8327H11.0002C11.3096 12.8327 11.6063 12.7098 11.8251 12.491C12.0439 12.2722 12.1668 11.9754 12.1668 11.666V5.24935L8.0835 1.16602Z"
+              fill={
                 {
-                  "color": "#FC72FF",
-                  "fontFamily": "Basel-Medium",
-                  "fontSize": 13,
-                  "fontWeight": "500",
-                  "lineHeight": 16,
+                  "payload": 4278190080,
+                  "type": 0,
                 }
               }
-              suppressHighlighting={true}
-            >
-              Paste
-            </Text>
-            <RNSVGSvgView
-              align="xMidYMid"
-              bbHeight="16"
-              bbWidth="16"
-              fill="currentColor"
-              focusable={false}
-              meetOrSlice={0}
-              minX={0}
-              minY={0}
-              strokeWidth={8}
-              style={
+              propList={
                 [
-                  {
-                    "backgroundColor": "transparent",
-                    "borderWidth": 0,
-                  },
-                  {
-                    "color": "#FC72FF",
-                    "height": 16,
-                    "width": 16,
-                  },
-                  {
-                    "flex": 0,
-                    "height": 16,
-                    "width": 16,
-                  },
+                  "stroke",
+                  "strokeWidth",
+                  "strokeLinecap",
+                  "strokeLinejoin",
                 ]
               }
-              tintColor="#FC72FF"
-              vbHeight={16}
-              vbWidth={16}
-            >
-              <RNSVGGroup
-                fill={
-                  {
-                    "type": 2,
-                  }
+              stroke={
+                {
+                  "type": 2,
+                }
+              }
+              strokeLinecap={1}
+              strokeLinejoin={1}
+              strokeWidth="1.5"
+            />
+            <RNSVGPath
+              d="M8.0835 1.16602V5.24935H12.1668"
+              fill={
+                {
+                  "payload": 4278190080,
+                  "type": 0,
                 }
-                propList={
-                  [
-                    "fill",
-                    "strokeWidth",
-                  ]
+              }
+              propList={
+                [
+                  "stroke",
+                  "strokeWidth",
+                  "strokeLinecap",
+                  "strokeLinejoin",
+                ]
+              }
+              stroke={
+                {
+                  "type": 2,
                 }
-                strokeWidth="8"
-              >
-                <RNSVGPath
-                  d="M14 4.24666V8.56665C14 8.71332 13.9866 8.86 13.9533 9H11.2533C10.0066 9 9 10.0067 9 11.2533V13.9534C8.86 13.9867 8.7134 14 8.56673 14H4.25326C2.74659 14 2 13.2467 2 11.7467V4.24666C2 2.74666 2.74659 2 4.25326 2H11.7467C13.2534 2 14 2.74666 14 4.24666ZM10 11.2533V13.48C10.06 13.44 10.1067 13.3933 10.16 13.34L13.34 10.16C13.3933 10.1067 13.44 10.06 13.48 10H11.2533C10.5599 10 10 10.56 10 11.2533Z"
-                  fill={
-                    {
-                      "type": 2,
-                    }
-                  }
-                  propList={
-                    [
-                      "fill",
-                    ]
-                  }
-                />
-              </RNSVGGroup>
-            </RNSVGSvgView>
-          </View>
-        </View>
+              }
+              strokeLinecap={1}
+              strokeLinejoin={1}
+              strokeWidth="1.5"
+            />
+          </RNSVGGroup>
+        </RNSVGSvgView>
+        <Text
+          maxFontSizeMultiplier={1.2}
+          style={
+            {
+              "color": "#222222",
+              "fontFamily": "Basel-Medium",
+              "fontSize": 17,
+              "fontWeight": "500",
+              "lineHeight": 24,
+            }
+          }
+          suppressHighlighting={true}
+        >
+          Paste
+        </Text>
       </View>
     </View>
   </View>
   <View
     style={
       {
+        "alignItems": "stretch",
         "flexDirection": "column",
       }
     }
diff --git a/apps/mobile/src/features/import/__snapshots__/WalletPreviewCard.test.tsx.snap b/apps/mobile/src/features/import/__snapshots__/WalletPreviewCard.test.tsx.snap
index 0d1cd1ad6f8..6346b07cf75 100644
--- a/apps/mobile/src/features/import/__snapshots__/WalletPreviewCard.test.tsx.snap
+++ b/apps/mobile/src/features/import/__snapshots__/WalletPreviewCard.test.tsx.snap
@@ -39,14 +39,14 @@ exports[`renders wallet preview card 1`] = `
   onStartShouldSetResponder={[Function]}
   style={
     {
-      "backgroundColor": "#FFFFFF",
-      "borderBottomColor": "#2222220D",
+      "backgroundColor": "#F9F9F9",
+      "borderBottomColor": "#FC72FF",
       "borderBottomLeftRadius": 20,
       "borderBottomRightRadius": 20,
-      "borderLeftColor": "#2222220D",
-      "borderRightColor": "#2222220D",
+      "borderLeftColor": "#FC72FF",
+      "borderRightColor": "#FC72FF",
       "borderStyle": "solid",
-      "borderTopColor": "#2222220D",
+      "borderTopColor": "#FC72FF",
       "borderTopLeftRadius": 20,
       "borderTopRightRadius": 20,
       "borderWidth": 1,
@@ -81,6 +81,7 @@ exports[`renders wallet preview card 1`] = `
       <View
         style={
           {
+            "alignItems": "stretch",
             "flexDirection": "column",
             "height": 32,
             "width": 32,
@@ -90,6 +91,7 @@ exports[`renders wallet preview card 1`] = `
         <View
           style={
             {
+              "alignItems": "stretch",
               "flexDirection": "column",
               "height": 32,
               "width": 32,
@@ -232,105 +234,64 @@ exports[`renders wallet preview card 1`] = `
           }
         }
       >
-        <View
+        <Text
+          allowFontScaling={true}
+          maxFontSizeMultiplier={1.4}
           style={
             {
-              "alignItems": "center",
-              "flexDirection": "row",
-              "gap": 2,
-              "justifyContent": "center",
+              "color": "#222222",
+              "fontFamily": "Basel-Book",
+              "fontSize": 19,
+              "lineHeight": 24,
             }
           }
+          suppressHighlighting={true}
         >
-          <Text
-            allowFontScaling={true}
-            maxFontSizeMultiplier={1.4}
-            numberOfLines={1}
-            style={
-              {
-                "color": "#222222",
-                "flexShrink": 1,
-                "fontFamily": "Basel-Book",
-                "fontSize": 19,
-                "lineHeight": 24,
-              }
-            }
-            suppressHighlighting={true}
-          >
-            0x​82D5...3Fa6
-          </Text>
-        </View>
+          0x82D5...3Fa6
+        </Text>
       </View>
     </View>
-    <RNSVGSvgView
-      align="xMidYMid"
-      bbHeight="20"
-      bbWidth="20"
-      fill="none"
-      focusable={false}
-      meetOrSlice={0}
-      minX={0}
-      minY={0}
-      strokeWidth={8}
+    <View
       style={
-        [
-          {
-            "backgroundColor": "transparent",
-            "borderWidth": 0,
-          },
-          {
-            "color": "#FC72FF",
-            "height": 20,
-            "width": 20,
-          },
-          {
-            "flex": 0,
-            "height": 20,
-            "width": 20,
-          },
-        ]
+        {
+          "alignItems": "center",
+          "borderBottomColor": "#FC72FF",
+          "borderBottomLeftRadius": 999999,
+          "borderBottomRightRadius": 999999,
+          "borderBottomWidth": 1,
+          "borderLeftColor": "#FC72FF",
+          "borderLeftWidth": 1,
+          "borderRightColor": "#FC72FF",
+          "borderRightWidth": 1,
+          "borderStyle": "solid",
+          "borderTopColor": "#FC72FF",
+          "borderTopLeftRadius": 999999,
+          "borderTopRightRadius": 999999,
+          "borderTopWidth": 1,
+          "flexDirection": "column",
+          "height": 16,
+          "justifyContent": "center",
+          "width": 16,
+        }
       }
-      tintColor="#FC72FF"
-      vbHeight={16}
-      vbWidth={16}
     >
-      <RNSVGGroup
-        fill={null}
-        propList={
-          [
-            "fill",
-            "strokeWidth",
-          ]
-        }
-        strokeWidth="8"
-      >
-        <RNSVGPath
-          d="M13.3334 4L6.00008 11.3333L2.66675 8"
-          fill={
-            {
-              "payload": 4278190080,
-              "type": 0,
-            }
-          }
-          propList={
-            [
-              "stroke",
-              "strokeWidth",
-              "strokeLinecap",
-              "strokeLinejoin",
-            ]
-          }
-          stroke={
-            {
-              "type": 2,
-            }
+      <View
+        style={
+          {
+            "alignItems": "stretch",
+            "backgroundColor": "#FC72FF",
+            "borderBottomLeftRadius": 999999,
+            "borderBottomRightRadius": 999999,
+            "borderTopLeftRadius": 999999,
+            "borderTopRightRadius": 999999,
+            "flexDirection": "column",
+            "height": 8,
+            "opacity": 1,
+            "width": 8,
           }
-          strokeLinecap={1}
-          strokeLinejoin={1}
-          strokeWidth="2"
-        />
-      </RNSVGGroup>
-    </RNSVGSvgView>
+        }
+      />
+    </View>
   </View>
 </View>
 `;
diff --git a/apps/mobile/src/features/modals/ModalsState.ts b/apps/mobile/src/features/modals/ModalsState.ts
index 2ada1979ee2..77346d5a3a8 100644
--- a/apps/mobile/src/features/modals/ModalsState.ts
+++ b/apps/mobile/src/features/modals/ModalsState.ts
@@ -1,9 +1,8 @@
 import { ExploreModalState } from 'src/app/modals/ExploreModalState'
 import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import { RemoveWalletModalState } from 'src/components/RemoveWallet/RemoveWalletModalState'
-import { ScantasticModalState } from 'src/features/scantastic/ScantasticModalState'
+import { ModalName } from 'src/features/telemetry/constants'
 import { TransactionState } from 'wallet/src/features/transactions/transactionState/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export interface AppModalState<T> {
   isOpen: boolean
@@ -20,7 +19,6 @@ export interface ModalsState {
   [ModalName.LanguageSelector]: AppModalState<undefined>
   [ModalName.RemoveWallet]: AppModalState<RemoveWalletModalState>
   [ModalName.RestoreWallet]: AppModalState<undefined>
-  [ModalName.Scantastic]: AppModalState<ScantasticModalState>
   [ModalName.Send]: AppModalState<TransactionState>
   [ModalName.Swap]: AppModalState<TransactionState>
   [ModalName.UnitagsIntro]: AppModalState<undefined>
diff --git a/apps/mobile/src/features/modals/modalSlice.test.ts b/apps/mobile/src/features/modals/modalSlice.test.ts
index 7901170dde1..f891325e04e 100644
--- a/apps/mobile/src/features/modals/modalSlice.test.ts
+++ b/apps/mobile/src/features/modals/modalSlice.test.ts
@@ -6,7 +6,7 @@ import {
   modalsReducer,
   openModal,
 } from 'src/features/modals/modalSlice'
-import { ModalName } from 'wallet/src/telemetry/constants'
+import { ModalName } from 'src/features/telemetry/constants'
 import { ModalsState } from './ModalsState'
 
 const initialState = { ...initialModalState }
diff --git a/apps/mobile/src/features/modals/modalSlice.ts b/apps/mobile/src/features/modals/modalSlice.ts
index 112de725753..9ea231ad635 100644
--- a/apps/mobile/src/features/modals/modalSlice.ts
+++ b/apps/mobile/src/features/modals/modalSlice.ts
@@ -2,68 +2,53 @@ import { createSlice, PayloadAction } from '@reduxjs/toolkit'
 import { ExploreModalState } from 'src/app/modals/ExploreModalState'
 import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import { RemoveWalletModalState } from 'src/components/RemoveWallet/RemoveWalletModalState'
-import { ScantasticModalState } from 'src/features/scantastic/ScantasticModalState'
+import { ModalName } from 'src/features/telemetry/constants'
 import { getKeys } from 'utilities/src/primitives/objects'
 import { TransactionState } from 'wallet/src/features/transactions/transactionState/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { ModalsState } from './ModalsState'
 
-type AccountSwitcherModalParams = {
-  name: typeof ModalName.AccountSwitcher
-  initialState?: undefined
-}
+type AccountSwitcherModalParams = { name: ModalName.AccountSwitcher; initialState?: undefined }
 
-type ExperimentsModalParams = { name: typeof ModalName.Experiments; initialState?: undefined }
+type ExperimentsModalParams = { name: ModalName.Experiments; initialState?: undefined }
 
 type ExploreModalParams = {
-  name: typeof ModalName.Explore
+  name: ModalName.Explore
   initialState?: ExploreModalState
 }
 
-type FiatCurrencySelectorParams = {
-  name: typeof ModalName.FiatCurrencySelector
-  initialState?: undefined
-}
+type FiatCurrencySelectorParams = { name: ModalName.FiatCurrencySelector; initialState?: undefined }
 
-type FiatOnRampModalParams = { name: typeof ModalName.FiatOnRamp; initialState?: undefined }
+type FiatOnRampModalParams = { name: ModalName.FiatOnRamp; initialState?: undefined }
 
 type FiatOnRampAggregatorModalParams = {
-  name: typeof ModalName.FiatOnRampAggregator
+  name: ModalName.FiatOnRampAggregator
   initialState?: undefined
 }
 
 type LanguageSelectorModalParams = {
-  name: typeof ModalName.LanguageSelector
+  name: ModalName.LanguageSelector
   initialState?: undefined
 }
 
-type ScantasticModalParams = {
-  name: typeof ModalName.Scantastic
-  initialState: ScantasticModalState
-}
-
 type RemoveWalletModalParams = {
-  name: typeof ModalName.RemoveWallet
+  name: ModalName.RemoveWallet
   initialState?: RemoveWalletModalState
 }
 
-type RestoreWalletModalParams = { name: typeof ModalName.RestoreWallet; initialState?: undefined }
+type RestoreWalletModalParams = { name: ModalName.RestoreWallet; initialState?: undefined }
 
 type WalletConnectModalParams = {
-  name: typeof ModalName.WalletConnectScan
+  name: ModalName.WalletConnectScan
   initialState: ScannerModalState
 }
 
-type SwapModalParams = { name: typeof ModalName.Swap; initialState?: TransactionState }
+type SwapModalParams = { name: ModalName.Swap; initialState?: TransactionState }
 
-type SendModalParams = { name: typeof ModalName.Send; initialState?: TransactionState }
+type SendModalParams = { name: ModalName.Send; initialState?: TransactionState }
 
-type UnitagsIntroParams = { name: typeof ModalName.UnitagsIntro; initialState?: undefined }
+type UnitagsIntroParams = { name: ModalName.UnitagsIntro; initialState?: undefined }
 
-type ViewOnlyExplainerParams = {
-  name: typeof ModalName.ViewOnlyExplainer
-  initialState?: undefined
-}
+type ViewOnlyExplainerParams = { name: ModalName.ViewOnlyExplainer; initialState?: undefined }
 
 export type OpenModalParams =
   | AccountSwitcherModalParams
@@ -73,7 +58,6 @@ export type OpenModalParams =
   | FiatOnRampModalParams
   | FiatOnRampAggregatorModalParams
   | LanguageSelectorModalParams
-  | ScantasticModalParams
   | RemoveWalletModalParams
   | SendModalParams
   | SwapModalParams
@@ -97,10 +81,6 @@ export const initialModalState: ModalsState = {
     isOpen: false,
     initialState: ScannerModalState.ScanQr,
   },
-  [ModalName.Scantastic]: {
-    isOpen: false,
-    initialState: undefined,
-  },
   [ModalName.Swap]: {
     isOpen: false,
     initialState: undefined,
diff --git a/apps/mobile/src/features/modals/saga.ts b/apps/mobile/src/features/modals/saga.ts
index 27b0838ad6f..5e7254c8e54 100644
--- a/apps/mobile/src/features/modals/saga.ts
+++ b/apps/mobile/src/features/modals/saga.ts
@@ -6,8 +6,8 @@ import {
   openModal,
   OpenModalParams,
 } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { takeEvery } from 'typed-redux-saga'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export function* modalWatcher() {
   yield* takeEvery(openModal, handleOpenModalAction)
diff --git a/apps/mobile/src/features/nfts/collection/ListPriceCard.tsx b/apps/mobile/src/features/nfts/collection/ListPriceCard.tsx
index 6445a24f8e3..90c68e722bc 100644
--- a/apps/mobile/src/features/nfts/collection/ListPriceCard.tsx
+++ b/apps/mobile/src/features/nfts/collection/ListPriceCard.tsx
@@ -2,7 +2,7 @@ import { BlurView } from 'expo-blur'
 import React from 'react'
 import { StyleSheet } from 'react-native'
 import { ColorTokens, Flex, FlexProps, Logos, SpaceTokens, Text, useSporeColors } from 'ui/src'
-import { TextVariantTokens, borderRadii, iconSizes, spacing } from 'ui/src/theme'
+import { borderRadii, iconSizes, spacing, TextVariantTokens } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
 import { IAmount } from 'wallet/src/data/__generated__/types-and-hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
diff --git a/apps/mobile/src/features/nfts/collection/NFTCollectionContextMenu.tsx b/apps/mobile/src/features/nfts/collection/NFTCollectionContextMenu.tsx
index aa9c2baa4bc..a88b349bdeb 100644
--- a/apps/mobile/src/features/nfts/collection/NFTCollectionContextMenu.tsx
+++ b/apps/mobile/src/features/nfts/collection/NFTCollectionContextMenu.tsx
@@ -6,10 +6,10 @@ import { TripleDot } from 'src/components/icons/TripleDot'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
 import { MobileEventName, ShareableEntity } from 'src/features/telemetry/constants'
 import { disableOnPress } from 'src/utils/disableOnPress'
+import { getNftCollectionUrl, getTwitterLink, openUri } from 'src/utils/linking'
 import { ColorTokens, Flex, TouchableArea } from 'ui/src'
 import { iconSizes, spacing } from 'ui/src/theme'
 import { logger } from 'utilities/src/logger/logger'
-import { getNftCollectionUrl, getTwitterLink, openUri } from 'wallet/src/utils/linking'
 import { NFTCollectionData } from './types'
 
 type MenuOption = {
diff --git a/apps/mobile/src/features/nfts/hooks.ts b/apps/mobile/src/features/nfts/hooks.ts
index 7a812da67cd..59d3466481a 100644
--- a/apps/mobile/src/features/nfts/hooks.ts
+++ b/apps/mobile/src/features/nfts/hooks.ts
@@ -5,6 +5,7 @@ import { ContextMenuAction, ContextMenuOnPressNativeEvent } from 'react-native-c
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
 import { MobileEventName, ShareableEntity } from 'src/features/telemetry/constants'
+import { getNftUrl } from 'src/utils/linking'
 import { logger } from 'utilities/src/logger/logger'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { selectNftsData } from 'wallet/src/features/favorites/selectors'
@@ -13,7 +14,6 @@ import { shouldHideNft } from 'wallet/src/features/nfts/hooks'
 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 { getNftUrl } from 'wallet/src/utils/linking'
 
 interface NFTMenuParams {
   tokenId?: string
diff --git a/apps/mobile/src/features/nfts/item/__snapshots__/CollectionPreviewCard.test.tsx.snap b/apps/mobile/src/features/nfts/item/__snapshots__/CollectionPreviewCard.test.tsx.snap
index 83f5f7ca641..ddecfa94036 100644
--- a/apps/mobile/src/features/nfts/item/__snapshots__/CollectionPreviewCard.test.tsx.snap
+++ b/apps/mobile/src/features/nfts/item/__snapshots__/CollectionPreviewCard.test.tsx.snap
@@ -76,6 +76,7 @@ exports[`renders collection preview card 1`] = `
       <View
         style={
           {
+            "alignItems": "stretch",
             "borderBottomLeftRadius": 999999,
             "borderBottomRightRadius": 999999,
             "borderTopLeftRadius": 999999,
@@ -121,6 +122,7 @@ exports[`renders collection preview card 1`] = `
       <View
         style={
           {
+            "alignItems": "stretch",
             "flexDirection": "column",
             "flexShrink": 1,
           }
@@ -139,6 +141,7 @@ exports[`renders collection preview card 1`] = `
           <View
             style={
               {
+                "alignItems": "stretch",
                 "flexDirection": "column",
                 "flexShrink": 1,
               }
diff --git a/apps/mobile/src/features/nfts/item/__snapshots__/traits.test.tsx.snap b/apps/mobile/src/features/nfts/item/__snapshots__/traits.test.tsx.snap
index bc4bbe6dd0d..a36c2bf317d 100644
--- a/apps/mobile/src/features/nfts/item/__snapshots__/traits.test.tsx.snap
+++ b/apps/mobile/src/features/nfts/item/__snapshots__/traits.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`renders trait card 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "backgroundColor": "#2222220D",
       "borderBottomLeftRadius": 16,
       "borderBottomRightRadius": 16,
diff --git a/packages/wallet/src/features/notifications/components/NotificationToast.tsx b/apps/mobile/src/features/notifications/NotificationToast.tsx
similarity index 79%
rename from packages/wallet/src/features/notifications/components/NotificationToast.tsx
rename to apps/mobile/src/features/notifications/NotificationToast.tsx
index da153dd62bc..66a574278fa 100644
--- a/packages/wallet/src/features/notifications/components/NotificationToast.tsx
+++ b/apps/mobile/src/features/notifications/NotificationToast.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect } from 'react'
+import React, { useCallback, useEffect } from 'react'
 import {
   Directions,
   FlingGestureHandler,
@@ -6,13 +6,12 @@ import {
   State,
 } from 'react-native-gesture-handler'
 import { useAnimatedStyle, useSharedValue, withDelay, withSpring } from 'react-native-reanimated'
-import { isWeb } from 'tamagui'
-import { AnimatedFlex, Flex, Text, TouchableArea, mediumShadowProps, useDeviceInsets } from 'ui/src'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { selectActiveAccountNotifications } from 'src/features/notifications/selectors'
+import { AnimatedFlex, Flex, mediumShadowProps, Text, TouchableArea, useDeviceInsets } from 'ui/src'
 import { borderRadii, spacing } from 'ui/src/theme'
 import { useTimeout } from 'utilities/src/time/timing'
-import { selectActiveAccountNotifications } from 'wallet/src/features/notifications/selectors'
 import { popNotification } from 'wallet/src/features/notifications/slice'
-import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 
 const NOTIFICATION_HEIGHT = 64
 
@@ -26,7 +25,6 @@ const SMALL_TOAST_RADIUS = borderRadii.roundedFull
 
 export interface NotificationContentProps {
   title: string
-  subtitle?: string
   icon?: JSX.Element
   actionButton?: {
     title: string
@@ -43,7 +41,6 @@ export interface NotificationToastProps extends NotificationContentProps {
 }
 
 export function NotificationToast({
-  subtitle,
   title,
   icon,
   onPress,
@@ -58,7 +55,7 @@ export function NotificationToast({
   const currentNotification = notifications?.[0]
   const hasQueuedNotification = !!notifications?.[1]
 
-  const showOffset = useDeviceInsets().top + spacing.spacing4 + (isWeb ? spacing.spacing12 : 0)
+  const showOffset = useDeviceInsets().top + spacing.spacing4
   const bannerOffset = useSharedValue(HIDE_OFFSET_Y)
 
   useEffect(() => {
@@ -67,12 +64,9 @@ export function NotificationToast({
     }
   }, [showOffset, bannerOffset, currentNotification])
 
-  const animatedStyle = useAnimatedStyle(
-    () => ({
-      transform: [{ translateY: bannerOffset.value }],
-    }),
-    [bannerOffset]
-  )
+  const animatedStyle = useAnimatedStyle(() => ({
+    transform: [{ translateY: bannerOffset.value }],
+  }))
 
   const dismissLatest = useCallback(() => {
     bannerOffset.value = withSpring(HIDE_OFFSET_Y, SPRING_ANIMATION)
@@ -113,19 +107,13 @@ export function NotificationToast({
     <FlingGestureHandler direction={Directions.UP} onHandlerStateChange={onFling}>
       <AnimatedFlex
         centered
-        borderRadius={LARGE_TOAST_RADIUS}
         pointerEvents="box-none"
         position="absolute"
         style={animatedStyle}
         top={0}
         width="100%"
         zIndex="$modal">
-        <Flex
-          {...mediumShadowProps}
-          borderColor="$surface3"
-          borderRadius={smallToast ? SMALL_TOAST_RADIUS : LARGE_TOAST_RADIUS}
-          borderWidth={TOAST_BORDER_WIDTH}
-          mx={smallToast ? 'auto' : '$spacing24'}>
+        <Flex {...mediumShadowProps} mx={smallToast ? 'auto' : '$spacing24'}>
           {smallToast ? (
             <NotificationContentSmall
               icon={icon}
@@ -141,7 +129,6 @@ export function NotificationToast({
                   : undefined
               }
               icon={icon}
-              subtitle={subtitle}
               title={title}
               onPress={onNotificationPress}
               onPressIn={onPressIn}
@@ -153,9 +140,8 @@ export function NotificationToast({
   )
 }
 
-function NotificationContent({
+export function NotificationContent({
   title,
-  subtitle,
   icon,
   actionButton,
   onPress,
@@ -165,7 +151,9 @@ function NotificationContent({
     <TouchableArea
       alignItems="center"
       bg="$surface2"
+      borderColor="$surface3"
       borderRadius={LARGE_TOAST_RADIUS}
+      borderWidth={TOAST_BORDER_WIDTH}
       flex={1}
       flexDirection="row"
       minHeight={NOTIFICATION_HEIGHT}
@@ -181,18 +169,10 @@ function NotificationContent({
           gap="$spacing12"
           justifyContent="flex-start">
           {icon}
-          <Flex shrink alignItems="flex-start" flexDirection="column">
-            <Text
-              adjustsFontSizeToFit
-              numberOfLines={subtitle ? 1 : 2}
-              variant={`body${subtitle ? 3 : 2}`}>
+          <Flex row shrink alignItems="center">
+            <Text adjustsFontSizeToFit numberOfLines={2} variant="body2">
               {title}
             </Text>
-            {subtitle && (
-              <Text adjustsFontSizeToFit color="$neutral2" numberOfLines={1} variant="body3">
-                {subtitle}
-              </Text>
-            )}
           </Flex>
         </Flex>
         {actionButton && (
@@ -209,7 +189,7 @@ function NotificationContent({
   )
 }
 
-function NotificationContentSmall({
+export function NotificationContentSmall({
   title,
   icon,
   onPress,
@@ -219,7 +199,9 @@ function NotificationContentSmall({
     <Flex centered row shrink pointerEvents="box-none">
       <TouchableArea
         bg="$surface2"
+        borderColor="$surface3"
         borderRadius={SMALL_TOAST_RADIUS}
+        borderWidth={TOAST_BORDER_WIDTH}
         p="$spacing12"
         onPress={onPress}
         onPressIn={onPressIn}>
diff --git a/apps/mobile/src/features/notifications/NotificationToastWrapper.tsx b/apps/mobile/src/features/notifications/NotificationToastWrapper.tsx
index c6574ece647..4c381736821 100644
--- a/apps/mobile/src/features/notifications/NotificationToastWrapper.tsx
+++ b/apps/mobile/src/features/notifications/NotificationToastWrapper.tsx
@@ -1,10 +1,26 @@
 import React from 'react'
 import { useAppSelector } from 'src/app/hooks'
-import { ScantasticCompleteNotification } from 'src/features/notifications/ScantasticCompleteNotification'
-import { WCNotification } from 'src/features/notifications/WCNotification'
-import { SharedNotificationToastRouter } from 'wallet/src/features/notifications/components/SharedNotificationToastRouter'
-import { selectActiveAccountNotifications } from 'wallet/src/features/notifications/selectors'
+import {
+  ApproveNotification,
+  ChangeAssetVisibilityNotification,
+  ChooseCountryNotification,
+  CopiedNotification,
+  DefaultNotification,
+  ErrorNotification,
+  SuccessNotification,
+  SwapNetworkNotification,
+  SwapNotification,
+  SwapPendingNotification,
+  TransferCurrencyNotification,
+  TransferNFTNotification,
+  UnknownTxNotification,
+  WCNotification,
+  WrapNotification,
+} from 'src/features/notifications/Notifications'
+import { selectActiveAccountNotifications } from 'src/features/notifications/selectors'
+import { AssetType } from 'wallet/src/entities/assets'
 import { AppNotification, AppNotificationType } from 'wallet/src/features/notifications/types'
+import { TransactionType } from 'wallet/src/features/transactions/types'
 
 export function NotificationToastWrapper(): JSX.Element | null {
   const notifications = useAppSelector(selectActiveAccountNotifications)
@@ -17,19 +33,47 @@ export function NotificationToastWrapper(): JSX.Element | null {
   return <NotificationToastRouter notification={notification} />
 }
 
-function NotificationToastRouter({
+export function NotificationToastRouter({
   notification,
 }: {
   notification: AppNotification
 }): JSX.Element | null {
-  // Insert Mobile-only notifications here.
-  // Shared wallet notifications should go in SharedNotificationToastRouter.
   switch (notification.type) {
     case AppNotificationType.WalletConnect:
       return <WCNotification notification={notification} />
-    case AppNotificationType.ScantasticComplete:
-      return <ScantasticCompleteNotification notification={notification} />
+    case AppNotificationType.Error:
+      return <ErrorNotification notification={notification} />
+    case AppNotificationType.Default:
+      return <DefaultNotification notification={notification} />
+    case AppNotificationType.Success:
+      return <SuccessNotification notification={notification} />
+    case AppNotificationType.Copied:
+      return <CopiedNotification notification={notification} />
+    case AppNotificationType.SwapNetwork:
+      return <SwapNetworkNotification notification={notification} />
+    case AppNotificationType.ChooseCountry:
+      return <ChooseCountryNotification notification={notification} />
+    case AppNotificationType.AssetVisibility:
+      return <ChangeAssetVisibilityNotification notification={notification} />
+    case AppNotificationType.SwapPending:
+      return <SwapPendingNotification notification={notification} />
+    case AppNotificationType.Transaction:
+      switch (notification.txType) {
+        case TransactionType.Approve:
+          return <ApproveNotification notification={notification} />
+        case TransactionType.Swap:
+          return <SwapNotification notification={notification} />
+        case TransactionType.Wrap:
+          return <WrapNotification notification={notification} />
+        case TransactionType.Send:
+        case TransactionType.Receive:
+          if (notification.assetType === AssetType.Currency) {
+            return <TransferCurrencyNotification notification={notification} />
+          } else {
+            return <TransferNFTNotification notification={notification} />
+          }
+        case TransactionType.Unknown:
+          return <UnknownTxNotification notification={notification} />
+      }
   }
-
-  return <SharedNotificationToastRouter notification={notification} />
 }
diff --git a/apps/mobile/src/features/notifications/Notifications.tsx b/apps/mobile/src/features/notifications/Notifications.tsx
new file mode 100644
index 00000000000..83a8abda3e7
--- /dev/null
+++ b/apps/mobile/src/features/notifications/Notifications.tsx
@@ -0,0 +1,634 @@
+// TODO(MOB-204): reduce file length
+// consider splitting into multiple files
+/* eslint-disable max-lines */
+import React from 'react'
+import { TFunction, useTranslation } from 'react-i18next'
+import { SvgUri } from 'react-native-svg'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { useEagerActivityNavigation } from 'src/app/navigation/hooks'
+import { store } from 'src/app/store'
+import { CheckmarkCircle } from 'src/components/icons/CheckmarkCircle'
+import { SpinningLoader } from 'src/components/loading/SpinningLoader'
+import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
+import { closeAllModals, closeModal, openModal } from 'src/features/modals/modalSlice'
+import { NotificationToast } from 'src/features/notifications/NotificationToast'
+import {
+  formApproveNotificationTitle,
+  formSwapNotificationTitle,
+  formTransferCurrencyNotificationTitle,
+  formTransferNFTNotificationTitle,
+  formUnknownTxTitle,
+  formWCNotificationTitle,
+  formWrapNotificationTitle,
+} from 'src/features/notifications/utils'
+import { ModalName } from 'src/features/telemetry/constants'
+import { useCreateSwapFormState, useCreateWrapFormState } from 'src/features/transactions/hooks'
+import { Flex, useSporeColors } from 'ui/src'
+import EyeOffIcon from 'ui/src/assets/icons/eye-off.svg'
+import EyeIcon from 'ui/src/assets/icons/eye.svg'
+import { iconSizes } from 'ui/src/theme'
+import { ONE_SECOND_MS } from 'utilities/src/time/time'
+import {
+  DappLogoWithTxStatus,
+  LogoWithTxStatus,
+} from 'wallet/src/components/CurrencyLogo/LogoWithTxStatus'
+import { NetworkLogo } from 'wallet/src/components/CurrencyLogo/NetworkLogo'
+import { SplitLogo } from 'wallet/src/components/CurrencyLogo/SplitLogo'
+import { CHAIN_INFO } from 'wallet/src/constants/chains'
+import { AssetType } from 'wallet/src/entities/assets'
+import { toSupportedChainId } from 'wallet/src/features/chains/utils'
+import { useENS } from 'wallet/src/features/ens/useENS'
+import { getCountryFlagSvgUrl } from 'wallet/src/features/fiatOnRamp/meld'
+import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
+import { useNFT } from 'wallet/src/features/nfts/hooks'
+import {
+  AppErrorNotification,
+  AppNotificationDefault,
+  ApproveTxNotification,
+  ChangeAssetVisibilityNotification as ChangeAssetVisibilityNotificationType,
+  ChooseCountryNotification as ChooseCountryNotificationType,
+  CopyNotification,
+  CopyNotificationType,
+  SwapNetworkNotification as SwapNetworkNotificationType,
+  SwapPendingNotification as SwapPendingNotificationType,
+  SwapTxNotification,
+  TransactionNotificationBase,
+  TransferCurrencyTxNotification,
+  TransferNFTTxNotification,
+  WalletConnectNotification,
+  WrapTxNotification,
+} from 'wallet/src/features/notifications/types'
+import {
+  useCurrencyInfo,
+  useNativeCurrencyInfo,
+  useWrappedNativeCurrencyInfo,
+} from 'wallet/src/features/tokens/useCurrencyInfo'
+import {
+  TransactionStatus,
+  TransactionType,
+  WrapType,
+} from 'wallet/src/features/transactions/types'
+import { selectActiveAccountAddress } from 'wallet/src/features/wallet/selectors'
+import { WalletConnectEvent } from 'wallet/src/features/walletConnect/types'
+import { buildCurrencyId } from 'wallet/src/utils/currencyId'
+
+export const NOTIFICATION_ICON_SIZE = iconSizes.icon36
+
+// Helpers to preload profile data, and dismiss modals and navigate
+const useNavigateToProfileTab = (
+  address: string | undefined
+): {
+  onPressIn: () => Promise<void>
+  onPress: () => void
+} => {
+  const { preload, navigate } = useEagerActivityNavigation()
+
+  const onPressIn = async (): Promise<void> => {
+    if (!address) {
+      return
+    }
+    await preload(address)
+  }
+
+  const onPress = (): void => {
+    if (!address) {
+      return
+    }
+    navigate()
+    store.dispatch(closeAllModals())
+  }
+
+  return {
+    onPressIn,
+    onPress,
+  }
+}
+
+export function WCNotification({
+  notification,
+}: {
+  notification: WalletConnectNotification
+}): JSX.Element {
+  const { imageUrl, chainId, address, event, hideDelay, dappName } = notification
+  const dispatch = useAppDispatch()
+  const validChainId = toSupportedChainId(chainId)
+  const title = formWCNotificationTitle(notification)
+
+  const smallToastEvents = [
+    WalletConnectEvent.Connected,
+    WalletConnectEvent.Disconnected,
+    WalletConnectEvent.NetworkChanged,
+  ]
+  const smallToast = smallToastEvents.includes(event)
+
+  const icon = (
+    <DappLogoWithTxStatus
+      chainId={validChainId}
+      dappImageUrl={imageUrl}
+      dappName={dappName}
+      event={event}
+      size={smallToast ? iconSizes.icon24 : NOTIFICATION_ICON_SIZE}
+    />
+  )
+
+  const onPressNotification = (): void => {
+    dispatch(
+      openModal({
+        name: ModalName.WalletConnectScan,
+        initialState: ScannerModalState.ConnectedDapps,
+      })
+    )
+  }
+
+  return (
+    <NotificationToast
+      address={address}
+      hideDelay={hideDelay}
+      icon={icon}
+      smallToast={smallToast}
+      title={title}
+      onPress={onPressNotification}
+    />
+  )
+}
+
+export function ApproveNotification({
+  notification: { address, chainId, tokenAddress, spender, txStatus, txType, hideDelay },
+}: {
+  notification: ApproveTxNotification
+}): JSX.Element {
+  const { onPress, onPressIn } = useNavigateToProfileTab(address)
+
+  const currencyInfo = useCurrencyInfo(buildCurrencyId(chainId, tokenAddress))
+  const title = formApproveNotificationTitle(
+    txStatus,
+    currencyInfo?.currency,
+    tokenAddress,
+    spender
+  )
+  const icon = (
+    <LogoWithTxStatus
+      assetType={AssetType.Currency}
+      chainId={chainId}
+      currencyInfo={currencyInfo}
+      size={NOTIFICATION_ICON_SIZE}
+      txStatus={txStatus}
+      txType={txType}
+    />
+  )
+
+  return (
+    <NotificationToast
+      address={address}
+      hideDelay={hideDelay}
+      icon={icon}
+      title={title}
+      onPress={onPress}
+      onPressIn={onPressIn}
+    />
+  )
+}
+
+export function SwapNotification({
+  notification: {
+    chainId,
+    txId,
+    txStatus,
+    inputCurrencyId,
+    inputCurrencyAmountRaw,
+    outputCurrencyId,
+    outputCurrencyAmountRaw,
+    tradeType,
+    address,
+    hideDelay,
+  },
+}: {
+  notification: SwapTxNotification
+}): JSX.Element {
+  const formatter = useLocalizationContext()
+  const inputCurrencyInfo = useCurrencyInfo(inputCurrencyId)
+  const outputCurrencyInfo = useCurrencyInfo(outputCurrencyId)
+  const title = formSwapNotificationTitle(
+    formatter,
+    txStatus,
+    inputCurrencyInfo?.currency,
+    outputCurrencyInfo?.currency,
+    inputCurrencyId,
+    outputCurrencyId,
+    inputCurrencyAmountRaw,
+    outputCurrencyAmountRaw,
+    tradeType
+  )
+
+  const swapFormState = useCreateSwapFormState(address, chainId, txId)
+  const dispatch = useAppDispatch()
+  const { t } = useTranslation()
+  const retryButton =
+    txStatus === TransactionStatus.Failed
+      ? {
+          title: t('Retry'),
+          onPress: (): void => {
+            dispatch(closeModal({ name: ModalName.Swap }))
+            dispatch(openModal({ name: ModalName.Swap, initialState: swapFormState ?? undefined }))
+          },
+        }
+      : undefined
+
+  const { onPress, onPressIn } = useNavigateToProfileTab(address)
+
+  const icon = (
+    <SplitLogo
+      chainId={chainId}
+      inputCurrencyInfo={inputCurrencyInfo}
+      outputCurrencyInfo={outputCurrencyInfo}
+      size={NOTIFICATION_ICON_SIZE}
+    />
+  )
+
+  return (
+    <NotificationToast
+      actionButton={retryButton}
+      address={address}
+      hideDelay={hideDelay}
+      icon={icon}
+      title={title}
+      onPress={onPress}
+      onPressIn={onPressIn}
+    />
+  )
+}
+
+export function WrapNotification({
+  notification: { txId, txStatus, currencyAmountRaw, address, hideDelay, unwrapped, chainId },
+}: {
+  notification: WrapTxNotification
+}): JSX.Element {
+  const formatter = useLocalizationContext()
+  const nativeCurrencyInfo = useNativeCurrencyInfo(chainId)
+  const wrappedCurrencyInfo = useWrappedNativeCurrencyInfo(chainId)
+  const inputCurrencyInfo = unwrapped ? wrappedCurrencyInfo : nativeCurrencyInfo
+  const outputCurrencyInfo = unwrapped ? nativeCurrencyInfo : wrappedCurrencyInfo
+
+  const title = formWrapNotificationTitle(
+    formatter,
+    txStatus,
+    inputCurrencyInfo?.currency,
+    outputCurrencyInfo?.currency,
+    currencyAmountRaw,
+    unwrapped
+  )
+
+  const wrapFormState = useCreateWrapFormState(
+    address,
+    chainId,
+    txId,
+    inputCurrencyInfo?.currency,
+    outputCurrencyInfo?.currency
+  )
+
+  const dispatch = useAppDispatch()
+  const { t } = useTranslation()
+  const retryButton =
+    txStatus === TransactionStatus.Failed
+      ? {
+          title: t('Retry'),
+          onPress: (): void => {
+            dispatch(closeModal({ name: ModalName.Swap }))
+            dispatch(openModal({ name: ModalName.Swap, initialState: wrapFormState ?? undefined }))
+          },
+        }
+      : undefined
+
+  const { onPress, onPressIn } = useNavigateToProfileTab(address)
+
+  const icon = (
+    <SplitLogo
+      chainId={chainId}
+      inputCurrencyInfo={inputCurrencyInfo}
+      outputCurrencyInfo={outputCurrencyInfo}
+      size={NOTIFICATION_ICON_SIZE}
+    />
+  )
+
+  return (
+    <NotificationToast
+      actionButton={retryButton}
+      address={address}
+      hideDelay={hideDelay}
+      icon={icon}
+      title={title}
+      onPress={onPress}
+      onPressIn={onPressIn}
+    />
+  )
+}
+
+export function TransferCurrencyNotification({
+  notification,
+}: {
+  notification: TransferCurrencyTxNotification
+}): JSX.Element {
+  const formatter = useLocalizationContext()
+  const {
+    address,
+    assetType,
+    chainId,
+    tokenAddress,
+    currencyAmountRaw,
+    txType,
+    txStatus,
+    hideDelay,
+  } = notification
+  const senderOrRecipient =
+    txType === TransactionType.Send ? notification.recipient : notification.sender
+  const { name: ensName } = useENS(chainId, senderOrRecipient)
+  const currencyInfo = useCurrencyInfo(buildCurrencyId(chainId, tokenAddress))
+
+  const title = formTransferCurrencyNotificationTitle(
+    formatter,
+    txType,
+    txStatus,
+    currencyInfo?.currency,
+    tokenAddress,
+    currencyAmountRaw,
+    ensName ?? senderOrRecipient
+  )
+
+  const { onPress, onPressIn } = useNavigateToProfileTab(address)
+
+  const icon = (
+    <LogoWithTxStatus
+      assetType={assetType}
+      chainId={chainId}
+      currencyInfo={currencyInfo}
+      size={NOTIFICATION_ICON_SIZE}
+      txStatus={txStatus}
+      txType={txType}
+    />
+  )
+
+  return (
+    <NotificationToast
+      address={address}
+      hideDelay={hideDelay}
+      icon={icon}
+      title={title}
+      onPress={onPress}
+      onPressIn={onPressIn}
+    />
+  )
+}
+
+export function TransferNFTNotification({
+  notification,
+}: {
+  notification: TransferNFTTxNotification
+}): JSX.Element {
+  const { address, assetType, chainId, tokenAddress, tokenId, txType, txStatus, hideDelay } =
+    notification
+  const userAddress = useAppSelector(selectActiveAccountAddress) || ''
+  const senderOrRecipient =
+    txType === TransactionType.Send ? notification.recipient : notification.sender
+  const nftOwner = txType === TransactionType.Send ? notification.recipient : userAddress
+  const { data: nft } = useNFT(nftOwner, tokenAddress, tokenId)
+  const { name: ensName } = useENS(chainId, senderOrRecipient)
+  const title = formTransferNFTNotificationTitle(
+    txType,
+    txStatus,
+    nft,
+    tokenAddress,
+    tokenId,
+    ensName ?? senderOrRecipient
+  )
+
+  const { onPress, onPressIn } = useNavigateToProfileTab(address)
+
+  const icon = (
+    <LogoWithTxStatus
+      assetType={assetType}
+      chainId={chainId}
+      nftImageUrl={nft?.thumbnail?.url ?? undefined}
+      size={NOTIFICATION_ICON_SIZE}
+      txStatus={txStatus}
+      txType={txType}
+    />
+  )
+
+  return (
+    <NotificationToast
+      address={address}
+      hideDelay={hideDelay}
+      icon={icon}
+      title={title}
+      onPress={onPress}
+      onPressIn={onPressIn}
+    />
+  )
+}
+
+export function UnknownTxNotification({
+  notification: { address, chainId, tokenAddress, txStatus, txType, hideDelay },
+}: {
+  notification: TransactionNotificationBase
+}): JSX.Element {
+  const { name: ensName } = useENS(chainId, tokenAddress)
+  const currencyInfo = useCurrencyInfo(
+    tokenAddress ? buildCurrencyId(chainId, tokenAddress) : undefined
+  )
+  const title = formUnknownTxTitle(txStatus, tokenAddress, ensName)
+  const icon = (
+    <LogoWithTxStatus
+      assetType={AssetType.Currency}
+      chainId={chainId}
+      currencyInfo={currencyInfo}
+      size={NOTIFICATION_ICON_SIZE}
+      txStatus={txStatus}
+      txType={txType}
+    />
+  )
+
+  const { onPress, onPressIn } = useNavigateToProfileTab(address)
+
+  return (
+    <NotificationToast
+      address={address}
+      hideDelay={hideDelay}
+      icon={icon}
+      title={title}
+      onPress={onPress}
+      onPressIn={onPressIn}
+    />
+  )
+}
+
+export function ErrorNotification({
+  notification: { address, errorMessage, hideDelay },
+}: {
+  notification: AppErrorNotification
+}): JSX.Element {
+  return <NotificationToast address={address} hideDelay={hideDelay} title={errorMessage} />
+}
+
+export function DefaultNotification({
+  notification: { address, title, hideDelay },
+}: {
+  notification: AppNotificationDefault
+}): JSX.Element {
+  return <NotificationToast address={address} hideDelay={hideDelay} title={title} />
+}
+
+export function SuccessNotification({
+  notification: { hideDelay = 2000, title },
+}: {
+  notification: Pick<AppNotificationDefault, 'title' | 'hideDelay'>
+}): JSX.Element | null {
+  const colors = useSporeColors()
+
+  return (
+    <NotificationToast
+      smallToast
+      hideDelay={hideDelay}
+      icon={
+        <CheckmarkCircle
+          backgroundColor={colors.statusSuccess.val}
+          checkmarkStrokeWidth={2}
+          color={colors.sporeWhite.val}
+          size={iconSizes.icon16}
+        />
+      }
+      title={title}
+    />
+  )
+}
+
+export function CopiedNotification({
+  notification: { hideDelay = 2000, copyType },
+}: {
+  notification: CopyNotification
+}): JSX.Element | null {
+  const { t } = useTranslation()
+
+  let title
+  switch (copyType) {
+    case CopyNotificationType.Address:
+      title = t('Address copied')
+      break
+    case CopyNotificationType.TransactionId:
+      title = t('Transaction ID copied')
+      break
+    case CopyNotificationType.Image:
+      title = t('Image copied')
+      break
+  }
+
+  return <SuccessNotification notification={{ title, hideDelay }} />
+}
+
+export function SwapNetworkNotification({
+  notification: { chainId, hideDelay },
+}: {
+  notification: SwapNetworkNotificationType
+}): JSX.Element {
+  const { t } = useTranslation()
+  const network = CHAIN_INFO[chainId].label
+
+  return (
+    <NotificationToast
+      smallToast
+      hideDelay={hideDelay}
+      icon={<NetworkLogo chainId={chainId} size={iconSizes.icon24} />}
+      title={t('Swapping on {{ network }}', { network })}
+    />
+  )
+}
+
+export function ChooseCountryNotification({
+  notification: { countryName, countryCode, hideDelay },
+}: {
+  notification: ChooseCountryNotificationType
+}): JSX.Element {
+  const { t } = useTranslation()
+  const countryFlagUrl = getCountryFlagSvgUrl(countryCode)
+  return (
+    <NotificationToast
+      smallToast
+      hideDelay={hideDelay}
+      icon={
+        <Flex borderRadius="$roundedFull" overflow="hidden">
+          <SvgUri height={iconSizes.icon20} uri={countryFlagUrl} width={iconSizes.icon20} />
+        </Flex>
+      }
+      title={t('Switched to {{name}}', { name: countryName })}
+    />
+  )
+}
+
+export function ChangeAssetVisibilityNotification({
+  notification: { visible, hideDelay, assetName },
+}: {
+  notification: ChangeAssetVisibilityNotificationType
+}): JSX.Element {
+  const { t } = useTranslation()
+  const colors = useSporeColors()
+
+  return (
+    <NotificationToast
+      smallToast
+      hideDelay={hideDelay}
+      icon={
+        visible ? (
+          <EyeOffIcon
+            color={colors.neutral1.get()}
+            height={iconSizes.icon24}
+            width={iconSizes.icon24}
+          />
+        ) : (
+          <EyeIcon
+            color={colors.neutral1.get()}
+            height={iconSizes.icon24}
+            width={iconSizes.icon24}
+          />
+        )
+      }
+      title={
+        visible
+          ? t('{{assetName}} hidden', { assetName })
+          : t('{{assetName}} unhidden', { assetName })
+      }
+    />
+  )
+}
+
+// We roughly track the L1 block time, accuracy isnt crucial because we have other pending states,
+// and when a txn confirms it ll replace this toast.
+const SWAP_PENDING_NOTIFICATION_DELAY = 10 * ONE_SECOND_MS
+
+export function SwapPendingNotification({
+  notification,
+}: {
+  notification: SwapPendingNotificationType
+}): JSX.Element {
+  const { t } = useTranslation()
+
+  const notificationText = getNotificationText(notification.wrapType, t)
+
+  return (
+    <NotificationToast
+      smallToast
+      hideDelay={SWAP_PENDING_NOTIFICATION_DELAY}
+      icon={<SpinningLoader color="$accent1" />}
+      title={notificationText}
+    />
+  )
+}
+
+function getNotificationText(wrapType: WrapType, t: TFunction): string {
+  switch (wrapType) {
+    case WrapType.NotApplicable:
+      return t('Swap pending')
+    case WrapType.Unwrap:
+      return t('Unwrap pending')
+    case WrapType.Wrap:
+      return t('Wrap pending')
+  }
+}
diff --git a/apps/mobile/src/features/notifications/PendingNotificationBadge.tsx b/apps/mobile/src/features/notifications/PendingNotificationBadge.tsx
index 37919e9e496..d508f54dede 100644
--- a/apps/mobile/src/features/notifications/PendingNotificationBadge.tsx
+++ b/apps/mobile/src/features/notifications/PendingNotificationBadge.tsx
@@ -1,15 +1,15 @@
 import React from 'react'
 import { useAppSelector } from 'src/app/hooks'
 import { useEagerActivityNavigation } from 'src/app/navigation/hooks'
+import { CheckmarkCircle } from 'src/components/icons/CheckmarkCircle'
+import { SpinningLoader } from 'src/components/loading/SpinningLoader'
+import { useSelectAddressHasNotifications } from 'src/features/notifications/hooks'
+import { selectActiveAccountNotifications } from 'src/features/notifications/selectors'
+import { useSortedPendingTransactions } from 'src/features/transactions/hooks'
 import { Flex, TouchableArea, useSporeColors } from 'ui/src'
 import AlertCircle from 'ui/src/assets/icons/alert-circle.svg'
 import { iconSizes } from 'ui/src/theme'
-import { CheckmarkCircle } from 'wallet/src/components/icons/CheckmarkCircle'
-import { SpinningLoader } from 'wallet/src/components/loading/SpinningLoader'
-import { useSelectAddressHasNotifications } from 'wallet/src/features/notifications/hooks'
-import { selectActiveAccountNotifications } from 'wallet/src/features/notifications/selectors'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
-import { useSortedPendingTransactions } from 'wallet/src/features/transactions/hooks'
 import { TransactionStatus } from 'wallet/src/features/transactions/types'
 import { selectActiveAccountAddress } from 'wallet/src/features/wallet/selectors'
 
diff --git a/apps/mobile/src/features/notifications/ScantasticCompleteNotification.tsx b/apps/mobile/src/features/notifications/ScantasticCompleteNotification.tsx
deleted file mode 100644
index 83c695bf2ba..00000000000
--- a/apps/mobile/src/features/notifications/ScantasticCompleteNotification.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { Flex, Icons } from 'ui/src'
-import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
-import { ScantasticCompleteNotification as ScantasticCompleteNotificationType } from 'wallet/src/features/notifications/types'
-
-export function ScantasticCompleteNotification({
-  notification: { hideDelay },
-}: {
-  notification: ScantasticCompleteNotificationType
-}): JSX.Element {
-  const { t } = useTranslation()
-  return (
-    <NotificationToast
-      hideDelay={hideDelay}
-      icon={
-        <Flex position="relative">
-          <Flex backgroundColor="$accent2" borderRadius="$roundedFull" p="$spacing12">
-            <Icons.Laptop color="$accent1" size="$icon.24" />
-          </Flex>
-          <Flex
-            backgroundColor="$statusSuccess"
-            borderRadius="$roundedFull"
-            bottom={0}
-            p="$spacing4"
-            position="absolute"
-            right={0}>
-            <Icons.Check color="$white" size="$icon.8" />
-          </Flex>
-        </Flex>
-      }
-      subtitle={t('Continue on Uniswap Extension')}
-      title={t('Success')}
-    />
-  )
-}
diff --git a/apps/mobile/src/features/notifications/WCNotification.tsx b/apps/mobile/src/features/notifications/WCNotification.tsx
deleted file mode 100644
index b7e89ca69ae..00000000000
--- a/apps/mobile/src/features/notifications/WCNotification.tsx
+++ /dev/null
@@ -1,61 +0,0 @@
-import React from 'react'
-import { useAppDispatch } from 'src/app/hooks'
-import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
-import { openModal } from 'src/features/modals/modalSlice'
-import { iconSizes } from 'ui/src/theme'
-import { DappLogoWithTxStatus } from 'wallet/src/components/CurrencyLogo/LogoWithTxStatus'
-import { toSupportedChainId } from 'wallet/src/features/chains/utils'
-import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
-import { NOTIFICATION_ICON_SIZE } from 'wallet/src/features/notifications/constants'
-import { WalletConnectNotification } from 'wallet/src/features/notifications/types'
-import { formWCNotificationTitle } from 'wallet/src/features/notifications/utils'
-import { WalletConnectEvent } from 'wallet/src/features/walletConnect/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
-
-export function WCNotification({
-  notification,
-}: {
-  notification: WalletConnectNotification
-}): JSX.Element {
-  const { imageUrl, chainId, address, event, hideDelay, dappName } = notification
-  const dispatch = useAppDispatch()
-  const validChainId = toSupportedChainId(chainId)
-  const title = formWCNotificationTitle(notification)
-
-  const smallToastEvents = [
-    WalletConnectEvent.Connected,
-    WalletConnectEvent.Disconnected,
-    WalletConnectEvent.NetworkChanged,
-  ]
-  const smallToast = smallToastEvents.includes(event)
-
-  const icon = (
-    <DappLogoWithTxStatus
-      chainId={validChainId}
-      dappImageUrl={imageUrl}
-      dappName={dappName}
-      event={event}
-      size={smallToast ? iconSizes.icon24 : NOTIFICATION_ICON_SIZE}
-    />
-  )
-
-  const onPressNotification = (): void => {
-    dispatch(
-      openModal({
-        name: ModalName.WalletConnectScan,
-        initialState: ScannerModalState.ConnectedDapps,
-      })
-    )
-  }
-
-  return (
-    <NotificationToast
-      address={address}
-      hideDelay={hideDelay}
-      icon={icon}
-      smallToast={smallToast}
-      title={title}
-      onPress={onPressNotification}
-    />
-  )
-}
diff --git a/packages/wallet/src/features/notifications/buildReceiveNotification.ts b/apps/mobile/src/features/notifications/buildReceiveNotification.ts
similarity index 100%
rename from packages/wallet/src/features/notifications/buildReceiveNotification.ts
rename to apps/mobile/src/features/notifications/buildReceiveNotification.ts
diff --git a/apps/mobile/src/features/notifications/hooks/useNotificationOSPermissionsEnabled.ts b/apps/mobile/src/features/notifications/hooks.ts
similarity index 70%
rename from apps/mobile/src/features/notifications/hooks/useNotificationOSPermissionsEnabled.ts
rename to apps/mobile/src/features/notifications/hooks.ts
index 874761cd2af..ce9fe439d32 100644
--- a/apps/mobile/src/features/notifications/hooks/useNotificationOSPermissionsEnabled.ts
+++ b/apps/mobile/src/features/notifications/hooks.ts
@@ -1,6 +1,8 @@
 import { useFocusEffect } from '@react-navigation/core'
-import { useState } from 'react'
+import { useMemo, useState } from 'react'
 import { checkNotifications } from 'react-native-permissions'
+import { useAppSelector } from 'src/app/hooks'
+import { makeSelectHasNotifications } from 'src/features/notifications/selectors'
 import { useAppStateTrigger } from 'src/utils/useAppStateTrigger'
 
 export enum NotificationPermission {
@@ -9,6 +11,11 @@ export enum NotificationPermission {
   Loading = 'loading',
 }
 
+export function useSelectAddressHasNotifications(address: Address | null): boolean | undefined {
+  const selectHasNotifications = useMemo(makeSelectHasNotifications, [])
+  return useAppSelector((state) => selectHasNotifications(state, address))
+}
+
 export function useNotificationOSPermissionsEnabled(): NotificationPermission {
   const [notificationPermissionsEnabled, setNotificationPermissionsEnabled] =
     useState<NotificationPermission>(NotificationPermission.Loading)
diff --git a/apps/mobile/src/features/notifications/hooks/useNavigateToProfileTab.ts b/apps/mobile/src/features/notifications/hooks/useNavigateToProfileTab.ts
deleted file mode 100644
index fcf1b3e66b3..00000000000
--- a/apps/mobile/src/features/notifications/hooks/useNavigateToProfileTab.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-import { useEagerActivityNavigation } from 'src/app/navigation/hooks'
-import { store } from 'src/app/store'
-import { closeAllModals } from 'src/features/modals/modalSlice'
-
-// Helpers to preload profile data, and dismiss modals and navigate
-export const useNavigateToProfileTab = (
-  address: string | undefined
-): {
-  onPressIn: () => Promise<void>
-  onPress: () => void
-} => {
-  const { preload, navigate } = useEagerActivityNavigation()
-
-  const onPressIn = async (): Promise<void> => {
-    if (!address) {
-      return
-    }
-    await preload(address)
-  }
-
-  const onPress = (): void => {
-    if (!address) {
-      return
-    }
-    navigate()
-    store.dispatch(closeAllModals())
-  }
-
-  return {
-    onPressIn,
-    onPress,
-  }
-}
diff --git a/packages/wallet/src/features/notifications/notificationWatcherSaga.test.ts b/apps/mobile/src/features/notifications/notificationWatcherSaga.test.ts
similarity index 98%
rename from packages/wallet/src/features/notifications/notificationWatcherSaga.test.ts
rename to apps/mobile/src/features/notifications/notificationWatcherSaga.test.ts
index 24ea5fb37bf..b55ae44c8d3 100644
--- a/packages/wallet/src/features/notifications/notificationWatcherSaga.test.ts
+++ b/apps/mobile/src/features/notifications/notificationWatcherSaga.test.ts
@@ -1,9 +1,9 @@
 import { TradeType } from '@uniswap/sdk-core'
 import { expectSaga } from 'redux-saga-test-plan'
+import { pushTransactionNotification } from 'src/features/notifications/notificationWatcherSaga'
 import { getNativeAddress } from 'wallet/src/constants/addresses'
 import { ChainId } from 'wallet/src/constants/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'
 import { finalizeTransaction } from 'wallet/src/features/transactions/slice'
diff --git a/packages/wallet/src/features/notifications/notificationWatcherSaga.ts b/apps/mobile/src/features/notifications/notificationWatcherSaga.ts
similarity index 99%
rename from packages/wallet/src/features/notifications/notificationWatcherSaga.ts
rename to apps/mobile/src/features/notifications/notificationWatcherSaga.ts
index d832e600761..f010b3ea8a7 100644
--- a/packages/wallet/src/features/notifications/notificationWatcherSaga.ts
+++ b/apps/mobile/src/features/notifications/notificationWatcherSaga.ts
@@ -1,3 +1,4 @@
+import { appSelect } from 'src/app/hooks'
 import { call, put, takeLatest } from 'typed-redux-saga'
 import { ChainId } from 'wallet/src/constants/chains'
 import { AssetType } from 'wallet/src/entities/assets'
@@ -10,7 +11,6 @@ import { TransactionType } from 'wallet/src/features/transactions/types'
 import { buildReceiveNotification } from './buildReceiveNotification'
 
 import { WalletConnectEvent } from 'wallet/src/features/walletConnect/types'
-import { appSelect } from 'wallet/src/state'
 
 export function* notificationWatcher() {
   yield* takeLatest(finalizeTransaction.type, pushTransactionNotification)
diff --git a/packages/wallet/src/features/notifications/selectors.ts b/apps/mobile/src/features/notifications/selectors.ts
similarity index 84%
rename from packages/wallet/src/features/notifications/selectors.ts
rename to apps/mobile/src/features/notifications/selectors.ts
index 10df189787b..74e0f4216c9 100644
--- a/packages/wallet/src/features/notifications/selectors.ts
+++ b/apps/mobile/src/features/notifications/selectors.ts
@@ -1,9 +1,9 @@
 import { createSelector, Selector } from '@reduxjs/toolkit'
+import { MobileState } from 'src/app/reducer'
 import { AppNotification } from 'wallet/src/features/notifications/types'
 import { selectActiveAccountAddress } from 'wallet/src/features/wallet/selectors'
-import { SharedState } from 'wallet/src/state/reducer'
 
-const selectNotificationQueue = (state: SharedState): AppNotification[] =>
+const selectNotificationQueue = (state: MobileState): AppNotification[] =>
   state.notifications.notificationQueue
 
 export const selectActiveAccountNotifications = createSelector(
@@ -19,19 +19,19 @@ export const selectActiveAccountNotifications = createSelector(
 )
 
 const selectNotificationStatus = (
-  state: SharedState
+  state: MobileState
 ): {
   [userAddress: string]: boolean | undefined
 } => state.notifications.notificationStatus
 
 export const makeSelectHasNotifications = (): Selector<
-  SharedState,
+  MobileState,
   boolean | undefined,
   [Address | null]
 > =>
   createSelector(
     selectNotificationStatus,
-    (_: SharedState, address: Address | null) => address,
+    (_: MobileState, address: Address | null) => address,
     (notificationStatuses, address) => {
       if (!address) {
         return undefined
@@ -41,7 +41,7 @@ export const makeSelectHasNotifications = (): Selector<
   )
 
 export const selectLastTxNotificationUpdate = (
-  state: SharedState
+  state: MobileState
 ): {
   [address: string]: number | undefined
 } => state.notifications.lastTxNotificationUpdate
diff --git a/packages/wallet/src/features/notifications/builtReceiveNotification.test.ts b/apps/mobile/src/features/notifications/utils.test.ts
similarity index 57%
rename from packages/wallet/src/features/notifications/builtReceiveNotification.test.ts
rename to apps/mobile/src/features/notifications/utils.test.ts
index 9446c905814..1acdf574363 100644
--- a/packages/wallet/src/features/notifications/builtReceiveNotification.test.ts
+++ b/apps/mobile/src/features/notifications/utils.test.ts
@@ -1,14 +1,88 @@
+import { TradeType } from '@uniswap/sdk-core'
+import { createFinalizedTxAction } from 'src/features/notifications/notificationWatcherSaga.test'
+import { formSwapNotificationTitle } from 'src/features/notifications/utils'
 import { ChainId } from 'wallet/src/constants/chains'
+import { DAI, USDC } from 'wallet/src/constants/tokens'
 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 { AppNotificationType } from 'wallet/src/features/notifications/types'
 import {
   ReceiveTokenTransactionInfo,
   TransactionStatus,
   TransactionType,
 } from 'wallet/src/features/transactions/types'
-import { SAMPLE_SEED_ADDRESS_1, account } from 'wallet/src/test/fixtures'
+import { initializeTranslation } from 'wallet/src/i18n/i18n'
+import { account, SAMPLE_SEED_ADDRESS_1 } from 'wallet/src/test/fixtures'
+import { mockLocalizedFormatter } from 'wallet/src/test/utils'
+import { buildReceiveNotification } from './buildReceiveNotification'
+
+describe(formSwapNotificationTitle, () => {
+  beforeAll(() => {
+    initializeTranslation()
+  })
+
+  it('formats successful local swap title', () => {
+    expect(
+      formSwapNotificationTitle(
+        mockLocalizedFormatter,
+        TransactionStatus.Success,
+        DAI,
+        USDC,
+        '1-DAI',
+        '1-USDC',
+        '1000000000000000000',
+        '1000000',
+        TradeType.EXACT_INPUT
+      )
+    ).toEqual('Swapped 1.00 DAI for ~1.00 USDC.')
+  })
+
+  it('formats successful remote swap title', () => {
+    expect(
+      formSwapNotificationTitle(
+        mockLocalizedFormatter,
+        TransactionStatus.Success,
+        DAI,
+        USDC,
+        '1-DAI',
+        '1-USDC',
+        '1000000000000000000',
+        '1200000'
+      )
+    ).toEqual('Swapped 1.00 DAI for 1.20 USDC.')
+  })
+
+  it('formats canceled swap title', () => {
+    expect(
+      formSwapNotificationTitle(
+        mockLocalizedFormatter,
+        TransactionStatus.Cancelled,
+        DAI,
+        USDC,
+        '1-DAI',
+        '1-USDC',
+        '1000000000000000000',
+        '1000000',
+        TradeType.EXACT_INPUT
+      )
+    ).toEqual('Canceled DAI-USDC swap.')
+  })
+
+  it('formats failed swap title', () => {
+    expect(
+      formSwapNotificationTitle(
+        mockLocalizedFormatter,
+        TransactionStatus.Failed,
+        DAI,
+        USDC,
+        '1-DAI',
+        '1-USDC',
+        '1000000000000000000',
+        '1000000',
+        TradeType.EXACT_INPUT
+      )
+    ).toEqual('Failed to swap 1.00 DAI for ~1.00 USDC.')
+  })
+})
 
 const receiveCurrencyTypeInfo: ReceiveTokenTransactionInfo = {
   type: TransactionType.Receive,
diff --git a/packages/wallet/src/features/notifications/utils.ts b/apps/mobile/src/features/notifications/utils.ts
similarity index 100%
rename from packages/wallet/src/features/notifications/utils.ts
rename to apps/mobile/src/features/notifications/utils.ts
diff --git a/apps/mobile/src/features/onboarding/OnboardingScreen.tsx b/apps/mobile/src/features/onboarding/OnboardingScreen.tsx
index 78d1e8ea43b..477ce4e78d1 100644
--- a/apps/mobile/src/features/onboarding/OnboardingScreen.tsx
+++ b/apps/mobile/src/features/onboarding/OnboardingScreen.tsx
@@ -2,7 +2,7 @@ import { useHeaderHeight } from '@react-navigation/elements'
 import React, { PropsWithChildren } from 'react'
 import { KeyboardAvoidingView, StyleSheet } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
-import { SHORT_SCREEN_HEADER_HEIGHT_RATIO, Screen } from 'src/components/layout/Screen'
+import { Screen, SHORT_SCREEN_HEADER_HEIGHT_RATIO } from 'src/components/layout/Screen'
 import { AnimatedFlex, Flex, SpaceTokens, Text, useDeviceInsets, useMedia } from 'ui/src'
 import { fonts } from 'ui/src/theme'
 import { isIOS } from 'wallet/src/utils/platform'
@@ -58,9 +58,9 @@ export function OnboardingScreen({
             )}
             {subtitle ? (
               <Text
-                $short={{ variant: 'body3' }}
+                $short={{ variant: 'body3', maxFontSizeMultiplier: 1.1 }}
                 color="$neutral2"
-                maxFontSizeMultiplier={media.short ? 1.1 : fonts.body2.maxFontSizeMultiplier}
+                maxFontSizeMultiplier={fonts.body2.maxFontSizeMultiplier}
                 textAlign="center"
                 variant="body2">
                 {subtitle}
diff --git a/apps/mobile/src/features/onboarding/OptionCard.tsx b/apps/mobile/src/features/onboarding/OptionCard.tsx
index acbe22872c6..16167cc7dbe 100644
--- a/apps/mobile/src/features/onboarding/OptionCard.tsx
+++ b/apps/mobile/src/features/onboarding/OptionCard.tsx
@@ -1,8 +1,9 @@
 import React from 'react'
 import Trace from 'src/components/Trace/Trace'
-import { Flex, Text, TouchableArea, useIsDarkMode } from 'ui/src'
+import { ElementName } from 'src/features/telemetry/constants'
+import { Flex, Text, TouchableArea, useMedia } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
-import { ElementNameType } from 'wallet/src/telemetry/constants'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 
 export function OptionCard({
   title,
@@ -19,19 +20,22 @@ export function OptionCard({
   blurb: string
   icon: React.ReactNode
   onPress: () => void
-  elementName: ElementNameType
+  elementName: ElementName
   disabled?: boolean
   opacity?: number
   badgeText?: string | undefined
   hapticFeedback?: boolean | undefined
 }): JSX.Element {
+  const media = useMedia()
   const isDarkMode = useIsDarkMode()
 
+  const iconSize = media.short ? iconSizes.icon24 : iconSizes.icon36
+
   return (
     <Trace logPress element={elementName}>
       <TouchableArea
-        backgroundColor={isDarkMode ? '$surface2' : '$surface1'}
-        borderColor="$surface3"
+        backgroundColor="$surface2"
+        borderColor={isDarkMode ? '$transparent' : '$surface3'}
         borderRadius="$rounded20"
         borderWidth={1}
         disabled={disabled}
@@ -40,21 +44,21 @@ export function OptionCard({
         p="$spacing16"
         testID={elementName}
         onPress={onPress}>
-        <Flex row alignContent="center" alignItems="flex-start" gap="$spacing16">
+        <Flex row alignContent="center" alignItems="center" gap="$spacing16">
           <Flex
             alignItems="center"
             backgroundColor="$DEP_magentaDark"
             borderRadius="$roundedFull"
-            height={iconSizes.icon24}
+            height={iconSize}
             justifyContent="center"
             p="$spacing16"
-            width={iconSizes.icon24}>
+            width={iconSize}>
             {icon}
           </Flex>
           <Flex row alignItems="center" gap="$spacing4" pr="$spacing60">
             <Flex fill alignItems="flex-start" gap="$spacing4" justifyContent="space-around">
               <Flex row gap="$spacing8">
-                <Text $short={{ variant: 'subheading2' }} allowFontScaling={false} variant="body2">
+                <Text $short={{ variant: 'subheading2' }} allowFontScaling={false} variant="body1">
                   {title}
                 </Text>
                 {badgeText && (
@@ -69,7 +73,7 @@ export function OptionCard({
                   </Flex>
                 )}
               </Flex>
-              <Text allowFontScaling={false} color="$neutral2" variant="body3">
+              <Text allowFontScaling={false} color="$neutral2" variant="body2">
                 {blurb}
               </Text>
             </Flex>
diff --git a/apps/mobile/src/features/onboarding/PasswordError.tsx b/apps/mobile/src/features/onboarding/PasswordError.tsx
index 4ac7c104f0d..faeadc3f52e 100644
--- a/apps/mobile/src/features/onboarding/PasswordError.tsx
+++ b/apps/mobile/src/features/onboarding/PasswordError.tsx
@@ -1,6 +1,7 @@
 import React from 'react'
 import { StyleProp, ViewStyle } from 'react-native'
-import { AnimatedFlex, Flex, Text } from 'ui/src'
+import { AnimatedFlex, Flex, Text, useSporeColors } from 'ui/src'
+import AlertTriangle from 'ui/src/assets/icons/alert-triangle.svg'
 
 interface PasswordErrorProps {
   errorText: string
@@ -8,13 +9,22 @@ interface PasswordErrorProps {
 }
 
 export function PasswordError({ errorText, style }: PasswordErrorProps): JSX.Element {
+  const colors = useSporeColors()
+
   return (
     <AnimatedFlex centered row gap="$spacing8" pt="$spacing12" px="$spacing8" style={style}>
+      <AlertTriangle
+        color={colors.statusCritical.val}
+        height={ERROR_ICON_HEIGHT}
+        width={ERROR_ICON_HEIGHT}
+      />
       <Flex>
-        <Text color="$statusCritical" variant="body3">
+        <Text color="$statusCritical" variant="body2">
           {errorText}
         </Text>
       </Flex>
     </AnimatedFlex>
   )
 }
+
+const ERROR_ICON_HEIGHT = 20
diff --git a/apps/mobile/src/features/onboarding/SafeKeyboardOnboardingScreen.tsx b/apps/mobile/src/features/onboarding/SafeKeyboardOnboardingScreen.tsx
index 5b6cb5cae5f..2cfd4102246 100644
--- a/apps/mobile/src/features/onboarding/SafeKeyboardOnboardingScreen.tsx
+++ b/apps/mobile/src/features/onboarding/SafeKeyboardOnboardingScreen.tsx
@@ -4,10 +4,10 @@ import React, { PropsWithChildren } from 'react'
 import { KeyboardAvoidingView, ScrollView, StyleSheet } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
 import { Screen } from 'src/components/layout/Screen'
-import { AnimatedFlex, Flex, SpaceTokens, Text, flexStyles, useMedia, useSporeColors } from 'ui/src'
+import { useKeyboardLayout } from 'src/utils/useKeyboardLayout'
+import { AnimatedFlex, Flex, flexStyles, SpaceTokens, Text, useMedia, useSporeColors } from 'ui/src'
 import { opacify, spacing } from 'ui/src/theme'
 import { isIOS } from 'wallet/src/utils/platform'
-import { useKeyboardLayout } from 'wallet/src/utils/useKeyboardLayout'
 
 type OnboardingScreenProps = {
   subtitle?: string
diff --git a/apps/mobile/src/features/onboarding/hooks.ts b/apps/mobile/src/features/onboarding/hooks.ts
index 8123fdbec81..8f5fd70fef7 100644
--- a/apps/mobile/src/features/onboarding/hooks.ts
+++ b/apps/mobile/src/features/onboarding/hooks.ts
@@ -4,19 +4,14 @@ import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
 import { MobileEventName } from 'src/features/telemetry/constants'
 import { Screens } from 'src/screens/Screens'
 import { useTrace } from 'utilities/src/telemetry/trace/TraceContext'
-import { FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
-import { useFeatureFlag } from 'wallet/src/features/experiments/hooks'
 import { ImportType, OnboardingEntryPoint } from 'wallet/src/features/onboarding/types'
 import { Account, BackupType } from 'wallet/src/features/wallet/accounts/types'
 import {
-  PendingAccountActions,
   pendingAccountActions,
+  PendingAccountActions,
 } from 'wallet/src/features/wallet/create/pendingAccountsSaga'
 import { usePendingAccounts } from 'wallet/src/features/wallet/hooks'
-import {
-  markAccountDismissedUnitagPrompt,
-  setFinishedOnboarding,
-} from 'wallet/src/features/wallet/slice'
+import { setFinishedOnboarding } from 'wallet/src/features/wallet/slice'
 import { sendWalletAppsFlyerEvent } from 'wallet/src/telemetry'
 import { WalletAppsFlyerEvents } from 'wallet/src/telemetry/constants'
 
@@ -34,7 +29,6 @@ export function useCompleteOnboardingCallback(
   const pendingWalletAddresses = Object.keys(pendingAccounts)
   const parentTrace = useTrace()
   const navigation = useOnboardingStackNavigation()
-  const unitagsFeatureFlagEnabled = useFeatureFlag(FEATURE_FLAGS.Unitags)
 
   return async () => {
     sendMobileAnalyticsEvent(
@@ -54,18 +48,6 @@ export function useCompleteOnboardingCallback(
     // Remove pending flag from all new accounts.
     dispatch(pendingAccountActions.trigger(PendingAccountActions.Activate))
 
-    // Dismiss unitags prompt if:
-    // - the feature was enabled
-    // - the onboarding method prompts for unitags (create new or additional)
-    if (
-      unitagsFeatureFlagEnabled &&
-      [ImportType.CreateNew, ImportType.CreateAdditional].includes(importType)
-    ) {
-      pendingWalletAddresses.forEach((address) => {
-        dispatch(markAccountDismissedUnitagPrompt(address))
-      })
-    }
-
     // Exit flow
     dispatch(setFinishedOnboarding({ finishedOnboarding: true }))
     if (entryPoint === OnboardingEntryPoint.Sidebar) {
diff --git a/apps/mobile/src/features/scantastic/ScantasticEncryption.ts b/apps/mobile/src/features/scantastic/ScantasticEncryption.ts
deleted file mode 100644
index 349aeba0e04..00000000000
--- a/apps/mobile/src/features/scantastic/ScantasticEncryption.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-interface ScantasticEncryption {
-  getEncryptedMnemonic: (mnemonicId: string, n: string, e: string) => Promise<string>
-}
-
-declare module 'react-native' {
-  interface NativeModulesStatic {
-    ScantasticEncryption: ScantasticEncryption
-  }
-}
-import { NativeModules } from 'react-native'
-
-const { ScantasticEncryption } = NativeModules
-
-export function getEncryptedMnemonic(mnemonicId: string, n: string, e: string): Promise<string> {
-  return ScantasticEncryption.getEncryptedMnemonic(mnemonicId, n, e)
-}
diff --git a/apps/mobile/src/features/scantastic/ScantasticModal.tsx b/apps/mobile/src/features/scantastic/ScantasticModal.tsx
deleted file mode 100644
index 0cce87c17a8..00000000000
--- a/apps/mobile/src/features/scantastic/ScantasticModal.tsx
+++ /dev/null
@@ -1,286 +0,0 @@
-import React, { useCallback, useEffect, useState } from 'react'
-import { Trans, useTranslation } from 'react-i18next'
-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'
-import { Button, Flex, Icons, Text, useSporeColors } from 'ui/src'
-import { iconSizes } from 'ui/src/theme'
-import { logger } from 'utilities/src/logger/logger'
-import { getDurationRemainingString } from 'utilities/src/time/duration'
-import { ONE_MINUTE_MS, ONE_SECOND_MS } from 'utilities/src/time/time'
-import { useInterval } from 'utilities/src/time/timing'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { uniswapUrls } from 'wallet/src/constants/urls'
-import { pushNotification } from 'wallet/src/features/notifications/slice'
-import { AppNotificationType } from 'wallet/src/features/notifications/types'
-import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
-import { ModalName } from 'wallet/src/telemetry/constants'
-import { getEncryptedMnemonic } from './ScantasticEncryption'
-
-enum OtpState {
-  Pending = 'pending',
-  Redeemed = 'redeemed',
-  Expired = 'expired',
-}
-interface OtpStateApiResponse {
-  otp?: OtpState
-  expiresAtInSeconds?: number
-}
-
-export function ScantasticModal(): JSX.Element | null {
-  const { t } = useTranslation()
-  const colors = useSporeColors()
-  const dispatch = useAppDispatch()
-
-  const account = useActiveAccount()
-
-  const { initialState } = useAppSelector(selectModalState(ModalName.Scantastic))
-  const [OTP, setOTP] = useState('')
-  // Once a user has scanned a QR they have 6 minutes to correctly input the OTP
-  const [expirationTimestamp, setExpirationTimestamp] = useState<number>(
-    Date.now() + 6 * ONE_MINUTE_MS
-  )
-  const pubKey: JsonWebKey = initialState?.pubKey ? JSON.parse(initialState?.pubKey) : undefined
-  const uuid = initialState?.uuid
-  const device = initialState?.vendor + ' ' + initialState?.model || ''
-  const browser = initialState?.browser || ''
-
-  const [expired, setExpired] = useState(false)
-  const [redeemed, setRedeemed] = useState(false)
-  const [expiryText, setExpiryText] = useState('')
-
-  if (redeemed) {
-    dispatch(
-      pushNotification({
-        type: AppNotificationType.ScantasticComplete,
-        hideDelay: 6 * ONE_SECOND_MS,
-      })
-    )
-    dispatch(closeAllModals())
-  }
-
-  useEffect(() => {
-    const interval = setInterval(() => {
-      const timeLeft = expirationTimestamp - Date.now()
-      if (timeLeft <= 0) {
-        return setExpiryText(t('Expired'))
-      }
-      return setExpiryText(
-        t('Expires in {{duration}}...', {
-          duration: getDurationRemainingString(expirationTimestamp),
-        })
-      )
-    }, ONE_SECOND_MS)
-
-    return () => clearInterval(interval)
-  }, [expirationTimestamp, t])
-
-  const onClose = useCallback((): void => {
-    dispatch(closeAllModals())
-  }, [dispatch])
-
-  const onEncryptSeedphrase = async (): Promise<void> => {
-    let encryptedSeedphrase = ''
-
-    try {
-      if (!pubKey.n || !pubKey.e) {
-        throw new Error(t('Invalid public key'))
-      }
-      encryptedSeedphrase = await getEncryptedMnemonic(account?.address || '', pubKey.n, pubKey.e)
-    } catch (e) {
-      // TODO(EXT-485): improve error handling
-      logger.error(e, { tags: { file: 'ScantasticModal', function: 'getEncryptedMnemonic' } })
-    }
-
-    try {
-      // submit encrypted blob
-      const response = await fetch(`${uniswapUrls.apiBaseExtensionUrl}/scantastic/blob`, {
-        method: 'POST',
-        headers: {
-          Accept: 'application/json',
-          'Content-Type': 'application/json',
-          Origin: 'https://uniswap.org',
-        },
-        body: JSON.stringify({
-          uuid,
-          blob: encryptedSeedphrase,
-        }),
-      })
-      if (!response.ok) {
-        throw new Error(t('Failed to send.'))
-      }
-      const data = await response.json()
-      if (!data?.otp) {
-        throw new Error(t('OTP unavailable'))
-      } else {
-        setExpirationTimestamp(Date.now() + ONE_MINUTE_MS * 2)
-        setOTP(data.otp)
-      }
-    } catch (e) {
-      // TODO(EXT-485): improve error handling
-      logger.error(e, { tags: { file: 'ScantasticModal', function: 'fetch' } })
-    }
-  }
-
-  const { trigger: biometricTrigger } = useBiometricPrompt(onEncryptSeedphrase)
-  const {
-    requiredForAppAccess: biometricAuthRequiredForAppAccess,
-    requiredForTransactions: biometricAuthRequiredForTransactions,
-  } = useBiometricAppSettings()
-
-  const onConfirmSync = async (): Promise<void> => {
-    if (biometricAuthRequiredForAppAccess || biometricAuthRequiredForTransactions) {
-      await biometricTrigger()
-    } else {
-      await onEncryptSeedphrase()
-    }
-  }
-
-  const checkOTPState = useCallback(async (): Promise<void> => {
-    if (!OTP || !uuid) {
-      return
-    }
-    try {
-      const response = await fetch(
-        `${uniswapUrls.apiBaseExtensionUrl}/scantastic/otp-state/${uuid}`,
-        {
-          method: 'POST',
-          headers: {
-            Accept: 'application/json',
-            Origin: 'https://uniswap.org',
-          },
-        }
-      )
-      if (!response.ok) {
-        return
-      }
-      const data: OtpStateApiResponse = await response.json()
-      const otpState = data.otp
-      if (!otpState) {
-        return
-      }
-      if (data.expiresAtInSeconds) {
-        setExpirationTimestamp(data.expiresAtInSeconds * ONE_SECOND_MS)
-      }
-      if (otpState === OtpState.Redeemed) {
-        setRedeemed(true)
-      }
-      if (otpState === OtpState.Expired) {
-        setExpired(true)
-      }
-    } catch (e) {
-      logger.warn('ScanToOnboard.tsx', 'checkOTPState', e as string)
-    }
-  }, [OTP, uuid])
-
-  useInterval(checkOTPState, 6000, true)
-
-  if (expired) {
-    return (
-      <BottomSheetModal
-        backgroundColor={colors.surface1.get()}
-        name={ModalName.OtpInputExpired}
-        onClose={onClose}>
-        <Flex centered gap="$spacing16" height="100%" mb="$spacing24" p="$spacing24" pt="$none">
-          <Flex centered backgroundColor="$accent2" borderRadius="$rounded12" p="$spacing12">
-            <Icons.Laptop size={iconSizes.icon24} />
-          </Flex>
-          <Text variant="subheading1">
-            <Trans>Your session timed out</Trans>
-          </Text>
-          <Text color="$neutral2" textAlign="center" variant="body3">
-            <Trans>
-              Scan the QR code on the Uniswap Extension again to continue syncing your wallet.
-            </Trans>
-          </Text>
-          <Button theme="secondary" width="100%" onPress={onClose}>
-            <Text>Close</Text>
-          </Button>
-        </Flex>
-      </BottomSheetModal>
-    )
-  }
-
-  if (OTP) {
-    return (
-      <BottomSheetModal
-        backgroundColor={colors.surface1.get()}
-        name={ModalName.OtpScanInput}
-        onClose={onClose}>
-        <Flex centered gap="$spacing16" height="100%" mb="$spacing24" p="$spacing24" pt="$none">
-          <Flex centered backgroundColor="$accent2" borderRadius="$rounded12" p="$spacing12">
-            <Icons.Laptop size={iconSizes.icon24} />
-          </Flex>
-          <Text variant="subheading1">
-            <Trans>Uniswap one-time code</Trans>
-          </Text>
-          <Text color="$neutral2" textAlign="center" variant="body3">
-            <Trans>
-              Enter this code in the Uniswap Extension. Your recovery phrase will be safely
-              encrypted and transferred.
-            </Trans>
-          </Text>
-          <Text variant="heading1">
-            {OTP.substring(0, 3)} {OTP.substring(3)}
-          </Text>
-          <Text color="$neutral3" variant="body3">
-            {expiryText}
-          </Text>
-        </Flex>
-      </BottomSheetModal>
-    )
-  }
-  return (
-    <BottomSheetModal
-      backgroundColor={colors.surface1.get()}
-      name={ModalName.RemoveSeedPhraseWarningModal}
-      onClose={onClose}>
-      <Flex centered gap="$spacing16" height="100%" mb="$spacing24" p="$spacing24" pt="$none">
-        <Flex centered backgroundColor="$accent2" borderRadius="$rounded12" p="$spacing12">
-          <Icons.Laptop size={iconSizes.icon24} />
-        </Flex>
-        <Text variant="subheading1">
-          <Trans>Is this your device?</Trans>
-        </Text>
-        <Text color="$neutral2" textAlign="center" variant="body3">
-          <Trans>
-            Only continue if you are syncing with the Uniswap Extension on a trusted device.
-          </Trans>
-        </Text>
-        {device && (
-          <Flex row paddingHorizontal="$spacing8">
-            <Text color="$neutral2" flex={1} variant="body3">
-              <Trans>Device</Trans>
-            </Text>
-            <Text variant="body3">{device}</Text>
-          </Flex>
-        )}
-        {browser && (
-          <Flex row paddingHorizontal="$spacing8">
-            <Text color="$neutral2" flex={1} variant="body3">
-              <Trans>Browser</Trans>
-            </Text>
-            <Text variant="body3">{browser}</Text>
-          </Flex>
-        )}
-        <Flex flexDirection="column" gap="$spacing4" mt="$spacing12" width="100%">
-          <Button
-            icon={<Icons.Faceid size={iconSizes.icon16} />}
-            mb="$spacing4"
-            theme="primary"
-            onPress={onConfirmSync}>
-            <Text>
-              <Trans>Yes, continue</Trans>
-            </Text>
-          </Button>
-          <Button backgroundColor="$transparent" theme="secondary" onPress={onClose}>
-            <Text color="$accent1">
-              <Trans>Cancel</Trans>
-            </Text>
-          </Button>
-        </Flex>
-      </Flex>
-    </BottomSheetModal>
-  )
-}
diff --git a/apps/mobile/src/features/scantastic/ScantasticModalState.ts b/apps/mobile/src/features/scantastic/ScantasticModalState.ts
deleted file mode 100644
index 59bdd6d364f..00000000000
--- a/apps/mobile/src/features/scantastic/ScantasticModalState.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-export interface ScantasticModalState {
-  uuid: string
-  pubKey: string
-  vendor: string
-  model: string
-  browser: string
-}
diff --git a/apps/mobile/src/features/send/hooks.ts b/apps/mobile/src/features/send/hooks.ts
index ba23e597e6e..7cb84e5185a 100644
--- a/apps/mobile/src/features/send/hooks.ts
+++ b/apps/mobile/src/features/send/hooks.ts
@@ -1,5 +1,6 @@
 import { useCallback } from 'react'
 import { openModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { ChainId } from 'wallet/src/constants/chains'
 import { AssetType } from 'wallet/src/entities/assets'
 import {
@@ -7,7 +8,6 @@ import {
   TransactionState,
 } from 'wallet/src/features/transactions/transactionState/types'
 import { useAppDispatch } from 'wallet/src/state'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export const useNavigateToSend: () => (
   currencyAddress: Address,
diff --git a/apps/mobile/src/features/swap/hooks.ts b/apps/mobile/src/features/swap/hooks.ts
index a988f1e5533..77e898bf55e 100644
--- a/apps/mobile/src/features/swap/hooks.ts
+++ b/apps/mobile/src/features/swap/hooks.ts
@@ -1,5 +1,6 @@
 import { useCallback } from 'react'
 import { openModal } from 'src/features/modals/modalSlice'
+import { ModalName } from 'src/features/telemetry/constants'
 import { getNativeAddress } from 'wallet/src/constants/addresses'
 import { ChainId } from 'wallet/src/constants/chains'
 import { AssetType, CurrencyAsset } from 'wallet/src/entities/assets'
@@ -8,7 +9,6 @@ import {
   TransactionState,
 } from 'wallet/src/features/transactions/transactionState/types'
 import { useAppDispatch } from 'wallet/src/state'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { areAddressesEqual } from 'wallet/src/utils/addresses'
 
 export const useNavigateToSwap: () => (
diff --git a/apps/mobile/src/features/telemetry/constants.ts b/apps/mobile/src/features/telemetry/constants.ts
index bc2f67d19f2..b8dab32172a 100644
--- a/apps/mobile/src/features/telemetry/constants.ts
+++ b/apps/mobile/src/features/telemetry/constants.ts
@@ -48,18 +48,21 @@ export enum MobileEventName {
   DeepLinkOpened = 'Deep Link Opened',
   ExploreFilterSelected = 'Explore Filter Selected',
   ExploreSearchResultClicked = 'Explore Search Result Clicked',
+  ExploreSearchCancel = 'Explore Search Cancel',
   ExploreTokenItemSelected = 'Explore Token Item Selected',
   FavoriteItem = 'Favorite Item',
   FiatOnRampBannerPressed = 'Fiat OnRamp Banner Pressed',
   FiatOnRampQuickActionButtonPressed = 'Fiat OnRamp QuickAction Button Pressed',
   FiatOnRampAmountEntered = 'Fiat OnRamp Amount Entered',
   FiatOnRampWidgetOpened = 'Fiat OnRamp Widget Opened',
+  NetworkFilterSelected = 'Network Filter Selected',
   OnboardingCompleted = 'Onboarding Completed',
   PerformanceReport = 'Performance Report',
   PerformanceGraphql = 'Performance GraphQL',
   ShareButtonClicked = 'Share Button Clicked',
   ShareLinkOpened = 'Share Link Opened',
   TokenDetailsOtherChainButtonPressed = 'Token Details Other Chain Button Pressed',
+  TokenSelected = 'Token Selected',
   WalletAdded = 'Wallet Added',
   WalletConnectSheetCompleted = 'Wallet Connect Sheet Completed',
   WidgetConfigurationUpdated = 'Widget Configuration Updated',
@@ -67,6 +70,85 @@ export enum MobileEventName {
   // alphabetize additional values.
 }
 
+/**
+ * Possible names for the section property in TraceContext
+ */
+export const enum SectionName {
+  CurrencyInputPanel = 'currency-input-panel',
+  CurrencyOutputPanel = 'currency-output-panel',
+  ExploreFavoriteTokensSection = 'explore-favorite-tokens-section',
+  ExploreSearch = 'explore-search',
+  ExploreTopTokensSection = 'explore-top-tokens-section',
+  HomeActivityTab = 'home-activity-tab',
+  HomeFeedTab = 'home-feed-tab',
+  HomeNFTsTab = 'home-nfts-tab',
+  HomeTokensTab = 'home-tokens-tab',
+  ImportAccountForm = 'import-account-form',
+  ProfileActivityTab = 'profile-activity-tab',
+  ProfileNftsTab = 'profile-nfts-tab',
+  ProfileTokensTab = 'profile-tokens-tab',
+  SwapForm = 'swap-form',
+  SwapPending = 'swap-pending',
+  SwapReview = 'swap-review',
+  TokenSelector = 'token-selector',
+  TokenDetails = 'token-details',
+  TransferForm = 'transfer-form',
+  TransferPending = 'transfer-pending',
+  TransferReview = 'transfer-review',
+  // alphabetize additional values.
+}
+
+/**
+ * Possible names for the modal property in TraceContext
+ */
+export const enum ModalName {
+  AccountEdit = 'account-edit-modal',
+  AccountSwitcher = 'account-switcher-modal',
+  AddWallet = 'add-wallet-modal',
+  BlockedAddress = 'blocked-address',
+  ChooseProfilePhoto = 'choose-profile-photo-modal',
+  CloudBackupInfo = 'cloud-backup-info-modal',
+  Experiments = 'experiments',
+  Explore = 'explore-modal',
+  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',
+  ForceUpgradeModal = 'force-upgrade-modal',
+  LanguageSelector = 'language-selector-modal',
+  NetworkFeeInfo = 'network-fee-info',
+  NetworkSelector = 'network-selector-modal',
+  NftCollection = 'nft-collection',
+  QRCodeNetworkInfo = 'qr-code-network-info',
+  RemoveWallet = 'remove-wallet-modal',
+  RestoreWallet = 'restore-wallet-modal',
+  RemoveSeedPhraseWarningModal = 'remove-seed-phrase-warning-modal',
+  ScreenshotWarning = 'screenshot-warning',
+  Send = 'send-modal',
+  SeedPhraseWarningModal = 'seed-phrase-warning-modal',
+  SendWarning = 'send-warning-modal',
+  SlippageInfo = 'slippage-info-modal',
+  Swap = 'swap-modal',
+  SwapSettings = 'swap-settings-modal',
+  SwapWarning = 'swap-warning-modal',
+  SwapProtection = 'swap-protection-modal',
+  TokenSelector = 'token-selector',
+  TokenWarningModal = 'token-warning-modal',
+  TooltipContent = 'tooltip-content',
+  TransactionActions = 'transaction-actions',
+  UnitagsIntro = 'unitags-intro-modal',
+  ViewSeedPhraseWarning = 'view-seed-phrase-warning',
+  ViewOnlyExplainer = 'view-only-explainer-modal',
+  WalletConnectScan = 'wallet-connect-scan-modal',
+  WCDappConnectedNetworks = 'wc-dapp-connected-networks-modal',
+  WCPendingConnection = 'wc-pending-connection-modal',
+  WCSignRequest = 'wc-sign-request-modal',
+  WCViewOnlyWarning = 'wc-view-only-warning-modal',
+  // alphabetize additional values.
+}
+
 /**
  * Views not within the navigation stack that we still want to
  * log Pageview events for. (Usually presented as nested views within another screen)
@@ -76,6 +158,94 @@ export const enum ManualPageViewScreen {
   ConfirmRecoveryPhrase = 'ConfirmRecoveryPhrase',
 }
 
+/**
+ * Possible names for the element property in TraceContext
+ */
+export const enum ElementName {
+  AcceptNewRate = 'accept-new-rate',
+  AccountCard = 'account-card',
+  AddManualBackup = 'add-manual-backup',
+  AddViewOnlyWallet = 'add-view-only-wallet',
+  AddCloudBackup = 'add-cloud-backup',
+  Back = 'back',
+  Buy = 'buy',
+  Cancel = 'cancel',
+  Confirm = 'confirm',
+  Continue = 'continue',
+  Copy = 'copy',
+  CreateAccount = 'create-account',
+  Edit = 'edit',
+  EmptyStateBuy = 'empty-state-buy',
+  EmptyStateGetStarted = 'empty-state-get-started',
+  EmptyStateImport = 'empty-state-get-import',
+  EmptyStateReceive = 'empty-state-receive',
+  Enable = 'enable',
+  EtherscanView = 'etherscan-view',
+  Favorite = 'favorite',
+  FiatOnRampTokenSelector = 'fiat-on-ramp-token-selector',
+  FiatOnRampAggregatorTokenSelector = 'fiat-on-ramp-aggregator-token-selector',
+  FiatOnRampWidgetButton = 'fiat-on-ramp-widget-button',
+  FiatOnRampCountryPicker = 'fiat-on-ramp-country-picker',
+  GetHelp = 'get-help',
+  GetStarted = 'get-started',
+  ImportAccount = 'import',
+  Manage = 'manage',
+  MoonpayExplorerView = 'moonpay-explorer-view',
+  NetworkButton = 'network-button',
+  Next = 'next',
+  OK = 'ok',
+  OnboardingImportBackup = 'onboarding-import-backup',
+  OnboardingImportSeedPhrase = 'onboarding-import-seed-phrase',
+  OnboardingImportWatchedAccount = 'onboarding-import-watched-account',
+  OpenDeviceLanguageSettings = 'open-device-language-settings',
+  OpenCameraRoll = 'open-camera-roll',
+  OpenNftsList = 'open-nfts-list',
+  QRCodeModalToggle = 'qr-code-modal-toggle',
+  Receive = 'receive',
+  RecoveryHelpButton = 'recovery-help-button',
+  Remove = 'remove',
+  RestoreFromCloud = 'restore-from-cloud',
+  RestoreWallet = 'restore-wallet',
+  ReviewSwap = 'review-swap',
+  ReviewTransfer = 'review-transfer',
+  SearchEtherscanItem = 'search-etherscan-item',
+  SearchNFTCollectionItem = 'search-nft-collection-item',
+  SelectRecipient = 'select-recipient',
+  SearchTokenItem = 'search-token-item',
+  Sell = 'sell',
+  Send = 'send',
+  SetMaxInput = 'set-max-input',
+  SetMaxOutput = 'set-max-output',
+  Skip = 'skip',
+  Submit = 'submit',
+  Swap = 'swap',
+  SwapReview = 'swap-review',
+  SwapSettings = 'swap-settings',
+  SwitchCurrenciesButton = 'switch-currencies-button',
+  TimeFrame1H = 'time-frame-1H',
+  TimeFrame1D = 'time-frame-1D',
+  TimeFrame1W = 'time-frame-1W',
+  TimeFrame1M = 'time-frame-1M',
+  TimeFrame1Y = 'time-frame-1Y',
+  TokenAddress = 'token-address',
+  TokenInputSelector = 'token-input-selector',
+  TokenLinkEtherscan = 'token-link-etherscan',
+  TokenLinkTwitter = 'token-link-twitter',
+  TokenLinkWebsite = 'token-link-website',
+  TokenOutputSelector = 'token-output-selector',
+  TokenSelectorToggle = 'token-selector-toggle',
+  TokenWarningAccept = 'token-warning-accept',
+  Unwrap = 'unwrap',
+  WCDappSwitchAccount = 'wc-dapp-switch-account',
+  WCDappNetworks = 'wc-dapp-networks',
+  WalletCard = 'wallet-card',
+  WalletConnectScan = 'wallet-connect-scan',
+  WalletQRCode = 'wallet-qr-code',
+  WalletSettings = 'WalletSettings',
+  Wrap = 'wrap',
+  // alphabetize additional values.
+}
+
 /**
  * User properties tied to user rather than events
  */
diff --git a/apps/mobile/src/features/telemetry/hooks.ts b/apps/mobile/src/features/telemetry/hooks.ts
index 451d4c6e260..eff095502f4 100644
--- a/apps/mobile/src/features/telemetry/hooks.ts
+++ b/apps/mobile/src/features/telemetry/hooks.ts
@@ -1,5 +1,6 @@
 import { useCallback, useMemo } from 'react'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { useAccountList } from 'src/components/accounts/hooks'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
 import { MobileEventName } from 'src/features/telemetry/constants'
 import {
@@ -17,7 +18,6 @@ import {
 } from 'src/features/telemetry/slice'
 import { useAsyncData } from 'utilities/src/react/hooks'
 import { areSameDays } from 'utilities/src/time/date'
-import { useAccountList } from 'wallet/src/features/accounts/hooks'
 import { Account, AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useAccounts } from 'wallet/src/features/wallet/hooks'
 import { sendWalletAppsFlyerEvent } from 'wallet/src/telemetry'
diff --git a/apps/mobile/src/features/telemetry/slice.ts b/apps/mobile/src/features/telemetry/slice.ts
index fd9a6f8abe6..5ee812ca93a 100644
--- a/apps/mobile/src/features/telemetry/slice.ts
+++ b/apps/mobile/src/features/telemetry/slice.ts
@@ -47,8 +47,7 @@ export const slice = createSlice({
     setAllowAnalytics: (state, { payload: { enabled } }: PayloadAction<{ enabled: boolean }>) => {
       sendWalletAnalyticsEvent(SharedEventName.ANALYTICS_SWITCH_TOGGLED, { enabled })
       analytics.flushEvents()
-      // eslint-disable-next-line no-void
-      void analytics.setAllowAnalytics(enabled).finally(() => undefined)
+      analytics.setAllowAnalytics(enabled).finally(() => undefined)
       state.allowAnalytics = enabled
     },
   },
diff --git a/apps/mobile/src/features/telemetry/timing/selectors.ts b/apps/mobile/src/features/telemetry/timing/selectors.ts
new file mode 100644
index 00000000000..3f5f3789ddc
--- /dev/null
+++ b/apps/mobile/src/features/telemetry/timing/selectors.ts
@@ -0,0 +1,4 @@
+import { MobileState } from 'src/app/reducer'
+
+export const selectSwapStartTimestamp = (state: MobileState): number | undefined =>
+  state.timing.swap.startTimestamp
diff --git a/packages/wallet/src/telemetry/timing/slice.ts b/apps/mobile/src/features/telemetry/timing/slice.ts
similarity index 100%
rename from packages/wallet/src/telemetry/timing/slice.ts
rename to apps/mobile/src/features/telemetry/timing/slice.ts
diff --git a/apps/mobile/src/features/telemetry/types.ts b/apps/mobile/src/features/telemetry/types.ts
index 372c9c38fb8..5deb81c6b44 100644
--- a/apps/mobile/src/features/telemetry/types.ts
+++ b/apps/mobile/src/features/telemetry/types.ts
@@ -1,10 +1,17 @@
+import { ApolloError } from '@apollo/client'
+import { SerializedError } from '@reduxjs/toolkit'
+import { FetchBaseQueryError } from '@reduxjs/toolkit/dist/query/fetchBaseQuery'
 import { RenderPassReport } from '@shopify/react-native-performance'
-import { SharedEventName } from '@uniswap/analytics-events'
+import { SharedEventName, SwapEventName } from '@uniswap/analytics-events'
+import { providers } from 'ethers'
 import { MobileEventName, ShareableEntity } from 'src/features/telemetry/constants'
 import { WidgetEvent, WidgetType } from 'src/features/widgets/widgets'
 import { TraceProps } from 'utilities/src/telemetry/trace/Trace'
+import { ChainId } from 'wallet/src/constants/chains'
 import { ImportType } from 'wallet/src/features/onboarding/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { EthMethod, WCEventType, WCRequestOutcome } from 'wallet/src/features/walletConnect/types'
+import { SwapTradeBaseProperties } from 'wallet/src/telemetry/types'
 
 // Events related to Moonpay internal transactions
 // NOTE: we do not currently have access to the full life cycle of these txs
@@ -57,6 +64,9 @@ export type MobileEventProperties = {
     AssetDetailsBaseProperties & {
       type: 'collection' | 'token' | 'address'
     }
+  [MobileEventName.ExploreSearchCancel]: {
+    query: string
+  }
   [MobileEventName.ExploreTokenItemSelected]: AssetDetailsBaseProperties & {
     position: number
   }
@@ -67,6 +77,9 @@ export type MobileEventProperties = {
   [MobileEventName.FiatOnRampBannerPressed]: TraceProps
   [MobileEventName.FiatOnRampAmountEntered]: TraceProps & { source: 'chip' | 'textInput' }
   [MobileEventName.FiatOnRampWidgetOpened]: TraceProps & { externalTransactionId: string }
+  [MobileEventName.NetworkFilterSelected]: TraceProps & {
+    chain: ChainId | 'All'
+  }
   [MobileEventName.OnboardingCompleted]: OnboardingCompletedProps & TraceProps
   [MobileEventName.PerformanceReport]: RenderPassReport
   [MobileEventName.PerformanceGraphql]: {
@@ -84,6 +97,11 @@ export type MobileEventProperties = {
     url: string
   }
   [MobileEventName.TokenDetailsOtherChainButtonPressed]: TraceProps
+  [MobileEventName.TokenSelected]: TraceProps &
+    AssetDetailsBaseProperties &
+    SearchResultContextProperties & {
+      field: CurrencyField
+    }
   [MobileEventName.WalletAdded]: OnboardingCompletedProps & TraceProps
   [MobileEventName.WalletConnectSheetCompleted]: {
     request_type: WCEventType
@@ -103,4 +121,24 @@ export type MobileEventProperties = {
   [SharedEventName.APP_LOADED]: TraceProps | undefined
   [SharedEventName.ELEMENT_CLICKED]: TraceProps
   [SharedEventName.PAGE_VIEWED]: TraceProps
+  [SwapEventName.SWAP_DETAILS_EXPANDED]: TraceProps | undefined
+  [SwapEventName.SWAP_QUOTE_RECEIVED]: {
+    quote_latency_milliseconds?: number
+  } & SwapTradeBaseProperties
+  [SwapEventName.SWAP_SUBMITTED_BUTTON_CLICKED]: {
+    estimated_network_fee_wei?: string
+    gas_limit?: string
+    transaction_deadline_seconds?: number
+    token_in_amount_usd?: number
+    token_out_amount_usd?: number
+    is_auto_slippage?: boolean
+    swap_quote_block_number?: string
+    swap_flow_duration_milliseconds?: number
+    is_hold_to_swap?: boolean
+    is_fiat_input_mode?: boolean
+  } & SwapTradeBaseProperties
+  [SwapEventName.SWAP_ESTIMATE_GAS_CALL_FAILED]: {
+    error?: ApolloError | FetchBaseQueryError | SerializedError | Error | string
+    txRequest?: providers.TransactionRequest
+  } & SwapTradeBaseProperties
 }
diff --git a/packages/wallet/src/features/tokens/dismissedWarningTokensSelector.ts b/apps/mobile/src/features/tokens/dismissedWarningTokensSelector.ts
similarity index 63%
rename from packages/wallet/src/features/tokens/dismissedWarningTokensSelector.ts
rename to apps/mobile/src/features/tokens/dismissedWarningTokensSelector.ts
index 72d0ad2368c..ae7b458f105 100644
--- a/packages/wallet/src/features/tokens/dismissedWarningTokensSelector.ts
+++ b/apps/mobile/src/features/tokens/dismissedWarningTokensSelector.ts
@@ -1,9 +1,9 @@
-import type { SharedState } from 'wallet/src/state/reducer'
+import type { MobileState } from 'src/app/reducer'
 
 // selectors
 
 export const dismissedWarningTokensSelector = (
-  state: SharedState
+  state: MobileState
 ): {
   [currencyId: string]: boolean
 } => state.tokens.dismissedWarningTokens
diff --git a/packages/wallet/src/features/tokens/hooks.ts b/apps/mobile/src/features/tokens/hooks.ts
similarity index 69%
rename from packages/wallet/src/features/tokens/hooks.ts
rename to apps/mobile/src/features/tokens/hooks.ts
index 97aadbaa15a..03a8e4e1f52 100644
--- a/packages/wallet/src/features/tokens/hooks.ts
+++ b/apps/mobile/src/features/tokens/hooks.ts
@@ -1,4 +1,6 @@
-import { useMemo } from 'react'
+import { impactAsync } from 'expo-haptics'
+import { useCallback, useMemo } from 'react'
+import { setClipboard } from 'src/utils/clipboard'
 import { getWrappedNativeAddress } from 'wallet/src/constants/addresses'
 import { ChainId } from 'wallet/src/constants/chains'
 import {
@@ -6,6 +8,9 @@ import {
   SearchPopularTokensQuery,
   useSearchPopularTokensQuery,
 } from 'wallet/src/data/__generated__/types-and-hooks'
+import { pushNotification } from 'wallet/src/features/notifications/slice'
+import { AppNotificationType, CopyNotificationType } from 'wallet/src/features/notifications/types'
+import { useAppDispatch } from 'wallet/src/state'
 import { areAddressesEqual } from 'wallet/src/utils/addresses'
 
 export type TopToken = NonNullable<NonNullable<SearchPopularTokensQuery['topTokens']>[0]>
@@ -50,3 +55,15 @@ export function usePopularTokens(): {
 
   return { popularTokens, loading }
 }
+
+export function useCopyTokenAddressCallback(tokenAddress: Address): () => void {
+  const dispatch = useAppDispatch()
+  return useCallback(async () => {
+    await impactAsync()
+    await setClipboard(tokenAddress)
+
+    dispatch(
+      pushNotification({ type: AppNotificationType.Copied, copyType: CopyNotificationType.Address })
+    )
+  }, [tokenAddress, dispatch])
+}
diff --git a/packages/wallet/src/features/tokens/safetyHooks.ts b/apps/mobile/src/features/tokens/safetyHooks.ts
similarity index 82%
rename from packages/wallet/src/features/tokens/safetyHooks.ts
rename to apps/mobile/src/features/tokens/safetyHooks.ts
index cd228708456..1a94e3308fb 100644
--- a/packages/wallet/src/features/tokens/safetyHooks.ts
+++ b/apps/mobile/src/features/tokens/safetyHooks.ts
@@ -1,10 +1,10 @@
 import { useCallback } from 'react'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { addDismissedWarningToken } from 'src/features/tokens/tokensSlice'
 import { ThemeKeys } from 'ui/src'
 import { SafetyLevel } from 'wallet/src/data/__generated__/types-and-hooks'
-import { dismissedWarningTokensSelector } from 'wallet/src/features/tokens/dismissedWarningTokensSelector'
-import { addDismissedWarningToken } from 'wallet/src/features/tokens/tokensSlice'
-import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 import { CurrencyId } from 'wallet/src/utils/currencyId'
+import { dismissedWarningTokensSelector } from './dismissedWarningTokensSelector'
 
 export function useTokenWarningDismissed(currencyId: Maybe<CurrencyId>): {
   tokenWarningDismissed: boolean // user dismissed warning
diff --git a/packages/wallet/src/features/tokens/tokensSlice.ts b/apps/mobile/src/features/tokens/tokensSlice.ts
similarity index 100%
rename from packages/wallet/src/features/tokens/tokensSlice.ts
rename to apps/mobile/src/features/tokens/tokensSlice.ts
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/CancelConfirmationView.tsx b/apps/mobile/src/features/transactions/SummaryCards/CancelConfirmationView.tsx
similarity index 84%
rename from packages/wallet/src/features/transactions/SummaryCards/SummaryItems/CancelConfirmationView.tsx
rename to apps/mobile/src/features/transactions/SummaryCards/CancelConfirmationView.tsx
index 0486bed0d84..b94b4a974fd 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/CancelConfirmationView.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/CancelConfirmationView.tsx
@@ -1,27 +1,26 @@
 import { providers } from 'ethers'
 import { notificationAsync } from 'expo-haptics'
-import { useCallback } from 'react'
+import { default as React, useCallback } from 'react'
 import { useTranslation } from 'react-i18next'
 import { ActivityIndicator } from 'react-native'
+import { AddressDisplay } from 'src/components/AddressDisplay'
+import { useBiometricAppSettings, useBiometricPrompt } from 'src/features/biometrics/hooks'
+import { useCancelationGasFeeInfo } from 'src/features/gas/hooks'
+import { ElementName } from 'src/features/telemetry/constants'
 import { Button, Flex, Text, useSporeColors } from 'ui/src'
 import SlashCircleIcon from 'ui/src/assets/icons/slash-circle.svg'
 import { NumberType } from 'utilities/src/format/types'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
-import { AuthTrigger } from 'wallet/src/features/auth/types'
-import { useCancelationGasFeeInfo, useUSDValue } from 'wallet/src/features/gas/hooks'
+import { useUSDValue } from 'wallet/src/features/gas/hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { TransactionDetails, TransactionStatus } from 'wallet/src/features/transactions/types'
 import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
-import { ElementName } from 'wallet/src/telemetry/constants'
 import { shortenAddress } from 'wallet/src/utils/addresses'
 
 export function CancelConfirmationView({
-  authTrigger,
   onBack,
   onCancel,
   transactionDetails,
 }: {
-  authTrigger?: AuthTrigger
   onBack: () => void
   onCancel: (txRequest: providers.TransactionRequest) => void
   transactionDetails: TransactionDetails
@@ -46,14 +45,17 @@ export function CancelConfirmationView({
     onCancel(cancelationGasFeeInfo.cancelRequest)
   }, [cancelationGasFeeInfo, onCancel])
 
+  const { trigger: actionButtonTrigger } = useBiometricPrompt(onCancelConfirm)
+  const { requiredForTransactions } = useBiometricAppSettings()
+
   const onPressCancel = useCallback(async () => {
     await notificationAsync()
-    if (authTrigger) {
-      await authTrigger({ successCallback: onCancelConfirm, failureCallback: () => {} })
+    if (requiredForTransactions) {
+      await actionButtonTrigger()
     } else {
       onCancelConfirm()
     }
-  }, [onCancelConfirm, authTrigger])
+  }, [onCancelConfirm, requiredForTransactions, actionButtonTrigger])
 
   return (
     <Flex
diff --git a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/ApproveSummaryItem.stories.tsx b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/ApproveSummaryItem.stories.tsx
index f310480f714..6ef7871935e 100644
--- a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/ApproveSummaryItem.stories.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/ApproveSummaryItem.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryObj } from '@storybook/react'
+import TransactionSummaryLayout from 'src/features/transactions/SummaryCards/TransactionSummaryLayout'
 import { ChainId } from 'wallet/src/constants/chains'
 import { TokenDocument } from 'wallet/src/data/__generated__/types-and-hooks'
 import { ApproveSummaryItem } from 'wallet/src/features/transactions/SummaryCards/SummaryItems/ApproveSummaryItem'
-import TransactionSummaryLayout from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout'
 import {
   ApproveTransactionInfo,
   TransactionDetails,
diff --git a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/FiatPurchaseSummaryItem.stories.tsx b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/FiatPurchaseSummaryItem.stories.tsx
index 96276715e12..00494bbbd47 100644
--- a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/FiatPurchaseSummaryItem.stories.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/FiatPurchaseSummaryItem.stories.tsx
@@ -1,10 +1,10 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import React from 'react'
+import TransactionSummaryLayout from 'src/features/transactions/SummaryCards/TransactionSummaryLayout'
 import { getNativeAddress } from 'wallet/src/constants/addresses'
 import { ChainId } from 'wallet/src/constants/chains'
 import { Chain, TokenDocument } from 'wallet/src/data/__generated__/types-and-hooks'
 import { FiatPurchaseSummaryItem } from 'wallet/src/features/transactions/SummaryCards/SummaryItems/FiatPurchaseSummaryItem'
-import TransactionSummaryLayout from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout'
 import {
   FiatPurchaseTransactionInfo,
   TransactionDetails,
diff --git a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/NFTApproveSummaryItem.stories.tsx b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/NFTApproveSummaryItem.stories.tsx
index 7b597b5f257..045a4ebc112 100644
--- a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/NFTApproveSummaryItem.stories.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/NFTApproveSummaryItem.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import React from 'react'
+import TransactionSummaryLayout from 'src/features/transactions/SummaryCards/TransactionSummaryLayout'
 import { ChainId } from 'wallet/src/constants/chains'
 import { NFTApproveSummaryItem } from 'wallet/src/features/transactions/SummaryCards/SummaryItems/NFTApproveSummaryItem'
-import TransactionSummaryLayout from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout'
 import {
   NFTApproveTransactionInfo,
   TransactionDetails,
diff --git a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/NFTMintSummaryItem.stories.tsx b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/NFTMintSummaryItem.stories.tsx
index 7dcf9250cf7..9b03d5ded40 100644
--- a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/NFTMintSummaryItem.stories.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/NFTMintSummaryItem.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import React from 'react'
+import TransactionSummaryLayout from 'src/features/transactions/SummaryCards/TransactionSummaryLayout'
 import { NFTMintSummaryItem } from 'wallet/src/features/transactions/SummaryCards/SummaryItems/NFTMintSummaryItem'
-import TransactionSummaryLayout from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout'
 import {
   NFTMintTransactionInfo,
   TransactionDetails,
diff --git a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/NFTTradeSummaryItem.stories.tsx b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/NFTTradeSummaryItem.stories.tsx
index a69b9cbe88a..e74b62a9bd9 100644
--- a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/NFTTradeSummaryItem.stories.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/NFTTradeSummaryItem.stories.tsx
@@ -1,8 +1,8 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import React from 'react'
+import TransactionSummaryLayout from 'src/features/transactions/SummaryCards/TransactionSummaryLayout'
 import { ChainId } from 'wallet/src/constants/chains'
 import { NFTTradeSummaryItem } from 'wallet/src/features/transactions/SummaryCards/SummaryItems/NFTTradeSummaryItem'
-import TransactionSummaryLayout from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout'
 import {
   NFTTradeTransactionInfo,
   NFTTradeType,
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 a6adf82c17b..deaf5be004a 100644
--- a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/ReceiveSummaryItem.stories.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/ReceiveSummaryItem.stories.tsx
@@ -1,10 +1,10 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import React from 'react'
+import TransactionSummaryLayout from 'src/features/transactions/SummaryCards/TransactionSummaryLayout'
 import { ChainId } from 'wallet/src/constants/chains'
 import { TokenDocument } from 'wallet/src/data/__generated__/types-and-hooks'
 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 {
   ReceiveTokenTransactionInfo,
   TransactionDetails,
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 e8456450544..d32c27908f2 100644
--- a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/SendSummaryItem.stories.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/SendSummaryItem.stories.tsx
@@ -1,10 +1,10 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import React from 'react'
+import TransactionSummaryLayout from 'src/features/transactions/SummaryCards/TransactionSummaryLayout'
 import { ChainId } from 'wallet/src/constants/chains'
 import { TokenDocument } from 'wallet/src/data/__generated__/types-and-hooks'
 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 {
   SendTokenTransactionInfo,
   TransactionDetails,
diff --git a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/SwapSummaryItem.stories.tsx b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/SwapSummaryItem.stories.tsx
index d797cd97444..20aadb994e1 100644
--- a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/SwapSummaryItem.stories.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/SwapSummaryItem.stories.tsx
@@ -1,10 +1,10 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import { TradeType } from '@uniswap/sdk-core'
 import React from 'react'
+import TransactionSummaryLayout from 'src/features/transactions/SummaryCards/TransactionSummaryLayout'
 import { ChainId } from 'wallet/src/constants/chains'
 import { TokenDocument } from 'wallet/src/data/__generated__/types-and-hooks'
 import { SwapSummaryItem } from 'wallet/src/features/transactions/SummaryCards/SummaryItems/SwapSummaryItem'
-import TransactionSummaryLayout from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout'
 import {
   ExactInputSwapTransactionInfo,
   ExactOutputSwapTransactionInfo,
diff --git a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/UnknownSummaryItem.stories.tsx b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/UnknownSummaryItem.stories.tsx
index 790a0397217..06977737042 100644
--- a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/UnknownSummaryItem.stories.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/UnknownSummaryItem.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import React from 'react'
+import TransactionSummaryLayout from 'src/features/transactions/SummaryCards/TransactionSummaryLayout'
 import { ChainId } from 'wallet/src/constants/chains'
-import TransactionSummaryLayout from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout'
 import { UnknownSummaryItem } from 'wallet/src/features/transactions/SummaryCards/SummaryItems/UnknownSummaryItem'
 import {
   TransactionDetails,
diff --git a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/WCSummaryItem.stories.tsx b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/WCSummaryItem.stories.tsx
index ccd1833fa6e..97d2f132849 100644
--- a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/WCSummaryItem.stories.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/WCSummaryItem.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import React from 'react'
+import TransactionSummaryLayout from 'src/features/transactions/SummaryCards/TransactionSummaryLayout'
 import { ChainId } from 'wallet/src/constants/chains'
-import TransactionSummaryLayout from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout'
 import { WCSummaryItem } from 'wallet/src/features/transactions/SummaryCards/SummaryItems/WCSummaryItem'
 import {
   TransactionDetails,
diff --git a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/WrapSummaryItem.stories.tsx b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/WrapSummaryItem.stories.tsx
index 858c31ee1e3..89b1e9a2a4e 100644
--- a/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/WrapSummaryItem.stories.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/SummaryItems/WrapSummaryItem.stories.tsx
@@ -1,7 +1,7 @@
 import type { Meta, StoryObj } from '@storybook/react'
 import React from 'react'
+import TransactionSummaryLayout from 'src/features/transactions/SummaryCards/TransactionSummaryLayout'
 import { TokenDocument } from 'wallet/src/data/__generated__/types-and-hooks'
-import TransactionSummaryLayout from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout'
 import { WrapSummaryItem } from 'wallet/src/features/transactions/SummaryCards/SummaryItems/WrapSummaryItem'
 import {
   TransactionDetails,
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionActionsModal.tsx b/apps/mobile/src/features/transactions/SummaryCards/TransactionActionsModal.tsx
similarity index 91%
rename from packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionActionsModal.tsx
rename to apps/mobile/src/features/transactions/SummaryCards/TransactionActionsModal.tsx
index 1b361ad15d6..34a5f885e82 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionActionsModal.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/TransactionActionsModal.tsx
@@ -1,12 +1,13 @@
 import dayjs from 'dayjs'
-import { useCallback, useMemo } from 'react'
+import { default as React, useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
+import { useAppDispatch } from 'src/app/hooks'
+import { ActionSheetModalContent, MenuItemProp } from 'src/components/modals/ActionSheetModal'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
+import { setClipboard } from 'src/utils/clipboard'
+import { openMoonpayHelpLink, openUniswapHelpLink } from 'src/utils/linking'
 import { ColorTokens, Flex, Separator, Text } from 'ui/src'
-import {
-  ActionSheetModalContent,
-  MenuItemProp,
-} from 'wallet/src/components/modals/ActionSheetModal'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
 import { CHAIN_INFO } from 'wallet/src/constants/chains'
 import { FORMAT_DATE_LONG, useFormattedDate } from 'wallet/src/features/language/localizedDayjs'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
@@ -17,11 +18,7 @@ import {
   TransactionDetails,
   TransactionType,
 } from 'wallet/src/features/transactions/types'
-import { useAppDispatch } from 'wallet/src/state'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
-import { setClipboard } from 'wallet/src/utils/clipboard'
 import { CurrencyId } from 'wallet/src/utils/currencyId'
-import { openMoonpayHelpLink, openUniswapHelpLink } from 'wallet/src/utils/linking'
 
 function renderOptionItem(label: string, textColorOverride?: ColorTokens): () => JSX.Element {
   return function OptionItem(): JSX.Element {
@@ -89,7 +86,7 @@ export default function TransactionActionsModal({
       onViewTokenDetails && isSwapTransaction && inputCurrencyInfo && outputCurrencyInfo
         ? [
             {
-              key: inputCurrencyInfo.currencyId,
+              key: ElementName.TokenAddress,
               onPress: () => onViewTokenDetails(inputCurrencyInfo.currencyId),
               render: renderOptionItem(
                 t('View {{ tokenSymbol }}', {
@@ -98,7 +95,7 @@ export default function TransactionActionsModal({
               ),
             },
             {
-              key: outputCurrencyInfo.currencyId,
+              key: ElementName.TokenAddress,
               onPress: () => onViewTokenDetails(outputCurrencyInfo.currencyId),
               render: renderOptionItem(
                 t('View {{ tokenSymbol }}', {
diff --git a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout.tsx b/apps/mobile/src/features/transactions/SummaryCards/TransactionSummaryLayout.tsx
similarity index 85%
rename from packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout.tsx
rename to apps/mobile/src/features/transactions/SummaryCards/TransactionSummaryLayout.tsx
index 4a9c03d3279..a8a1e087900 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionSummaryLayout.tsx
+++ b/apps/mobile/src/features/transactions/SummaryCards/TransactionSummaryLayout.tsx
@@ -1,37 +1,35 @@
 /* eslint-disable complexity */
 import { providers } from 'ethers'
-import { memo, useEffect, useState } from 'react'
+import { default as React, memo, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { useAppDispatch } from 'src/app/hooks'
+import { SpinningLoader } from 'src/components/loading/SpinningLoader'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
+import { useTokenDetailsNavigation } from 'src/components/TokenDetails/hooks'
+import { ModalName } from 'src/features/telemetry/constants'
+import { useLowestPendingNonce } from 'src/features/transactions/hooks'
+import { CancelConfirmationView } from 'src/features/transactions/SummaryCards/CancelConfirmationView'
+import TransactionActionsModal from 'src/features/transactions/SummaryCards/TransactionActionsModal'
+import { openMoonpayTransactionLink, openTransactionLink } from 'src/utils/linking'
 import { Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
 import AlertTriangle from 'ui/src/assets/icons/alert-triangle.svg'
 import SlashCircleIcon from 'ui/src/assets/icons/slash-circle.svg'
-import { DisplayNameText } from 'wallet/src/components/accounts/DisplayNameText'
-import { SpinningLoader } from 'wallet/src/components/loading/SpinningLoader'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
-import { CancelConfirmationView } from 'wallet/src/features/transactions/SummaryCards/SummaryItems/CancelConfirmationView'
-import TransactionActionsModal from 'wallet/src/features/transactions/SummaryCards/SummaryItems/TransactionActionsModal'
+import { cancelTransaction } from 'wallet/src/features/transactions/slice'
 import { TransactionSummaryLayoutProps } from 'wallet/src/features/transactions/SummaryCards/types'
 import {
+  getTransactionSummaryTitle,
   TXN_HISTORY_ICON_SIZE,
   TXN_STATUS_ICON_SIZE,
-  getTransactionSummaryTitle,
   useFormattedTime,
 } from 'wallet/src/features/transactions/SummaryCards/utils'
-import { useLowestPendingNonce } from 'wallet/src/features/transactions/hooks'
-import { cancelTransaction } from 'wallet/src/features/transactions/slice'
 import { TransactionStatus, TransactionType } from 'wallet/src/features/transactions/types'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccountWithThrow, useDisplayName } from 'wallet/src/features/wallet/hooks'
-import { useAppDispatch } from 'wallet/src/state'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { CurrencyId } from 'wallet/src/utils/currencyId'
-import { openMoonpayTransactionLink, openTransactionLink } from 'wallet/src/utils/linking'
 
 const LOADING_SPINNER_SIZE = 20
 
 function TransactionSummaryLayout({
-  authTrigger,
   transaction,
   title,
   caption,
@@ -40,8 +38,7 @@ function TransactionSummaryLayout({
 }: TransactionSummaryLayoutProps): JSX.Element {
   const { t } = useTranslation()
   const colors = useSporeColors()
-
-  const { navigateToTokenDetails } = useWalletNavigation()
+  const tokenDetailsNavigation = useTokenDetailsNavigation()
 
   const { type } = useActiveAccountWithThrow()
   const readonly = type === AccountType.Readonly
@@ -140,11 +137,10 @@ function TransactionSummaryLayout({
             <Flex grow>
               <Flex grow row alignItems="center" gap="$spacing4" justifyContent="space-between">
                 <Flex row shrink alignItems="center" gap="$spacing4">
-                  {walletDisplayName ? (
-                    <DisplayNameText
-                      displayName={walletDisplayName}
-                      textProps={{ color: '$accent1', variant: 'body1' }}
-                    />
+                  {walletDisplayName?.name ? (
+                    <Text color="$accent1" numberOfLines={1} variant="body1">
+                      {walletDisplayName.name}
+                    </Text>
                   ) : null}
                   <Text color="$neutral2" numberOfLines={1} variant="body2">
                     {title}
@@ -207,7 +203,7 @@ function TransactionSummaryLayout({
               ? (currencyId: CurrencyId): void | undefined => {
                   setShowActionsModal(false)
                   if (transaction.typeInfo.type === TransactionType.Swap) {
-                    navigateToTokenDetails(currencyId)
+                    tokenDetailsNavigation.navigate(currencyId)
                   }
                 }
               : undefined
@@ -221,7 +217,6 @@ function TransactionSummaryLayout({
           onClose={(): void => setShowCancelModal(false)}>
           {transaction && (
             <CancelConfirmationView
-              authTrigger={authTrigger}
               transactionDetails={transaction}
               onBack={(): void => {
                 setShowActionsModal(true)
diff --git a/packages/wallet/src/features/transactions/TransactionDetails/TransactionDetails.tsx b/apps/mobile/src/features/transactions/TransactionDetails.tsx
similarity index 81%
rename from packages/wallet/src/features/transactions/TransactionDetails/TransactionDetails.tsx
rename to apps/mobile/src/features/transactions/TransactionDetails.tsx
index 1c766d0f93f..326804de997 100644
--- a/packages/wallet/src/features/transactions/TransactionDetails/TransactionDetails.tsx
+++ b/apps/mobile/src/features/transactions/TransactionDetails.tsx
@@ -1,22 +1,21 @@
 import { SwapEventName } from '@uniswap/analytics-events'
-import { PropsWithChildren, ReactNode, useState } from 'react'
+import React, { PropsWithChildren, ReactNode, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { AccountDetails } from 'src/components/accounts/AccountDetails'
+import { Warning } from 'src/components/modals/WarningModal/types'
+import { getAlertColor } from 'src/components/modals/WarningModal/WarningModal'
+import { NetworkFee } from 'src/components/Network/NetworkFee'
+import { OnShowSwapFeeInfo, SwapFee } from 'src/components/SwapFee/SwapFee'
+import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
+import { FeeOnTransferInfo } from 'src/features/transactions/swap/FeeOnTransferInfo'
 import { Flex, Icons, Separator, Text, TouchableArea, useSporeColors } from 'ui/src'
 import AnglesMaximize from 'ui/src/assets/icons/angles-maximize.svg'
 import AnglesMinimize from 'ui/src/assets/icons/angles-minimize.svg'
 import { iconSizes } from 'ui/src/theme'
-import { getAlertColor } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { NetworkFee } from 'wallet/src/components/network/NetworkFee'
 import { ChainId } from 'wallet/src/constants/chains'
 import { GasFeeResult } from 'wallet/src/features/gas/types'
 import { SwapFeeInfo } from 'wallet/src/features/routing/types'
-import { FeeOnTransferInfo } from 'wallet/src/features/transactions/TransactionDetails/FeeOnTransferInfo'
-import {
-  OnShowSwapFeeInfo,
-  SwapFee,
-} from 'wallet/src/features/transactions/TransactionDetails/SwapFee'
-import { Warning } from 'wallet/src/features/transactions/WarningModal/types'
-import { sendWalletAnalyticsEvent } from 'wallet/src/telemetry'
+import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 
 interface TransactionDetailsProps {
   banner?: ReactNode
@@ -31,7 +30,6 @@ interface TransactionDetailsProps {
   onShowSwapFeeInfo?: OnShowSwapFeeInfo
   onShowWarning?: () => void
   isSwap?: boolean
-  AccountDetails?: JSX.Element
 }
 
 export function TransactionDetails({
@@ -48,17 +46,17 @@ export function TransactionDetails({
   onShowSwapFeeInfo,
   onShowWarning,
   isSwap,
-  AccountDetails,
 }: PropsWithChildren<TransactionDetailsProps>): JSX.Element {
   const colors = useSporeColors()
   const { t } = useTranslation()
+  const userAddress = useActiveAccountAddressWithThrow()
   const warningColor = getAlertColor(warning?.severity)
 
   const [showChildren, setShowChildren] = useState(showExpandedChildren)
 
   const onPressToggleShowChildren = (): void => {
     if (!showChildren) {
-      sendWalletAnalyticsEvent(SwapEventName.SWAP_DETAILS_EXPANDED)
+      sendMobileAnalyticsEvent(SwapEventName.SWAP_DETAILS_EXPANDED)
     }
     setShowChildren(!showChildren)
   }
@@ -130,7 +128,9 @@ export function TransactionDetails({
           <SwapFee swapFeeInfo={swapFeeInfo} onShowSwapFeeInfo={onShowSwapFeeInfo} />
         )}
         <NetworkFee chainId={chainId} gasFee={gasFee} onShowNetworkFeeInfo={onShowNetworkFeeInfo} />
-        {AccountDetails}
+        {!isSwap || !swapFeeInfo ? (
+          <AccountDetails address={userAddress} iconSize={iconSizes.icon20} />
+        ) : null}
       </Flex>
     </Flex>
   )
diff --git a/apps/mobile/src/features/transactions/TransactionFlow.tsx b/apps/mobile/src/features/transactions/TransactionFlow.tsx
index 2be13123ac2..5c7d369b559 100644
--- a/apps/mobile/src/features/transactions/TransactionFlow.tsx
+++ b/apps/mobile/src/features/transactions/TransactionFlow.tsx
@@ -2,39 +2,30 @@ import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { TouchableWithoutFeedback } from 'react-native'
 import { useAnimatedStyle, useSharedValue, withSpring } from 'react-native-reanimated'
-import { useShouldShowNativeKeyboard } from 'src/app/hooks'
 import { Screen } from 'src/components/layout/Screen'
+import { useBottomSheetContext } from 'src/components/modals/BottomSheetContext'
+import { HandleBar } from 'src/components/modals/HandleBar'
+import { WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
 import Trace from 'src/components/Trace/Trace'
-import { useBiometricAppSettings, useBiometricPrompt } from 'src/features/biometrics/hooks'
+import { ModalName, SectionName } from 'src/features/telemetry/constants'
+import { SwapSettingsModal } from 'src/features/transactions/swap/modals/SwapSettingsModal'
 import { SwapForm } from 'src/features/transactions/swap/SwapForm'
 import { SwapReview } from 'src/features/transactions/swap/SwapReview'
 import { SwapStatus } from 'src/features/transactions/swap/SwapStatus'
 import { HeaderContent } from 'src/features/transactions/TransactionFlowHeaderContent'
+import { transactionStateActions } from 'src/features/transactions/transactionState/transactionState'
+import { DerivedTransferInfo } from 'src/features/transactions/transfer/hooks'
+import { TransferReview } from 'src/features/transactions/transfer/TransferReview'
 import { TransferStatus } from 'src/features/transactions/transfer/TransferStatus'
-import { useWalletRestore } from 'src/features/wallet/hooks'
+import { TransferTokenForm } from 'src/features/transactions/transfer/TransferTokenForm'
 import { AnimatedFlex, Flex, useDeviceDimensions, useSporeColors } from 'ui/src'
 import EyeIcon from 'ui/src/assets/icons/eye.svg'
 import { iconSizes } from 'ui/src/theme'
-import { useBottomSheetContext } from 'wallet/src/components/modals/BottomSheetContext'
-import { HandleBar } from 'wallet/src/components/modals/HandleBar'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
 import { GasFeeResult } from 'wallet/src/features/gas/types'
-import { SwapSettingsModal } from 'wallet/src/features/transactions/swap/modals/SwapSettingsModal'
-import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
-import { transactionStateActions } from 'wallet/src/features/transactions/transactionState/transactionState'
-import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import {
-  useTransferERC20Callback,
-  useTransferNFTCallback,
-} from 'wallet/src/features/transactions/transfer/hooks/useTransferCallback'
-import { TransferReview } from 'wallet/src/features/transactions/transfer/TransferReview'
-import { TransferTokenForm } from 'wallet/src/features/transactions/transfer/TransferTokenForm'
-import { DerivedTransferInfo } from 'wallet/src/features/transactions/transfer/types'
-import { TransactionFlowProps, TransactionStep } from 'wallet/src/features/transactions/types'
 import { ANIMATE_SPRING_CONFIG } from 'wallet/src/features/transactions/utils'
-import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
-import { ModalName, SectionName } from 'wallet/src/telemetry/constants'
-import { currencyAddress } from 'wallet/src/utils/currencyId'
+import { DerivedSwapInfo } from './swap/types'
+import { TransactionFlowProps, TransactionStep } from './types'
 
 type InnerContentProps = Pick<
   TransactionFlowProps,
@@ -117,7 +108,7 @@ export function TransactionFlow({
       <Screen edges={['top']}>
         <HandleBar backgroundColor="none" />
         <AnimatedFlex grow row height="100%" style={wrapperStyle}>
-          {/* Padding bottom must have a similar size to the handlebar
+          {/* Padding bottom must have a similar size to the handlebar 
           height as 100% height doesn't include the handlebar height */}
           <Flex gap="$spacing16" pb="$spacing24" px="$spacing16" width="100%">
             {step !== TransactionStep.SUBMITTED && (
@@ -310,47 +301,6 @@ function TransferInnerContent({
   onReviewNext,
   onReviewPrev,
 }: TransferInnerContentProps): JSX.Element | null {
-  // TODO: move this up in the tree to mobile specific flow
-  const { walletNeedsRestore, openWalletRestoreModal } = useWalletRestore()
-  const { showNativeKeyboard, onDecimalPadLayout, isLayoutPending, onInputPanelLayout } =
-    useShouldShowNativeKeyboard()
-
-  const { currencyAmounts, recipient, currencyInInfo, nftIn, chainId, txId } = derivedTransferInfo
-  const transferERC20Callback = useTransferERC20Callback(
-    txId,
-    chainId,
-    recipient,
-    currencyInInfo ? currencyAddress(currencyInInfo.currency) : undefined,
-    currencyAmounts[CurrencyField.INPUT]?.quotient.toString(),
-    txRequest,
-    onReviewNext
-  )
-  const transferNFTCallback = useTransferNFTCallback(
-    txId,
-    chainId,
-    recipient,
-    nftIn?.nftContract?.address,
-    nftIn?.tokenId,
-    txRequest,
-    onReviewNext
-  )
-
-  const onTransfer = (): void => {
-    onFormNext()
-    nftIn ? transferNFTCallback?.() : transferERC20Callback?.()
-  }
-
-  const { trigger: biometricAuthAndTransfer } = useBiometricPrompt(onTransfer)
-  const { requiredForTransactions: biometricRequired } = useBiometricAppSettings()
-
-  const onReviewSubmit = async (): Promise<void> => {
-    if (biometricRequired) {
-      await biometricAuthAndTransfer()
-    } else {
-      onTransfer()
-    }
-  }
-
   switch (step) {
     case TransactionStep.SUBMITTED:
       return (
@@ -368,14 +318,8 @@ function TransferInnerContent({
           <TransferTokenForm
             derivedTransferInfo={derivedTransferInfo}
             dispatch={dispatch}
-            isLayoutPending={isLayoutPending}
-            openWalletRestoreModal={openWalletRestoreModal}
-            showNativeKeyboard={showNativeKeyboard}
             showingSelectorScreen={showingSelectorScreen}
-            walletNeedsRestore={!!walletNeedsRestore}
             warnings={warnings}
-            onDecimalPadLayout={onDecimalPadLayout}
-            onInputPanelLayout={onInputPanelLayout}
             onNext={onFormNext}
           />
         </Trace>
@@ -388,8 +332,8 @@ function TransferInnerContent({
             gasFee={gasFee}
             txRequest={txRequest}
             warnings={warnings}
+            onNext={onReviewNext}
             onPrev={onReviewPrev}
-            onReviewSubmit={onReviewSubmit}
           />
         </Trace>
       )
diff --git a/apps/mobile/src/features/transactions/TransactionFlowHeaderContent.tsx b/apps/mobile/src/features/transactions/TransactionFlowHeaderContent.tsx
index 30e2bd7ca7e..a94312d2ee9 100644
--- a/apps/mobile/src/features/transactions/TransactionFlowHeaderContent.tsx
+++ b/apps/mobile/src/features/transactions/TransactionFlowHeaderContent.tsx
@@ -1,17 +1,17 @@
 import React, { Dispatch, SetStateAction } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Keyboard } from 'react-native'
+import { ElementName } from 'src/features/telemetry/constants'
+import { useTokenFormActionHandlers } from 'src/features/transactions/hooks'
 import { Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
 import EyeIcon from 'ui/src/assets/icons/eye.svg'
 import SettingsIcon from 'ui/src/assets/icons/settings.svg'
 import { iconSizes } from 'ui/src/theme'
 import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { useTokenFormActionHandlers } from 'wallet/src/features/transactions/hooks/useTokenFormActionHandlers'
-import { TransactionFlowProps, TransactionStep } from 'wallet/src/features/transactions/types'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
-import { ElementName } from 'wallet/src/telemetry/constants'
+import { TransactionFlowProps, TransactionStep } from './types'
 
 type HeaderContentProps = Pick<
   TransactionFlowProps,
diff --git a/packages/wallet/src/features/transactions/TransactionHistoryUpdater.test.tsx b/apps/mobile/src/features/transactions/TransactionHistoryUpdater.test.tsx
similarity index 92%
rename from packages/wallet/src/features/transactions/TransactionHistoryUpdater.test.tsx
rename to apps/mobile/src/features/transactions/TransactionHistoryUpdater.test.tsx
index 9319e49af9e..aa95d3478db 100644
--- a/packages/wallet/src/features/transactions/TransactionHistoryUpdater.test.tsx
+++ b/apps/mobile/src/features/transactions/TransactionHistoryUpdater.test.tsx
@@ -1,5 +1,11 @@
 import dayjs from 'dayjs'
 import MockDate from 'mockdate'
+import React from 'react'
+import {
+  getReceiveNotificationFromData,
+  TransactionHistoryUpdater,
+} from 'src/features/transactions/TransactionHistoryUpdater'
+import { render } from 'src/test/test-utils'
 import { ChainId } from 'wallet/src/constants/chains'
 import { AssetActivity, Resolvers } from 'wallet/src/data/__generated__/types-and-hooks'
 import { AssetType } from 'wallet/src/entities/assets'
@@ -7,27 +13,16 @@ import { AppNotificationType } from 'wallet/src/features/notifications/types'
 import { TransactionStatus, TransactionType } from 'wallet/src/features/transactions/types'
 import { Account } from 'wallet/src/features/wallet/accounts/types'
 import { SwapProtectionSetting } from 'wallet/src/features/wallet/slice'
+import { account, account2, faker, SAMPLE_SEED_ADDRESS_1 } from 'wallet/src/test/fixtures'
 import {
   MAX_FIXTURE_TIMESTAMP,
-  SAMPLE_SEED_ADDRESS_1,
-  account,
-  account2,
-  faker,
-} from 'wallet/src/test/fixtures'
-import { Portfolios, PortfoliosWithReceive } from 'wallet/src/test/gqlFixtures'
-import { render } from 'wallet/src/test/test-utils'
-import {
-  TransactionHistoryUpdater,
-  getReceiveNotificationFromData,
-} from './TransactionHistoryUpdater'
+  Portfolios,
+  PortfoliosWithReceive,
+} from 'wallet/src/test/gqlFixtures'
 
 const mockedRefetchQueries = jest.fn()
-
-jest.mock('@apollo/client', () => ({
-  ...jest.requireActual('@apollo/client'),
-  useApolloClient: jest.fn((): { refetchQueries: jest.Mock } => ({
-    refetchQueries: mockedRefetchQueries,
-  })),
+jest.mock('src/data/usePersistedApolloClient', () => ({
+  apolloClient: { refetchQueries: mockedRefetchQueries },
 }))
 
 const present = dayjs('2022-02-01')
@@ -143,7 +138,6 @@ describe(TransactionHistoryUpdater, () => {
     const notificationStatusState = tree.store.getState().notifications.notificationStatus
     expect(notificationStatusState[account.address]).toBeTruthy()
     expect(notificationStatusState[account2.address]).toBeTruthy()
-    expect(mockedRefetchQueries).toHaveBeenCalled()
   })
 
   it('does not update notification status when there are no new transactions', async () => {
@@ -213,7 +207,7 @@ describe(getReceiveNotificationFromData, () => {
       chainId: ChainId.Mainnet,
       txHash: PortfoliosWithReceive[0].assetActivities[0]?.details.hash, // generated
       address: account.address,
-      txId: '0x9b0e1021d79e2a85b7a419f47cfa364ea6ae10bf',
+      txId: '0x80cde0e2abd1bf5fadcf7ff9edf7ae13feec1c32',
       type: AppNotificationType.Transaction,
       txType: TransactionType.Receive,
       assetType: AssetType.Currency,
diff --git a/packages/wallet/src/features/transactions/TransactionHistoryUpdater.tsx b/apps/mobile/src/features/transactions/TransactionHistoryUpdater.tsx
similarity index 93%
rename from packages/wallet/src/features/transactions/TransactionHistoryUpdater.tsx
rename to apps/mobile/src/features/transactions/TransactionHistoryUpdater.tsx
index 8591c490cb3..7472fc6ecdf 100644
--- a/packages/wallet/src/features/transactions/TransactionHistoryUpdater.tsx
+++ b/apps/mobile/src/features/transactions/TransactionHistoryUpdater.tsx
@@ -1,28 +1,27 @@
-import { useApolloClient } from '@apollo/client'
+// causing lint job to fail
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
 import dayjs from 'dayjs'
-import { useEffect, useMemo } from 'react'
+import React, { useEffect, useMemo } from 'react'
 import { View } from 'react-native'
 import { batch } from 'react-redux'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { apolloClient } from 'src/data/usePersistedApolloClient'
+import { buildReceiveNotification } from 'src/features/notifications/buildReceiveNotification'
+import { selectLastTxNotificationUpdate } from 'src/features/notifications/selectors'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { PollingInterval } from 'wallet/src/constants/misc'
+import { GQLQueries } from 'wallet/src/data/queries'
 import {
   TransactionHistoryUpdaterQueryResult,
   TransactionListQuery,
   useTransactionHistoryUpdaterQuery,
   useTransactionListLazyQuery,
 } from 'wallet/src/data/__generated__/types-and-hooks'
-import { GQLQueries } from 'wallet/src/data/queries'
-import { buildReceiveNotification } from 'wallet/src/features/notifications/buildReceiveNotification'
-import { selectLastTxNotificationUpdate } from 'wallet/src/features/notifications/selectors'
 import {
   pushNotification,
   setLastTxNotificationUpdate,
   setNotificationStatus,
 } from 'wallet/src/features/notifications/slice'
-import {
-  ReceiveCurrencyTxNotification,
-  ReceiveNFTNotification,
-} from 'wallet/src/features/notifications/types'
 import { parseDataResponseToTransactionDetails } from 'wallet/src/features/transactions/history/utils'
 import { useSelectAddressTransactions } from 'wallet/src/features/transactions/selectors'
 import { TransactionStatus, TransactionType } from 'wallet/src/features/transactions/types'
@@ -32,7 +31,6 @@ import {
   useHideSpamTokensSetting,
 } from 'wallet/src/features/wallet/hooks'
 import { selectActiveAccountAddress } from 'wallet/src/features/wallet/selectors'
-import { useAppDispatch, useAppSelector } from 'wallet/src/state'
 
 /**
  * For all imported accounts, checks for new transactions and updates
@@ -105,7 +103,6 @@ function AddressTransactionHistoryUpdater({
   >
 }): JSX.Element | null {
   const dispatch = useAppDispatch()
-  const apolloClient = useApolloClient()
 
   const activeAccountAddress = useAppSelector(selectActiveAccountAddress)
 
@@ -175,7 +172,6 @@ function AddressTransactionHistoryUpdater({
     activeAccountAddress,
     activities,
     address,
-    apolloClient,
     dispatch,
     fetchAndDispatchReceiveNotification,
     hideSpamTokens,
@@ -231,7 +227,7 @@ export function getReceiveNotificationFromData(
   address: Address,
   lastTxNotificationUpdateTimestamp: number | undefined,
   hideSpamTokens = false
-): ReceiveCurrencyTxNotification | ReceiveNFTNotification | undefined {
+) {
   if (!data || !lastTxNotificationUpdateTimestamp) {
     return
   }
diff --git a/apps/mobile/src/features/transactions/TransactionPending/TransactionPending.tsx b/apps/mobile/src/features/transactions/TransactionPending/TransactionPending.tsx
index e80d94d96c5..b86fe1acdcb 100644
--- a/apps/mobile/src/features/transactions/TransactionPending/TransactionPending.tsx
+++ b/apps/mobile/src/features/transactions/TransactionPending/TransactionPending.tsx
@@ -1,15 +1,15 @@
 import React from 'react'
 import { useTranslation } from 'react-i18next'
+import { ElementName } from 'src/features/telemetry/constants'
 import { StatusAnimation } from 'src/features/transactions/TransactionPending/StatusAnimation'
+import { openTransactionLink } from 'src/utils/linking'
 import { AnimatedFlex, Button, Flex, Text, TouchableArea } from 'ui/src'
 import { ChainId } from 'wallet/src/constants/chains'
 import {
+  isFinalizedTx,
   TransactionDetails,
   TransactionStatus,
-  isFinalizedTx,
 } from 'wallet/src/features/transactions/types'
-import { ElementName } from 'wallet/src/telemetry/constants'
-import { openTransactionLink } from 'wallet/src/utils/linking'
 
 type TransactionStatusProps = {
   transaction: TransactionDetails | undefined
diff --git a/packages/wallet/src/features/transactions/TransactionReview/TransactionReview.tsx b/apps/mobile/src/features/transactions/TransactionReview.tsx
similarity index 81%
rename from packages/wallet/src/features/transactions/TransactionReview/TransactionReview.tsx
rename to apps/mobile/src/features/transactions/TransactionReview.tsx
index 69b6114dcc4..9bf4638b471 100644
--- a/packages/wallet/src/features/transactions/TransactionReview/TransactionReview.tsx
+++ b/apps/mobile/src/features/transactions/TransactionReview.tsx
@@ -1,32 +1,36 @@
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
-import { ReactNode } from 'react'
+import { notificationAsync } from 'expo-haptics'
+import React, { ReactNode } from 'react'
 import { useTranslation } from 'react-i18next'
 import { FadeInUp, FadeOut } from 'react-native-reanimated'
-import { isWeb } from 'tamagui'
-import { AnimatedFlex, Button, Flex, Text, useDeviceDimensions, useMedia } from 'ui/src'
-import { BackArrow } from 'ui/src/components/icons/BackArrow'
+import { AddressDisplay } from 'src/components/AddressDisplay'
+import { TransferArrowButton } from 'src/components/buttons/TransferArrowButton'
+import { Arrow } from 'src/components/icons/Arrow'
+import { AmountInput } from 'src/components/input/AmountInput'
+import { RecipientPrevTransfers } from 'src/components/input/RecipientInputPanel'
+import { TextInputProps } from 'src/components/input/TextInput'
+import { NFTTransfer } from 'src/components/NFT/NFTTransfer'
+import { useBiometricAppSettings, useBiometricPrompt } from 'src/features/biometrics/hooks'
+import { ElementName } from 'src/features/telemetry/constants'
+import {
+  AnimatedFlex,
+  Button,
+  Flex,
+  Text,
+  useDeviceDimensions,
+  useMedia,
+  useSporeColors,
+} from 'ui/src'
 import { fonts, iconSizes } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
-import { TransferArrowButton } from 'wallet/src/components/buttons/TransferArrowButton'
 import { CurrencyLogo } from 'wallet/src/components/CurrencyLogo/CurrencyLogo'
-import { AmountInput } from 'wallet/src/components/input/AmountInput'
-import { RecipientPrevTransfers } from 'wallet/src/components/input/RecipientInputPanel'
-import { TextInputProps } from 'wallet/src/components/input/TextInput'
-import { NFTTransfer } from 'wallet/src/components/NFT/NFTTransfer'
 import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { GQLNftAsset } from 'wallet/src/features/nfts/hooks'
-import { ElementNameType } from 'wallet/src/telemetry/constants'
 import { getSymbolDisplayText } from 'wallet/src/utils/currency'
 
 interface BaseReviewProps {
-  actionButtonProps: {
-    disabled: boolean
-    label: string
-    name: ElementNameType
-    onPress: () => void
-  }
+  actionButtonProps: { disabled: boolean; label: string; name: ElementName; onPress: () => void }
   isFiatInput?: boolean
   transactionDetails?: ReactNode
   nftIn?: GQLNftAsset
@@ -69,11 +73,15 @@ export function TransactionReview({
   usdTokenEquivalentAmount,
   onPrev,
 }: TransactionReviewProps): JSX.Element {
+  const colors = useSporeColors()
   const media = useMedia()
   const { fullHeight } = useDeviceDimensions()
   const { t } = useTranslation()
   const { convertFiatAmountFormatted } = useLocalizationContext()
 
+  const { trigger: actionButtonTrigger } = useBiometricPrompt(actionButtonProps.onPress)
+  const { requiredForTransactions } = useBiometricAppSettings()
+
   const textProps: TextInputProps = media.short
     ? {
         fontFamily: '$heading',
@@ -110,8 +118,7 @@ export function TransactionReview({
         grow
         $short={{ gap: '$none' }}
         entering={FadeInUp}
-        // TODO(EXT-526): re-enable `exiting` animation when it's fixed.
-        exiting={isWeb ? undefined : FadeOut}
+        exiting={FadeOut}
         gap="$spacing4">
         {currencyInInfo ? (
           <Flex centered gap={innerGap}>
@@ -205,19 +212,30 @@ export function TransactionReview({
       </AnimatedFlex>
       <AnimatedFlex
         entering={FadeInUp}
-        // TODO(EXT-526): re-enable `exiting` animation when it's fixed.
-        exiting={isWeb ? undefined : FadeOut}
+        exiting={FadeOut}
         gap="$spacing12"
         justifyContent="flex-end">
         {transactionDetails}
         <Flex row gap="$spacing8">
-          <Button icon={<BackArrow />} size="large" theme="tertiary" onPress={onPrev} />
+          <Button
+            icon={<Arrow color={colors.neutral1.val} direction="w" size={iconSizes.icon24} />}
+            size="large"
+            theme="tertiary"
+            onPress={onPrev}
+          />
           <Button
             fill
             disabled={actionButtonProps.disabled}
             size="large"
             testID={actionButtonProps.name}
-            onPress={actionButtonProps.onPress}>
+            onPress={async (): Promise<void> => {
+              await notificationAsync()
+              if (requiredForTransactions) {
+                await actionButtonTrigger()
+              } else {
+                actionButtonProps.onPress()
+              }
+            }}>
             {actionButtonProps.label}
           </Button>
         </Flex>
diff --git a/packages/wallet/src/features/transactions/hooks.ts b/apps/mobile/src/features/transactions/hooks.ts
similarity index 59%
rename from packages/wallet/src/features/transactions/hooks.ts
rename to apps/mobile/src/features/transactions/hooks.ts
index 79bacc91fc6..6469eca3e91 100644
--- a/packages/wallet/src/features/transactions/hooks.ts
+++ b/apps/mobile/src/features/transactions/hooks.ts
@@ -1,7 +1,19 @@
+import { AnyAction } from '@reduxjs/toolkit'
 import { Currency } from '@uniswap/sdk-core'
 import { BigNumberish } from 'ethers'
-import { useMemo } from 'react'
+import { useCallback, useMemo } from 'react'
+import { SearchContext } from 'src/components/explore/search/SearchContext'
+import { flowToModalName } from 'src/components/TokenSelector/flowToModalName'
+import { TokenSelectorFlow } from 'src/components/TokenSelector/types'
+import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
+import { MobileEventName } from 'src/features/telemetry/constants'
+import {
+  createSwapFormFromTxDetails,
+  createWrapFormFromTxDetails,
+} from 'src/features/transactions/swap/createSwapFormFromTxDetails'
+import { transactionStateActions } from 'src/features/transactions/transactionState/transactionState'
 import { ChainId } from 'wallet/src/constants/chains'
+import { AssetType } from 'wallet/src/entities/assets'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import {
   makeSelectTransaction,
@@ -9,19 +21,18 @@ import {
 } from 'wallet/src/features/transactions/selectors'
 import { finalizeTransaction } from 'wallet/src/features/transactions/slice'
 import {
-  createSwapFormFromTxDetails,
-  createWrapFormFromTxDetails,
-} from 'wallet/src/features/transactions/swap/createSwapFormFromTxDetails'
-import { TransactionState } from 'wallet/src/features/transactions/transactionState/types'
+  CurrencyField,
+  TransactionState,
+} from 'wallet/src/features/transactions/transactionState/types'
 import {
+  isFinalizedTx,
   TransactionDetails,
   TransactionStatus,
   TransactionType,
-  isFinalizedTx,
 } from 'wallet/src/features/transactions/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 import { useAppDispatch, useAppSelector } from 'wallet/src/state'
-import { areCurrencyIdsEqual, buildCurrencyId } from 'wallet/src/utils/currencyId'
+import { areCurrencyIdsEqual, buildCurrencyId, currencyAddress } from 'wallet/src/utils/currencyId'
 
 export function usePendingTransactions(
   address: Address | null,
@@ -119,6 +130,135 @@ export function useCreateWrapFormState(
   }, [chainId, inputCurrency, outputCurrency, transaction, txId])
 }
 
+export function useTokenSelectorActionHandlers(
+  dispatch: React.Dispatch<AnyAction>,
+  flow: TokenSelectorFlow
+): {
+  onShowTokenSelector: (field: CurrencyField) => void
+  onHideTokenSelector: () => void
+  onSelectCurrency: (currency: Currency, field: CurrencyField, context: SearchContext) => void
+} {
+  const onShowTokenSelector = useCallback(
+    (field: CurrencyField) => dispatch(transactionStateActions.showTokenSelector(field)),
+    [dispatch]
+  )
+
+  const onHideTokenSelector = useCallback(
+    () => dispatch(transactionStateActions.showTokenSelector(undefined)),
+    [dispatch]
+  )
+
+  const onSelectCurrency = useCallback(
+    (currency: Currency, field: CurrencyField, context: SearchContext) => {
+      dispatch(
+        transactionStateActions.selectCurrency({
+          field,
+          tradeableAsset: {
+            address: currencyAddress(currency),
+            chainId: currency.chainId,
+            type: AssetType.Currency,
+          },
+        })
+      )
+
+      // log event that a currency was selected
+      sendMobileAnalyticsEvent(MobileEventName.TokenSelected, {
+        name: currency.name,
+        address: currencyAddress(currency),
+        chain: currency.chainId,
+        modal: flowToModalName(flow),
+        field,
+        category: context.category,
+        position: context.position,
+        suggestion_count: context.suggestionCount,
+        query: context.query,
+      })
+
+      // hide screen when done selecting
+      onHideTokenSelector()
+    },
+    [dispatch, flow, onHideTokenSelector]
+  )
+  return { onSelectCurrency, onShowTokenSelector, onHideTokenSelector }
+}
+
+/** Set of handlers wrapping actions involving user input */
+export function useTokenFormActionHandlers(dispatch: React.Dispatch<AnyAction>): {
+  onCreateTxId: (txId: string) => void
+  onFocusInput: () => void
+  onFocusOutput: () => void
+  onSwitchCurrencies: () => void
+  onToggleFiatInput: (isFiatInput: boolean) => void
+  onSetExactAmount: (field: CurrencyField, value: string, isFiatInput?: boolean) => void
+  onSetMax: (amount: string) => void
+} {
+  const onUpdateExactTokenAmount = useCallback(
+    (field: CurrencyField, amount: string) =>
+      dispatch(transactionStateActions.updateExactAmountToken({ field, amount })),
+    [dispatch]
+  )
+
+  const onUpdateExactUSDAmount = useCallback(
+    (field: CurrencyField, amount: string) =>
+      dispatch(transactionStateActions.updateExactAmountFiat({ field, amount })),
+    [dispatch]
+  )
+
+  const onSetExactAmount = useCallback(
+    (field: CurrencyField, value: string, isFiatInput?: boolean) => {
+      const updater = isFiatInput ? onUpdateExactUSDAmount : onUpdateExactTokenAmount
+      updater(field, value)
+    },
+    [onUpdateExactUSDAmount, onUpdateExactTokenAmount]
+  )
+
+  const onSetMax = useCallback(
+    (amount: string) => {
+      // when setting max amount, always switch to token mode because
+      // our token/usd updater doesnt handle this case yet
+      dispatch(transactionStateActions.toggleFiatInput(false))
+      dispatch(
+        transactionStateActions.updateExactAmountToken({ field: CurrencyField.INPUT, amount })
+      )
+      // Unfocus the CurrencyInputField by setting focusOnCurrencyField to null
+      dispatch(transactionStateActions.onFocus(null))
+    },
+    [dispatch]
+  )
+
+  const onSwitchCurrencies = useCallback(() => {
+    dispatch(transactionStateActions.switchCurrencySides())
+  }, [dispatch])
+
+  const onToggleFiatInput = useCallback(
+    (isFiatInput: boolean) => dispatch(transactionStateActions.toggleFiatInput(isFiatInput)),
+    [dispatch]
+  )
+
+  const onCreateTxId = useCallback(
+    (txId: string) => dispatch(transactionStateActions.setTxId(txId)),
+    [dispatch]
+  )
+
+  const onFocusInput = useCallback(
+    () => dispatch(transactionStateActions.onFocus(CurrencyField.INPUT)),
+    [dispatch]
+  )
+  const onFocusOutput = useCallback(
+    () => dispatch(transactionStateActions.onFocus(CurrencyField.OUTPUT)),
+    [dispatch]
+  )
+  return {
+    onCreateTxId,
+    onFocusInput,
+    onFocusOutput,
+    onSwitchCurrencies,
+    onToggleFiatInput,
+    onSetExactAmount,
+    onSetMax,
+  }
+}
+
 /**
  * Merge local and remote transactions. If duplicated hash found use data from local store.
  */
@@ -257,3 +397,25 @@ export function useLowestPendingNonce(): BigNumberish | undefined {
     return min
   }, [pending])
 }
+
+/**
+ * Gets all transactions from a given sender and to a given recipient
+ * @param sender Get all transactions sent by this sender
+ * @param recipient Then filter so that we only keep txns to this recipient
+ */
+export function useAllTransactionsBetweenAddresses(
+  sender: Address,
+  recipient: Maybe<Address>
+): TransactionDetails[] | undefined {
+  const txnsToSearch = useSelectAddressTransactions(sender)
+  return useMemo(() => {
+    if (!sender || !recipient || !txnsToSearch) {
+      return
+    }
+
+    return txnsToSearch.filter(
+      (tx: TransactionDetails) =>
+        tx.typeInfo.type === TransactionType.Send && tx.typeInfo.recipient === recipient
+    )
+  }, [recipient, sender, txnsToSearch])
+}
diff --git a/apps/mobile/src/features/transactions/hooks/useOnSendEmptyActionPress.ts b/apps/mobile/src/features/transactions/hooks/useOnSendEmptyActionPress.ts
deleted file mode 100644
index e72e95faf21..00000000000
--- a/apps/mobile/src/features/transactions/hooks/useOnSendEmptyActionPress.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { useCallback } from 'react'
-import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
-import { closeModal, openModal } from 'src/features/modals/modalSlice'
-import { useFiatOnRampIpAddressQuery } from 'wallet/src/features/fiatOnRamp/api'
-import { useAppDispatch } from 'wallet/src/state'
-import { ModalName } from 'wallet/src/telemetry/constants'
-
-export function useOnSendEmptyActionPress(): () => void {
-  const { data } = useFiatOnRampIpAddressQuery()
-  const dispatch = useAppDispatch()
-  const fiatOnRampEligible = Boolean(data?.isBuyAllowed)
-
-  return useCallback((): void => {
-    dispatch(closeModal({ name: ModalName.Send }))
-    if (fiatOnRampEligible) {
-      dispatch(openModal({ name: ModalName.FiatOnRamp }))
-    } else {
-      dispatch(
-        openModal({
-          name: ModalName.WalletConnectScan,
-          initialState: ScannerModalState.WalletQr,
-        })
-      )
-    }
-  }, [dispatch, fiatOnRampEligible])
-}
diff --git a/packages/wallet/src/features/transactions/TransactionDetails/FeeOnTransferInfo.tsx b/apps/mobile/src/features/transactions/swap/FeeOnTransferInfo.tsx
similarity index 98%
rename from packages/wallet/src/features/transactions/TransactionDetails/FeeOnTransferInfo.tsx
rename to apps/mobile/src/features/transactions/swap/FeeOnTransferInfo.tsx
index 1331018f6c5..931db6e3d5a 100644
--- a/packages/wallet/src/features/transactions/TransactionDetails/FeeOnTransferInfo.tsx
+++ b/apps/mobile/src/features/transactions/swap/FeeOnTransferInfo.tsx
@@ -1,4 +1,5 @@
 import { Percent } from '@uniswap/sdk-core'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { Flex, Icons, Text, TouchableArea } from 'ui/src'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
diff --git a/apps/mobile/src/features/transactions/swap/SwapArrowButton.tsx b/apps/mobile/src/features/transactions/swap/SwapArrowButton.tsx
index 328d7d84947..834c357d152 100644
--- a/apps/mobile/src/features/transactions/swap/SwapArrowButton.tsx
+++ b/apps/mobile/src/features/transactions/swap/SwapArrowButton.tsx
@@ -1,7 +1,7 @@
 import React from 'react'
+import { Arrow } from 'src/components/icons/Arrow'
 import { Flex, TouchableArea, TouchableAreaProps, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
-import { Arrow } from 'wallet/src/components/icons/Arrow'
 
 type SwapArrowButtonProps = Pick<
   TouchableAreaProps,
diff --git a/packages/wallet/src/features/transactions/swap/SwapDetails.tsx b/apps/mobile/src/features/transactions/swap/SwapDetails.tsx
similarity index 93%
rename from packages/wallet/src/features/transactions/swap/SwapDetails.tsx
rename to apps/mobile/src/features/transactions/swap/SwapDetails.tsx
index db8ac3b767c..88753c77b0c 100644
--- a/packages/wallet/src/features/transactions/swap/SwapDetails.tsx
+++ b/apps/mobile/src/features/transactions/swap/SwapDetails.tsx
@@ -2,23 +2,24 @@ import { Currency, TradeType } from '@uniswap/sdk-core'
 import React, { useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { TouchableOpacity } from 'react-native-gesture-handler'
-import { Flex, Icons, Text, TouchableArea } from 'ui/src'
+import { Warning } from 'src/components/modals/WarningModal/types'
+import { OnShowSwapFeeInfo } from 'src/components/SwapFee/SwapFee'
+import Trace from 'src/components/Trace/Trace'
+import { CurrencyInfo } from 'src/features/dataApi/types'
+import { ElementName } from 'src/features/telemetry/constants'
+import { FeeOnTransferInfo } from 'src/features/transactions/swap/FeeOnTransferInfo'
+import { DerivedSwapInfo } from 'src/features/transactions/swap/types'
+import { getRateToDisplay } from 'src/features/transactions/swap/utils'
+import { TransactionDetails } from 'src/features/transactions/TransactionDetails'
+import { Flex, Text, TouchableArea } from 'ui/src'
+import { InfoCircleFilled } from 'ui/src/components/icons'
 import { NumberType } from 'utilities/src/format/types'
-import { Trace } from 'utilities/src/telemetry/trace/Trace'
-import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
 import { useSwapRewriteEnabled } from 'wallet/src/features/experiments/hooks'
 import { GasFeeResult } from 'wallet/src/features/gas/types'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useUSDCPrice } from 'wallet/src/features/routing/useUSDCPrice'
-import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
 import { Trade } from 'wallet/src/features/transactions/swap/useTrade'
-import { getRateToDisplay } from 'wallet/src/features/transactions/swap/utils'
-import { FeeOnTransferInfo } from 'wallet/src/features/transactions/TransactionDetails/FeeOnTransferInfo'
-import { OnShowSwapFeeInfo } from 'wallet/src/features/transactions/TransactionDetails/SwapFee'
-import { TransactionDetails } from 'wallet/src/features/transactions/TransactionDetails/TransactionDetails'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import { Warning } from 'wallet/src/features/transactions/WarningModal/types'
-import { ElementName } from 'wallet/src/telemetry/constants'
 import { getFormattedCurrencyAmount, getSymbolDisplayText } from 'wallet/src/utils/currency'
 import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
@@ -206,7 +207,7 @@ export function SwapDetails({
             <Text color="$neutral2" numberOfLines={3} variant="body3">
               {t('Max slippage')}
               &nbsp;
-              <Icons.InfoCircleFilled color="$neutral3" size="$icon.16" />
+              <InfoCircleFilled color="$neutral3" size="$icon.16" />
             </Text>
           </Flex>
         </TouchableArea>
diff --git a/apps/mobile/src/features/transactions/swap/SwapFlow.tsx b/apps/mobile/src/features/transactions/swap/SwapFlow.tsx
index 58b8329c8d4..546c7d082ae 100644
--- a/apps/mobile/src/features/transactions/swap/SwapFlow.tsx
+++ b/apps/mobile/src/features/transactions/swap/SwapFlow.tsx
@@ -1,28 +1,25 @@
 import React, { useEffect, useMemo, useReducer, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { TransactionFlow } from 'src/features/transactions/TransactionFlow'
+import { WarningAction } from 'src/components/modals/WarningModal/types'
 import {
   TokenSelectorModal,
   TokenSelectorVariation,
-} from 'wallet/src/components/TokenSelector/TokenSelector'
-import { useSwapWarnings } from 'wallet/src/features/transactions/hooks/useSwapWarnings'
-import { useTokenSelectorActionHandlers } from 'wallet/src/features/transactions/hooks/useTokenSelectorActionHandlers'
-import { useTransactionGasWarning } from 'wallet/src/features/transactions/hooks/useTransactionGasWarning'
-import {
-  useDerivedSwapInfo,
-  useSwapTxAndGasInfoLegacy,
-} from 'wallet/src/features/transactions/swap/hooks'
+} from 'src/components/TokenSelector/TokenSelector'
+import { TokenSelectorFlow } from 'src/components/TokenSelector/types'
+import { useTokenSelectorActionHandlers } from 'src/features/transactions/hooks'
+import { useDerivedSwapInfo, useSwapTxAndGasInfo } from 'src/features/transactions/swap/hooks'
+import { useSwapWarnings } from 'src/features/transactions/swap/useSwapWarnings'
+import { TransactionFlow } from 'src/features/transactions/TransactionFlow'
 import {
   initialState as emptyState,
   transactionStateReducer,
-} from 'wallet/src/features/transactions/transactionState/transactionState'
+} from 'src/features/transactions/transactionState/transactionState'
+import { TransactionStep } from 'src/features/transactions/types'
+import { useTransactionGasWarning } from 'src/features/transactions/useTransactionGasWarning'
 import {
   CurrencyField,
   TransactionState,
 } from 'wallet/src/features/transactions/transactionState/types'
-import { TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
-import { TransactionStep } from 'wallet/src/features/transactions/types'
-import { WarningAction } from 'wallet/src/features/transactions/WarningModal/types'
 
 interface SwapFormProps {
   prefilledState?: TransactionState
@@ -45,15 +42,12 @@ export function SwapFlow({ prefilledState, onClose }: SwapFormProps): JSX.Elemen
   const [step, setStep] = useState<TransactionStep>(TransactionStep.FORM)
 
   const warnings = useSwapWarnings(t, derivedSwapInfo)
-
-  // Force this legacy swap flow to use the old routing api  logic, as we're planning to remove this, and splitting the code is complex.
-  const { txRequest, approveTxRequest, gasFee } = useSwapTxAndGasInfoLegacy({
+  const { txRequest, approveTxRequest, gasFee } = useSwapTxAndGasInfo({
     derivedSwapInfo,
     skipGasFeeQuery:
       step === TransactionStep.SUBMITTED ||
       warnings.some((warning) => warning.action === WarningAction.DisableReview),
   })
-
   const gasWarning = useTransactionGasWarning({
     derivedInfo: derivedSwapInfo,
     gasFee: gasFee.value,
@@ -64,10 +58,9 @@ export function SwapFlow({ prefilledState, onClose }: SwapFormProps): JSX.Elemen
   }, [warnings, gasWarning])
 
   // keep currencies list option as state so that rendered list remains stable through the slide animation
-  const [listVariation, setListVariation] = useState<
-    | TokenSelectorVariation.BalancesAndPopular
-    | TokenSelectorVariation.SuggestedAndFavoritesAndPopular
-  >(TokenSelectorVariation.BalancesAndPopular)
+  const [listVariation, setListVariation] = useState<TokenSelectorVariation>(
+    TokenSelectorVariation.BalancesAndPopular
+  )
 
   useEffect(() => {
     if (selectingCurrencyField) {
diff --git a/apps/mobile/src/features/transactions/swap/SwapForm.tsx b/apps/mobile/src/features/transactions/swap/SwapForm.tsx
index bea887d062a..b6bb6ddc23f 100644
--- a/apps/mobile/src/features/transactions/swap/SwapForm.tsx
+++ b/apps/mobile/src/features/transactions/swap/SwapForm.tsx
@@ -6,41 +6,38 @@ import { useTranslation } from 'react-i18next'
 import { Keyboard, StyleSheet, TextInputProps } from 'react-native'
 import { FadeIn, FadeOut, FadeOutDown } from 'react-native-reanimated'
 import { useShouldShowNativeKeyboard } from 'src/app/hooks'
+import { CurrencyInputPanel } from 'src/components/input/CurrencyInputPanel'
+import { DecimalPad } from 'src/components/input/DecimalPad'
+import { SpinningLoader } from 'src/components/loading/SpinningLoader'
+import { Warning, WarningAction, WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal, { getAlertColor } from 'src/components/modals/WarningModal/WarningModal'
+import { TokenSelectorFlow } from 'src/components/TokenSelector/types'
 import Trace from 'src/components/Trace/Trace'
+import { ElementName, ModalName, SectionName } from 'src/features/telemetry/constants'
+import {
+  useTokenFormActionHandlers,
+  useTokenSelectorActionHandlers,
+} from 'src/features/transactions/hooks'
+import { useSwapAnalytics } from 'src/features/transactions/swap/analytics'
+import { useShowSwapNetworkNotification } from 'src/features/transactions/swap/hooks'
 import { SwapArrowButton } from 'src/features/transactions/swap/SwapArrowButton'
+import { isPriceImpactWarning } from 'src/features/transactions/swap/useSwapWarnings'
+import { getRateToDisplay, isWrapAction } from 'src/features/transactions/swap/utils'
+import { BlockedAddressWarning } from 'src/features/trm/BlockedAddressWarning'
 import { useWalletRestore } from 'src/features/wallet/hooks'
 import { AnimatedFlex, Button, Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
 import InfoCircleFilled from 'ui/src/assets/icons/info-circle-filled.svg'
 import InfoCircle from 'ui/src/assets/icons/info-circle.svg'
 import { iconSizes, spacing } from 'ui/src/theme'
-import { CurrencyInputPanelLegacy } from 'wallet/src/components/legacy/CurrencyInputPanelLegacy'
-import { DecimalPadLegacy } from 'wallet/src/components/legacy/DecimalPadLegacy'
-import { SpinningLoader } from 'wallet/src/components/loading/SpinningLoader'
-import { getAlertColor, WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { useSwapAnalytics } from 'wallet/src/features/transactions/swap/analytics'
-import { BlockedAddressWarning } from 'wallet/src/features/trm/BlockedAddressWarning'
-import { ModalName, SectionName } from 'wallet/src/telemetry/constants'
 // eslint-disable-next-line no-restricted-imports
 import { formatCurrencyAmount } from 'utilities/src/format/localeBased'
 import { NumberType } from 'utilities/src/format/types'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { useUSDCPrice } from 'wallet/src/features/routing/useUSDCPrice'
-import { isPriceImpactWarning } from 'wallet/src/features/transactions/hooks/useSwapWarnings'
-import { useTokenFormActionHandlers } from 'wallet/src/features/transactions/hooks/useTokenFormActionHandlers'
-import { useTokenSelectorActionHandlers } from 'wallet/src/features/transactions/hooks/useTokenSelectorActionHandlers'
-import { useShowSwapNetworkNotification } from 'wallet/src/features/transactions/swap/hooks'
-import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
-import { getRateToDisplay, isWrapAction } from 'wallet/src/features/transactions/swap/utils'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import { TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
 import { createTransactionId } from 'wallet/src/features/transactions/utils'
-import {
-  Warning,
-  WarningAction,
-  WarningSeverity,
-} from 'wallet/src/features/transactions/WarningModal/types'
 import { useIsBlockedActiveAddress } from 'wallet/src/features/trm/hooks'
-import { ElementName } from 'wallet/src/telemetry/constants'
+import { DerivedSwapInfo } from './types'
 
 interface SwapFormProps {
   dispatch: Dispatch<AnyAction>
@@ -248,7 +245,7 @@ function _SwapForm({
           onLayout={onInputPanelLayout}>
           <Trace section={SectionName.CurrencyInputPanel}>
             <Flex backgroundColor="$surface2" borderRadius="$rounded20">
-              <CurrencyInputPanelLegacy
+              <CurrencyInputPanel
                 currencyAmount={currencyAmounts[CurrencyField.INPUT]}
                 currencyBalance={currencyBalances[CurrencyField.INPUT]}
                 currencyInfo={currencies[CurrencyField.INPUT]}
@@ -309,7 +306,7 @@ function _SwapForm({
                 borderTopRightRadius="$rounded20"
                 overflow="hidden"
                 position="relative">
-                <CurrencyInputPanelLegacy
+                <CurrencyInputPanel
                   isOutput
                   currencyAmount={currencyAmounts[CurrencyField.OUTPUT]}
                   currencyBalance={currencyBalances[CurrencyField.OUTPUT]}
@@ -464,7 +461,7 @@ function _SwapForm({
           right={0}
           onLayout={onDecimalPadLayout}>
           {!showNativeKeyboard && (
-            <DecimalPadLegacy
+            <DecimalPad
               resetSelection={resetSelection}
               selection={focusOnCurrencyField ? selection[focusOnCurrencyField] : undefined}
               setValue={setValue}
diff --git a/apps/mobile/src/features/transactions/swap/SwapReview.tsx b/apps/mobile/src/features/transactions/swap/SwapReview.tsx
index 06a585b8e7a..7c04c6cd16b 100644
--- a/apps/mobile/src/features/transactions/swap/SwapReview.tsx
+++ b/apps/mobile/src/features/transactions/swap/SwapReview.tsx
@@ -1,41 +1,35 @@
 /* eslint-disable complexity */
 import { providers } from 'ethers'
-import { notificationAsync } from 'expo-haptics'
 import React, { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { Warning, WarningAction, WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
 import Trace from 'src/components/Trace/Trace'
-import { useBiometricAppSettings, useBiometricPrompt } from 'src/features/biometrics/hooks'
-import { NumberType } from 'utilities/src/format/types'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { GasFeeResult } from 'wallet/src/features/gas/types'
-import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
+import { ModalName, SectionName } from 'src/features/telemetry/constants'
 import {
   useAcceptedTrade,
   useSwapCallback,
   useWrapCallback,
-} from 'wallet/src/features/transactions/swap/hooks'
-import { FeeOnTransferInfoModal } from 'wallet/src/features/transactions/swap/modals/FeeOnTransferInfoModal'
-import { NetworkFeeInfoModal } from 'wallet/src/features/transactions/swap/modals/NetworkFeeInfoModal'
-import { SlippageInfoModal } from 'wallet/src/features/transactions/swap/modals/SlippageInfoModal'
-import { SwapFeeInfoModal } from 'wallet/src/features/transactions/swap/modals/SwapFeeInfoModal'
-import { SwapDetails } from 'wallet/src/features/transactions/swap/SwapDetails'
-import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
+} from 'src/features/transactions/swap/hooks'
+import { FeeOnTransferInfoModal } from 'src/features/transactions/swap/modals/FeeOnTransferInfoModal'
+import { NetworkFeeInfoModal } from 'src/features/transactions/swap/modals/NetworkFeeInfoModal'
+import { SlippageInfoModal } from 'src/features/transactions/swap/modals/SlippageInfoModal'
+import { SwapFeeInfoModal } from 'src/features/transactions/swap/modals/SwapFeeInfoModal'
+import { SwapDetails } from 'src/features/transactions/swap/SwapDetails'
 import {
   getActionElementName,
   getActionName,
   isWrapAction,
-} from 'wallet/src/features/transactions/swap/utils'
-import { TransactionDetails } from 'wallet/src/features/transactions/TransactionDetails/TransactionDetails'
-import { TransactionReview } from 'wallet/src/features/transactions/TransactionReview/TransactionReview'
+} from 'src/features/transactions/swap/utils'
+import { TransactionDetails } from 'src/features/transactions/TransactionDetails'
+import { TransactionReview } from 'src/features/transactions/TransactionReview'
+import { NumberType } from 'utilities/src/format/types'
+import { GasFeeResult } from 'wallet/src/features/gas/types'
+import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import {
-  Warning,
-  WarningAction,
-  WarningSeverity,
-} from 'wallet/src/features/transactions/WarningModal/types'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
-import { ModalName, SectionName } from 'wallet/src/telemetry/constants'
+import { DerivedSwapInfo } from './types'
 
 interface SwapFormProps {
   onNext: () => void
@@ -125,39 +119,24 @@ export function SwapReview({
     txId
   )
 
-  const onSwapOrWrap = useCallback(() => {
-    return isWrapAction(wrapType) ? onWrap() : onSwap()
-  }, [onSwap, onWrap, wrapType])
-
-  const { trigger: biometricAuthAndTransfer } = useBiometricPrompt(onSwapOrWrap)
-  const { requiredForTransactions: biometricRequired } = useBiometricAppSettings()
-
-  const onAuthAndSubmitTxn = useCallback(async () => {
-    if (biometricRequired) {
-      await biometricAuthAndTransfer()
-    } else {
-      onSwapOrWrap()
-    }
-  }, [biometricAuthAndTransfer, biometricRequired, onSwapOrWrap])
-
-  const onPress = useCallback(async () => {
+  const onPress = useCallback(() => {
     if (swapWarning && !showWarningModal && !warningAcknowledged) {
       setShouldSubmitTx(true)
       setShowWarningModal(true)
       return
     }
-    await notificationAsync()
-    await onAuthAndSubmitTxn()
-  }, [swapWarning, showWarningModal, warningAcknowledged, onAuthAndSubmitTxn])
 
-  const onConfirmWarning = useCallback(async () => {
+    isWrapAction(wrapType) ? onWrap() : onSwap()
+  }, [warningAcknowledged, swapWarning, showWarningModal, wrapType, onWrap, onSwap])
+
+  const onConfirmWarning = useCallback(() => {
     setWarningAcknowledged(true)
     setShowWarningModal(false)
 
     if (shouldSubmitTx) {
-      await onAuthAndSubmitTxn()
+      isWrapAction(wrapType) ? onWrap() : onSwap()
     }
-  }, [shouldSubmitTx, onAuthAndSubmitTxn])
+  }, [wrapType, onWrap, onSwap, shouldSubmitTx])
 
   const onCancelWarning = useCallback(() => {
     setShowWarningModal(false)
diff --git a/apps/mobile/src/features/transactions/swap/SwapStatus.tsx b/apps/mobile/src/features/transactions/swap/SwapStatus.tsx
index f7c9d90b153..2da1267b277 100644
--- a/apps/mobile/src/features/transactions/swap/SwapStatus.tsx
+++ b/apps/mobile/src/features/transactions/swap/SwapStatus.tsx
@@ -1,6 +1,7 @@
 import { TradeType } from '@uniswap/sdk-core'
 import React, { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
+import { useSelectTransaction } from 'src/features/transactions/hooks'
 import { TransactionPending } from 'src/features/transactions/TransactionPending/TransactionPending'
 import { AppTFunction } from 'ui/src/i18n/types'
 import { ChainId } from 'wallet/src/constants/chains'
@@ -10,18 +11,17 @@ import {
   useLocalizationContext,
 } from 'wallet/src/features/language/LocalizationContext'
 import { getAmountsFromTrade } from 'wallet/src/features/transactions/getAmountsFromTrade'
-import { useSelectTransaction } from 'wallet/src/features/transactions/hooks'
-import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import {
+  isConfirmedSwapTypeInfo,
   TransactionDetails,
   TransactionStatus,
   TransactionType,
   WrapType,
-  isConfirmedSwapTypeInfo,
 } from 'wallet/src/features/transactions/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 import { getFormattedCurrencyAmount, getSymbolDisplayText } from 'wallet/src/utils/currency'
+import { DerivedSwapInfo } from './types'
 
 type SwapStatusProps = {
   derivedSwapInfo: DerivedSwapInfo
diff --git a/packages/wallet/src/features/transactions/swap/analytics.ts b/apps/mobile/src/features/transactions/swap/analytics.ts
similarity index 76%
rename from packages/wallet/src/features/transactions/swap/analytics.ts
rename to apps/mobile/src/features/transactions/swap/analytics.ts
index 3e2f9cde519..085edf9f04c 100644
--- a/packages/wallet/src/features/transactions/swap/analytics.ts
+++ b/apps/mobile/src/features/transactions/swap/analytics.ts
@@ -1,19 +1,18 @@
 import { SwapEventName } from '@uniswap/analytics-events'
 import { Currency, TradeType } from '@uniswap/sdk-core'
 import { useEffect, useRef } from 'react'
+import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
 import { NumberType } from 'utilities/src/format/types'
 import {
   LocalizationContextState,
   useLocalizationContext,
 } from 'wallet/src/features/language/LocalizationContext'
-import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
-import { QuoteData, Trade } from 'wallet/src/features/transactions/swap/useTrade'
+import { Trade } from 'wallet/src/features/transactions/swap/useTrade'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import { QuoteType } from 'wallet/src/features/transactions/utils'
-import { sendWalletAnalyticsEvent } from 'wallet/src/telemetry'
 import { SwapTradeBaseProperties } from 'wallet/src/telemetry/types'
 import { currencyAddress, getCurrencyAddressForAnalytics } from 'wallet/src/utils/currencyId'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
+import { DerivedSwapInfo } from './types'
 
 // hook-based analytics because this one is data-lifecycle dependent
 export function useSwapAnalytics(derivedSwapInfo: DerivedSwapInfo): void {
@@ -46,23 +45,20 @@ export function useSwapAnalytics(derivedSwapInfo: DerivedSwapInfo): void {
       return
     }
 
-    sendWalletAnalyticsEvent(
+    sendMobileAnalyticsEvent(
       SwapEventName.SWAP_QUOTE_RECEIVED,
-      getBaseTradeAnalyticsProperties({ formatter, trade: currTrade })
+      getBaseTradeAnalyticsProperties(formatter, currTrade)
     )
   }, [inputAmount, inputCurrencyId, outputCurrencyId, tradeType, formatter])
 
   return
 }
 
-export function getBaseTradeAnalyticsProperties({
-  formatter,
-  trade,
-}: {
-  formatter: LocalizationContextState
+export function getBaseTradeAnalyticsProperties(
+  formatter: LocalizationContextState,
   trade: Trade<Currency, Currency, TradeType>
-}): SwapTradeBaseProperties {
-  const portionAmount = getPortionAmountFromQuoteData(trade.quoteData)
+): SwapTradeBaseProperties {
+  const portionAmount = trade.quote?.portionAmount
 
   const feeCurrencyAmount = getCurrencyAmount({
     value: portionAmount,
@@ -89,25 +85,19 @@ export function getBaseTradeAnalyticsProperties({
     }),
     allowed_slippage_basis_points: trade.slippageTolerance * 100,
     fee_amount: portionAmount,
-    quoteType: trade.quoteData?.quoteType,
-    requestId: trade.quoteData?.quote?.requestId,
   }
 }
 
-export function getBaseTradeAnalyticsPropertiesFromSwapInfo({
-  derivedSwapInfo,
-  formatter,
-}: {
-  derivedSwapInfo: DerivedSwapInfo
+export function getBaseTradeAnalyticsPropertiesFromSwapInfo(
+  derivedSwapInfo: DerivedSwapInfo,
   formatter: LocalizationContextState
-}): SwapTradeBaseProperties {
+): SwapTradeBaseProperties {
   const { chainId, currencyAmounts } = derivedSwapInfo
   const inputCurrencyAmount = currencyAmounts[CurrencyField.INPUT]
   const outputCurrencyAmount = currencyAmounts[CurrencyField.OUTPUT]
   const slippageTolerance =
     derivedSwapInfo.customSlippageTolerance ?? derivedSwapInfo.autoSlippageTolerance
-
-  const portionAmount = getPortionAmountFromQuoteData(derivedSwapInfo.trade.trade?.quoteData)
+  const portionAmount = derivedSwapInfo.trade.trade?.quote?.portionAmount
 
   const feeCurrencyAmount = getCurrencyAmount({
     value: portionAmount,
@@ -143,16 +133,3 @@ export function getBaseTradeAnalyticsPropertiesFromSwapInfo({
     fee_amount: portionAmount,
   }
 }
-
-// Index into the quote response for portion amount based on the response type
-function getPortionAmountFromQuoteData(quoteData?: QuoteData): string | undefined {
-  if (!quoteData?.quote) {
-    return undefined
-  }
-
-  if (quoteData.quoteType === QuoteType.RoutingApi) {
-    return quoteData.quote.portionAmount
-  }
-
-  return quoteData.quote.quote.portionAmount
-}
diff --git a/packages/wallet/src/features/transactions/swap/createSwapFormFromTxDetails.ts b/apps/mobile/src/features/transactions/swap/createSwapFormFromTxDetails.ts
similarity index 98%
rename from packages/wallet/src/features/transactions/swap/createSwapFormFromTxDetails.ts
rename to apps/mobile/src/features/transactions/swap/createSwapFormFromTxDetails.ts
index 7fdb98c1c5d..85ad34baba7 100644
--- a/packages/wallet/src/features/transactions/swap/createSwapFormFromTxDetails.ts
+++ b/apps/mobile/src/features/transactions/swap/createSwapFormFromTxDetails.ts
@@ -8,7 +8,7 @@ import {
 } from 'wallet/src/features/transactions/transactionState/types'
 import { TransactionDetails, TransactionType } from 'wallet/src/features/transactions/types'
 import { currencyAddress, currencyIdToAddress } from 'wallet/src/utils/currencyId'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
 interface Props {
   transactionDetails: TransactionDetails
diff --git a/packages/wallet/src/features/transactions/swap/hooks.ts b/apps/mobile/src/features/transactions/swap/hooks.ts
similarity index 86%
rename from packages/wallet/src/features/transactions/swap/hooks.ts
rename to apps/mobile/src/features/transactions/swap/hooks.ts
index 7c6702339c6..45dbc96e8c1 100644
--- a/packages/wallet/src/features/transactions/swap/hooks.ts
+++ b/apps/mobile/src/features/transactions/swap/hooks.ts
@@ -9,6 +9,29 @@ import { FeeOptions } from '@uniswap/v3-sdk'
 import { providers } from 'ethers'
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { AnyAction } from 'redux'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { setHasSubmittedHoldToSwap } from 'src/features/behaviorHistory/slice'
+import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
+import { selectSwapStartTimestamp } from 'src/features/telemetry/timing/selectors'
+import { updateSwapStartTimestamp } from 'src/features/telemetry/timing/slice'
+import {
+  getBaseTradeAnalyticsProperties,
+  getBaseTradeAnalyticsPropertiesFromSwapInfo,
+} from 'src/features/transactions/swap/analytics'
+import { swapActions } from 'src/features/transactions/swap/swapSaga'
+import {
+  getSwapMethodParameters,
+  getWrapType,
+  isWrapAction,
+  requireAcceptNewTrade,
+  sumGasFees,
+} from 'src/features/transactions/swap/utils'
+import { getWethContract, tokenWrapActions } from 'src/features/transactions/swap/wrapSaga'
+import {
+  updateExactAmountFiat,
+  updateExactAmountToken,
+} from 'src/features/transactions/transactionState/transactionState'
+import { toStringish } from 'src/utils/number'
 import { NumberType } from 'utilities/src/format/types'
 import { logger } from 'utilities/src/logger/logger'
 import { flattenObjectOfObjects } from 'utilities/src/primitives/objects'
@@ -16,7 +39,6 @@ import { useAsyncData, usePrevious } from 'utilities/src/react/hooks'
 import ERC20_ABI from 'wallet/src/abis/erc20.json'
 import { Erc20 } from 'wallet/src/abis/types'
 import { ChainId } from 'wallet/src/constants/chains'
-import { setHasSubmittedHoldToSwap } from 'wallet/src/features/behaviorHistory/slice'
 import { ContractManager } from 'wallet/src/features/contracts/ContractManager'
 import { FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
 import { useFeatureFlag } from 'wallet/src/features/experiments/hooks'
@@ -26,7 +48,6 @@ 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 { useOnChainCurrencyBalance } from 'wallet/src/features/portfolio/api'
-import { NO_QUOTE_DATA } from 'wallet/src/features/routing/api'
 import { useSimulatedGasLimit } from 'wallet/src/features/routing/hooks'
 import {
   STABLECOIN_AMOUNT_OUT,
@@ -35,14 +56,6 @@ import {
 } from 'wallet/src/features/routing/useUSDCPrice'
 import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
 import { selectTransactions } from 'wallet/src/features/transactions/selectors'
-import {
-  getBaseTradeAnalyticsProperties,
-  getBaseTradeAnalyticsPropertiesFromSwapInfo,
-} from 'wallet/src/features/transactions/swap/analytics'
-import { SwapParams, swapActions } from 'wallet/src/features/transactions/swap/swapSaga'
-import { useTradingApiTrade } from 'wallet/src/features/transactions/swap/tradingApi/useTradingApiTrade'
-import { isClassicQuote } from 'wallet/src/features/transactions/swap/tradingApi/utils'
-import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
 import {
   PermitSignatureInfo,
   usePermit2Signature,
@@ -52,23 +65,6 @@ import {
   useSetTradeSlippage,
   useTrade,
 } from 'wallet/src/features/transactions/swap/useTrade'
-import {
-  getSwapMethodParameters,
-  getWrapType,
-  isWrapAction,
-  requireAcceptNewTrade,
-  sumGasFees,
-  tradeToTransactionInfo,
-} from 'wallet/src/features/transactions/swap/utils'
-import {
-  WrapParams,
-  getWethContract,
-  tokenWrapActions,
-} from 'wallet/src/features/transactions/swap/wrapSaga'
-import {
-  updateExactAmountFiat,
-  updateExactAmountToken,
-} from 'wallet/src/features/transactions/transactionState/transactionState'
 import {
   CurrencyField,
   TransactionState,
@@ -78,19 +74,14 @@ import {
   TransactionType,
   WrapType,
 } from 'wallet/src/features/transactions/types'
-import { QuoteType } from 'wallet/src/features/transactions/utils'
 import { useContractManager, useProvider } from 'wallet/src/features/wallet/context'
 import {
   useActiveAccount,
   useActiveAccountAddressWithThrow,
 } from 'wallet/src/features/wallet/hooks'
-import { useAppDispatch, useAppSelector } from 'wallet/src/state'
-import { sendWalletAnalyticsEvent } from 'wallet/src/telemetry'
-import { selectSwapStartTimestamp } from 'wallet/src/telemetry/timing/selectors'
-import { updateSwapStartTimestamp } from 'wallet/src/telemetry/timing/slice'
 import { buildCurrencyId } from 'wallet/src/utils/currencyId'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
-import { toStringish } from 'wallet/src/utils/number'
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
+import { DerivedSwapInfo } from './types'
 
 const NUM_DECIMALS_USD = 2
 const NUM_DECIMALS_DISPLAY = 2
@@ -155,31 +146,23 @@ export function useDerivedSwapInfo(state: TransactionState): DerivedSwapInfo {
   }, [exactAmountToken, exactCurrency])
 
   const shouldGetQuote = !isWrapAction(wrapType)
+
   const sendPortionEnabled = useFeatureFlag(FEATURE_FLAGS.PortionFields)
-  const isTradingApiEnabled = useFeatureFlag(FEATURE_FLAGS.TradingApi)
 
-  const tradeParams = {
+  // Fetch the trade quote. If customSlippageTolerance is undefined, then the quote is fetched with MAX_AUTO_SLIPPAGE_TOLERANCE
+  const tradeWithoutSlippage = useTrade({
     amountSpecified: shouldGetQuote ? amountSpecified : null,
     otherCurrency,
     tradeType: isExactIn ? TradeType.EXACT_INPUT : TradeType.EXACT_OUTPUT,
     customSlippageTolerance,
     sendPortionEnabled,
-  }
-
-  const legacyTrade = useTrade({
-    ...tradeParams,
-    skip: isTradingApiEnabled,
-  })
-
-  const tradingApiTrade = useTradingApiTrade({
-    ...tradeParams,
-    skip: !isTradingApiEnabled,
   })
 
-  const activeTrade = isTradingApiEnabled ? tradingApiTrade : legacyTrade
-
   // Calculate auto slippage tolerance for trade. If customSlippageTolerance is undefined, then the Trade slippage is set to the calculated value.
-  const { trade, autoSlippageTolerance } = useSetTradeSlippage(activeTrade, customSlippageTolerance)
+  const { trade, autoSlippageTolerance } = useSetTradeSlippage(
+    tradeWithoutSlippage,
+    customSlippageTolerance
+  )
 
   const currencyAmounts = useMemo(
     () =>
@@ -199,9 +182,9 @@ export function useDerivedSwapInfo(state: TransactionState): DerivedSwapInfo {
             [CurrencyField.OUTPUT]: amountSpecified,
           },
     [
-      shouldGetQuote,
-      exactCurrencyField,
       amountSpecified,
+      exactCurrencyField,
+      shouldGetQuote,
       trade.trade?.inputAmount,
       trade.trade?.outputAmount,
     ]
@@ -231,11 +214,11 @@ export function useDerivedSwapInfo(state: TransactionState): DerivedSwapInfo {
       currencyAmounts,
       currencyAmountsUSDValue,
       currencyBalances,
-      trade,
       exactAmountToken,
       exactAmountFiat,
       exactCurrencyField,
       focusOnCurrencyField,
+      trade,
       wrapType,
       selectingCurrencyField,
       txId,
@@ -243,21 +226,21 @@ export function useDerivedSwapInfo(state: TransactionState): DerivedSwapInfo {
       customSlippageTolerance,
     }
   }, [
-    autoSlippageTolerance,
     chainId,
     currencies,
     currencyAmounts,
-    currencyAmountsUSDValue,
     currencyBalances,
-    customSlippageTolerance,
-    exactAmountFiat,
+    currencyAmountsUSDValue,
     exactAmountToken,
+    exactAmountFiat,
     exactCurrencyField,
     focusOnCurrencyField,
     selectingCurrencyField,
     trade,
     txId,
     wrapType,
+    autoSlippageTolerance,
+    customSlippageTolerance,
   ])
 }
 
@@ -338,14 +321,11 @@ export enum ApprovalAction {
   Permit = 'permit',
 
   Permit2Approve = 'permit2-approve',
-
-  // Unable to fetch approval status, should block submission UI
-  Unknown = 'unknown',
 }
 
-export type TokenApprovalInfo =
+type TokenApprovalInfo =
   | {
-      action: ApprovalAction.None | ApprovalAction.Permit | ApprovalAction.Unknown
+      action: ApprovalAction.None | ApprovalAction.Permit
       txRequest: null
     }
   | {
@@ -381,7 +361,7 @@ function useTransactionRequestInfo(
   }
 }
 
-export function useWrapTransactionRequest(
+function useWrapTransactionRequest(
   derivedSwapInfo: DerivedSwapInfo
 ): providers.TransactionRequest | undefined {
   const address = useActiveAccountAddressWithThrow()
@@ -610,7 +590,7 @@ interface SwapTxAndGasInfo {
   gasFee: GasFeeResult
 }
 
-export function useSwapTxAndGasInfoLegacy({
+export function useSwapTxAndGasInfo({
   derivedSwapInfo,
   skipGasFeeQuery,
 }: {
@@ -673,26 +653,19 @@ export function useSwapTxAndGasInfoLegacy({
     if (swapGasFee.error && simulatedGasEstimateError) {
       if (shouldFetchSimulatedGasLimit) {
         const simulationError =
-          typeof simulatedGasEstimateError === 'boolean'
+          typeof simulatedGasEstimationInfo.error === 'boolean'
             ? new Error('Unknown gas simulation error')
             : simulatedGasEstimateError
 
-        const isNoQuoteDataError =
-          'message' in simulationError && simulationError.message === NO_QUOTE_DATA
-
-        // We do not want to log to Sentry if it's a liquidity error.
-        if (!isNoQuoteDataError) {
-          logger.error(simulationError, {
-            tags: { file: 'swap/hooks', function: 'useSwapTxAndGasInfo' },
-            extra: {
-              requestId: simulatedGasEstimateRequestId,
-              quoteId: simulatedGasEstimateQuoteId,
-            },
-          })
-        }
-
-        sendWalletAnalyticsEvent(SwapEventName.SWAP_ESTIMATE_GAS_CALL_FAILED, {
-          ...getBaseTradeAnalyticsPropertiesFromSwapInfo({ derivedSwapInfo, formatter }),
+        logger.error(simulationError, {
+          tags: { file: 'swap/hooks', function: 'useSwapTxAndGasInfo' },
+          extra: {
+            requestId: simulatedGasEstimateRequestId,
+            quoteId: simulatedGasEstimateQuoteId,
+          },
+        })
+        sendMobileAnalyticsEvent(SwapEventName.SWAP_ESTIMATE_GAS_CALL_FAILED, {
+          ...getBaseTradeAnalyticsPropertiesFromSwapInfo(derivedSwapInfo, formatter),
           error: simulationError.toString(),
           txRequest: transactionRequest,
         })
@@ -700,9 +673,8 @@ export function useSwapTxAndGasInfoLegacy({
         logger.error(swapGasFee.error, {
           tags: { file: 'swap/hooks', function: 'useSwapTxAndGasInfo' },
         })
-
-        sendWalletAnalyticsEvent(SwapEventName.SWAP_ESTIMATE_GAS_CALL_FAILED, {
-          ...getBaseTradeAnalyticsPropertiesFromSwapInfo({ derivedSwapInfo, formatter }),
+        sendMobileAnalyticsEvent(SwapEventName.SWAP_ESTIMATE_GAS_CALL_FAILED, {
+          ...getBaseTradeAnalyticsPropertiesFromSwapInfo(derivedSwapInfo, formatter),
           error: swapGasFee.error.toString(),
           txRequest: transactionRequest,
         })
@@ -780,18 +752,18 @@ export function useSwapCallback(
   onSubmit: () => void,
   txId?: string,
   isHoldToSwap?: boolean,
-
   isFiatInputMode?: boolean
 ): () => void {
   const appDispatch = useAppDispatch()
   const account = useActiveAccount()
   const formatter = useLocalizationContext()
+
   const swapStartTimestamp = useAppSelector(selectSwapStartTimestamp)
 
   return useMemo(() => {
     if (!account || !swapTxRequest || !trade || !gasFee.value) {
       return () => {
-        logger.error(new Error('Attempted swap with missing required parameters'), {
+        logger.error('Attempted swap with missing required parameters', {
           tags: {
             file: 'swap/hooks',
             function: 'useSwapCallback',
@@ -802,27 +774,21 @@ export function useSwapCallback(
     }
 
     return () => {
-      const params: SwapParams = {
-        txId,
-        account,
-        analytics: getBaseTradeAnalyticsProperties({ formatter, trade }),
-        approveTxRequest,
-        swapTxRequest,
-        swapTypeInfo: tradeToTransactionInfo(trade),
-      }
-
-      appDispatch(swapActions.trigger(params))
+      appDispatch(
+        swapActions.trigger({
+          txId,
+          account,
+          trade,
+          currencyInAmountUSD,
+          currencyOutAmountUSD,
+          approveTxRequest,
+          swapTxRequest,
+        })
+      )
       onSubmit()
 
-      const blockNumber =
-        trade.quoteData?.quoteType === QuoteType.TradingApi
-          ? isClassicQuote(trade.quoteData?.quote?.quote)
-            ? trade.quoteData?.quote?.quote?.blockNumber?.toString()
-            : undefined
-          : trade.quoteData?.quote?.blockNumber
-
-      sendWalletAnalyticsEvent(SwapEventName.SWAP_SUBMITTED_BUTTON_CLICKED, {
-        ...getBaseTradeAnalyticsProperties({ formatter, trade }),
+      sendMobileAnalyticsEvent(SwapEventName.SWAP_SUBMITTED_BUTTON_CLICKED, {
+        ...getBaseTradeAnalyticsProperties(formatter, trade),
         estimated_network_fee_wei: gasFee.value,
         gas_limit: toStringish(swapTxRequest.gasLimit),
         token_in_amount_usd: currencyInAmountUSD
@@ -832,7 +798,7 @@ export function useSwapCallback(
           ? parseFloat(currencyOutAmountUSD.toFixed(2))
           : undefined,
         transaction_deadline_seconds: trade.deadline,
-        swap_quote_block_number: blockNumber,
+        swap_quote_block_number: trade.quote?.blockNumber,
         is_auto_slippage: isAutoSlippage,
         swap_flow_duration_milliseconds: swapStartTimestamp
           ? Date.now() - swapStartTimestamp
@@ -884,7 +850,7 @@ export function useWrapCallback(
     if (!isWrapAction(wrapType)) {
       return {
         wrapCallback: (): void =>
-          logger.error(new Error('Attempted wrap on a non-wrap transaction'), {
+          logger.error('Attempted wrap on a non-wrap transaction', {
             tags: {
               file: 'swap/hooks',
               function: 'useWrapCallback',
@@ -896,7 +862,7 @@ export function useWrapCallback(
     if (!account || !inputCurrencyAmount || !txRequest) {
       return {
         wrapCallback: (): void =>
-          logger.error(new Error('Attempted wrap with missing required parameters'), {
+          logger.error('Attempted wrap with missing required parameters', {
             tags: {
               file: 'swap/hooks',
               function: 'useWrapCallback',
@@ -908,14 +874,14 @@ export function useWrapCallback(
 
     return {
       wrapCallback: (): void => {
-        const params: WrapParams = {
-          account,
-          inputCurrencyAmount,
-          txId,
-          txRequest,
-        }
-
-        appDispatch(tokenWrapActions.trigger(params))
+        appDispatch(
+          tokenWrapActions.trigger({
+            account,
+            inputCurrencyAmount,
+            txId,
+            txRequest,
+          })
+        )
         onSuccess()
       },
     }
diff --git a/packages/wallet/src/features/transactions/swap/modals/FeeOnTransferInfoModal.tsx b/apps/mobile/src/features/transactions/swap/modals/FeeOnTransferInfoModal.tsx
similarity index 83%
rename from packages/wallet/src/features/transactions/swap/modals/FeeOnTransferInfoModal.tsx
rename to apps/mobile/src/features/transactions/swap/modals/FeeOnTransferInfoModal.tsx
index a48b71ee426..25de2305d99 100644
--- a/packages/wallet/src/features/transactions/swap/modals/FeeOnTransferInfoModal.tsx
+++ b/apps/mobile/src/features/transactions/swap/modals/FeeOnTransferInfoModal.tsx
@@ -1,10 +1,11 @@
+import React from 'react'
 import { useTranslation } from 'react-i18next'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
+import { LearnMoreLink } from 'src/components/text/LearnMoreLink'
+import { ModalName } from 'src/features/telemetry/constants'
 import { Icons, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'wallet/src/constants/urls'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export function FeeOnTransferInfoModal({ onClose }: { onClose: () => void }): JSX.Element {
   const { t } = useTranslation()
diff --git a/packages/wallet/src/features/transactions/swap/modals/NetworkFeeInfoModal.tsx b/apps/mobile/src/features/transactions/swap/modals/NetworkFeeInfoModal.tsx
similarity index 73%
rename from packages/wallet/src/features/transactions/swap/modals/NetworkFeeInfoModal.tsx
rename to apps/mobile/src/features/transactions/swap/modals/NetworkFeeInfoModal.tsx
index 129a3288cd3..796af960383 100644
--- a/packages/wallet/src/features/transactions/swap/modals/NetworkFeeInfoModal.tsx
+++ b/apps/mobile/src/features/transactions/swap/modals/NetworkFeeInfoModal.tsx
@@ -1,10 +1,11 @@
+import React from 'react'
 import { useTranslation } from 'react-i18next'
+import { WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
+import { LearnMoreLink } from 'src/components/text/LearnMoreLink'
+import { ModalName } from 'src/features/telemetry/constants'
 import { Icons, useSporeColors } from 'ui/src'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'wallet/src/constants/urls'
-import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export function NetworkFeeInfoModal({ onClose }: { onClose: () => void }): JSX.Element {
   const colors = useSporeColors()
diff --git a/packages/wallet/src/features/transactions/swap/modals/SlippageInfoModal.tsx b/apps/mobile/src/features/transactions/swap/modals/SlippageInfoModal.tsx
similarity index 94%
rename from packages/wallet/src/features/transactions/swap/modals/SlippageInfoModal.tsx
rename to apps/mobile/src/features/transactions/swap/modals/SlippageInfoModal.tsx
index 54ef2a67ded..8bb7f03142c 100644
--- a/packages/wallet/src/features/transactions/swap/modals/SlippageInfoModal.tsx
+++ b/apps/mobile/src/features/transactions/swap/modals/SlippageInfoModal.tsx
@@ -1,16 +1,17 @@
 import { Currency, TradeType } from '@uniswap/sdk-core'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
+import { LearnMoreLink } from 'src/components/text/LearnMoreLink'
+import { ModalName } from 'src/features/telemetry/constants'
+import { slippageToleranceToPercent } from 'src/features/transactions/swap/utils'
 import { Button, Flex, Icons, Text, useSporeColors } from 'ui/src'
 import AlertTriangleIcon from 'ui/src/assets/icons/alert-triangle.svg'
 import { iconSizes } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'wallet/src/constants/urls'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { Trade } from 'wallet/src/features/transactions/swap/useTrade'
-import { slippageToleranceToPercent } from 'wallet/src/features/transactions/swap/utils'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { getSymbolDisplayText } from 'wallet/src/utils/currency'
 
 export type SlippageInfoModalProps = {
diff --git a/packages/wallet/src/features/transactions/swap/modals/SwapFeeInfoModal.tsx b/apps/mobile/src/features/transactions/swap/modals/SwapFeeInfoModal.tsx
similarity index 82%
rename from packages/wallet/src/features/transactions/swap/modals/SwapFeeInfoModal.tsx
rename to apps/mobile/src/features/transactions/swap/modals/SwapFeeInfoModal.tsx
index aacb60723a0..9d730030530 100644
--- a/packages/wallet/src/features/transactions/swap/modals/SwapFeeInfoModal.tsx
+++ b/apps/mobile/src/features/transactions/swap/modals/SwapFeeInfoModal.tsx
@@ -1,10 +1,11 @@
+import React from 'react'
 import { useTranslation } from 'react-i18next'
+import { WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
+import { ModalName } from 'src/features/telemetry/constants'
+import { openUri } from 'src/utils/linking'
 import { Text, TouchableArea, useSporeColors } from 'ui/src'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
 import { uniswapUrls } from 'wallet/src/constants/urls'
-import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
-import { openUri } from 'wallet/src/utils/linking'
 
 export function SwapFeeInfoModal({
   onClose,
diff --git a/packages/wallet/src/features/transactions/swap/modals/SwapProtectionModal.tsx b/apps/mobile/src/features/transactions/swap/modals/SwapProtectionModal.tsx
similarity index 79%
rename from packages/wallet/src/features/transactions/swap/modals/SwapProtectionModal.tsx
rename to apps/mobile/src/features/transactions/swap/modals/SwapProtectionModal.tsx
index b734148a45f..263d720bdae 100644
--- a/packages/wallet/src/features/transactions/swap/modals/SwapProtectionModal.tsx
+++ b/apps/mobile/src/features/transactions/swap/modals/SwapProtectionModal.tsx
@@ -1,9 +1,10 @@
+import React from 'react'
 import { useTranslation } from 'react-i18next'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
+import { LearnMoreLink } from 'src/components/text/LearnMoreLink'
+import { ModalName } from 'src/features/telemetry/constants'
 import { Icons, useSporeColors } from 'ui/src'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
 import { uniswapUrls } from 'wallet/src/constants/urls'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export function SwapProtectionInfoModal({ onClose }: { onClose: () => void }): JSX.Element {
   const colors = useSporeColors()
diff --git a/packages/wallet/src/features/transactions/swap/modals/SwapSettingsModal.tsx b/apps/mobile/src/features/transactions/swap/modals/SwapSettingsModal.tsx
similarity index 92%
rename from packages/wallet/src/features/transactions/swap/modals/SwapSettingsModal.tsx
rename to apps/mobile/src/features/transactions/swap/modals/SwapSettingsModal.tsx
index bf681770bf5..4588c350762 100644
--- a/packages/wallet/src/features/transactions/swap/modals/SwapSettingsModal.tsx
+++ b/apps/mobile/src/features/transactions/swap/modals/SwapSettingsModal.tsx
@@ -1,23 +1,30 @@
 /* eslint-disable max-lines */
+import { BottomSheetTextInput } from '@gorhom/bottom-sheet'
 import { Trade } from '@uniswap/router-sdk'
 import { Currency, TradeType } from '@uniswap/sdk-core'
 import { impactAsync } from 'expo-haptics'
-import { useCallback, useMemo, useState } from 'react'
+import React, { useCallback, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useAnimatedStyle, useSharedValue } from 'react-native-reanimated'
-import { isWeb } from 'tamagui'
+import {
+  Easing,
+  useAnimatedStyle,
+  useSharedValue,
+  withRepeat,
+  withTiming,
+} from 'react-native-reanimated'
+import PlusMinusButton, { PlusMinusButtonType } from 'src/components/buttons/PlusMinusButton'
+import { Switch } from 'src/components/buttons/Switch'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
+import { LearnMoreLink } from 'src/components/text/LearnMoreLink'
+import { ModalName } from 'src/features/telemetry/constants'
+import { SwapProtectionInfoModal } from 'src/features/transactions/swap/modals/SwapProtectionModal'
+import { DerivedSwapInfo } from 'src/features/transactions/swap/types'
+import { slippageToleranceToPercent } from 'src/features/transactions/swap/utils'
 import { AnimatedFlex, Button, Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
 import AlertTriangleIcon from 'ui/src/assets/icons/alert-triangle.svg'
 import { fonts, iconSizes, spacing } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
-import PlusMinusButton, { PlusMinusButtonType } from 'wallet/src/components/buttons/PlusMinusButton'
-import { Switch } from 'wallet/src/components/buttons/Switch'
-import {
-  BottomSheetModal,
-  BottomSheetTextInput,
-} from 'wallet/src/components/modals/BottomSheetModal'
-import { LearnMoreLink } from 'wallet/src/components/text/LearnMoreLink'
-import { CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
+import { ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
 import {
   MAX_AUTO_SLIPPAGE_TOLERANCE,
   MAX_CUSTOM_SLIPPAGE_TOLERANCE,
@@ -27,14 +34,9 @@ import { FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
 import { useFeatureFlag } from 'wallet/src/features/experiments/hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { isPrivateRpcSupportedOnChain } from 'wallet/src/features/providers'
-import { SwapProtectionInfoModal } from 'wallet/src/features/transactions/swap/modals/SwapProtectionModal'
-import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
-import { slippageToleranceToPercent } from 'wallet/src/features/transactions/swap/utils'
 import { useSwapProtectionSetting } from 'wallet/src/features/wallet/hooks'
-import { SwapProtectionSetting, setSwapProtectionSetting } from 'wallet/src/features/wallet/slice'
+import { setSwapProtectionSetting, SwapProtectionSetting } from 'wallet/src/features/wallet/slice'
 import { useAppDispatch } from 'wallet/src/state'
-import { ModalName } from 'wallet/src/telemetry/constants'
-import { errorShakeAnimation } from 'wallet/src/utils/animations'
 import { getSymbolDisplayText } from 'wallet/src/utils/currency'
 
 const SLIPPAGE_INCREMENT = 0.1
@@ -268,12 +270,9 @@ function SlippageSettings({
   const showSlippageWarning = parsedInputSlippageTolerance > autoSlippageTolerance
 
   const inputShakeX = useSharedValue(0)
-  const inputAnimatedStyle = useAnimatedStyle(
-    () => ({
-      transform: [{ translateX: inputShakeX.value }],
-    }),
-    [inputShakeX]
-  )
+  const inputAnimatedStyle = useAnimatedStyle(() => ({
+    transform: [{ translateX: inputShakeX.value }],
+  }))
 
   const onPressAutoSlippage = (): void => {
     setAutoSlippageEnabled(true)
@@ -324,7 +323,14 @@ function SlippageSettings({
        * without the input shaking (ex. typing 0.x shouldn't shake after typing char)
        */
       if (isInvalidNumber || overMaxTolerance || moreThanOneDecimalSymbol || moreThanTwoDecimals) {
-        inputShakeX.value = errorShakeAnimation(inputShakeX)
+        inputShakeX.value = withRepeat(
+          withTiming(5, { duration: 50, easing: Easing.inOut(Easing.ease) }),
+          3,
+          true,
+          () => {
+            inputShakeX.value = 0
+          }
+        )
         await impactAsync()
         return
       }
@@ -417,11 +423,9 @@ function SlippageSettings({
               style={{
                 color: autoSlippageEnabled ? colors.neutral2.get() : colors.neutral1.get(),
                 fontSize: fonts.subheading1.fontSize,
+                fontFamily: fonts.subheading1.family,
                 width: fonts.subheading1.fontSize * 4,
                 padding: spacing.none,
-                ...(!isWeb && {
-                  fontFamily: fonts.subheading1.family,
-                }),
               }}
               textAlign="center"
               value={
diff --git a/packages/wallet/src/features/transactions/swap/swapSaga.test.ts b/apps/mobile/src/features/transactions/swap/swapSaga.test.ts
similarity index 87%
rename from packages/wallet/src/features/transactions/swap/swapSaga.test.ts
rename to apps/mobile/src/features/transactions/swap/swapSaga.test.ts
index 50140811d89..a9f1177f74f 100644
--- a/packages/wallet/src/features/transactions/swap/swapSaga.test.ts
+++ b/apps/mobile/src/features/transactions/swap/swapSaga.test.ts
@@ -5,12 +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 { approveAndSwap, SwapParams } from 'src/features/transactions/swap/swapSaga'
 import { ChainId } from 'wallet/src/constants/chains'
 import { DAI } from 'wallet/src/constants/tokens'
 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'
 import { Trade } from 'wallet/src/features/transactions/swap/useTrade'
 import {
   ExactInputSwapTransactionInfo,
@@ -56,19 +55,17 @@ const mockSwapTxRequest = {
 const swapParams: SwapParams = {
   txId: '1',
   account,
-  analytics: {} as ReturnType<typeof getBaseTradeAnalyticsProperties>,
+  trade: mockTrade,
   approveTxRequest: mockApproveTxRequest,
   swapTxRequest: mockSwapTxRequest,
-  swapTypeInfo: transactionTypeInfo,
 }
 
 const swapParamsWithoutApprove: SwapParams = {
   txId: '1',
   account,
-  analytics: {} as ReturnType<typeof getBaseTradeAnalyticsProperties>,
+  trade: mockTrade,
   approveTxRequest: undefined,
   swapTxRequest: mockSwapTxRequest,
-  swapTypeInfo: transactionTypeInfo,
 }
 
 const nonce = 1
@@ -83,7 +80,6 @@ describe(approveAndSwap, () => {
         account: swapParams.account,
         options: { request: mockApproveTxRequest },
         typeInfo: transactionTypeInfo,
-        analytics: swapParams.analytics,
       }),
       undefined,
     ],
@@ -103,7 +99,6 @@ describe(approveAndSwap, () => {
             account: swapParams.account,
             options: { request: { ...mockSwapTxRequest, nonce: nonce + 1 } },
             typeInfo: transactionTypeInfo,
-            analytics: swapParams.analytics,
           }),
           undefined,
         ],
diff --git a/packages/wallet/src/features/transactions/swap/swapSaga.ts b/apps/mobile/src/features/transactions/swap/swapSaga.ts
similarity index 77%
rename from packages/wallet/src/features/transactions/swap/swapSaga.ts
rename to apps/mobile/src/features/transactions/swap/swapSaga.ts
index 4781f3dd1dc..a011738ffc5 100644
--- a/packages/wallet/src/features/transactions/swap/swapSaga.ts
+++ b/apps/mobile/src/features/transactions/swap/swapSaga.ts
@@ -1,18 +1,14 @@
 import { providers } from 'ethers'
+import { tradeToTransactionInfo } from 'src/features/transactions/swap/utils'
 import { Statsig } from 'statsig-react-native'
-import { isWeb } from 'tamagui'
 import { call, select } from 'typed-redux-saga'
 import { logger } from 'utilities/src/logger/logger'
 import { RPCType } from 'wallet/src/constants/chains'
 import { FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
 import { isPrivateRpcSupportedOnChain } from 'wallet/src/features/providers'
 import { makeSelectAddressTransactions } from 'wallet/src/features/transactions/selectors'
-import {
-  SendTransactionParams,
-  sendTransaction,
-} from 'wallet/src/features/transactions/sendTransactionSaga'
-import { getBaseTradeAnalyticsProperties } from 'wallet/src/features/transactions/swap/analytics'
-import { tradeToTransactionInfo } from 'wallet/src/features/transactions/swap/utils'
+import { sendTransaction } from 'wallet/src/features/transactions/sendTransactionSaga'
+import { Trade } from 'wallet/src/features/transactions/swap/useTrade'
 import {
   TransactionStatus,
   TransactionType,
@@ -27,15 +23,14 @@ import { createMonitoredSaga } from 'wallet/src/utils/saga'
 export type SwapParams = {
   txId?: string
   account: Account
-  analytics: ReturnType<typeof getBaseTradeAnalyticsProperties>
+  trade: Trade
   approveTxRequest?: providers.TransactionRequest
   swapTxRequest: providers.TransactionRequest
-  swapTypeInfo: ReturnType<typeof tradeToTransactionInfo>
 }
 
 export function* approveAndSwap(params: SwapParams) {
   try {
-    const { account, approveTxRequest, swapTxRequest, txId, analytics, swapTypeInfo } = params
+    const { account, approveTxRequest, swapTxRequest, txId, trade } = params
     if (!swapTxRequest.chainId || !swapTxRequest.to || (approveTxRequest && !approveTxRequest.to)) {
       throw new Error('approveAndSwap received incomplete transaction request details')
     }
@@ -55,15 +50,13 @@ export function* approveAndSwap(params: SwapParams) {
         spender: swapTxRequest.to,
       }
 
-      const sendTransactionParams: SendTransactionParams = {
+      yield* call(sendTransaction, {
         chainId,
         account,
         options: { request: approveTxRequest, submitViaPrivateRpc },
         typeInfo,
-        analytics,
-      }
-
-      yield* call(sendTransaction, sendTransactionParams)
+        trade,
+      })
     }
 
     const request = {
@@ -71,21 +64,18 @@ export function* approveAndSwap(params: SwapParams) {
       nonce: approveTxRequest ? nonce + 1 : undefined,
     }
 
-    const sendTransactionParams: SendTransactionParams = {
+    const swapTypeInfo = tradeToTransactionInfo(trade)
+
+    yield* call(sendTransaction, {
       txId,
       chainId,
       account,
       options: { request, submitViaPrivateRpc },
       typeInfo: swapTypeInfo,
-      analytics,
-    }
-
-    yield* call(sendTransaction, sendTransactionParams)
-  } catch (error) {
-    logger.error(error, {
-      tags: { file: 'swapSaga', function: 'approveAndSwap' },
-      extra: { analytics: params.analytics },
+      trade,
     })
+  } catch (error) {
+    logger.error(error, { tags: { file: 'swapSaga', function: 'approveAndSwap' } })
   }
 }
 
@@ -118,8 +108,7 @@ function* getNonceForApproveAndSwap(
 function* shouldSubmitViaPrivateRpc(chainId: number) {
   const swapProtectionSetting = yield* select(selectWalletSwapProtectionSetting)
   const swapProtectionOn = swapProtectionSetting === SwapProtectionSetting.On
-  // TODO(EXT-460): remove this once Statsig is set up in the Extension
-  const mevBlockerFeatureEnabled = isWeb ? true : Statsig.checkGate(FEATURE_FLAGS.MevBlocker)
+  const mevBlockerFeatureEnabled = Statsig.checkGate(FEATURE_FLAGS.MevBlocker)
   const privateRpcSupportedOnChain = chainId ? isPrivateRpcSupportedOnChain(chainId) : false
   return Boolean(swapProtectionOn && privateRpcSupportedOnChain && mevBlockerFeatureEnabled)
 }
diff --git a/packages/wallet/src/features/transactions/swap/types.ts b/apps/mobile/src/features/transactions/swap/types.ts
similarity index 89%
rename from packages/wallet/src/features/transactions/swap/types.ts
rename to apps/mobile/src/features/transactions/swap/types.ts
index ce9c257d3d9..43898638546 100644
--- a/packages/wallet/src/features/transactions/swap/types.ts
+++ b/apps/mobile/src/features/transactions/swap/types.ts
@@ -1,9 +1,9 @@
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
+import { CurrencyInfo } from 'src/features/dataApi/types'
+import { BaseDerivedInfo } from 'src/features/transactions/transactionState/types'
 import { ChainId } from 'wallet/src/constants/chains'
-import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
 import { useTrade } from 'wallet/src/features/transactions/swap/useTrade'
 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'
 
 export type DerivedSwapInfo<
diff --git a/packages/wallet/src/features/transactions/hooks/useSwapWarnings.test.ts b/apps/mobile/src/features/transactions/swap/useSwapWarnings.test.ts
similarity index 95%
rename from packages/wallet/src/features/transactions/hooks/useSwapWarnings.test.ts
rename to apps/mobile/src/features/transactions/swap/useSwapWarnings.test.ts
index efeb935c9ee..cb65217f81b 100644
--- a/packages/wallet/src/features/transactions/hooks/useSwapWarnings.test.ts
+++ b/apps/mobile/src/features/transactions/swap/useSwapWarnings.test.ts
@@ -1,13 +1,12 @@
 import { CurrencyAmount } from '@uniswap/sdk-core'
+import { WarningLabel } from 'src/components/modals/WarningModal/types'
+import { getSwapWarnings } from 'src/features/transactions/swap/useSwapWarnings'
 import { ChainId } from 'wallet/src/constants/chains'
 import { DAI, USDC } from 'wallet/src/constants/tokens'
 import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
-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 { WarningLabel } from 'wallet/src/features/transactions/WarningModal/types'
 import {
   daiCurrencyInfo,
   ethCurrencyInfo,
@@ -15,6 +14,7 @@ import {
   networkUnknown,
   networkUp,
 } from 'wallet/src/test/fixtures'
+import { DerivedSwapInfo } from './types'
 
 const ETH = NativeCurrency.onChain(ChainId.Mainnet)
 
diff --git a/packages/wallet/src/features/transactions/hooks/useSwapWarnings.tsx b/apps/mobile/src/features/transactions/swap/useSwapWarnings.tsx
similarity index 96%
rename from packages/wallet/src/features/transactions/hooks/useSwapWarnings.tsx
rename to apps/mobile/src/features/transactions/swap/useSwapWarnings.tsx
index c0ccbd9eeff..db3a99af4c9 100644
--- a/packages/wallet/src/features/transactions/hooks/useSwapWarnings.tsx
+++ b/apps/mobile/src/features/transactions/swap/useSwapWarnings.tsx
@@ -2,6 +2,14 @@ import { useNetInfo } from '@react-native-community/netinfo'
 import { Percent } from '@uniswap/sdk-core'
 import _ from 'lodash'
 import { TFunction } from 'react-i18next'
+import { getNetworkWarning } from 'src/components/modals/WarningModal/constants'
+import {
+  Warning,
+  WarningAction,
+  WarningLabel,
+  WarningSeverity,
+} from 'src/components/modals/WarningModal/types'
+import { DerivedSwapInfo } from 'src/features/transactions/swap/types'
 import { formatPriceImpact } from 'utilities/src/format/formatPriceImpact'
 import { useMemoCompare } from 'utilities/src/react/hooks'
 import { useSwapRewriteEnabled } from 'wallet/src/features/experiments/hooks'
@@ -10,16 +18,8 @@ import {
   NO_QUOTE_DATA,
   SWAP_QUOTE_ERROR,
 } from 'wallet/src/features/routing/api'
-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'
-import { getNetworkWarning } from 'wallet/src/features/transactions/WarningModal/getNetworkWarning'
-import {
-  Warning,
-  WarningAction,
-  WarningLabel,
-  WarningSeverity,
-} from 'wallet/src/features/transactions/WarningModal/types'
 
 const PRICE_IMPACT_THRESHOLD_MEDIUM = new Percent(3, 100) // 3%
 const PRICE_IMPACT_THRESHOLD_HIGH = new Percent(5, 100) // 5%
diff --git a/apps/mobile/src/features/transactions/swap/utils.test.ts b/apps/mobile/src/features/transactions/swap/utils.test.ts
new file mode 100644
index 00000000000..28bdf7fa329
--- /dev/null
+++ b/apps/mobile/src/features/transactions/swap/utils.test.ts
@@ -0,0 +1,108 @@
+import { Currency, CurrencyAmount, TradeType } from '@uniswap/sdk-core'
+import { Route } from '@uniswap/v3-sdk'
+import { getWrapType, requireAcceptNewTrade } from 'src/features/transactions/swap/utils'
+import { ChainId } from 'wallet/src/constants/chains'
+import { UNI, WBTC, wrappedNativeCurrency } from 'wallet/src/constants/tokens'
+import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
+import { Trade } from 'wallet/src/features/transactions/swap/useTrade'
+import { WrapType } from 'wallet/src/features/transactions/types'
+import { mockPool } from 'wallet/src/test/fixtures'
+
+describe(getWrapType, () => {
+  const eth = NativeCurrency.onChain(ChainId.Mainnet)
+  const weth = wrappedNativeCurrency(ChainId.Mainnet)
+
+  const goerliEth = NativeCurrency.onChain(ChainId.Goerli)
+  const goerliWeth = wrappedNativeCurrency(ChainId.Goerli)
+
+  it('handles undefined args', () => {
+    expect(getWrapType(undefined, weth)).toEqual(WrapType.NotApplicable)
+    expect(getWrapType(weth, undefined)).toEqual(WrapType.NotApplicable)
+    expect(getWrapType(undefined, undefined)).toEqual(WrapType.NotApplicable)
+  })
+
+  it('handles wrap', () => {
+    expect(getWrapType(eth, weth)).toEqual(WrapType.Wrap)
+
+    // different chains
+    expect(getWrapType(goerliEth, weth)).toEqual(WrapType.NotApplicable)
+    expect(getWrapType(eth, goerliWeth)).toEqual(WrapType.NotApplicable)
+  })
+
+  it('handles unwrap', () => {
+    expect(getWrapType(weth, eth)).toEqual(WrapType.Unwrap)
+
+    // different chains
+    expect(getWrapType(weth, goerliEth)).toEqual(WrapType.NotApplicable)
+    expect(getWrapType(goerliWeth, eth)).toEqual(WrapType.NotApplicable)
+  })
+})
+
+describe(requireAcceptNewTrade, () => {
+  const oldTrade = new Trade({
+    v3Routes: [
+      {
+        routev3: new Route<Currency, Currency>([mockPool], UNI[ChainId.Mainnet], WBTC),
+        inputAmount: CurrencyAmount.fromRawAmount(UNI[ChainId.Mainnet], 1000),
+        outputAmount: CurrencyAmount.fromRawAmount(WBTC, 1000),
+      },
+    ],
+    v2Routes: [],
+    mixedRoutes: [],
+    tradeType: TradeType.EXACT_INPUT,
+    slippageTolerance: 0.5,
+  })
+
+  it('returns false when prices are within threshold', () => {
+    const newTrade = new Trade({
+      v3Routes: [
+        {
+          routev3: new Route<Currency, Currency>([mockPool], UNI[ChainId.Mainnet], WBTC),
+          inputAmount: CurrencyAmount.fromRawAmount(UNI[ChainId.Mainnet], 1000),
+          // Update this number if `ACCEPT_NEW_TRADE_THRESHOLD` changes
+          outputAmount: CurrencyAmount.fromRawAmount(WBTC, 990),
+        },
+      ],
+      v2Routes: [],
+      mixedRoutes: [],
+      tradeType: TradeType.EXACT_INPUT,
+      slippageTolerance: 0.5,
+    })
+    expect(requireAcceptNewTrade(oldTrade, newTrade)).toBe(false)
+  })
+
+  it('returns true when prices move above threshold', () => {
+    const newTrade = new Trade({
+      v3Routes: [
+        {
+          routev3: new Route<Currency, Currency>([mockPool], UNI[ChainId.Mainnet], WBTC),
+          inputAmount: CurrencyAmount.fromRawAmount(UNI[ChainId.Mainnet], 1000),
+          // Update this number if `ACCEPT_NEW_TRADE_THRESHOLD` changes
+          outputAmount: CurrencyAmount.fromRawAmount(WBTC, 979),
+        },
+      ],
+      v2Routes: [],
+      mixedRoutes: [],
+      tradeType: TradeType.EXACT_INPUT,
+      slippageTolerance: 0.5,
+    })
+    expect(requireAcceptNewTrade(oldTrade, newTrade)).toBe(true)
+  })
+
+  it('returns false when new price is better', () => {
+    const newTrade = new Trade({
+      v3Routes: [
+        {
+          routev3: new Route<Currency, Currency>([mockPool], UNI[ChainId.Mainnet], WBTC),
+          inputAmount: CurrencyAmount.fromRawAmount(UNI[ChainId.Mainnet], 1000),
+          outputAmount: CurrencyAmount.fromRawAmount(WBTC, 2000000),
+        },
+      ],
+      v2Routes: [],
+      mixedRoutes: [],
+      tradeType: TradeType.EXACT_INPUT,
+      slippageTolerance: 0.5,
+    })
+    expect(requireAcceptNewTrade(oldTrade, newTrade)).toBe(false)
+  })
+})
diff --git a/apps/mobile/src/features/transactions/swap/utils.ts b/apps/mobile/src/features/transactions/swap/utils.ts
new file mode 100644
index 00000000000..aa929ca9c89
--- /dev/null
+++ b/apps/mobile/src/features/transactions/swap/utils.ts
@@ -0,0 +1,238 @@
+import { Protocol } from '@uniswap/router-sdk'
+import { Currency, Percent, TradeType } from '@uniswap/sdk-core'
+import {
+  FlatFeeOptions,
+  SwapOptions as UniversalRouterSwapOptions,
+  SwapRouter as UniversalSwapRouter,
+} from '@uniswap/universal-router-sdk'
+import { FeeOptions } from '@uniswap/v3-sdk'
+import { BigNumber } from 'ethers'
+import { ElementName } from 'src/features/telemetry/constants'
+import { AppTFunction } from 'ui/src/i18n/types'
+import { NumberType } from 'utilities/src/format/types'
+import { ChainId } from 'wallet/src/constants/chains'
+import { AssetType } from 'wallet/src/entities/assets'
+import { LocalizationContextState } from 'wallet/src/features/language/LocalizationContext'
+import { PermitSignatureInfo } from 'wallet/src/features/transactions/swap/usePermit2Signature'
+import { Trade } from 'wallet/src/features/transactions/swap/useTrade'
+import {
+  CurrencyField,
+  TransactionState,
+} from 'wallet/src/features/transactions/transactionState/types'
+import {
+  ExactInputSwapTransactionInfo,
+  ExactOutputSwapTransactionInfo,
+  TransactionType,
+  WrapType,
+} from 'wallet/src/features/transactions/types'
+import { getSymbolDisplayText } from 'wallet/src/utils/currency'
+import {
+  areCurrencyIdsEqual,
+  buildWrappedNativeCurrencyId,
+  CurrencyId,
+  currencyId,
+  currencyIdToAddress,
+  currencyIdToChain,
+} from 'wallet/src/utils/currencyId'
+
+export function getWrapType(
+  inputCurrency: Currency | null | undefined,
+  outputCurrency: Currency | null | undefined
+): WrapType {
+  if (!inputCurrency || !outputCurrency || inputCurrency.chainId !== outputCurrency.chainId) {
+    return WrapType.NotApplicable
+  }
+
+  const inputChainId = inputCurrency.chainId as ChainId
+  const wrappedCurrencyId = buildWrappedNativeCurrencyId(inputChainId)
+
+  if (
+    inputCurrency.isNative &&
+    areCurrencyIdsEqual(currencyId(outputCurrency), wrappedCurrencyId)
+  ) {
+    return WrapType.Wrap
+  } else if (
+    outputCurrency.isNative &&
+    areCurrencyIdsEqual(currencyId(inputCurrency), wrappedCurrencyId)
+  ) {
+    return WrapType.Unwrap
+  }
+
+  return WrapType.NotApplicable
+}
+
+export function isWrapAction(wrapType: WrapType): wrapType is WrapType.Unwrap | WrapType.Wrap {
+  return wrapType === WrapType.Unwrap || wrapType === WrapType.Wrap
+}
+
+export function tradeToTransactionInfo(
+  trade: Trade
+): ExactInputSwapTransactionInfo | ExactOutputSwapTransactionInfo {
+  const slippageTolerancePercent = slippageToleranceToPercent(trade.slippageTolerance)
+  const { quote, slippageTolerance } = trade
+  const { gasUseEstimate, quoteId, routeString } = quote || {}
+
+  const baseTransactionInfo = {
+    inputCurrencyId: currencyId(trade.inputAmount.currency),
+    outputCurrencyId: currencyId(trade.outputAmount.currency),
+    slippageTolerance,
+    quoteId,
+    gasUseEstimate,
+    routeString,
+    protocol: getProtocolVersionFromTrade(trade),
+  }
+
+  return trade.tradeType === TradeType.EXACT_INPUT
+    ? {
+        ...baseTransactionInfo,
+        type: TransactionType.Swap,
+        tradeType: TradeType.EXACT_INPUT,
+        inputCurrencyAmountRaw: trade.inputAmount.quotient.toString(),
+        expectedOutputCurrencyAmountRaw: trade.outputAmount.quotient.toString(),
+        minimumOutputCurrencyAmountRaw: trade
+          .minimumAmountOut(slippageTolerancePercent)
+          .quotient.toString(),
+      }
+    : {
+        ...baseTransactionInfo,
+        type: TransactionType.Swap,
+        tradeType: TradeType.EXACT_OUTPUT,
+        outputCurrencyAmountRaw: trade.outputAmount.quotient.toString(),
+        expectedInputCurrencyAmountRaw: trade.inputAmount.quotient.toString(),
+        maximumInputCurrencyAmountRaw: trade
+          .maximumAmountIn(slippageTolerancePercent)
+          .quotient.toString(),
+      }
+}
+
+// any price movement below ACCEPT_NEW_TRADE_THRESHOLD is auto-accepted for the user
+const ACCEPT_NEW_TRADE_THRESHOLD = new Percent(1, 100)
+export function requireAcceptNewTrade(oldTrade: Maybe<Trade>, newTrade: Maybe<Trade>): boolean {
+  if (!oldTrade || !newTrade) {
+    return false
+  }
+
+  return (
+    oldTrade.tradeType !== newTrade.tradeType ||
+    !oldTrade.inputAmount.currency.equals(newTrade.inputAmount.currency) ||
+    !oldTrade.outputAmount.currency.equals(newTrade.outputAmount.currency) ||
+    newTrade.executionPrice.lessThan(oldTrade.worstExecutionPrice(ACCEPT_NEW_TRADE_THRESHOLD))
+  )
+}
+
+export const getRateToDisplay = (
+  formatter: LocalizationContextState,
+  trade: Trade,
+  showInverseRate: boolean
+): string => {
+  const price = showInverseRate ? trade.executionPrice.invert() : trade.executionPrice
+  const formattedPrice = formatter.formatNumberOrString({
+    value: price.toSignificant(),
+    type: NumberType.SwapPrice,
+  })
+  const quoteCurrencySymbol = getSymbolDisplayText(trade.executionPrice.quoteCurrency.symbol)
+  const baseCurrencySymbol = getSymbolDisplayText(trade.executionPrice.baseCurrency.symbol)
+  const rate = `1 ${quoteCurrencySymbol} = ${formattedPrice} ${baseCurrencySymbol}`
+  const inverseRate = `1 ${baseCurrencySymbol} = ${formattedPrice} ${quoteCurrencySymbol}`
+  return showInverseRate ? rate : inverseRate
+}
+
+export const getActionName = (t: AppTFunction, wrapType: WrapType): string => {
+  switch (wrapType) {
+    case WrapType.Unwrap:
+      return t('Unwrap')
+    case WrapType.Wrap:
+      return t('Wrap')
+    default:
+      return t('Swap')
+  }
+}
+
+export const getActionElementName = (wrapType: WrapType): ElementName => {
+  switch (wrapType) {
+    case WrapType.Unwrap:
+      return ElementName.Unwrap
+    case WrapType.Wrap:
+      return ElementName.Wrap
+    default:
+      return ElementName.Swap
+  }
+}
+
+export function sumGasFees(gasFee1?: string | undefined, gasFee2?: string): string | undefined {
+  if (!gasFee1 || !gasFee2) {
+    return gasFee1 || gasFee2
+  }
+
+  return BigNumber.from(gasFee1).add(gasFee2).toString()
+}
+
+export const prepareSwapFormState = ({
+  inputCurrencyId,
+}: {
+  inputCurrencyId?: CurrencyId
+}): TransactionState | undefined => {
+  return inputCurrencyId
+    ? {
+        exactCurrencyField: CurrencyField.INPUT,
+        exactAmountToken: '',
+        [CurrencyField.INPUT]: {
+          address: currencyIdToAddress(inputCurrencyId),
+          chainId: currencyIdToChain(inputCurrencyId) ?? ChainId.Mainnet,
+          type: AssetType.Currency,
+        },
+        [CurrencyField.OUTPUT]: null,
+      }
+    : undefined
+}
+
+// rounds to nearest basis point
+export const slippageToleranceToPercent = (slippage: number): Percent => {
+  const basisPoints = Math.round(slippage * 100)
+  return new Percent(basisPoints, 10_000)
+}
+
+interface MethodParameterArgs {
+  permit2Signature?: PermitSignatureInfo
+  trade: Trade
+  address: string
+  feeOptions?: FeeOptions
+  flatFeeOptions?: FlatFeeOptions
+}
+
+export const getSwapMethodParameters = ({
+  permit2Signature,
+  trade,
+  address,
+  feeOptions,
+  flatFeeOptions,
+}: MethodParameterArgs): { calldata: string; value: string } => {
+  const slippageTolerancePercent = slippageToleranceToPercent(trade.slippageTolerance)
+  const baseOptions = {
+    slippageTolerance: slippageTolerancePercent,
+    recipient: address,
+    fee: feeOptions,
+    flatFee: flatFeeOptions,
+  }
+
+  const universalRouterSwapOptions: UniversalRouterSwapOptions = permit2Signature
+    ? {
+        ...baseOptions,
+        inputTokenPermit: {
+          signature: permit2Signature.signature,
+          ...permit2Signature.permitMessage,
+        },
+      }
+    : baseOptions
+  return UniversalSwapRouter.swapERC20CallParameters(trade, universalRouterSwapOptions)
+}
+
+export function getProtocolVersionFromTrade(trade: Trade): Protocol {
+  if (trade.routes.every((r) => r.protocol === Protocol.V2)) {
+    return Protocol.V2
+  }
+  if (trade.routes.every((r) => r.protocol === Protocol.V3)) {
+    return Protocol.V3
+  }
+  return Protocol.MIXED
+}
diff --git a/packages/wallet/src/features/transactions/swap/wrapSaga.test.ts b/apps/mobile/src/features/transactions/swap/wrapSaga.test.ts
similarity index 92%
rename from packages/wallet/src/features/transactions/swap/wrapSaga.test.ts
rename to apps/mobile/src/features/transactions/swap/wrapSaga.test.ts
index cbfac52cc1f..04021f5b2db 100644
--- a/packages/wallet/src/features/transactions/swap/wrapSaga.test.ts
+++ b/apps/mobile/src/features/transactions/swap/wrapSaga.test.ts
@@ -1,9 +1,9 @@
 import { CurrencyAmount } from '@uniswap/sdk-core'
 import { testSaga } from 'redux-saga-test-plan'
+import { Params, wrap } from 'src/features/transactions/swap/wrapSaga'
 import { ChainId } from 'wallet/src/constants/chains'
 import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { sendTransaction } from 'wallet/src/features/transactions/sendTransactionSaga'
-import { wrap, WrapParams } from 'wallet/src/features/transactions/swap/wrapSaga'
 import { TransactionType, WrapTransactionInfo } from 'wallet/src/features/transactions/types'
 import { account } from 'wallet/src/test/fixtures'
 
@@ -25,7 +25,7 @@ const transaction = {
   chainId: ChainId.Mainnet,
 }
 
-const params: WrapParams = {
+const params: Params = {
   txId: '1',
   account,
   txRequest: transaction,
@@ -51,7 +51,7 @@ describe(wrap, () => {
   })
 
   it('successfully unwraps to native eth', () => {
-    const unwrapParams: WrapParams = {
+    const unwrapParams: Params = {
       ...params,
       inputCurrencyAmount: CurrencyAmount.fromRawAmount(
         NativeCurrency.onChain(ChainId.Mainnet).wrapped,
diff --git a/packages/wallet/src/features/transactions/swap/wrapSaga.ts b/apps/mobile/src/features/transactions/swap/wrapSaga.ts
similarity index 94%
rename from packages/wallet/src/features/transactions/swap/wrapSaga.ts
rename to apps/mobile/src/features/transactions/swap/wrapSaga.ts
index ce90b32a092..0c65268e12e 100644
--- a/packages/wallet/src/features/transactions/swap/wrapSaga.ts
+++ b/apps/mobile/src/features/transactions/swap/wrapSaga.ts
@@ -15,7 +15,7 @@ import {
 import { Account } from 'wallet/src/features/wallet/accounts/types'
 import { createMonitoredSaga } from 'wallet/src/utils/saga'
 
-export type WrapParams = {
+export type Params = {
   txId?: string
   txRequest: providers.TransactionRequest
   account: Account
@@ -29,7 +29,7 @@ export async function getWethContract(
   return new Contract(getWrappedNativeAddress(chainId), WETH_ABI, provider) as Weth
 }
 
-export function* wrap(params: WrapParams) {
+export function* wrap(params: Params) {
   try {
     const { account, inputCurrencyAmount, txRequest, txId } = params
     let typeInfo: TransactionTypeInfo
@@ -69,4 +69,4 @@ export const {
   wrappedSaga: tokenWrapSaga,
   reducer: tokenWrapReducer,
   actions: tokenWrapActions,
-} = createMonitoredSaga<WrapParams>(wrap, 'wrap')
+} = createMonitoredSaga<Params>(wrap, 'wrap')
diff --git a/packages/wallet/src/features/transactions/swap/CurrencyInputPanel.tsx b/apps/mobile/src/features/transactions/swapRewrite/CurrencyInputPanel.tsx
similarity index 93%
rename from packages/wallet/src/features/transactions/swap/CurrencyInputPanel.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/CurrencyInputPanel.tsx
index de0cc9774e5..ae5714e01d8 100644
--- a/packages/wallet/src/features/transactions/swap/CurrencyInputPanel.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/CurrencyInputPanel.tsx
@@ -6,10 +6,8 @@ import {
   TextInput,
   TextInputProps,
   TextInputSelectionChangeEventData,
-  ViewStyle,
 } from 'react-native'
 import {
-  AnimatedStyleProp,
   Easing,
   useAnimatedStyle,
   useSharedValue,
@@ -17,19 +15,19 @@ import {
   withSequence,
   withTiming,
 } from 'react-native-reanimated'
+import { useDynamicFontSizing } from 'src/app/hooks'
+import { AmountInput } from 'src/components/input/AmountInput'
+import { SelectTokenButton } from 'src/components/TokenSelector/SelectTokenButton'
+import { MaxAmountButton } from 'src/features/transactions/swapRewrite/MaxAmountButton'
 import { AnimatedFlex, Flex, FlexProps, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { fonts, spacing } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
 import { useForwardRef, usePrevious } from 'utilities/src/react/hooks'
-import { AmountInput } from 'wallet/src/components/input/AmountInput'
-import { SelectTokenButton } from 'wallet/src/components/TokenSelector/SelectTokenButton'
 import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
 import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { MaxAmountButton } from 'wallet/src/features/transactions/swap/MaxAmountButton'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { getSymbolDisplayText } from 'wallet/src/utils/currency'
-import { useDynamicFontSizing } from 'wallet/src/utils/useDynamicFontSizing'
 
 type CurrentInputPanelProps = {
   autoFocus?: boolean
@@ -46,7 +44,7 @@ type CurrentInputPanelProps = {
   onSetExactAmount: (amount: string) => void
   onSetMax?: (amount: string, currencyField: CurrencyField) => void
   onShowTokenSelector: () => void
-  onToggleIsFiatMode: (currencyField: CurrencyField) => void
+  onToggleIsFiatMode: () => void
   selection?: TextInputProps['selection']
   showNonZeroBalancesOnly?: boolean
   showSoftInputOnFocus?: boolean
@@ -109,11 +107,6 @@ export const CurrencyInputPanel = memo(
       usdValue?.toExact(),
       NumberType.FiatTokenQuantity
     )
-
-    const _onToggleIsFiatMode = useCallback(() => {
-      onToggleIsFiatMode(currencyField)
-    }, [currencyField, onToggleIsFiatMode])
-
     const formattedCurrencyAmount = currencyAmount
       ? formatCurrencyAmount({ value: currencyAmount, type: NumberType.TokenTx })
       : ''
@@ -227,7 +220,12 @@ export const CurrencyInputPanel = memo(
 
     return (
       <TouchableArea hapticFeedback onPress={currencyInfo ? onPressIn : onShowTokenSelector}>
-        <AnimatedFlex {...rest} overflow="hidden" px="$spacing16" style={animatedContainerStyle}>
+        <AnimatedFlex
+          {...rest}
+          overflow="hidden"
+          paddingBottom="$spacing16"
+          px="$spacing16"
+          style={animatedContainerStyle}>
           <AnimatedFlex
             row
             alignItems="center"
@@ -313,17 +311,17 @@ export const CurrencyInputPanel = memo(
             left={spacing.spacing16}
             paddingTop="$spacing16"
             position="absolute"
-            right={spacing.spacing16}
-            style={animatedInfoRowStyle}>
+            style={animatedInfoRowStyle}
+            width="100%">
             {/* Keep the animated parent container so animation styles are always mounted  */}
             {currencyInfo && (
               <>
-                <TouchableArea disabled={fiatModeFeatureEnabled} onPress={_onToggleIsFiatMode}>
+                <TouchableArea disabled={fiatModeFeatureEnabled} onPress={onToggleIsFiatMode}>
                   <Flex centered row shrink gap="$spacing4">
                     <Text color="$neutral2" numberOfLines={1} variant="body3">
                       {inputPanelFormattedValue}
                     </Text>
-                    {Boolean(inputPanelFormattedValue && fiatModeFeatureEnabled) && (
+                    {inputPanelFormattedValue && fiatModeFeatureEnabled && (
                       <Icons.ArrowUpDown color="$neutral3" size="$icon.12" />
                     )}
                   </Flex>
@@ -355,9 +353,16 @@ function useAnimatedContainerStyles(
   isLoading: boolean | undefined,
   isCollapsed: boolean | undefined
 ): {
-  animatedContainerStyle: AnimatedStyleProp<ViewStyle>
-  animatedAmountInputStyle: AnimatedStyleProp<ViewStyle>
-  animatedInfoRowStyle: AnimatedStyleProp<ViewStyle>
+  animatedContainerStyle: {
+    paddingTop: number
+    paddingBottom: number
+  }
+  animatedAmountInputStyle: {
+    opacity: number
+  }
+  animatedInfoRowStyle: {
+    bottom: number
+  }
 } {
   const animatedContainerStyle = useAnimatedStyle(() => {
     return {
@@ -379,7 +384,6 @@ function useAnimatedContainerStyles(
     -1,
     true
   )
-
   const animatedAmountInputStyle = useAnimatedStyle(
     () => ({
       opacity: isLoading ? loadingFlexProgress.value : 1,
diff --git a/packages/wallet/src/features/transactions/swap/DecimalPad.tsx b/apps/mobile/src/features/transactions/swapRewrite/DecimalPad.tsx
similarity index 98%
rename from packages/wallet/src/features/transactions/swap/DecimalPad.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/DecimalPad.tsx
index 11289707871..34430408d01 100644
--- a/packages/wallet/src/features/transactions/swap/DecimalPad.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/DecimalPad.tsx
@@ -1,5 +1,5 @@
 import { ImpactFeedbackStyle } from 'expo-haptics'
-import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { I18nManager, LayoutChangeEvent } from 'react-native'
 import { Flex, Icons, Text, TouchableArea, useMedia } from 'ui/src'
 import { fonts } from 'ui/src/theme'
diff --git a/packages/wallet/src/features/transactions/swap/DecimalPadInput.tsx b/apps/mobile/src/features/transactions/swapRewrite/DecimalPadInput.tsx
similarity index 96%
rename from packages/wallet/src/features/transactions/swap/DecimalPadInput.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/DecimalPadInput.tsx
index 1e8b5c1a4b9..32b7df2a95a 100644
--- a/packages/wallet/src/features/transactions/swap/DecimalPadInput.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/DecimalPadInput.tsx
@@ -7,8 +7,8 @@ import {
   useMemo,
   useState,
 } from 'react'
-import { TextInputProps } from 'wallet/src/components/input/TextInput'
-import { DecimalPad, KeyAction, KeyLabel } from './DecimalPad'
+import { TextInputProps } from 'src/components/input/TextInput'
+import { DecimalPad, KeyAction, KeyLabel } from 'src/features/transactions/swapRewrite/DecimalPad'
 
 type DisableKeyCondition = (value: string) => boolean
 
@@ -82,7 +82,6 @@ export const DecimalPadInput = memo(
           // Prevent unnecessary re-renders and return the same value
           // if no key was updated (react state won't be updated if value is the
           // same as the previous one in terms of referential equality)
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-return
           return isUpdated ? newDisabledKeys : prevDisabledKeys
         })
       },
diff --git a/packages/wallet/src/features/transactions/swap/GasAndWarningRows.tsx b/apps/mobile/src/features/transactions/swapRewrite/GasAndWarningRows.tsx
similarity index 86%
rename from packages/wallet/src/features/transactions/swap/GasAndWarningRows.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/GasAndWarningRows.tsx
index 0cd3d538f52..ca890ef73de 100644
--- a/packages/wallet/src/features/transactions/swap/GasAndWarningRows.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/GasAndWarningRows.tsx
@@ -1,7 +1,12 @@
 import { useCallback, useState } from 'react'
 import { Keyboard } from 'react-native'
 import { FadeIn, FadeOut } from 'react-native-reanimated'
-import { isWeb } from 'tamagui'
+import { NetworkFeeInfoModal } from 'src/features/transactions/swap/modals/NetworkFeeInfoModal'
+import { useSwapFormContext } from 'src/features/transactions/swapRewrite/contexts/SwapFormContext'
+import { useSwapTxContext } from 'src/features/transactions/swapRewrite/contexts/SwapTxContext'
+import { useParsedSwapWarnings } from 'src/features/transactions/swapRewrite/hooks/useParsedSwapWarnings'
+import { SwapWarningModal } from 'src/features/transactions/swapRewrite/SwapWarningModal'
+import { BlockedAddressWarning } from 'src/features/trm/BlockedAddressWarning'
 import { AnimatedFlex, Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
@@ -9,12 +14,6 @@ import { SwapRewriteVariant } from 'wallet/src/features/experiments/constants'
 import { useSwapRewriteVariant } from 'wallet/src/features/experiments/hooks'
 import { useUSDValue } from 'wallet/src/features/gas/hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { useSwapFormContext } from 'wallet/src/features/transactions/contexts/SwapFormContext'
-import { useSwapTxContext } from 'wallet/src/features/transactions/contexts/SwapTxContext'
-import { useParsedSwapWarnings } from 'wallet/src/features/transactions/hooks/useParsedSwapWarnings'
-import { NetworkFeeInfoModal } from 'wallet/src/features/transactions/swap/modals/NetworkFeeInfoModal'
-import { SwapWarningModal } from 'wallet/src/features/transactions/swap/SwapWarningModal'
-import { BlockedAddressWarning } from 'wallet/src/features/trm/BlockedAddressWarning'
 import { useIsBlockedActiveAddress } from 'wallet/src/features/trm/hooks'
 
 export function GasAndWarningRows({ renderEmptyRows }: { renderEmptyRows: boolean }): JSX.Element {
@@ -100,8 +99,7 @@ export function GasAndWarningRows({ renderEmptyRows }: { renderEmptyRows: boolea
               centered
               row
               entering={FadeIn}
-              // TODO(EXT-526): re-enable `exiting` animation when it's fixed.
-              exiting={isWeb ? undefined : FadeOut}
+              exiting={FadeOut}
               gap="$spacing8"
               px="$spacing24">
               {formScreenWarning.Icon && (
diff --git a/packages/wallet/src/features/transactions/swap/HoldToSwapProgressCircle.tsx b/apps/mobile/src/features/transactions/swapRewrite/HoldToSwapProgressCircle.tsx
similarity index 92%
rename from packages/wallet/src/features/transactions/swap/HoldToSwapProgressCircle.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/HoldToSwapProgressCircle.tsx
index 29dd1fac77b..0b7343a9ebe 100644
--- a/packages/wallet/src/features/transactions/swap/HoldToSwapProgressCircle.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/HoldToSwapProgressCircle.tsx
@@ -2,11 +2,11 @@ import { impactAsync, ImpactFeedbackStyle } from 'expo-haptics'
 import { useEffect, useRef } from 'react'
 import Animated, { useAnimatedProps, useSharedValue, withTiming } from 'react-native-reanimated'
 import Svg, { Circle } from 'react-native-svg'
-import { iconSizes } from 'ui/src/theme'
 import {
   SwapScreen,
   useSwapScreenContext,
-} from 'wallet/src/features/transactions/contexts/SwapScreenContext'
+} from 'src/features/transactions/swapRewrite/contexts/SwapScreenContext'
+import { iconSizes } from 'ui/src/theme'
 
 export const HOLD_TO_SWAP_TIMEOUT = 3000
 
@@ -38,12 +38,9 @@ export function HoldToSwapProgressCircle(): JSX.Element {
 
   const progress = useSharedValue(0)
 
-  const animatedProps = useAnimatedProps(
-    () => ({
-      strokeDashoffset: CIRCLE_LENGTH * (1 - progress.value),
-    }),
-    [progress]
-  )
+  const animatedProps = useAnimatedProps(() => ({
+    strokeDashoffset: CIRCLE_LENGTH * (1 - progress.value),
+  }))
 
   useEffect(() => {
     if (isHoldToSwapPressed) {
diff --git a/packages/wallet/src/features/transactions/swap/MaxAmountButton.tsx b/apps/mobile/src/features/transactions/swapRewrite/MaxAmountButton.tsx
similarity index 87%
rename from packages/wallet/src/features/transactions/swap/MaxAmountButton.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/MaxAmountButton.tsx
index 5fe01af602e..8ea99bdbb7c 100644
--- a/packages/wallet/src/features/transactions/swap/MaxAmountButton.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/MaxAmountButton.tsx
@@ -1,11 +1,12 @@
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { StyleProp, ViewStyle } from 'react-native'
+import Trace from 'src/components/Trace/Trace'
+import { ElementName } from 'src/features/telemetry/constants'
+import { useSwapFormContext } from 'src/features/transactions/swapRewrite/contexts/SwapFormContext'
+import { maxAmountSpend } from 'src/utils/balance'
 import { Text, TouchableArea } from 'ui/src'
-import { Trace } from 'utilities/src/telemetry/trace/Trace'
-import { useSwapFormContext } from 'wallet/src/features/transactions/contexts/SwapFormContext'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import { ElementName } from 'wallet/src/telemetry/constants'
-import { maxAmountSpend } from 'wallet/src/utils/balance'
 
 interface MaxAmountButtonProps {
   onSetMax: (amount: string, currencyField: CurrencyField) => void
diff --git a/packages/wallet/src/features/transactions/swap/SwapArrowButton.tsx b/apps/mobile/src/features/transactions/swapRewrite/SwapArrowButton.tsx
similarity index 92%
rename from packages/wallet/src/features/transactions/swap/SwapArrowButton.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/SwapArrowButton.tsx
index 83bdaa1a490..1a3f3974396 100644
--- a/packages/wallet/src/features/transactions/swap/SwapArrowButton.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/SwapArrowButton.tsx
@@ -1,7 +1,7 @@
-import { useMemo } from 'react'
+import React, { useMemo } from 'react'
+import { Arrow } from 'src/components/icons/Arrow'
 import { Flex, TouchableArea, TouchableAreaProps, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
-import { Arrow } from 'wallet/src/components/icons/Arrow'
 
 type SwapArrowButtonProps = Pick<
   TouchableAreaProps,
diff --git a/packages/wallet/src/features/transactions/swap/SwapFlow.tsx b/apps/mobile/src/features/transactions/swapRewrite/SwapFlow.tsx
similarity index 54%
rename from packages/wallet/src/features/transactions/swap/SwapFlow.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/SwapFlow.tsx
index 771ad911bfa..a95318685d7 100644
--- a/packages/wallet/src/features/transactions/swap/SwapFlow.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/SwapFlow.tsx
@@ -1,37 +1,29 @@
-import { Dispatch, ReactNode, SetStateAction, useEffect, useState } from 'react'
-import { Trace } from 'utilities/src/telemetry/trace/Trace'
-import { FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
-import { useFeatureFlag } from 'wallet/src/features/experiments/hooks'
+import React, { Dispatch, ReactNode, SetStateAction, useEffect, useMemo, useState } from 'react'
+import { useAppSelector } from 'src/app/hooks'
+import { selectModalState } from 'src/features/modals/selectModalState'
+import { ModalName, SectionName } from 'src/features/telemetry/constants'
 import {
   SwapFormContextProvider,
   SwapFormState,
-} from 'wallet/src/features/transactions/contexts/SwapFormContext'
+} from 'src/features/transactions/swapRewrite/contexts/SwapFormContext'
 import {
   SwapScreen,
   SwapScreenContextProvider,
   useSwapScreenContext,
-} from 'wallet/src/features/transactions/contexts/SwapScreenContext'
-import {
-  SwapTxContextProviderLegacyApi,
-  SwapTxContextProviderTradingApi,
-} from 'wallet/src/features/transactions/contexts/SwapTxContext'
-import { SwapFormButton } from 'wallet/src/features/transactions/swap/SwapFormButton'
-import { SwapFormScreen } from 'wallet/src/features/transactions/swap/SwapFormScreen'
-import { SwapReviewScreen } from 'wallet/src/features/transactions/swap/SwapReviewScreen'
+} from 'src/features/transactions/swapRewrite/contexts/SwapScreenContext'
+import { SwapTxContextProvider } from 'src/features/transactions/swapRewrite/contexts/SwapTxContext'
+import { useOnCloseSwapModal } from 'src/features/transactions/swapRewrite/hooks/useOnCloseSwapModal'
+import { SwapFormButton } from 'src/features/transactions/swapRewrite/SwapFormButton'
+import { SwapFormScreen } from 'src/features/transactions/swapRewrite/SwapFormScreen'
+import { SwapReviewScreen } from 'src/features/transactions/swapRewrite/SwapReviewScreen'
 import {
   TransactionModal,
   TransactionModalFooterContainer,
-} from 'wallet/src/features/transactions/swap/TransactionModal'
-import { TransactionModalProps } from 'wallet/src/features/transactions/swap/TransactionModalProps'
-import { ModalName, SectionName } from 'wallet/src/telemetry/constants'
+} from 'src/features/transactions/swapRewrite/TransactionModal'
+import { getFocusOnCurrencyFieldFromInitialState } from 'src/features/transactions/swapRewrite/utils'
+import { Trace } from 'utilities/src/telemetry/trace/Trace'
 
-export function SwapFlow({
-  prefilledState,
-  ...transactionModalProps
-}: {
-  prefilledState?: SwapFormState
-  onClose: () => void
-} & Omit<TransactionModalProps, 'fullscreen' | 'modalName'>): JSX.Element {
+export function SwapFlow(): JSX.Element {
   // We need this additional `screen` state outside of the `SwapScreenContext` because the `SwapScreenContextProvider` needs to be inside the `BottomSheetModal`'s `Container`.
   const [screen, setScreen] = useState<SwapScreen>(SwapScreen.SwapForm)
 
@@ -40,9 +32,11 @@ export function SwapFlow({
   const showStickyReviewButton =
     screen === SwapScreen.SwapForm || screen === SwapScreen.SwapReviewHoldingToSwap
 
+  const onCloseSwapModal = useOnCloseSwapModal()
+
   return (
-    <TransactionModal fullscreen={fullscreen} modalName={ModalName.Swap} {...transactionModalProps}>
-      <SwapContextsContainer prefilledState={prefilledState}>
+    <TransactionModal fullscreen={fullscreen} modalName={ModalName.Swap} onClose={onCloseSwapModal}>
+      <SwapContextsContainer>
         <CurrentScreen screen={screen} setScreen={setScreen} />
         {/*
         We render the `Review` button here instead of doing it inside `SwapFormScreen` so that it stays in place when the user is "holding to swap".
@@ -111,23 +105,34 @@ function SwapReviewScreenDelayedRender(): JSX.Element {
   return <SwapReviewScreen hideContent={hideContent} />
 }
 
-function SwapContextsContainer({
-  prefilledState,
-  children,
-}: {
-  prefilledState: SwapFormState | undefined
-  children?: ReactNode
-}): JSX.Element {
-  // conditionally render a different provider based on the active api gate. Each uses different hooks for data fetching.
-  const isTradingApiEnabled = useFeatureFlag(FEATURE_FLAGS.TradingApi)
-  const SwapTxContextProviderWrapper = isTradingApiEnabled
-    ? SwapTxContextProviderTradingApi
-    : SwapTxContextProviderLegacyApi
+function SwapContextsContainer({ children }: { children?: ReactNode }): JSX.Element {
+  const onCloseSwapModal = useOnCloseSwapModal()
+  const { initialState } = useAppSelector(selectModalState(ModalName.Swap))
+
+  const prefilledState = useMemo(
+    (): SwapFormState | undefined =>
+      initialState
+        ? {
+            customSlippageTolerance: initialState.customSlippageTolerance,
+            exactAmountFiat: initialState.exactAmountFiat,
+            exactAmountToken: initialState.exactAmountToken,
+            exactCurrencyField: initialState.exactCurrencyField,
+            focusOnCurrencyField: getFocusOnCurrencyFieldFromInitialState(initialState),
+            input: initialState.input ?? undefined,
+            output: initialState.output ?? undefined,
+            selectingCurrencyField: initialState.selectingCurrencyField,
+            txId: initialState.txId,
+            isFiatMode: false,
+            isSubmitting: false,
+          }
+        : undefined,
+    [initialState]
+  )
 
   return (
     <SwapScreenContextProvider>
-      <SwapFormContextProvider prefilledState={prefilledState}>
-        <SwapTxContextProviderWrapper>{children}</SwapTxContextProviderWrapper>
+      <SwapFormContextProvider prefilledState={prefilledState} onClose={onCloseSwapModal}>
+        <SwapTxContextProvider>{children}</SwapTxContextProvider>
       </SwapFormContextProvider>
     </SwapScreenContextProvider>
   )
diff --git a/packages/wallet/src/features/transactions/swap/SwapFormButton.tsx b/apps/mobile/src/features/transactions/swapRewrite/SwapFormButton.tsx
similarity index 77%
rename from packages/wallet/src/features/transactions/swap/SwapFormButton.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/SwapFormButton.tsx
index e370fde216a..33be3097189 100644
--- a/packages/wallet/src/features/transactions/swap/SwapFormButton.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/SwapFormButton.tsx
@@ -1,31 +1,30 @@
-import { useCallback, useMemo } from 'react'
+import React, { useCallback, useMemo } from 'react'
 import { TFunction, useTranslation } from 'react-i18next'
-import { isWeb } from 'tamagui'
-import { Button, Flex, Icons, Text } from 'ui/src'
-import { Trace } from 'utilities/src/telemetry/trace/Trace'
+import { useAppSelector as useMobileAppSelector } from 'src/app/hooks'
+import Trace from 'src/components/Trace/Trace'
 import {
   selectHasSubmittedHoldToSwap,
   selectHasViewedReviewScreen,
-} from 'wallet/src/features/behaviorHistory/selectors'
-import { useSwapFormContext } from 'wallet/src/features/transactions/contexts/SwapFormContext'
+} from 'src/features/behaviorHistory/selectors'
+import { ElementName } from 'src/features/telemetry/constants'
+import { isWrapAction } from 'src/features/transactions/swap/utils'
+import { useSwapFormContext } from 'src/features/transactions/swapRewrite/contexts/SwapFormContext'
 import {
   SwapScreen,
   useSwapScreenContext,
-} from 'wallet/src/features/transactions/contexts/SwapScreenContext'
-import { useTransactionModalContext } from 'wallet/src/features/transactions/contexts/TransactionModalContext'
-import { useParsedSwapWarnings } from 'wallet/src/features/transactions/hooks/useParsedSwapWarnings'
+} from 'src/features/transactions/swapRewrite/contexts/SwapScreenContext'
 import {
   HoldToSwapProgressCircle,
   PROGRESS_CIRCLE_SIZE,
-} from 'wallet/src/features/transactions/swap/HoldToSwapProgressCircle'
-import { isWrapAction } from 'wallet/src/features/transactions/swap/utils'
+} from 'src/features/transactions/swapRewrite/HoldToSwapProgressCircle'
+import { useParsedSwapWarnings } from 'src/features/transactions/swapRewrite/hooks/useParsedSwapWarnings'
+import { useWalletRestore } from 'src/features/wallet/hooks'
+import { Button, Flex, Icons, Text } from 'ui/src'
 import { WrapType } from 'wallet/src/features/transactions/types'
 import { createTransactionId } from 'wallet/src/features/transactions/utils'
 import { useIsBlockedActiveAddress } from 'wallet/src/features/trm/hooks'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
-import { useAppSelector } from 'wallet/src/state'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 export const HOLD_TO_SWAP_TIMEOUT = 3000
 
@@ -33,13 +32,13 @@ export function SwapFormButton(): JSX.Element {
   const { t } = useTranslation()
   const activeAccount = useActiveAccountWithThrow()
 
-  const { walletNeedsRestore } = useTransactionModalContext()
   const { screen, setScreen } = useSwapScreenContext()
   const { derivedSwapInfo, isSubmitting, updateSwapForm } = useSwapFormContext()
   const { blockingWarning } = useParsedSwapWarnings()
 
   const { wrapType, trade } = derivedSwapInfo
 
+  const { walletNeedsRestore } = useWalletRestore()
   const { isBlocked, isBlockedLoading } = useIsBlockedActiveAddress()
 
   const noValidSwap = !isWrapAction(wrapType) && !trade.trade
@@ -56,15 +55,14 @@ export function SwapFormButton(): JSX.Element {
 
   const isHoldToSwapPressed = screen === SwapScreen.SwapReviewHoldingToSwap || isSubmitting
 
-  const hasViewedReviewScreen = useAppSelector(selectHasViewedReviewScreen)
-  const hasSubmittedHoldToSwap = useAppSelector(selectHasSubmittedHoldToSwap)
+  const hasViewedReviewScreen = useMobileAppSelector(selectHasViewedReviewScreen)
+  const hasSubmittedHoldToSwap = useMobileAppSelector(selectHasSubmittedHoldToSwap)
   const showHoldToSwapTip =
     hasViewedReviewScreen && !hasSubmittedHoldToSwap && activeAccount.type !== AccountType.Readonly
 
   // Force users to view regular review screen before enabling hold to swap
   // Disable for view only because onSwap action will fail
-  const enableHoldToSwap =
-    !isWeb && hasViewedReviewScreen && activeAccount.type !== AccountType.Readonly
+  const enableHoldToSwap = hasViewedReviewScreen && activeAccount.type !== AccountType.Readonly
 
   const onReview = useCallback(
     (nextScreen: SwapScreen) => {
@@ -94,7 +92,7 @@ export function SwapFormButton(): JSX.Element {
 
   return (
     <Flex alignItems="center" gap="$spacing16">
-      {!isWeb && !isHoldToSwapPressed && showHoldToSwapTip && <HoldToInstantSwapRow />}
+      {!isHoldToSwapPressed && showHoldToSwapTip && <HoldToInstantSwapRow />}
 
       <Trace logPress element={ElementName.SwapReview}>
         <Button
diff --git a/packages/wallet/src/features/transactions/swap/SwapFormHeader.tsx b/apps/mobile/src/features/transactions/swapRewrite/SwapFormHeader.tsx
similarity index 71%
rename from packages/wallet/src/features/transactions/swap/SwapFormHeader.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/SwapFormHeader.tsx
index 4e51f171fb8..008cea762b3 100644
--- a/packages/wallet/src/features/transactions/swap/SwapFormHeader.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/SwapFormHeader.tsx
@@ -1,25 +1,22 @@
 import { useCallback, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Keyboard } from 'react-native'
-import { isWeb } from 'tamagui'
+import { WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
+import { SwapSettingsModal } from 'src/features/transactions/swap/modals/SwapSettingsModal'
+import {
+  SwapScreen,
+  useSwapScreenContext,
+} from 'src/features/transactions/swapRewrite/contexts/SwapScreenContext'
 import { Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
 import EyeIcon from 'ui/src/assets/icons/eye.svg'
 import SettingsIcon from 'ui/src/assets/icons/settings.svg'
-import XIcon from 'ui/src/assets/icons/x.svg'
 import { iconSizes } from 'ui/src/theme'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { useSwapFormContext } from 'wallet/src/features/transactions/contexts/SwapFormContext'
-import {
-  SwapScreen,
-  useSwapScreenContext,
-} from 'wallet/src/features/transactions/contexts/SwapScreenContext'
-import { useTransactionModalContext } from 'wallet/src/features/transactions/contexts/TransactionModalContext'
-import { SwapSettingsModal } from 'wallet/src/features/transactions/swap/modals/SwapSettingsModal'
-import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
+import { useSwapFormContext } from './contexts/SwapFormContext'
 
 export function SwapFormHeader(): JSX.Element {
   const { t } = useTranslation()
@@ -28,7 +25,7 @@ export function SwapFormHeader(): JSX.Element {
   const account = useActiveAccountWithThrow()
 
   const { screen } = useSwapScreenContext()
-  const { onClose } = useTransactionModalContext()
+
   const { updateSwapForm, customSlippageTolerance, derivedSwapInfo } = useSwapFormContext()
 
   const [showSwapSettingsModal, setShowSettingsModal] = useState(false)
@@ -62,28 +59,10 @@ export function SwapFormHeader(): JSX.Element {
         row
         alignItems="center"
         justifyContent="space-between"
-        mb={isWeb ? '$spacing24' : '$spacing12'}
-        mt={isWeb ? '$spacing4' : '$spacing8'}
-        pl={isWeb ? '$spacing4' : '$spacing12'}
-        pr={isWeb ? '$spacing4' : customSlippageTolerance ? '$spacing8' : '$spacing16'}>
-        {isWeb && (
-          <TouchableArea hapticFeedback testID={ElementName.SwapSettings} onPress={onClose}>
-            <Flex
-              centered
-              row
-              bg="$surface2"
-              borderRadius="$roundedFull"
-              px="$spacing4"
-              py="$spacing4">
-              <XIcon
-                color={colors.neutral2.get()}
-                height={iconSizes.icon24}
-                width={iconSizes.icon24}
-              />
-            </Flex>
-          </TouchableArea>
-        )}
-
+        mt="$spacing8"
+        pb="$spacing12"
+        pl="$spacing12"
+        pr={customSlippageTolerance ? '$spacing8' : '$spacing16'}>
         <Text $sm={{ variant: 'subheading1' }} $xs={{ variant: 'subheading2' }}>
           {t('Swap')}
         </Text>
@@ -118,10 +97,10 @@ export function SwapFormHeader(): JSX.Element {
               <Flex
                 centered
                 row
-                bg={customSlippageTolerance || isWeb ? '$surface2' : '$transparent'}
+                bg={customSlippageTolerance ? '$surface2' : '$transparent'}
                 borderRadius="$roundedFull"
                 gap="$spacing4"
-                px={customSlippageTolerance ? '$spacing8' : '$spacing4'}
+                px={customSlippageTolerance ? '$spacing8' : '$none'}
                 py="$spacing4">
                 {customSlippageTolerance ? (
                   <Text color="$neutral2" variant="buttonLabel4">
@@ -132,8 +111,8 @@ export function SwapFormHeader(): JSX.Element {
                 ) : null}
                 <SettingsIcon
                   color={colors.neutral2.get()}
-                  height={isWeb ? iconSizes.icon24 : iconSizes.icon28}
-                  width={isWeb ? iconSizes.icon24 : iconSizes.icon28}
+                  height={iconSizes.icon28}
+                  width={iconSizes.icon28}
                 />
               </Flex>
             </TouchableArea>
diff --git a/packages/wallet/src/features/transactions/swap/SwapFormScreen.tsx b/apps/mobile/src/features/transactions/swapRewrite/SwapFormScreen.tsx
similarity index 83%
rename from packages/wallet/src/features/transactions/swap/SwapFormScreen.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/SwapFormScreen.tsx
index ffbe7449fc7..67b76c5197b 100644
--- a/packages/wallet/src/features/transactions/swap/SwapFormScreen.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/SwapFormScreen.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable max-lines */
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { LayoutChangeEvent, StyleSheet, TextInput, TextInputProps } from 'react-native'
 import {
@@ -10,32 +10,32 @@ import {
   useDerivedValue,
   withTiming,
 } from 'react-native-reanimated'
-import { isWeb } from 'tamagui'
-import { AnimatedFlex, Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
-import { iconSizes, spacing } from 'ui/src/theme'
-import { NumberType } from 'utilities/src/format/types'
-import { Trace } from 'utilities/src/telemetry/trace/Trace'
-import { useSwapFormContext } from 'wallet/src/features/transactions/contexts/SwapFormContext'
-import { useTransactionModalContext } from 'wallet/src/features/transactions/contexts/TransactionModalContext'
-import { useSyncFiatAndTokenAmountUpdater } from 'wallet/src/features/transactions/hooks/useSyncFiatAndTokenAmountUpdater'
-import { useSwapAnalytics } from 'wallet/src/features/transactions/swap/analytics'
-import { CurrencyInputPanel } from 'wallet/src/features/transactions/swap/CurrencyInputPanel'
+import { Delay } from 'src/components/layout/Delayed'
+import Trace from 'src/components/Trace/Trace'
+import { ElementName, SectionName } from 'src/features/telemetry/constants'
+import { useSwapAnalytics } from 'src/features/transactions/swap/analytics'
+import { useShowSwapNetworkNotification } from 'src/features/transactions/swap/hooks'
+import { isWrapAction } from 'src/features/transactions/swap/utils'
+import { useTransactionModalContext } from 'src/features/transactions/swapRewrite/contexts/TransactionModalContext'
+import { CurrencyInputPanel } from 'src/features/transactions/swapRewrite/CurrencyInputPanel'
 import {
   DecimalPadInput,
   DecimalPadInputRef,
-} from 'wallet/src/features/transactions/swap/DecimalPadInput'
-import { GasAndWarningRows } from 'wallet/src/features/transactions/swap/GasAndWarningRows'
-import { useShowSwapNetworkNotification } from 'wallet/src/features/transactions/swap/hooks'
-import { SwapArrowButton } from 'wallet/src/features/transactions/swap/SwapArrowButton'
-import { SwapFormHeader } from 'wallet/src/features/transactions/swap/SwapFormHeader'
-import { TransactionModalInnerContainer } from 'wallet/src/features/transactions/swap/TransactionModal'
-import { isWrapAction } from 'wallet/src/features/transactions/swap/utils'
+} from 'src/features/transactions/swapRewrite/DecimalPadInput'
+import { GasAndWarningRows } from 'src/features/transactions/swapRewrite/GasAndWarningRows'
+import { useSyncFiatAndTokenAmountUpdater } from 'src/features/transactions/swapRewrite/hooks/useSyncFiatAndTokenAmountUpdater'
+import { SwapArrowButton } from 'src/features/transactions/swapRewrite/SwapArrowButton'
+import { TransactionModalInnerContainer } from 'src/features/transactions/swapRewrite/TransactionModal'
+import { useWalletRestore } from 'src/features/wallet/hooks'
+import { AnimatedFlex, Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
+import { iconSizes, spacing } from 'ui/src/theme'
+import { NumberType } from 'utilities/src/format/types'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import { ElementName, SectionName } from 'wallet/src/telemetry/constants'
-
+import { useSwapFormContext } from './contexts/SwapFormContext'
+import { SwapFormHeader } from './SwapFormHeader'
+import { TokenSelector } from './TokenSelector'
 // eslint-disable-next-line no-restricted-imports
 import { formatCurrencyAmount } from 'utilities/src/format/localeBased'
-import { SwapTokenSelector } from 'wallet/src/features/transactions/swap/SwapTokenSelector'
 
 const SWAP_DIRECTION_BUTTON_SIZE = iconSizes.icon24
 const SWAP_DIRECTION_BUTTON_INNER_PADDING = spacing.spacing8 + spacing.spacing2
@@ -56,7 +56,7 @@ export function SwapFormScreen({ hideContent }: { hideContent: boolean }): JSX.E
 
       {!hideContent && <SwapFormContent />}
 
-      {!hideContent && !!selectingCurrencyField && <SwapTokenSelector />}
+      {!hideContent && !!selectingCurrencyField && <TokenSelector />}
     </TransactionModalInnerContainer>
   )
 }
@@ -65,8 +65,6 @@ function SwapFormContent(): JSX.Element {
   const { t } = useTranslation()
   const colors = useSporeColors()
 
-  const { walletNeedsRestore, openWalletRestoreModal } = useTransactionModalContext()
-
   const {
     amountUpdatedTimeRef,
     derivedSwapInfo,
@@ -97,10 +95,9 @@ function SwapFormContent(): JSX.Element {
   useSwapAnalytics(derivedSwapInfo)
   useShowSwapNetworkNotification(chainId)
 
+  const { walletNeedsRestore, openWalletRestoreModal } = useWalletRestore()
+
   const onRestorePress = (): void => {
-    if (!openWalletRestoreModal) {
-      throw new Error('Invalid call to `onRestorePress` with missing `openWalletRestoreModal`')
-    }
     openWalletRestoreModal()
   }
 
@@ -152,11 +149,9 @@ function SwapFormContent(): JSX.Element {
 
       selectionRef.current = { start, end }
 
-      if (!isWeb) {
-        setTimeout(() => {
-          inputFieldRef.current?.setNativeProps?.({ selection: { start, end } })
-        }, 0)
-      }
+      setTimeout(() => {
+        inputFieldRef.current?.setNativeProps?.({ selection: { start, end } })
+      }, 0)
     },
     [decimalPadControlledField]
   )
@@ -216,9 +211,9 @@ function SwapFormContent(): JSX.Element {
 
   const decimalPadAndButtonAnimatedStyle = useAnimatedStyle(() => {
     return {
-      opacity: withTiming(decimalPadReady ? 1 : 0, { duration: 250 }),
+      opacity: withTiming(decimalPadReady ? 1 : 0, { duration: Delay.Short / 2 }),
     }
-  }, [decimalPadReady])
+  })
 
   const onInputSelectionChange = useCallback(
     (start: number, end: number) => {
@@ -311,19 +306,16 @@ function SwapFormContent(): JSX.Element {
   )
 
   // Reset selection based the new input value (token, or fiat), and toggle fiat mode
-  const onToggleIsFiatMode = useCallback(
-    (currencyField: CurrencyField) => {
-      const newIsFiatMode = !isFiatMode
-      updateSwapForm({
-        isFiatMode: newIsFiatMode,
-        exactCurrencyField: currencyField,
-      })
+  const onToggleIsFiatMode = useCallback(() => {
+    const newIsFiatMode = !isFiatMode
 
-      // We want this update to happen on the next tick, after the input value is updated.
-      setTimeout(() => moveCursorToEnd({ overrideIsFiatMode: newIsFiatMode }), 0)
-    },
-    [isFiatMode, moveCursorToEnd, updateSwapForm]
-  )
+    updateSwapForm({
+      isFiatMode: newIsFiatMode,
+    })
+
+    // We want this update to happen on the next tick, after the input value is updated.
+    setTimeout(() => moveCursorToEnd({ overrideIsFiatMode: newIsFiatMode }), 0)
+  }, [isFiatMode, moveCursorToEnd, updateSwapForm])
 
   const onSwitchCurrencies = useCallback(() => {
     const newExactCurrencyField = exactFieldIsInput ? CurrencyField.OUTPUT : CurrencyField.INPUT
@@ -380,7 +372,7 @@ function SwapFormContent(): JSX.Element {
         [colors.surface1.val, colors.surface2.val]
       ),
     }
-  }, [inputColorTransitionProgress])
+  })
 
   const outputBackgroundStyle = useAnimatedStyle(() => {
     return {
@@ -390,12 +382,11 @@ function SwapFormContent(): JSX.Element {
         [colors.surface1.val, colors.surface2.val]
       ),
     }
-  }, [outputColorTransitionProgress])
+  })
 
   return (
     <Flex grow gap="$spacing8" justifyContent="space-between">
-      {/* TODO(EXT-526): re-enable `exiting` animation when it's fixed. */}
-      <AnimatedFlex entering={FadeIn} exiting={isWeb ? undefined : FadeOut} gap="$spacing2">
+      <AnimatedFlex entering={FadeIn} exiting={FadeOut} gap="$spacing2">
         <Trace section={SectionName.CurrencyInputPanel}>
           <AnimatedFlex
             borderColor="$surface3"
@@ -489,37 +480,34 @@ function SwapFormContent(): JSX.Element {
           <GasAndWarningRows renderEmptyRows />
         </Flex>
       </AnimatedFlex>
-      {!isWeb && (
-        <>
-          {/*
+
+      {/*
           This container is used to calculate the space that the `DecimalPad` can use.
           We position the `DecimalPad` with `position: absolute` at the bottom of the screen instead of
           putting it inside this container in order to avoid any overflows while the `DecimalPad`
           is automatically resizing to find the right size for the screen.
           */}
-          <Flex fill mt="$spacing8" onLayout={onBottomScreenLayout} />
-
-          <AnimatedFlex
-            $short={{ gap: '$none' }}
-            bottom={0}
-            gap="$spacing8"
-            left={0}
-            position="absolute"
-            right={0}
-            style={decimalPadAndButtonAnimatedStyle}>
-            <Flex grow justifyContent="flex-end">
-              <DecimalPadInput
-                ref={decimalPadRef}
-                resetSelection={resetSelection}
-                selectionRef={selection[decimalPadControlledField]}
-                setValue={decimalPadSetValue}
-                valueRef={decimalPadValueRef}
-                onReady={onDecimalPadReady}
-              />
-            </Flex>
-          </AnimatedFlex>
-        </>
-      )}
+      <Flex fill mt="$spacing8" onLayout={onBottomScreenLayout} />
+
+      <AnimatedFlex
+        $short={{ gap: '$none' }}
+        bottom={0}
+        gap="$spacing8"
+        left={0}
+        position="absolute"
+        right={0}
+        style={decimalPadAndButtonAnimatedStyle}>
+        <Flex grow justifyContent="flex-end">
+          <DecimalPadInput
+            ref={decimalPadRef}
+            resetSelection={resetSelection}
+            selectionRef={selection[decimalPadControlledField]}
+            setValue={decimalPadSetValue}
+            valueRef={decimalPadValueRef}
+            onReady={onDecimalPadReady}
+          />
+        </Flex>
+      </AnimatedFlex>
     </Flex>
   )
 }
diff --git a/packages/wallet/src/features/transactions/swap/SwapReviewScreen.tsx b/apps/mobile/src/features/transactions/swapRewrite/SwapReviewScreen.tsx
similarity index 79%
rename from packages/wallet/src/features/transactions/swap/SwapReviewScreen.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/SwapReviewScreen.tsx
index 10b1f6bfb4d..219c4d4e2b5 100644
--- a/packages/wallet/src/features/transactions/swap/SwapReviewScreen.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/SwapReviewScreen.tsx
@@ -1,55 +1,61 @@
 import { notificationAsync } from 'expo-haptics'
-import { useCallback, useEffect, useRef, useState } from 'react'
+import React, { useCallback, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { FadeIn } from 'react-native-reanimated'
-import { SpinningLoader } from 'wallet/src/components/loading/SpinningLoader'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { selectHasViewedReviewScreen } from 'wallet/src/features/behaviorHistory/selectors'
-import { setHasViewedReviewScreen } from 'wallet/src/features/behaviorHistory/slice'
-import { useSwapFormContext } from 'wallet/src/features/transactions/contexts/SwapFormContext'
+import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { Arrow } from 'src/components/icons/Arrow'
+import { BiometricsIcon } from 'src/components/icons/BiometricsIcon'
+import { SpinningLoader } from 'src/components/loading/SpinningLoader'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
+import { OnShowSwapFeeInfo } from 'src/components/SwapFee/SwapFee'
+import { selectHasViewedReviewScreen } from 'src/features/behaviorHistory/selectors'
+import { setHasViewedReviewScreen } from 'src/features/behaviorHistory/slice'
+import {
+  useBiometricAppSettings,
+  useBiometricPrompt,
+  useOsBiometricAuthEnabled,
+} from 'src/features/biometrics/hooks'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
+import {
+  useAcceptedTrade,
+  useSwapCallback,
+  useWrapCallback,
+} from 'src/features/transactions/swap/hooks'
+import { FeeOnTransferInfoModal } from 'src/features/transactions/swap/modals/FeeOnTransferInfoModal'
+import { NetworkFeeInfoModal } from 'src/features/transactions/swap/modals/NetworkFeeInfoModal'
+import { SlippageInfoModal } from 'src/features/transactions/swap/modals/SlippageInfoModal'
+import { SwapFeeInfoModal } from 'src/features/transactions/swap/modals/SwapFeeInfoModal'
+import { SwapDetails } from 'src/features/transactions/swap/SwapDetails'
+import { getActionName, isWrapAction } from 'src/features/transactions/swap/utils'
+import { useSwapFormContext } from 'src/features/transactions/swapRewrite/contexts/SwapFormContext'
 import {
   SwapScreen,
   useSwapScreenContext,
-} from 'wallet/src/features/transactions/contexts/SwapScreenContext'
-import { useSwapTxContext } from 'wallet/src/features/transactions/contexts/SwapTxContext'
-import { useTransactionModalContext } from 'wallet/src/features/transactions/contexts/TransactionModalContext'
-import { GasAndWarningRows } from 'wallet/src/features/transactions/swap/GasAndWarningRows'
-import { FeeOnTransferInfoModal } from 'wallet/src/features/transactions/swap/modals/FeeOnTransferInfoModal'
-import { NetworkFeeInfoModal } from 'wallet/src/features/transactions/swap/modals/NetworkFeeInfoModal'
-import { SlippageInfoModal } from 'wallet/src/features/transactions/swap/modals/SlippageInfoModal'
-import { SwapFeeInfoModal } from 'wallet/src/features/transactions/swap/modals/SwapFeeInfoModal'
-import { SwapDetails } from 'wallet/src/features/transactions/swap/SwapDetails'
+} from 'src/features/transactions/swapRewrite/contexts/SwapScreenContext'
+import { useSwapTxContext } from 'src/features/transactions/swapRewrite/contexts/SwapTxContext'
+import { useTransactionModalContext } from 'src/features/transactions/swapRewrite/contexts/TransactionModalContext'
+import { GasAndWarningRows } from 'src/features/transactions/swapRewrite/GasAndWarningRows'
+import { HOLD_TO_SWAP_TIMEOUT } from 'src/features/transactions/swapRewrite/HoldToSwapProgressCircle'
+import { useParsedSwapWarnings } from 'src/features/transactions/swapRewrite/hooks/useParsedSwapWarnings'
 import {
   TransactionModalFooterContainer,
   TransactionModalInnerContainer,
-} from 'wallet/src/features/transactions/swap/TransactionModal'
-import { OnShowSwapFeeInfo } from 'wallet/src/features/transactions/TransactionDetails/SwapFee'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
+} from 'src/features/transactions/swapRewrite/TransactionModal'
 
-import { isWeb } from 'tamagui'
-import { AnimatedFlex, Button, Flex, Separator } from 'ui/src'
-import { BackArrow } from 'ui/src/components/icons/BackArrow'
+import { TransactionAmountsReview } from 'src/features/transactions/swapRewrite/TransactionAmountsReview'
+import { TransactionDetails } from 'src/features/transactions/TransactionDetails'
+import { AnimatedFlex, Button, Flex, Separator, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
-import { useParsedSwapWarnings } from 'wallet/src/features/transactions/hooks/useParsedSwapWarnings'
-import { HOLD_TO_SWAP_TIMEOUT } from 'wallet/src/features/transactions/swap/HoldToSwapProgressCircle'
-import {
-  useAcceptedTrade,
-  useSwapCallback,
-  useWrapCallback,
-} from 'wallet/src/features/transactions/swap/hooks'
-import { TransactionAmountsReview } from 'wallet/src/features/transactions/swap/TransactionAmountsReview'
-import { getActionName, isWrapAction } from 'wallet/src/features/transactions/swap/utils'
-import { TransactionDetails } from 'wallet/src/features/transactions/TransactionDetails/TransactionDetails'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
-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 colors = useSporeColors()
   const dispatch = useAppDispatch()
 
   const account = useActiveAccountWithThrow()
@@ -62,18 +68,18 @@ export function SwapReviewScreen({ hideContent }: { hideContent: boolean }): JSX
   const [warningAcknowledged, setWarningAcknowledged] = useState(false)
   const [shouldSubmitTx, setShouldSubmitTx] = useState(false)
 
-  const { handleContentLayout, bottomSheetViewStyles, onClose, BiometricsIcon, authTrigger } =
-    useTransactionModalContext()
+  const { handleContentLayout, bottomSheetViewStyles } = useTransactionModalContext()
 
   const { screen, screenRef, setScreen } = useSwapScreenContext()
 
-  const { approveTxRequest, approvalError, gasFee, txRequest } = useSwapTxContext()
+  const { approveTxRequest, gasFee, txRequest } = useSwapTxContext()
 
   const {
     derivedSwapInfo,
     exactCurrencyField: ctxExactCurrencyField,
     focusOnCurrencyField,
     isSubmitting,
+    onClose,
     updateSwapForm,
     isFiatMode,
   } = useSwapFormContext()
@@ -173,25 +179,29 @@ export function SwapReviewScreen({ hideContent }: { hideContent: boolean }): JSX
     updateSwapForm({ isSubmitting: false })
   }, [setScreen, updateSwapForm])
 
+  const { trigger: submitWithBiometrix } = useBiometricPrompt(
+    submitTransaction,
+    onSubmitTransactionFailed
+  )
+
+  const { requiredForTransactions: requiresBiometrics } = useBiometricAppSettings()
+
+  // Detect auth type for icon display
+  const isBiometricAuthEnabled = useOsBiometricAuthEnabled()
+
   const onSubmitTransaction = useCallback(async () => {
     updateSwapForm({ isSubmitting: true })
 
-    if (!isWeb) {
-      await notificationAsync()
-    }
+    await notificationAsync()
 
-    if (authTrigger) {
-      await authTrigger({
-        successCallback: submitTransaction,
-        failureCallback: onSubmitTransactionFailed,
-      })
+    if (requiresBiometrics) {
+      await submitWithBiometrix()
     } else {
       submitTransaction()
     }
-  }, [authTrigger, onSubmitTransactionFailed, submitTransaction, updateSwapForm])
+  }, [requiresBiometrics, submitTransaction, submitWithBiometrix, updateSwapForm])
 
   const submitButtonDisabled =
-    approvalError ||
     noValidSwap ||
     !!blockingWarning ||
     newTradeRequiresAcceptance ||
@@ -331,6 +341,9 @@ export function SwapReviewScreen({ hideContent }: { hideContent: boolean }): JSX
     )
   }
 
+  const submitButtonIcon =
+    isBiometricAuthEnabled && requiresBiometrics ? <BiometricsIcon /> : undefined
+
   const actionText = getActionName(t, wrapType)
 
   const currencyInInfo = currencies[CurrencyField.INPUT]
@@ -443,12 +456,17 @@ export function SwapReviewScreen({ hideContent }: { hideContent: boolean }): JSX
       {screen !== SwapScreen.SwapReviewHoldingToSwap && (
         <TransactionModalFooterContainer>
           <Flex row gap="$spacing8">
-            <Button icon={<BackArrow />} size="large" theme="tertiary" onPress={onPrev} />
+            <Button
+              icon={<Arrow color={colors.neutral1.val} direction="w" size={iconSizes.icon24} />}
+              size="large"
+              theme="tertiary"
+              onPress={onPrev}
+            />
 
             <Button
               fill
               disabled={submitButtonDisabled}
-              icon={BiometricsIcon}
+              icon={submitButtonIcon}
               size="large"
               testID={ElementName.Swap}
               onPress={onSubmitTransaction}>
diff --git a/packages/wallet/src/features/transactions/swap/SwapWarningModal.tsx b/apps/mobile/src/features/transactions/swapRewrite/SwapWarningModal.tsx
similarity index 74%
rename from packages/wallet/src/features/transactions/swap/SwapWarningModal.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/SwapWarningModal.tsx
index d00617f6c9c..86bc2ff339e 100644
--- a/packages/wallet/src/features/transactions/swap/SwapWarningModal.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/SwapWarningModal.tsx
@@ -1,8 +1,8 @@
 import { useTranslation } from 'react-i18next'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
+import { ModalName } from 'src/features/telemetry/constants'
+import { ParsedWarnings } from 'src/features/transactions/swapRewrite/hooks/useParsedSwapWarnings'
 import { iconSizes } from 'ui/src/theme'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { ParsedWarnings } from 'wallet/src/features/transactions/hooks/useParsedSwapWarnings'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export function SwapWarningModal({
   onClose,
diff --git a/packages/wallet/src/features/transactions/swap/SwapTokenSelector.tsx b/apps/mobile/src/features/transactions/swapRewrite/TokenSelector.tsx
similarity index 81%
rename from packages/wallet/src/features/transactions/swap/SwapTokenSelector.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/TokenSelector.tsx
index 86af6556406..1d0505f370d 100644
--- a/packages/wallet/src/features/transactions/swap/SwapTokenSelector.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/TokenSelector.tsx
@@ -1,23 +1,20 @@
 import { Currency } from '@uniswap/sdk-core'
-import { useCallback } from 'react'
-import { flowToModalName } from 'wallet/src/components/TokenSelector/flowToModalName'
+import React, { useCallback } from 'react'
+import { SearchContext } from 'src/components/explore/search/SearchContext'
+import { flowToModalName } from 'src/components/TokenSelector/flowToModalName'
 import {
   TokenSelectorModal,
   TokenSelectorVariation,
-} from 'wallet/src/components/TokenSelector/TokenSelector'
+} from 'src/components/TokenSelector/TokenSelector'
+import { TokenSelectorFlow } from 'src/components/TokenSelector/types'
+import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
+import { MobileEventName } from 'src/features/telemetry/constants'
 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 { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import { TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
-import { sendWalletAnalyticsEvent } from 'wallet/src/telemetry'
-import { WalletEventName } from 'wallet/src/telemetry/constants'
 import { currencyAddress } from 'wallet/src/utils/currencyId'
+import { SwapFormState, useSwapFormContext } from './contexts/SwapFormContext'
 
-export function SwapTokenSelector(): JSX.Element {
+export function TokenSelector(): JSX.Element {
   const swapContext = useSwapFormContext()
   const { updateSwapForm, selectingCurrencyField, output, input } = swapContext
 
@@ -62,7 +59,7 @@ export function SwapTokenSelector(): JSX.Element {
 
       updateSwapForm(newState)
 
-      sendWalletAnalyticsEvent(WalletEventName.TokenSelected, {
+      sendMobileAnalyticsEvent(MobileEventName.TokenSelected, {
         name: currency.name,
         address: currencyAddress(currency),
         chain: currency.chainId,
diff --git a/packages/wallet/src/features/transactions/swap/TransactionAmountsReview.tsx b/apps/mobile/src/features/transactions/swapRewrite/TransactionAmountsReview.tsx
similarity index 97%
rename from packages/wallet/src/features/transactions/swap/TransactionAmountsReview.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/TransactionAmountsReview.tsx
index e7ab7777e40..a0d60bc1314 100644
--- a/packages/wallet/src/features/transactions/swap/TransactionAmountsReview.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/TransactionAmountsReview.tsx
@@ -1,11 +1,12 @@
+import React from 'react'
 import { useTranslation } from 'react-i18next'
+import { DerivedSwapInfo } from 'src/features/transactions/swap/types'
 import { Flex, Icons, Text, useSporeColors } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
 import { CurrencyLogo } from 'wallet/src/components/CurrencyLogo/CurrencyLogo'
 import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import { getSymbolDisplayText } from 'wallet/src/utils/currency'
 
diff --git a/packages/wallet/src/features/transactions/swap/TransactionModal.native.tsx b/apps/mobile/src/features/transactions/swapRewrite/TransactionModal.tsx
similarity index 84%
rename from packages/wallet/src/features/transactions/swap/TransactionModal.native.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/TransactionModal.tsx
index aaa4b1d1b3e..3408a26dc45 100644
--- a/packages/wallet/src/features/transactions/swap/TransactionModal.native.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/TransactionModal.tsx
@@ -4,7 +4,7 @@ import {
   KEYBOARD_STATE,
   useBottomSheetInternal,
 } from '@gorhom/bottom-sheet'
-import { useCallback, useMemo, useRef } from 'react'
+import React, { PropsWithChildren, useCallback, useMemo, useRef } from 'react'
 import { LayoutChangeEvent, StyleProp, TouchableWithoutFeedback, ViewStyle } from 'react-native'
 import {
   Extrapolate,
@@ -14,6 +14,10 @@ import {
   useDerivedValue,
   useSharedValue,
 } from 'react-native-reanimated'
+import { BottomSheetModal, BottomSheetModalRef } from 'src/components/modals/BottomSheetModal'
+import { HandleBar } from 'src/components/modals/HandleBar'
+import { ModalName } from 'src/features/telemetry/constants'
+import { TransactionModalContextProvider } from 'src/features/transactions/swapRewrite/contexts/TransactionModalContext'
 import {
   AnimatedFlex,
   Flex,
@@ -23,25 +27,19 @@ import {
   useSporeColors,
 } from 'ui/src'
 import { borderRadii, opacify } from 'ui/src/theme'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { BottomSheetModalRef } from 'wallet/src/components/modals/BottomSheetModalProps'
-import { HandleBar } from 'wallet/src/components/modals/HandleBar'
-import { TransactionModalContextProvider } from 'wallet/src/features/transactions/contexts/TransactionModalContext'
-import {
-  TransactionModalFooterContainerProps,
-  TransactionModalInnerContainerProps,
-  TransactionModalProps,
-} from 'wallet/src/features/transactions/swap/TransactionModalProps'
 
 const HANLDEBAR_HEIGHT = 32
 
 export function TransactionModal({
   children,
   fullscreen,
-  modalName,
   onClose,
-  ...transactionContextProps
-}: TransactionModalProps): JSX.Element {
+  modalName,
+}: PropsWithChildren<{
+  fullscreen: boolean
+  modalName: ModalName
+  onClose: () => void
+}>): JSX.Element {
   const colors = useSporeColors()
   const insets = useDeviceInsets()
   const dimensions = useDeviceDimensions()
@@ -97,9 +95,7 @@ export function TransactionModal({
       onClose={onClose}>
       <TransactionModalContextProvider
         bottomSheetViewStyles={bottomSheetViewStyles}
-        handleContentLayout={handleContentLayout}
-        onClose={onClose}
-        {...transactionContextProps}>
+        handleContentLayout={handleContentLayout}>
         {children}
       </TransactionModalContextProvider>
     </BottomSheetModal>
@@ -111,7 +107,11 @@ export function TransactionModalInnerContainer({
   onLayout,
   fullscreen,
   children,
-}: TransactionModalInnerContainerProps): JSX.Element {
+}: PropsWithChildren<{
+  bottomSheetViewStyles: StyleProp<ViewStyle>
+  onLayout: (event: LayoutChangeEvent) => void
+  fullscreen: boolean
+}>): JSX.Element {
   const insets = useDeviceInsets()
 
   const { animatedFooterHeight } = useBottomSheetInternal()
@@ -141,9 +141,7 @@ export function TransactionModalInnerContainer({
   )
 }
 
-export function TransactionModalFooterContainer({
-  children,
-}: TransactionModalFooterContainerProps): JSX.Element {
+export function TransactionModalFooterContainer({ children }: PropsWithChildren): JSX.Element {
   const insets = useDeviceInsets()
   const colors = useSporeColors()
 
diff --git a/packages/wallet/src/features/transactions/contexts/SwapFormContext.tsx b/apps/mobile/src/features/transactions/swapRewrite/contexts/SwapFormContext.tsx
similarity index 96%
rename from packages/wallet/src/features/transactions/contexts/SwapFormContext.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/contexts/SwapFormContext.tsx
index e288b36b9bb..73d83df4ec4 100644
--- a/packages/wallet/src/features/transactions/contexts/SwapFormContext.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/contexts/SwapFormContext.tsx
@@ -9,10 +9,10 @@ import {
   useRef,
   useState,
 } from 'react'
+import { useDerivedSwapInfo } from 'src/features/transactions/swap/hooks'
 import { getNativeAddress } from 'wallet/src/constants/addresses'
 import { ChainId } from 'wallet/src/constants/chains'
 import { AssetType, TradeableAsset } from 'wallet/src/entities/assets'
-import { useDerivedSwapInfo } from 'wallet/src/features/transactions/swap/hooks'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 
 export type SwapFormState = {
@@ -37,6 +37,7 @@ type SwapFormContextState = {
   amountUpdatedTimeRef: React.MutableRefObject<number>
   exactAmountFiatRef: React.MutableRefObject<string>
   exactAmountTokenRef: React.MutableRefObject<string>
+  onClose: () => void
   setSwapForm: Dispatch<SetStateAction<SwapFormState>>
   updateSwapForm: (newState: Partial<SwapFormState>) => void
 } & SwapFormState &
@@ -64,9 +65,11 @@ export const SwapFormContext = createContext<SwapFormContextState | undefined>(u
 export function SwapFormContextProvider({
   children,
   prefilledState,
+  onClose,
 }: {
   children: ReactNode
   prefilledState?: SwapFormState
+  onClose: () => void
 }): JSX.Element {
   const amountUpdatedTimeRef = useRef<number>(0)
   const exactAmountFiatRef = useRef<string>('')
@@ -118,6 +121,7 @@ export function SwapFormContextProvider({
       input: swapForm.input,
       isFiatMode: swapForm.isFiatMode,
       isSubmitting: swapForm.isSubmitting,
+      onClose,
       output: swapForm.output,
       selectingCurrencyField: swapForm.selectingCurrencyField,
       setSwapForm,
@@ -136,6 +140,7 @@ export function SwapFormContextProvider({
       swapForm.output,
       swapForm.selectingCurrencyField,
       swapForm.txId,
+      onClose,
       updateSwapForm,
       derivedSwapInfo,
     ]
diff --git a/packages/wallet/src/features/transactions/contexts/SwapScreenContext.tsx b/apps/mobile/src/features/transactions/swapRewrite/contexts/SwapScreenContext.tsx
similarity index 100%
rename from packages/wallet/src/features/transactions/contexts/SwapScreenContext.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/contexts/SwapScreenContext.tsx
diff --git a/apps/mobile/src/features/transactions/swapRewrite/contexts/SwapTxContext.tsx b/apps/mobile/src/features/transactions/swapRewrite/contexts/SwapTxContext.tsx
new file mode 100644
index 00000000000..972a86a2449
--- /dev/null
+++ b/apps/mobile/src/features/transactions/swapRewrite/contexts/SwapTxContext.tsx
@@ -0,0 +1,63 @@
+import { createContext, ReactNode, useContext, useMemo } from 'react'
+import { useSwapTxAndGasInfo } from 'src/features/transactions/swap/hooks'
+import { useSwapFormContext } from 'src/features/transactions/swapRewrite/contexts/SwapFormContext'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
+
+type SwapTxContextState = {
+  txRequest: ReturnType<typeof useSwapTxAndGasInfo>['txRequest']
+  approveTxRequest: ReturnType<typeof useSwapTxAndGasInfo>['approveTxRequest']
+  gasFee: ReturnType<typeof useSwapTxAndGasInfo>['gasFee']
+}
+
+export const SwapTxContext = createContext<SwapTxContextState | undefined>(undefined)
+
+export function SwapTxContextProvider({ children }: { children: ReactNode }): JSX.Element {
+  const { derivedSwapInfo } = useSwapFormContext()
+
+  const currencyBalanceIn = derivedSwapInfo.currencyBalances[CurrencyField.INPUT]
+  const currencyAmountIn = derivedSwapInfo.currencyAmounts[CurrencyField.INPUT]
+  const swapBalanceInsufficient = currencyAmountIn && currencyBalanceIn?.lessThan(currencyAmountIn)
+
+  const balanceLimitedDerivedSwapInfo = useMemo(() => {
+    if (swapBalanceInsufficient) {
+      return {
+        ...derivedSwapInfo,
+        currencyAmounts: {
+          // When the balance is insufficient to swap, we want to skip the Tx and Gas queries to avoid a 400 error,
+          // so we set the amounts to `null` to let the `useSwapTxAndGasInfo` hook (and its dependencies) know that they can skip this logic.
+          // The UI will show an "insufficient balance" error when this happens.
+          [CurrencyField.INPUT]: null,
+          [CurrencyField.OUTPUT]: null,
+        },
+      }
+    }
+
+    return derivedSwapInfo
+  }, [derivedSwapInfo, swapBalanceInsufficient])
+
+  const { txRequest, approveTxRequest, gasFee } = useSwapTxAndGasInfo({
+    derivedSwapInfo: balanceLimitedDerivedSwapInfo,
+    skipGasFeeQuery: false,
+  })
+
+  const state = useMemo<SwapTxContextState>(
+    (): SwapTxContextState => ({
+      txRequest,
+      approveTxRequest,
+      gasFee,
+    }),
+    [approveTxRequest, gasFee, txRequest]
+  )
+
+  return <SwapTxContext.Provider value={state}>{children}</SwapTxContext.Provider>
+}
+
+export const useSwapTxContext = (): SwapTxContextState => {
+  const swapContext = useContext(SwapTxContext)
+
+  if (swapContext === undefined) {
+    throw new Error('`useSwapTxContext` must be used inside of `SwapTxContextProvider`')
+  }
+
+  return swapContext
+}
diff --git a/packages/wallet/src/features/transactions/contexts/TransactionModalContext.tsx b/apps/mobile/src/features/transactions/swapRewrite/contexts/TransactionModalContext.tsx
similarity index 57%
rename from packages/wallet/src/features/transactions/contexts/TransactionModalContext.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/contexts/TransactionModalContext.tsx
index c67e6a48fa4..636ae452dd8 100644
--- a/packages/wallet/src/features/transactions/contexts/TransactionModalContext.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/contexts/TransactionModalContext.tsx
@@ -1,15 +1,9 @@
 import { createContext, ReactNode, useContext, useMemo } from 'react'
 import { LayoutChangeEvent, StyleProp, ViewStyle } from 'react-native'
-import { AuthTrigger } from 'wallet/src/features/auth/types'
 
-export type TransactionModalContextState = {
+type TransactionModalContextState = {
   bottomSheetViewStyles: StyleProp<ViewStyle>
   handleContentLayout: (event: LayoutChangeEvent) => void
-  openWalletRestoreModal?: () => void
-  walletNeedsRestore?: boolean
-  onClose: () => void
-  BiometricsIcon?: JSX.Element | null
-  authTrigger?: AuthTrigger
 }
 
 export const TransactionModalContext = createContext<TransactionModalContextState | undefined>(
@@ -18,42 +12,19 @@ export const TransactionModalContext = createContext<TransactionModalContextStat
 
 export function TransactionModalContextProvider({
   children,
-  BiometricsIcon,
-  authTrigger,
   bottomSheetViewStyles,
   handleContentLayout,
-  onClose,
-  openWalletRestoreModal,
-  walletNeedsRestore,
 }: {
   children: ReactNode
-  BiometricsIcon?: TransactionModalContextState['BiometricsIcon']
-  authTrigger?: TransactionModalContextState['authTrigger']
   bottomSheetViewStyles: TransactionModalContextState['bottomSheetViewStyles']
   handleContentLayout: TransactionModalContextState['handleContentLayout']
-  onClose: () => void
-  openWalletRestoreModal?: TransactionModalContextState['openWalletRestoreModal']
-  walletNeedsRestore?: TransactionModalContextState['walletNeedsRestore']
 }): JSX.Element {
   const state = useMemo<TransactionModalContextState>(
     (): TransactionModalContextState => ({
-      BiometricsIcon,
-      authTrigger,
       bottomSheetViewStyles,
       handleContentLayout,
-      onClose,
-      openWalletRestoreModal,
-      walletNeedsRestore,
     }),
-    [
-      BiometricsIcon,
-      authTrigger,
-      bottomSheetViewStyles,
-      handleContentLayout,
-      onClose,
-      openWalletRestoreModal,
-      walletNeedsRestore,
-    ]
+    [bottomSheetViewStyles, handleContentLayout]
   )
 
   return (
diff --git a/packages/wallet/src/features/transactions/contexts/TransferScreenContext.tsx b/apps/mobile/src/features/transactions/swapRewrite/contexts/TransferScreenContex.tsx
similarity index 94%
rename from packages/wallet/src/features/transactions/contexts/TransferScreenContext.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/contexts/TransferScreenContex.tsx
index 354be19430f..46bf116fc01 100644
--- a/packages/wallet/src/features/transactions/contexts/TransferScreenContext.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/contexts/TransferScreenContex.tsx
@@ -15,7 +15,6 @@ export const TransferScreenContext = createContext<TransferScreenContextState |
   undefined
 )
 
-// TODO: re-use the same context built in extension, and move that to shared folder.
 export function TransferScreenContextProvider({ children }: { children: ReactNode }): JSX.Element {
   const screenRef = useRef<TransferScreen>(TransferScreen.TransferForm)
   const [screen, setScreen] = useState<TransferScreen>(TransferScreen.TransferForm)
diff --git a/apps/mobile/src/features/transactions/swapRewrite/hooks/useOnCloseSendModal.tsx b/apps/mobile/src/features/transactions/swapRewrite/hooks/useOnCloseSwapModal.tsx
similarity index 56%
rename from apps/mobile/src/features/transactions/swapRewrite/hooks/useOnCloseSendModal.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/hooks/useOnCloseSwapModal.tsx
index 0a946ef4ca1..0a86d675950 100644
--- a/apps/mobile/src/features/transactions/swapRewrite/hooks/useOnCloseSendModal.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/hooks/useOnCloseSwapModal.tsx
@@ -1,7 +1,17 @@
 import { useCallback } from 'react'
 import { useAppDispatch } from 'src/app/hooks'
 import { closeModal } from 'src/features/modals/modalSlice'
-import { ModalName } from 'wallet/src/telemetry/constants'
+import { ModalName } from 'src/features/telemetry/constants'
+
+export function useOnCloseSwapModal(): () => void {
+  const appDispatch = useAppDispatch()
+
+  const onClose = useCallback((): void => {
+    appDispatch(closeModal({ name: ModalName.Swap }))
+  }, [appDispatch])
+
+  return onClose
+}
 
 export function useOnCloseSendModal(): () => void {
   const appDispatch = useAppDispatch()
diff --git a/packages/wallet/src/features/transactions/hooks/useParsedSwapWarnings.tsx b/apps/mobile/src/features/transactions/swapRewrite/hooks/useParsedSwapWarnings.tsx
similarity index 89%
rename from packages/wallet/src/features/transactions/hooks/useParsedSwapWarnings.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/hooks/useParsedSwapWarnings.tsx
index a02a849eb44..3f4d3d3e78c 100644
--- a/packages/wallet/src/features/transactions/hooks/useParsedSwapWarnings.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/hooks/useParsedSwapWarnings.tsx
@@ -1,18 +1,18 @@
 import { FunctionComponent, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { SvgProps } from 'react-native-svg'
-import { Icons } from 'ui/src'
-import { useSwapFormContext } from 'wallet/src/features/transactions/contexts/SwapFormContext'
-import { useSwapTxContext } from 'wallet/src/features/transactions/contexts/SwapTxContext'
-import { useSwapWarnings } from 'wallet/src/features/transactions/hooks/useSwapWarnings'
-import { useTransactionGasWarning } from 'wallet/src/features/transactions/hooks/useTransactionGasWarning'
 import {
   Warning,
   WarningAction,
   WarningColor,
   WarningLabel,
   WarningSeverity,
-} from 'wallet/src/features/transactions/WarningModal/types'
+} from 'src/components/modals/WarningModal/types'
+import { useSwapWarnings } from 'src/features/transactions/swap/useSwapWarnings'
+import { useSwapFormContext } from 'src/features/transactions/swapRewrite/contexts/SwapFormContext'
+import { useSwapTxContext } from 'src/features/transactions/swapRewrite/contexts/SwapTxContext'
+import { useTransactionGasWarning } from 'src/features/transactions/useTransactionGasWarning'
+import { Icons } from 'ui/src'
 
 type WarningWithStyle = {
   warning: Warning
diff --git a/packages/wallet/src/features/transactions/hooks/useSyncFiatAndTokenAmountUpdater.tsx b/apps/mobile/src/features/transactions/swapRewrite/hooks/useSyncFiatAndTokenAmountUpdater.tsx
similarity index 94%
rename from packages/wallet/src/features/transactions/hooks/useSyncFiatAndTokenAmountUpdater.tsx
rename to apps/mobile/src/features/transactions/swapRewrite/hooks/useSyncFiatAndTokenAmountUpdater.tsx
index 2d8975b4f9c..184b5297706 100644
--- a/packages/wallet/src/features/transactions/hooks/useSyncFiatAndTokenAmountUpdater.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/hooks/useSyncFiatAndTokenAmountUpdater.tsx
@@ -1,10 +1,10 @@
 import { useEffect } from 'react'
+import { useSwapFormContext } from 'src/features/transactions/swapRewrite/contexts/SwapFormContext'
 import { NumberType } from 'utilities/src/format/types'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { STABLECOIN_AMOUNT_OUT, useUSDCPrice } from 'wallet/src/features/routing/useUSDCPrice'
-import { useSwapFormContext } from 'wallet/src/features/transactions/contexts/SwapFormContext'
 import { currencyIdToChain } from 'wallet/src/utils/currencyId'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
 // Used for rounding in conversion math
 const NUM_DECIMALS_FIAT_ROUNDING = 2
diff --git a/apps/mobile/src/features/transactions/swapRewrite/transfer/TransferFlow.tsx b/apps/mobile/src/features/transactions/swapRewrite/transfer/TransferFlow.tsx
index ecba034f200..a7db47d972a 100644
--- a/apps/mobile/src/features/transactions/swapRewrite/transfer/TransferFlow.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/transfer/TransferFlow.tsx
@@ -1,22 +1,21 @@
 import { Dispatch, ReactNode, SetStateAction, useEffect, useMemo, useState } from 'react'
 import { useAppSelector } from 'src/app/hooks'
 import { selectModalState } from 'src/features/modals/selectModalState'
-import { useOnCloseSendModal } from 'src/features/transactions/swapRewrite/hooks/useOnCloseSendModal'
-import { TransferFormScreen } from 'src/features/transactions/swapRewrite/transfer/TransferFormScreen'
-import { getFocusOnCurrencyFieldFromInitialState } from 'src/features/transactions/swapRewrite/utils'
-import { useWalletRestore } from 'src/features/wallet/hooks'
-import { Trace } from 'utilities/src/telemetry/trace/Trace'
+import { ModalName, SectionName } from 'src/features/telemetry/constants'
 import {
   SwapFormContextProvider,
   SwapFormState,
-} from 'wallet/src/features/transactions/contexts/SwapFormContext'
+} from 'src/features/transactions/swapRewrite/contexts/SwapFormContext'
 import {
   TransferScreen,
   TransferScreenContextProvider,
   useTransferScreenContext,
-} from 'wallet/src/features/transactions/contexts/TransferScreenContext'
-import { TransactionModal } from 'wallet/src/features/transactions/swap/TransactionModal'
-import { ModalName, SectionName } from 'wallet/src/telemetry/constants'
+} from 'src/features/transactions/swapRewrite/contexts/TransferScreenContex'
+import { useOnCloseSendModal } from 'src/features/transactions/swapRewrite/hooks/useOnCloseSwapModal'
+import { TransactionModal } from 'src/features/transactions/swapRewrite/TransactionModal'
+import { TransferFormScreen } from 'src/features/transactions/swapRewrite/transfer/TransferFormScreen'
+import { getFocusOnCurrencyFieldFromInitialState } from 'src/features/transactions/swapRewrite/utils'
+import { Trace } from 'utilities/src/telemetry/trace/Trace'
 
 export function TransferFlow(): JSX.Element {
   // We need this additional `screen` state outside of the `SwapScreenContext` because the `TransferContextProvider` needs to be inside the `BottomSheetModal`'s `Container`.
@@ -24,15 +23,8 @@ export function TransferFlow(): JSX.Element {
   const fullscreen = screen === TransferScreen.TransferForm
   const onClose = useOnCloseSendModal()
 
-  const { walletNeedsRestore, openWalletRestoreModal } = useWalletRestore()
-
   return (
-    <TransactionModal
-      fullscreen={fullscreen}
-      modalName={ModalName.Send}
-      openWalletRestoreModal={openWalletRestoreModal}
-      walletNeedsRestore={walletNeedsRestore}
-      onClose={onClose}>
+    <TransactionModal fullscreen={fullscreen} modalName={ModalName.Send} onClose={onClose}>
       <TransferContextsContainer>
         <CurrentScreen screen={screen} setScreen={setScreen} />
       </TransferContextsContainer>
@@ -74,6 +66,7 @@ function TransferFormScreenDelayedRender(): JSX.Element {
 }
 
 function TransferContextsContainer({ children }: { children?: ReactNode }): JSX.Element {
+  const onClose = useOnCloseSendModal()
   const { initialState } = useAppSelector(selectModalState(ModalName.Send))
 
   const prefilledState = useMemo(
@@ -98,7 +91,9 @@ function TransferContextsContainer({ children }: { children?: ReactNode }): JSX.
 
   return (
     <TransferScreenContextProvider>
-      <SwapFormContextProvider prefilledState={prefilledState}>{children}</SwapFormContextProvider>
+      <SwapFormContextProvider prefilledState={prefilledState} onClose={onClose}>
+        {children}
+      </SwapFormContextProvider>
     </TransferScreenContextProvider>
   )
 }
diff --git a/apps/mobile/src/features/transactions/swapRewrite/transfer/TransferFormScreen.tsx b/apps/mobile/src/features/transactions/swapRewrite/transfer/TransferFormScreen.tsx
index af811294321..fefcf3dcd6a 100644
--- a/apps/mobile/src/features/transactions/swapRewrite/transfer/TransferFormScreen.tsx
+++ b/apps/mobile/src/features/transactions/swapRewrite/transfer/TransferFormScreen.tsx
@@ -1,8 +1,9 @@
 import React from 'react'
+import { useSwapFormContext } from 'src/features/transactions/swapRewrite/contexts/SwapFormContext'
+import { useTransactionModalContext } from 'src/features/transactions/swapRewrite/contexts/TransactionModalContext'
+import { TokenSelector } from 'src/features/transactions/swapRewrite/TokenSelector'
+import { TransactionModalInnerContainer } from 'src/features/transactions/swapRewrite/TransactionModal'
 import { Text } from 'ui/src'
-import { useSwapFormContext } from 'wallet/src/features/transactions/contexts/SwapFormContext'
-import { useTransactionModalContext } from 'wallet/src/features/transactions/contexts/TransactionModalContext'
-import { TransactionModalInnerContainer } from 'wallet/src/features/transactions/swap/TransactionModal'
 
 export function TransferFormScreen({ hideContent }: { hideContent: boolean }): JSX.Element {
   const { handleContentLayout, bottomSheetViewStyles } = useTransactionModalContext()
@@ -20,8 +21,3 @@ export function TransferFormScreen({ hideContent }: { hideContent: boolean }): J
     </TransactionModalInnerContainer>
   )
 }
-
-function TokenSelector(): JSX.Element | null {
-  // TODO: implement. See `wallet/.../SwapTokenSelector.tsx` for reference.
-  return null
-}
diff --git a/packages/wallet/src/features/transactions/transactionState/transactionState.test.ts b/apps/mobile/src/features/transactions/transactionState/transactionState.test.ts
similarity index 100%
rename from packages/wallet/src/features/transactions/transactionState/transactionState.test.ts
rename to apps/mobile/src/features/transactions/transactionState/transactionState.test.ts
diff --git a/packages/wallet/src/features/transactions/transactionState/transactionState.ts b/apps/mobile/src/features/transactions/transactionState/transactionState.ts
similarity index 100%
rename from packages/wallet/src/features/transactions/transactionState/transactionState.ts
rename to apps/mobile/src/features/transactions/transactionState/transactionState.ts
diff --git a/apps/mobile/src/features/transactions/transactionState/types.ts b/apps/mobile/src/features/transactions/transactionState/types.ts
new file mode 100644
index 00000000000..d869e981e2f
--- /dev/null
+++ b/apps/mobile/src/features/transactions/transactionState/types.ts
@@ -0,0 +1,18 @@
+import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
+import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
+
+export type BaseDerivedInfo<TInput = CurrencyInfo> = {
+  currencies: {
+    [CurrencyField.INPUT]: Maybe<TInput>
+  }
+  currencyAmounts: {
+    [CurrencyField.INPUT]: Maybe<CurrencyAmount<Currency>>
+  }
+  currencyBalances: {
+    [CurrencyField.INPUT]: Maybe<CurrencyAmount<Currency>>
+  }
+  exactAmountFiat?: string
+  exactAmountToken: string
+  exactCurrencyField: CurrencyField
+}
diff --git a/apps/mobile/src/features/transactions/transfer/TransferFlow.tsx b/apps/mobile/src/features/transactions/transfer/TransferFlow.tsx
index 3d1098211cb..23554fd7080 100644
--- a/apps/mobile/src/features/transactions/transfer/TransferFlow.tsx
+++ b/apps/mobile/src/features/transactions/transfer/TransferFlow.tsx
@@ -1,33 +1,34 @@
 import { providers } from 'ethers'
 import React, { useMemo, useReducer, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { WarningAction } from 'src/components/modals/WarningModal/types'
 import { RecipientSelect } from 'src/components/RecipientSelect/RecipientSelect'
-import { useOnSendEmptyActionPress } from 'src/features/transactions/hooks/useOnSendEmptyActionPress'
-import { TransactionFlow } from 'src/features/transactions/TransactionFlow'
 import {
   TokenSelectorModal,
   TokenSelectorVariation,
-} from 'wallet/src/components/TokenSelector/TokenSelector'
-import { useTransactionGasFee } from 'wallet/src/features/gas/hooks'
-import { GasSpeed } from 'wallet/src/features/gas/types'
-import { useTokenSelectorActionHandlers } from 'wallet/src/features/transactions/hooks/useTokenSelectorActionHandlers'
-import { useTransactionGasWarning } from 'wallet/src/features/transactions/hooks/useTransactionGasWarning'
+} from 'src/components/TokenSelector/TokenSelector'
+import { TokenSelectorFlow } from 'src/components/TokenSelector/types'
+import { useTokenSelectorActionHandlers } from 'src/features/transactions/hooks'
+import { TransactionFlow } from 'src/features/transactions/TransactionFlow'
 import {
   initialState as emptyState,
   transactionStateReducer,
-} from 'wallet/src/features/transactions/transactionState/transactionState'
+} from 'src/features/transactions/transactionState/transactionState'
+import { TransactionStep } from 'src/features/transactions/types'
+import { useTransactionGasWarning } from 'src/features/transactions/useTransactionGasWarning'
+import { useTransactionGasFee } from 'wallet/src/features/gas/hooks'
+import { GasSpeed } from 'wallet/src/features/gas/types'
 import {
   CurrencyField,
   TransactionState,
 } from 'wallet/src/features/transactions/transactionState/types'
-import { useDerivedTransferInfo } from 'wallet/src/features/transactions/transfer/hooks/useDerivedTransferInfo'
-import { useOnSelectRecipient } from 'wallet/src/features/transactions/transfer/hooks/useOnSelectRecipient'
-import { useOnToggleShowRecipientSelector } from 'wallet/src/features/transactions/transfer/hooks/useOnToggleShowRecipientSelector'
-import { useTransferTransactionRequest } from 'wallet/src/features/transactions/transfer/hooks/useTransferTransactionRequest'
-import { useTransferWarnings } from 'wallet/src/features/transactions/transfer/hooks/useTransferWarnings'
-import { TokenSelectorFlow } from 'wallet/src/features/transactions/transfer/types'
-import { TransactionStep } from 'wallet/src/features/transactions/types'
-import { WarningAction } from 'wallet/src/features/transactions/WarningModal/types'
+import {
+  useDerivedTransferInfo,
+  useOnSelectRecipient,
+  useOnToggleShowRecipientSelector,
+} from './hooks'
+import { useTransferTransactionRequest } from './useTransferTransactionRequest'
+import { useTransferWarnings } from './useTransferWarnings'
 
 interface TransferFormProps {
   prefilledState?: TransactionState
@@ -71,7 +72,6 @@ export function TransferFlow({ prefilledState, onClose }: TransferFormProps): JS
     dispatch,
     TokenSelectorFlow.Transfer
   )
-  const onSendEmptyActionPress = useOnSendEmptyActionPress()
 
   return (
     <>
@@ -104,7 +104,6 @@ export function TransferFlow({ prefilledState, onClose }: TransferFormProps): JS
           variation={TokenSelectorVariation.BalancesOnly}
           onClose={onHideTokenSelector}
           onSelectCurrency={onSelectCurrency}
-          onSendEmptyActionPress={onSendEmptyActionPress}
         />
       )}
     </>
diff --git a/packages/wallet/src/features/transactions/transfer/TransferFormWarnings.tsx b/apps/mobile/src/features/transactions/transfer/TransferFormWarnings.tsx
similarity index 81%
rename from packages/wallet/src/features/transactions/transfer/TransferFormWarnings.tsx
rename to apps/mobile/src/features/transactions/transfer/TransferFormWarnings.tsx
index f9799f1ca3d..3d8b714e8a0 100644
--- a/packages/wallet/src/features/transactions/transfer/TransferFormWarnings.tsx
+++ b/apps/mobile/src/features/transactions/transfer/TransferFormWarnings.tsx
@@ -1,19 +1,18 @@
-import { useEffect, useMemo } from 'react'
+import React, { useEffect, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
+import { WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
+import { ModalName } from 'src/features/telemetry/constants'
+import { useAllTransactionsBetweenAddresses } from 'src/features/transactions/hooks'
+import { useIsSmartContractAddress } from 'src/features/transactions/transfer/hooks'
 import { Flex, Text } from 'ui/src'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
 import { ChainId } from 'wallet/src/constants/chains'
-import { useAllTransactionsBetweenAddresses } from 'wallet/src/features/transactions/hooks/useAllTransactionsBetweenAddresses'
-import { useIsSmartContractAddress } from 'wallet/src/features/transactions/transfer/hooks/useIsSmartContractAddress'
-import { TransferSpeedbump } from 'wallet/src/features/transactions/transfer/types'
-import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
 import {
   useActiveAccountAddressWithThrow,
   useDisplayName,
   useSignerAccounts,
 } from 'wallet/src/features/wallet/hooks'
-import { DisplayNameType } from 'wallet/src/features/wallet/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
+import { TransferSpeedbump } from './types'
 
 interface TransferFormWarningProps {
   recipient?: string
@@ -106,13 +105,13 @@ export function TransferFormSpeedbumps({
 interface TransferRecipientProps {
   displayName?: string
   address?: string
-  type?: DisplayNameType
+  type?: string
 }
 
 const TransferRecipient = ({
   displayName,
   address,
-  type = DisplayNameType.Address,
+  type = 'address',
 }: TransferRecipientProps): JSX.Element => {
   return (
     <Flex
@@ -124,9 +123,9 @@ const TransferRecipient = ({
       px="$spacing16"
       py="$spacing12">
       <Text color="$neutral1" textAlign="center" variant="subheading2">
-        {type === DisplayNameType.ENS ? displayName : address}
+        {type === 'ens' ? displayName : address}
       </Text>
-      {type === DisplayNameType.ENS && (
+      {type === 'ens' && (
         <Text color="$neutral2" textAlign="center" variant="buttonLabel4">
           {address}
         </Text>
diff --git a/packages/wallet/src/features/transactions/transfer/TransferReview.tsx b/apps/mobile/src/features/transactions/transfer/TransferReview.tsx
similarity index 74%
rename from packages/wallet/src/features/transactions/transfer/TransferReview.tsx
rename to apps/mobile/src/features/transactions/transfer/TransferReview.tsx
index fb039700c37..dfe0916e9f7 100644
--- a/packages/wallet/src/features/transactions/transfer/TransferReview.tsx
+++ b/apps/mobile/src/features/transactions/transfer/TransferReview.tsx
@@ -1,36 +1,32 @@
 import { providers } from 'ethers'
-import { useState } from 'react'
+import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { iconSizes } from 'ui/src/theme'
+import { Warning, WarningAction, WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
+import { NetworkFeeInfoModal } from 'src/features/transactions/swap/modals/NetworkFeeInfoModal'
+import { TransactionDetails } from 'src/features/transactions/TransactionDetails'
+import { TransactionReview } from 'src/features/transactions/TransactionReview'
+import {
+  DerivedTransferInfo,
+  useTransferERC20Callback,
+  useTransferNFTCallback,
+} from 'src/features/transactions/transfer/hooks'
 import { NumberType } from 'utilities/src/format/types'
-import { AccountDetails } from 'wallet/src/components/accounts/AccountDetails'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
 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 { useUSDCValue } from 'wallet/src/features/routing/useUSDCPrice'
-import { NetworkFeeInfoModal } from 'wallet/src/features/transactions/swap/modals/NetworkFeeInfoModal'
-import { TransactionDetails } from 'wallet/src/features/transactions/TransactionDetails/TransactionDetails'
-import { TransactionReview } from 'wallet/src/features/transactions/TransactionReview/TransactionReview'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import { DerivedTransferInfo } from 'wallet/src/features/transactions/transfer/types'
-import {
-  Warning,
-  WarningAction,
-  WarningSeverity,
-} from 'wallet/src/features/transactions/WarningModal/types'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
-import {
-  useActiveAccountAddressWithThrow,
-  useActiveAccountWithThrow,
-} from 'wallet/src/features/wallet/hooks'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
+import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
+import { currencyAddress } from 'wallet/src/utils/currencyId'
 
 interface TransferFormProps {
   derivedTransferInfo: DerivedTransferInfo
   txRequest?: providers.TransactionRequest
   gasFee: GasFeeResult
-  onReviewSubmit: () => void
+  onNext: () => void
   onPrev: () => void
   warnings: Warning[]
 }
@@ -38,7 +34,7 @@ interface TransferFormProps {
 export function TransferReview({
   derivedTransferInfo,
   gasFee,
-  onReviewSubmit,
+  onNext,
   onPrev,
   txRequest,
   warnings,
@@ -50,8 +46,6 @@ export function TransferReview({
   const [showNetworkFeeInfoModal, setShowNetworkFeeInfoModal] = useState(false)
   const currency = useAppFiatCurrencyInfo()
 
-  const userAddress = useActiveAccountAddressWithThrow()
-
   const onShowWarning = (): void => {
     setShowWarningModal(true)
   }
@@ -75,6 +69,7 @@ export function TransferReview({
     currencyInInfo,
     nftIn,
     chainId,
+    txId,
     exactAmountFiat,
   } = derivedTransferInfo
 
@@ -93,11 +88,40 @@ export function TransferReview({
     !txRequest ||
     account.type === AccountType.Readonly
 
+  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 submitCallback = (): void => {
+    onNext()
+    nftIn ? transferNFTCallback?.() : transferERC20Callback?.()
+  }
+
+  if (!recipient) {
+    return null
+  }
+
   const actionButtonProps = {
     disabled: actionButtonDisabled,
     label: t('Send'),
     name: ElementName.Send,
-    onPress: onReviewSubmit,
+    onPress: submitCallback,
   }
 
   const transferWarning = warnings.find((warning) => warning.severity >= WarningSeverity.Medium)
@@ -114,10 +138,6 @@ export function TransferReview({
       })
     : formattedCurrencyAmount
 
-  if (!recipient) {
-    return null
-  }
-
   return (
     <>
       {showWarningModal && transferWarning?.title && (
@@ -144,7 +164,6 @@ export function TransferReview({
         recipient={recipient}
         transactionDetails={
           <TransactionDetails
-            AccountDetails={<AccountDetails address={userAddress} iconSize={iconSizes.icon20} />}
             chainId={chainId}
             gasFee={gasFee}
             showWarning={Boolean(transferWarning)}
diff --git a/apps/mobile/src/features/transactions/transfer/TransferStatus.tsx b/apps/mobile/src/features/transactions/transfer/TransferStatus.tsx
index 62fb6f4bc23..ae0a6e0dbc6 100644
--- a/apps/mobile/src/features/transactions/transfer/TransferStatus.tsx
+++ b/apps/mobile/src/features/transactions/transfer/TransferStatus.tsx
@@ -1,7 +1,9 @@
 import React, { useCallback, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { goBack } from 'src/app/navigation/rootNavigation'
+import { useSelectTransaction } from 'src/features/transactions/hooks'
 import { TransactionPending } from 'src/features/transactions/TransactionPending/TransactionPending'
+import { DerivedTransferInfo } from 'src/features/transactions/transfer/hooks'
 import { AppTFunction } from 'ui/src/i18n/types'
 import { NumberType } from 'utilities/src/format/types'
 import { FiatCurrencyInfo, useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
@@ -9,9 +11,7 @@ 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,
@@ -105,8 +105,7 @@ export function TransferStatus({
 
   const transaction = useSelectTransaction(activeAddress, chainId, txId)
 
-  const displayName = useDisplayName(recipient, { includeUnitagSuffix: true })
-  const recipientName = displayName?.name ?? recipient
+  const recipientName = useDisplayName(recipient)?.name ?? recipient
   const { title, description } = useMemo(() => {
     return getTextFromTransferStatus(
       t,
diff --git a/packages/wallet/src/features/transactions/transfer/TransferTokenForm.tsx b/apps/mobile/src/features/transactions/transfer/TransferTokenForm.tsx
similarity index 83%
rename from packages/wallet/src/features/transactions/transfer/TransferTokenForm.tsx
rename to apps/mobile/src/features/transactions/transfer/TransferTokenForm.tsx
index 20d0d9dd9d5..5d724c24f3c 100644
--- a/packages/wallet/src/features/transactions/transfer/TransferTokenForm.tsx
+++ b/apps/mobile/src/features/transactions/transfer/TransferTokenForm.tsx
@@ -3,9 +3,32 @@
 import { AnyAction } from '@reduxjs/toolkit'
 import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { Keyboard, LayoutChangeEvent, StyleSheet } from 'react-native'
+import { Keyboard, StyleSheet } from 'react-native'
 import { FadeIn, FadeOut, FadeOutDown } from 'react-native-reanimated'
-import { isWeb } from 'tamagui'
+import { useShouldShowNativeKeyboard } from 'src/app/hooks'
+import { TransferArrowButton } from 'src/components/buttons/TransferArrowButton'
+import { CurrencyInputPanel } from 'src/components/input/CurrencyInputPanel'
+import { DecimalPad } from 'src/components/input/DecimalPad'
+import { RecipientInputPanel } from 'src/components/input/RecipientInputPanel'
+import { TextInputProps } from 'src/components/input/TextInput'
+import { Warning, WarningAction, WarningSeverity } from 'src/components/modals/WarningModal/types'
+import WarningModal, { getAlertColor } from 'src/components/modals/WarningModal/WarningModal'
+import { NFTTransfer } from 'src/components/NFT/NFTTransfer'
+import { TokenSelectorFlow } from 'src/components/TokenSelector/types'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
+import {
+  useTokenFormActionHandlers,
+  useTokenSelectorActionHandlers,
+} from 'src/features/transactions/hooks'
+import { useUSDTokenUpdater } from 'src/features/transactions/swap/hooks'
+import { transactionStateActions } from 'src/features/transactions/transactionState/transactionState'
+import {
+  DerivedTransferInfo,
+  useOnToggleShowRecipientSelector,
+} from 'src/features/transactions/transfer/hooks'
+import { TransferFormSpeedbumps } from 'src/features/transactions/transfer/TransferFormWarnings'
+import { BlockedAddressWarning } from 'src/features/trm/BlockedAddressWarning'
+import { useWalletRestore } from 'src/features/wallet/hooks'
 import {
   AnimatedFlex,
   Button,
@@ -19,35 +42,11 @@ import {
 import InfoCircleFilled from 'ui/src/assets/icons/info-circle-filled.svg'
 import { iconSizes, spacing } from 'ui/src/theme'
 import { usePrevious } from 'utilities/src/react/hooks'
-import { TransferArrowButton } from 'wallet/src/components/buttons/TransferArrowButton'
-import { RecipientInputPanel } from 'wallet/src/components/input/RecipientInputPanel'
-import { TextInputProps } from 'wallet/src/components/input/TextInput'
-import { CurrencyInputPanelLegacy } from 'wallet/src/components/legacy/CurrencyInputPanelLegacy'
-import { DecimalPadLegacy } from 'wallet/src/components/legacy/DecimalPadLegacy'
-import { getAlertColor, WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { NFTTransfer } from 'wallet/src/components/NFT/NFTTransfer'
 import { useUSDCValue } from 'wallet/src/features/routing/useUSDCPrice'
-import { useTokenFormActionHandlers } from 'wallet/src/features/transactions/hooks/useTokenFormActionHandlers'
-import { useTokenSelectorActionHandlers } from 'wallet/src/features/transactions/hooks/useTokenSelectorActionHandlers'
-import { useUSDTokenUpdater } from 'wallet/src/features/transactions/swap/hooks'
-import { transactionStateActions } from 'wallet/src/features/transactions/transactionState/transactionState'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import { useOnToggleShowRecipientSelector } from 'wallet/src/features/transactions/transfer/hooks/useOnToggleShowRecipientSelector'
-import { TransferFormSpeedbumps } from 'wallet/src/features/transactions/transfer/TransferFormWarnings'
-import {
-  DerivedTransferInfo,
-  TokenSelectorFlow,
-  TransferSpeedbump,
-} from 'wallet/src/features/transactions/transfer/types'
 import { createTransactionId } from 'wallet/src/features/transactions/utils'
-import {
-  Warning,
-  WarningAction,
-  WarningSeverity,
-} from 'wallet/src/features/transactions/WarningModal/types'
-import { BlockedAddressWarning } from 'wallet/src/features/trm/BlockedAddressWarning'
 import { useIsBlocked, useIsBlockedActiveAddress } from 'wallet/src/features/trm/hooks'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
+import { TransferSpeedbump } from './types'
 
 interface TransferTokenProps {
   dispatch: React.Dispatch<AnyAction>
@@ -55,12 +54,6 @@ interface TransferTokenProps {
   onNext: () => void
   warnings: Warning[]
   showingSelectorScreen: boolean
-  walletNeedsRestore: boolean
-  openWalletRestoreModal?: () => void
-  showNativeKeyboard: boolean
-  onDecimalPadLayout?: (event: LayoutChangeEvent) => void
-  isLayoutPending: boolean
-  onInputPanelLayout?: (event: LayoutChangeEvent) => void
 }
 
 export function TransferTokenForm({
@@ -69,12 +62,6 @@ export function TransferTokenForm({
   onNext,
   warnings,
   showingSelectorScreen,
-  walletNeedsRestore,
-  openWalletRestoreModal,
-  showNativeKeyboard,
-  onDecimalPadLayout,
-  isLayoutPending,
-  onInputPanelLayout,
 }: TransferTokenProps): JSX.Element {
   const { t } = useTranslation()
   const colors = useSporeColors()
@@ -125,10 +112,9 @@ export function TransferTokenForm({
   const isBlocked = isActiveBlocked || isRecipientBlocked
   const isBlockedLoading = isActiveBlockedLoading || isRecipientBlockedLoading
 
+  const { walletNeedsRestore, openWalletRestoreModal } = useWalletRestore()
+
   const onRestorePress = (): void => {
-    if (!openWalletRestoreModal) {
-      throw new Error('Invalid call to `onRestorePress` with missing `openWalletRestoreModal`')
-    }
     setCurrencyFieldFocused(false)
     openWalletRestoreModal()
   }
@@ -219,6 +205,9 @@ export function TransferTokenForm({
   const transferWarning = warnings.find((warning) => warning.severity >= WarningSeverity.Low)
   const transferWarningColor = getAlertColor(transferWarning?.severity)
 
+  const { showNativeKeyboard, onDecimalPadLayout, isLayoutPending, onInputPanelLayout } =
+    useShouldShowNativeKeyboard()
+
   const TRANSFER_DIRECTION_BUTTON_SIZE = iconSizes.icon20
   const TRANSFER_DIRECTION_BUTTON_INNER_PADDING = spacing.spacing12
   const TRANSFER_DIRECTION_BUTTON_BORDER_WIDTH = spacing.spacing4
@@ -255,15 +244,14 @@ export function TransferTokenForm({
       <Flex grow gap="$spacing8" justifyContent="space-between">
         <AnimatedFlex
           entering={FadeIn}
-          // TODO(EXT-526): re-enable `exiting` animation when it's fixed.
-          exiting={isWeb ? undefined : FadeOut}
+          exiting={FadeOut}
           gap="$spacing2"
           onLayout={onInputPanelLayout}>
           {nftIn ? (
             <NFTTransfer asset={nftIn} nftSize={fullHeight / 4} />
           ) : (
             <Flex backgroundColor="$surface2" borderRadius="$rounded20" justifyContent="center">
-              <CurrencyInputPanelLegacy
+              <CurrencyInputPanel
                 currencyAmount={currencyAmounts[CurrencyField.INPUT]}
                 currencyBalance={currencyBalances[CurrencyField.INPUT]}
                 currencyInfo={currencyInInfo}
@@ -325,7 +313,7 @@ export function TransferTokenForm({
                 />
               )}
               {walletNeedsRestore && (
-                <TouchableArea disabled={!openWalletRestoreModal} onPress={onRestorePress}>
+                <TouchableArea onPress={onRestorePress}>
                   <Flex
                     grow
                     row
@@ -393,19 +381,17 @@ export function TransferTokenForm({
             ) : null}
           </Flex>
         </AnimatedFlex>
-
         <AnimatedFlex
           bottom={0}
-          // TODO(EXT-526): re-enable `exiting` animation when it's fixed.
-          exiting={isWeb ? undefined : FadeOutDown}
+          exiting={FadeOutDown}
           gap="$spacing8"
           left={0}
           opacity={isLayoutPending ? 0 : 1}
           position="absolute"
           right={0}
           onLayout={onDecimalPadLayout}>
-          {!isWeb && !nftIn && !showNativeKeyboard && (
-            <DecimalPadLegacy
+          {!nftIn && !showNativeKeyboard && (
+            <DecimalPad
               hasCurrencyPrefix={isFiatInput}
               resetSelection={resetSelection}
               selection={inputSelection}
diff --git a/apps/mobile/src/features/transactions/transfer/hooks.ts b/apps/mobile/src/features/transactions/transfer/hooks.ts
new file mode 100644
index 00000000000..9db27619bbe
--- /dev/null
+++ b/apps/mobile/src/features/transactions/transfer/hooks.ts
@@ -0,0 +1,261 @@
+import { AnyAction } from '@reduxjs/toolkit'
+import { providers } from 'ethers'
+import { useCallback, useMemo } from 'react'
+import { useAppDispatch } from 'src/app/hooks'
+import {
+  selectRecipient,
+  toggleShowRecipientSelector,
+} from 'src/features/transactions/transactionState/transactionState'
+import { BaseDerivedInfo } from 'src/features/transactions/transactionState/types'
+import { useAsyncData } from 'utilities/src/react/hooks'
+import { ChainId } from 'wallet/src/constants/chains'
+import { AssetType } from 'wallet/src/entities/assets'
+import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
+import { GQLNftAsset, 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 { transferTokenActions } from 'wallet/src/features/transactions/transfer/transferTokenSaga'
+import { TransferTokenParams } from 'wallet/src/features/transactions/transfer/types'
+import { useProvider } from 'wallet/src/features/wallet/context'
+import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
+import { buildCurrencyId } from 'wallet/src/utils/currencyId'
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
+
+export type DerivedTransferInfo = BaseDerivedInfo<CurrencyInfo | GQLNftAsset> & {
+  currencyTypes: { [CurrencyField.INPUT]?: AssetType }
+  currencyInInfo?: CurrencyInfo | null
+  chainId: ChainId
+  exactAmountFiat: string
+  exactCurrencyField: CurrencyField.INPUT
+  isFiatInput?: boolean
+  nftIn: GQLNftAsset | undefined
+  recipient?: string
+  txId?: string
+}
+
+export function useDerivedTransferInfo(state: TransactionState): DerivedTransferInfo {
+  const {
+    [CurrencyField.INPUT]: tradeableAsset,
+    exactAmountToken,
+    exactAmountFiat,
+    recipient,
+    isFiatInput,
+    txId,
+  } = state
+
+  const activeAccount = useActiveAccount()
+  const chainId = tradeableAsset?.chainId ?? ChainId.Mainnet
+
+  const currencyInInfo = useCurrencyInfo(
+    tradeableAsset?.type === AssetType.Currency
+      ? buildCurrencyId(tradeableAsset?.chainId, tradeableAsset?.address)
+      : undefined
+  )
+
+  const currencyIn = currencyInInfo?.currency
+  const { data: nftIn } = useNFT(
+    activeAccount?.address,
+    tradeableAsset?.address,
+    tradeableAsset?.type === AssetType.ERC1155 || tradeableAsset?.type === AssetType.ERC721
+      ? tradeableAsset.tokenId
+      : undefined
+  )
+
+  const currencies = useMemo(
+    () => ({
+      [CurrencyField.INPUT]: currencyInInfo ?? nftIn,
+    }),
+    [currencyInInfo, nftIn]
+  )
+
+  const { balance: tokenInBalance } = useOnChainCurrencyBalance(
+    currencyIn?.isToken ? currencyIn : undefined,
+    activeAccount?.address
+  )
+
+  const { balance: nativeInBalance } = useOnChainNativeCurrencyBalance(
+    chainId ?? ChainId.Mainnet,
+    activeAccount?.address
+  )
+
+  const amountSpecified = useMemo(
+    () =>
+      getCurrencyAmount({
+        value: exactAmountToken,
+        valueType: ValueType.Exact,
+        currency: currencyIn,
+      }),
+    [currencyIn, exactAmountToken]
+  )
+  const currencyAmounts = useMemo(
+    () => ({
+      [CurrencyField.INPUT]: amountSpecified,
+    }),
+    [amountSpecified]
+  )
+
+  const currencyBalances = useMemo(
+    () => ({
+      [CurrencyField.INPUT]: currencyIn?.isNative ? nativeInBalance : tokenInBalance,
+    }),
+    [currencyIn, nativeInBalance, tokenInBalance]
+  )
+  return useMemo(
+    () => ({
+      chainId,
+      currencies,
+      currencyAmounts,
+      currencyBalances,
+      currencyTypes: { [CurrencyField.INPUT]: tradeableAsset?.type },
+      currencyInInfo,
+      exactAmountToken,
+      exactAmountFiat: exactAmountFiat ?? '',
+      exactCurrencyField: CurrencyField.INPUT,
+      isFiatInput,
+      nftIn: nftIn ?? undefined,
+      recipient,
+      txId,
+    }),
+    [
+      chainId,
+      currencies,
+      currencyAmounts,
+      currencyBalances,
+      currencyInInfo,
+      exactAmountToken,
+      exactAmountFiat,
+      isFiatInput,
+      nftIn,
+      recipient,
+      tradeableAsset?.type,
+      txId,
+    ]
+  )
+}
+
+/** Helper transfer callback for ERC20s */
+export function useTransferERC20Callback(
+  txId?: string,
+  chainId?: ChainId,
+  toAddress?: Address,
+  tokenAddress?: Address,
+  amountInWei?: string,
+  transferTxWithGasSettings?: providers.TransactionRequest,
+  onSubmit?: () => void
+): (() => void) | null {
+  const account = useActiveAccount()
+
+  return useTransferCallback(
+    chainId && toAddress && tokenAddress && amountInWei && account
+      ? {
+          account,
+          chainId,
+          toAddress,
+          tokenAddress,
+          amountInWei,
+          type: AssetType.Currency,
+          txId,
+        }
+      : undefined,
+    transferTxWithGasSettings,
+    onSubmit
+  )
+}
+
+/** Helper transfer callback for NFTs */
+export function useTransferNFTCallback(
+  txId?: string,
+  chainId?: ChainId,
+  toAddress?: Address,
+  tokenAddress?: Address,
+  tokenId?: string,
+  txRequest?: providers.TransactionRequest,
+  onSubmit?: () => void
+): (() => void) | null {
+  const account = useActiveAccount()
+
+  return useTransferCallback(
+    account && chainId && toAddress && tokenAddress && tokenId
+      ? {
+          account,
+          chainId,
+          toAddress,
+          tokenAddress,
+          tokenId,
+          type: AssetType.ERC721,
+          txId,
+        }
+      : undefined,
+    txRequest,
+    onSubmit
+  )
+}
+
+/** General purpose transfer callback for ERC20s, NFTs, etc. */
+function useTransferCallback(
+  transferTokenParams?: TransferTokenParams,
+  txRequest?: providers.TransactionRequest,
+  onSubmit?: () => void
+): null | (() => void) {
+  const dispatch = useAppDispatch()
+
+  return useMemo(() => {
+    if (!transferTokenParams || !txRequest) {
+      return null
+    }
+
+    return () => {
+      dispatch(transferTokenActions.trigger({ transferTokenParams, txRequest }))
+      onSubmit?.()
+    }
+  }, [transferTokenParams, dispatch, txRequest, onSubmit])
+}
+
+export function useIsSmartContractAddress(
+  address: string | undefined,
+  chainId: ChainId
+): {
+  loading: boolean
+  isSmartContractAddress: boolean
+} {
+  const provider = useProvider(chainId)
+
+  const fetchIsSmartContractAddress = useCallback(async () => {
+    if (!address) {
+      return false
+    }
+    const code = await provider?.getCode(address)
+    // provider.getCode(address) will return a hex string if a smart contract is deployed at that address
+    // returning just 0x means there's no code and it's not a smart contract
+    return code !== '0x'
+  }, [provider, address])
+
+  const { data, isLoading } = useAsyncData(fetchIsSmartContractAddress)
+  return { isSmartContractAddress: !!data, loading: isLoading }
+}
+
+export function useOnToggleShowRecipientSelector(dispatch: React.Dispatch<AnyAction>): () => void {
+  return useCallback(() => {
+    dispatch(toggleShowRecipientSelector())
+  }, [dispatch])
+}
+
+export function useOnSelectRecipient(
+  dispatch: React.Dispatch<AnyAction>
+): (recipient: Address) => void {
+  const onToggleShowRecipientSelector = useOnToggleShowRecipientSelector(dispatch)
+  return useCallback(
+    (recipient: Address) => {
+      onToggleShowRecipientSelector()
+      dispatch(selectRecipient({ recipient }))
+    },
+    [dispatch, onToggleShowRecipientSelector]
+  )
+}
diff --git a/apps/mobile/src/features/transactions/transfer/types.tsx b/apps/mobile/src/features/transactions/transfer/types.tsx
new file mode 100644
index 00000000000..2b2798df84f
--- /dev/null
+++ b/apps/mobile/src/features/transactions/transfer/types.tsx
@@ -0,0 +1,4 @@
+export interface TransferSpeedbump {
+  hasWarning: boolean
+  loading: boolean
+}
diff --git a/packages/wallet/src/features/transactions/transfer/hooks/useTransferTransactionRequest.ts b/apps/mobile/src/features/transactions/transfer/useTransferTransactionRequest.ts
similarity index 98%
rename from packages/wallet/src/features/transactions/transfer/hooks/useTransferTransactionRequest.ts
rename to apps/mobile/src/features/transactions/transfer/useTransferTransactionRequest.ts
index aecf0010991..ad29a5b1edb 100644
--- a/packages/wallet/src/features/transactions/transfer/hooks/useTransferTransactionRequest.ts
+++ b/apps/mobile/src/features/transactions/transfer/useTransferTransactionRequest.ts
@@ -1,5 +1,6 @@
 import { providers } from 'ethers'
 import { useCallback } from 'react'
+import { DerivedTransferInfo } from 'src/features/transactions/transfer/hooks'
 import { useAsyncData } from 'utilities/src/react/hooks'
 import ERC1155_ABI from 'wallet/src/abis/erc1155.json'
 import ERC20_ABI from 'wallet/src/abis/erc20.json'
@@ -11,7 +12,6 @@ import { toSupportedChainId } from 'wallet/src/features/chains/utils'
 import { ContractManager } from 'wallet/src/features/contracts/ContractManager'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
 import {
-  DerivedTransferInfo,
   TransferCurrencyParams,
   TransferNFTParams,
   TransferTokenParams,
diff --git a/packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.test.ts b/apps/mobile/src/features/transactions/transfer/useTransferWarnings.test.ts
similarity index 95%
rename from packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.test.ts
rename to apps/mobile/src/features/transactions/transfer/useTransferWarnings.test.ts
index f0f4adcde28..dc65434fcf2 100644
--- a/packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.test.ts
+++ b/apps/mobile/src/features/transactions/transfer/useTransferWarnings.test.ts
@@ -1,13 +1,13 @@
 import { CurrencyAmount } from '@uniswap/sdk-core'
+import { WarningLabel } from 'src/components/modals/WarningModal/types'
+import { DerivedTransferInfo } from 'src/features/transactions/transfer/hooks'
+import { getTransferWarnings } from 'src/features/transactions/transfer/useTransferWarnings'
 import { ChainId } from 'wallet/src/constants/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 { 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 { WarningLabel } from 'wallet/src/features/transactions/WarningModal/types'
 import { networkDown, networkUnknown, networkUp, uniCurrencyInfo } from 'wallet/src/test/fixtures'
 
 const ETH = NativeCurrency.onChain(ChainId.Mainnet)
diff --git a/packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.ts b/apps/mobile/src/features/transactions/transfer/useTransferWarnings.ts
similarity index 93%
rename from packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.ts
rename to apps/mobile/src/features/transactions/transfer/useTransferWarnings.ts
index d0f40b7fc7b..6202a387e82 100644
--- a/packages/wallet/src/features/transactions/transfer/hooks/useTransferWarnings.ts
+++ b/apps/mobile/src/features/transactions/transfer/useTransferWarnings.ts
@@ -1,20 +1,20 @@
 import { useNetInfo } from '@react-native-community/netinfo'
 import _ from 'lodash'
 import { TFunction } from 'react-i18next'
+import { getNetworkWarning } from 'src/components/modals/WarningModal/constants'
+import {
+  Warning,
+  WarningAction,
+  WarningLabel,
+  WarningSeverity,
+} from 'src/components/modals/WarningModal/types'
+import { DerivedTransferInfo } from 'src/features/transactions/transfer/hooks'
 import { useMemoCompare } from 'utilities/src/react/hooks'
 import { ChainId } from 'wallet/src/constants/chains'
 import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
 import { GQLNftAsset } from 'wallet/src/features/nfts/hooks'
 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'
-import { getNetworkWarning } from 'wallet/src/features/transactions/WarningModal/getNetworkWarning'
-import {
-  Warning,
-  WarningAction,
-  WarningLabel,
-  WarningSeverity,
-} from 'wallet/src/features/transactions/WarningModal/types'
 import { currencyAddress } from 'wallet/src/utils/currencyId'
 
 export function getTransferWarnings(
diff --git a/apps/mobile/src/features/transactions/types.tsx b/apps/mobile/src/features/transactions/types.tsx
new file mode 100644
index 00000000000..d7180f5b45a
--- /dev/null
+++ b/apps/mobile/src/features/transactions/types.tsx
@@ -0,0 +1,31 @@
+import { AnyAction } from '@reduxjs/toolkit'
+import { providers } from 'ethers'
+import { Dispatch } from 'react'
+import { Warning } from 'src/components/modals/WarningModal/types'
+import { DerivedTransferInfo } from 'src/features/transactions/transfer/hooks'
+import { GasFeeResult } from 'wallet/src/features/gas/types'
+import { DerivedSwapInfo } from './swap/types'
+
+export enum TransactionStep {
+  FORM,
+  REVIEW,
+  SUBMITTED,
+}
+
+export interface TransactionFlowProps {
+  dispatch: Dispatch<AnyAction>
+  showRecipientSelector?: boolean
+  recipientSelector?: JSX.Element
+  flowName: string
+  derivedInfo: DerivedTransferInfo | DerivedSwapInfo
+  onClose: () => void
+  approveTxRequest?: providers.TransactionRequest
+  txRequest?: providers.TransactionRequest
+  gasFee: GasFeeResult
+  step: TransactionStep
+  setStep: (newStep: TransactionStep) => void
+  warnings: Warning[]
+  exactValue: string
+  isFiatInput?: boolean
+  showFiatToggle?: boolean
+}
diff --git a/packages/wallet/src/features/transactions/hooks/useTransactionGasWarning.tsx b/apps/mobile/src/features/transactions/useTransactionGasWarning.tsx
similarity index 92%
rename from packages/wallet/src/features/transactions/hooks/useTransactionGasWarning.tsx
rename to apps/mobile/src/features/transactions/useTransactionGasWarning.tsx
index 99ffc09c75d..1a2af580a9e 100644
--- a/packages/wallet/src/features/transactions/hooks/useTransactionGasWarning.tsx
+++ b/apps/mobile/src/features/transactions/useTransactionGasWarning.tsx
@@ -1,19 +1,19 @@
 import { CurrencyAmount, NativeCurrency } from '@uniswap/sdk-core'
 import { useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
-import { useSwapRewriteEnabled } from 'wallet/src/features/experiments/hooks'
-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'
+} from 'src/components/modals/WarningModal/types'
+import { DerivedTransferInfo } from 'src/features/transactions/transfer/hooks'
+import { useSwapRewriteEnabled } from 'wallet/src/features/experiments/hooks'
+import { useOnChainNativeCurrencyBalance } from 'wallet/src/features/portfolio/api'
+import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
+import { hasSufficientFundsIncludingGas } from 'wallet/src/features/transactions/utils'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+import { DerivedSwapInfo } from './swap/types'
 
 export function useTransactionGasWarning({
   derivedInfo,
diff --git a/packages/wallet/src/features/trm/BlockedAddressWarning.tsx b/apps/mobile/src/features/trm/BlockedAddressWarning.tsx
similarity index 90%
rename from packages/wallet/src/features/trm/BlockedAddressWarning.tsx
rename to apps/mobile/src/features/trm/BlockedAddressWarning.tsx
index 02700ebb125..bbf1b5ae7e4 100644
--- a/packages/wallet/src/features/trm/BlockedAddressWarning.tsx
+++ b/apps/mobile/src/features/trm/BlockedAddressWarning.tsx
@@ -1,10 +1,10 @@
-import { useState } from 'react'
+import React, { useState } from 'react'
 import { useTranslation } from 'react-i18next'
 import { Keyboard } from 'react-native'
+import { BlockedAddressModal } from 'src/components/modals/WarningModal/BlockedAddressModal'
 import { Flex, FlexProps, Text, TouchableArea, useSporeColors } from 'ui/src'
 import InfoCircle from 'ui/src/assets/icons/info-circle.svg'
 import { iconSizes } from 'ui/src/theme'
-import { BlockedAddressModal } from 'wallet/src/components/modals/WarningModal/BlockedAddressModal'
 
 export function BlockedAddressWarning({
   isRecipientBlocked,
diff --git a/apps/mobile/src/features/unitags/ChooseProfilePictureScreen.tsx b/apps/mobile/src/features/unitags/ChooseProfilePictureScreen.tsx
index 247be1151f2..79bd26d3ef7 100644
--- a/apps/mobile/src/features/unitags/ChooseProfilePictureScreen.tsx
+++ b/apps/mobile/src/features/unitags/ChooseProfilePictureScreen.tsx
@@ -1,52 +1,45 @@
-import React, { useCallback, useState } from 'react'
+import React, { useCallback, useEffect, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { ActivityIndicator } from 'react-native'
 import { getUniqueId } from 'react-native-device-info'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { UnitagStackScreenProp } from 'src/app/navigation/types'
+import { Screen } from 'src/components/layout/Screen'
 import { ChoosePhotoOptionsModal } from 'src/components/unitags/ChoosePhotoOptionsModal'
+import { ScreenRow } from 'src/components/unitags/ScreenRow'
 import { UnitagProfilePicture } from 'src/components/unitags/UnitagProfilePicture'
-import { SafeKeyboardOnboardingScreen } from 'src/features/onboarding/SafeKeyboardOnboardingScreen'
-import { isLocalFileUri, uploadAndUpdateAvatarAfterClaim } from 'src/features/unitags/avatars'
 import { OnboardingScreens, Screens, UnitagScreens } from 'src/screens/Screens'
-import { AnimatedFlex, Button, Flex, Icons, Text, useSporeColors } from 'ui/src'
-import Unitag from 'ui/src/assets/graphics/unitag.svg'
-import { fonts, iconSizes, imageSizes, spacing } from 'ui/src/theme'
-import { logger } from 'utilities/src/logger/logger'
+import { Button, Flex, Icons, Text, useDeviceInsets } from 'ui/src'
+import Unitag from 'ui/src/assets/icons/unitag.svg'
+import { fonts, iconSizes, imageSizes } from 'ui/src/theme'
 import { useAsyncData } from 'utilities/src/react/hooks'
-import { pushNotification } from 'wallet/src/features/notifications/slice'
-import { AppNotificationType } from 'wallet/src/features/notifications/types'
 import { ImportType, OnboardingEntryPoint } from 'wallet/src/features/onboarding/types'
-import {
-  useClaimUnitagMutation,
-  useUnitagUpdateMetadataMutation,
-} from 'wallet/src/features/unitags/api'
-import { useUnitagUpdater } from 'wallet/src/features/unitags/context'
+import { useClaimUnitagMutation } from 'wallet/src/features/unitags/api'
 import { parseUnitagErrorCode } from 'wallet/src/features/unitags/utils'
 import { useActiveAccountAddress, usePendingAccounts } from 'wallet/src/features/wallet/hooks'
-import { useAppDispatch } from 'wallet/src/state'
 
 export function ChooseProfilePictureScreen({
   route,
 }: UnitagStackScreenProp<UnitagScreens.ChooseProfilePicture>): JSX.Element {
-  const { entryPoint, unitag, importType } = route.params
+  const { entryPoint, unitag } = route.params
   const activeAddress = useActiveAccountAddress()
   const pendingAccountAddress = Object.values(usePendingAccounts())?.[0]?.address
   const unitagAddress = activeAddress || pendingAccountAddress
 
+  const insets = useDeviceInsets()
   const { t } = useTranslation()
-  const dispatch = useAppDispatch()
-  const colors = useSporeColors()
-  const { data: deviceId } = useAsyncData(getUniqueId)
-  const { triggerRefetchUnitags } = useUnitagUpdater()
-
   const [imageUri, setImageUri] = useState<string>()
   const [showModal, setShowModal] = useState(false)
   const [claimError, setClaimError] = useState<string>()
-  const [isClaiming, setIsClaiming] = useState(false)
-
-  const [claimUnitag] = useClaimUnitagMutation()
-  const [updateUnitagMetadata] = useUnitagUpdateMetadataMutation(unitag)
+  const [
+    claimUnitag,
+    {
+      called: claimRequestMade,
+      loading: claimResponseLoading,
+      data: claimResponse,
+      reset: resetClaimResponse,
+    },
+  ] = useClaimUnitagMutation()
+  const { data: deviceId } = useAsyncData(getUniqueId)
 
   const openModal = (): void => {
     setShowModal(true)
@@ -56,190 +49,128 @@ export function ChooseProfilePictureScreen({
     setShowModal(false)
   }
 
-  const onPressContinue = async (): Promise<void> => {
+  const onPressFinish = async (): Promise<void> => {
     if (!deviceId) {
       return // Should never hit this condition. Button is disabled if deviceId is undefined
     }
 
     // throw error if unitagAddress is falsey
     if (!unitagAddress) {
-      const error = new Error('unitagAddress should never be null when claiming a unitag')
-      logger.error(error, {
-        tags: { file: 'ChooseProfilePictureScreen', function: 'onPressFinish' },
-      })
-      return
+      throw new Error('unitagAddress should never be null when claiming a unitag')
     }
 
-    setIsClaiming(true)
-
-    try {
-      const { data: claimResponse } = await claimUnitag({
-        address: unitagAddress,
-        username: unitag,
-        deviceId,
-        metadata: {
-          avatar: imageUri && isLocalFileUri(imageUri) ? undefined : imageUri,
-        },
-      })
-
-      if (claimResponse?.data.errorCode) {
-        setClaimError(parseUnitagErrorCode(t, unitag, claimResponse?.data.errorCode))
-        setIsClaiming(false)
-        return
-      }
-
-      if (claimResponse?.data.success) {
-        await onClaimSuccess()
-        return
-      }
-    } catch (e) {
-      setIsClaiming(false)
-      logger.error(e, { tags: { file: 'ChooseProfilePictureScreen', function: 'claimUnitag' } })
-      dispatch(
-        pushNotification({
-          type: AppNotificationType.Error,
-          errorMessage: t('Could not claim username. Try again later.'),
-        })
-      )
-    }
+    await claimUnitag({
+      address: unitagAddress,
+      username: unitag,
+      deviceId,
+      metadata: {
+        avatar: imageUri ?? '', // TODO (MOB-2271): upload profile pic image to backend
+        description: '',
+        url: '',
+        twitter: '',
+      },
+    })
   }
 
-  const onClaimSuccess = useCallback(async (): Promise<void> => {
-    if (imageUri && isLocalFileUri(imageUri) && !!unitagAddress) {
-      // unitagAddress should always be defined here otherwise onPressContinue would've thrown an error
-      const { success: uploadUpdateAvatarSuccess } = await uploadAndUpdateAvatarAfterClaim(
-        unitag,
-        unitagAddress,
-        imageUri,
-        updateUnitagMetadata
-      )
-
-      if (!uploadUpdateAvatarSuccess) {
-        setIsClaiming(false)
-        dispatch(
-          pushNotification({
-            type: AppNotificationType.Error,
-            errorMessage: t('Could not set avatar. Try again later.'),
-          })
-        )
-        return
-      }
-    }
-
-    setIsClaiming(false)
-    triggerRefetchUnitags()
-
+  const onClaimSuccess = useCallback((): void => {
     if (entryPoint === Screens.Home) {
-      if (!unitagAddress) {
-        const error = new Error(
-          'unitagAddress should never be null when Unitag entryPoint is Home Screen'
-        )
-        logger.error(error, {
-          tags: { file: 'ChooseProfilePictureScreen', function: 'onClaimSuccess' },
-        })
-        return
+      if (!activeAddress) {
+        throw new Error('activeAddress should never be null when Unitag entryPoint is Home Screen')
       }
       navigate(Screens.UnitagStack, {
         screen: UnitagScreens.UnitagConfirmation,
         params: {
           unitag,
-          address: unitagAddress,
+          address: activeAddress,
           profilePictureUri: imageUri,
         },
       })
-    } else if (entryPoint === OnboardingScreens.Landing || importType === ImportType.CreateNew) {
-      navigate(Screens.OnboardingStack, {
-        screen: OnboardingScreens.WelcomeWallet,
-        params: {
-          importType: ImportType.CreateNew,
-          entryPoint:
-            OnboardingEntryPoint.Sidebar === entryPoint
-              ? OnboardingEntryPoint.Sidebar
-              : OnboardingEntryPoint.FreshInstallOrReplace,
-        },
-      })
     } else {
-      // entryPoint === OnboardingEntryPoint.Sidebar and adding an additional wallet
+      // entryPoint === OnboardingScreens.Landing
       navigate(Screens.OnboardingStack, {
-        screen: OnboardingScreens.Notifications,
+        screen: OnboardingScreens.QRAnimation,
         params: {
-          importType: ImportType.CreateAdditional,
-          entryPoint: OnboardingEntryPoint.Sidebar,
+          importType: ImportType.CreateNew,
+          entryPoint: OnboardingEntryPoint.FreshInstallOrReplace,
         },
       })
     }
+  }, [activeAddress, entryPoint, imageUri, unitag])
+
+  useEffect(() => {
+    if (claimRequestMade && !claimResponseLoading && !!claimResponse) {
+      // We POSTed to claim and got a response
+      if (claimResponse.success) {
+        onClaimSuccess()
+        return
+      }
+      if (claimResponse.errorCode) {
+        setClaimError(parseUnitagErrorCode(t, unitag, claimResponse.errorCode))
+      }
+      // Reset everything so called=false, claimResponse=undefined
+      resetClaimResponse()
+    }
   }, [
-    dispatch,
-    entryPoint,
-    imageUri,
-    importType,
-    t,
+    claimResponseLoading,
+    claimResponse,
+    onClaimSuccess,
     unitag,
-    unitagAddress,
-    updateUnitagMetadata,
-    triggerRefetchUnitags,
+    claimRequestMade,
+    resetClaimResponse,
+    t,
   ])
 
   return (
-    <SafeKeyboardOnboardingScreen
-      subtitle={t(
-        'Upload your own or stick with your unique Unicon. You can always change this later.'
-      )}
-      title={t('Choose a profile photo')}>
-      <Flex centered gap="$spacing20" mt="$spacing48">
-        <Flex onPress={openModal}>
-          <Flex px="$spacing4">
-            <ProfilePicture address={unitagAddress} imageUri={imageUri} />
-          </Flex>
-          <Flex
-            bg="$surface1"
-            borderRadius="$roundedFull"
-            bottom={-spacing.spacing4}
-            position="absolute"
-            right={-spacing.spacing4}>
-            <Flex
-              bg="$neutral2"
-              borderColor="$surface1"
-              borderRadius="$roundedFull"
-              borderWidth="$spacing4"
-              p="$spacing8">
-              <Icons.PencilDetailed color="$surface1" size={iconSizes.icon16} />
+    <Screen edges={['right', 'left']}>
+      <Flex
+        grow
+        $short={{ gap: '$none' }}
+        gap="$spacing16"
+        pb="$spacing16"
+        px="$spacing16"
+        style={{ marginTop: insets.top, marginBottom: insets.bottom }}>
+        <ScreenRow />
+        <TitleRow />
+        <Flex fill justifyContent="space-between">
+          <Flex centered gap="$spacing24" py="$spacing24">
+            <Flex>
+              <Flex px="$spacing4" onPress={openModal}>
+                <ProfilePicture address={unitagAddress} imageUri={imageUri} />
+              </Flex>
+              <Flex
+                backgroundColor="$neutral1"
+                borderRadius="$roundedFull"
+                bottom={0}
+                p="$spacing8"
+                position="absolute"
+                right={0}
+                onPress={openModal}>
+                <Icons.Edit color="$surface1" size={iconSizes.icon16} />
+              </Flex>
+            </Flex>
+            <Flex row gap="$spacing8" px="$spacing24">
+              <Text color="$neutral1" variant="heading2">
+                {unitag}
+              </Text>
+              <Flex position="absolute" right={0}>
+                <Unitag height={iconSizes.icon24} width={iconSizes.icon24} />
+              </Flex>
             </Flex>
+            {!!claimError && (
+              <Text color="$statusCritical" variant="body2">
+                {claimError}
+              </Text>
+            )}
           </Flex>
+          <Button
+            disabled={!deviceId || !!claimError}
+            size="medium"
+            theme="primary"
+            onPress={onPressFinish}>
+            {entryPoint === Screens.Home ? t('Finish') : t('Create wallet')}
+          </Button>
         </Flex>
-        <AnimatedFlex
-          row
-          alignSelf="center"
-          animation="lazy"
-          // eslint-disable-next-line react-native/no-inline-styles
-          enterStyle={{ o: 0 }}
-          gap="$spacing20">
-          <Text color="$neutral1" variant="heading2">
-            {unitag}
-          </Text>
-          <Flex row position="absolute" right={-spacing.spacing8} top={-spacing.spacing8}>
-            <Unitag height={iconSizes.icon28} width={iconSizes.icon28} />
-          </Flex>
-        </AnimatedFlex>
-        {!!claimError && (
-          <Text color="$statusCritical" variant="body2">
-            {claimError}
-          </Text>
-        )}
       </Flex>
-      <Button
-        disabled={!deviceId || !!claimError || isClaiming}
-        size="medium"
-        theme="primary"
-        onPress={onPressContinue}>
-        {isClaiming ? (
-          <Flex height={fonts.buttonLabel1.lineHeight}>
-            <ActivityIndicator color={colors.sporeWhite.val} />
-          </Flex>
-        ) : (
-          t('Continue')
-        )}
-      </Button>
       {showModal && (
         <ChoosePhotoOptionsModal
           address={activeAddress}
@@ -248,7 +179,31 @@ export function ChooseProfilePictureScreen({
           onClose={onCloseModal}
         />
       )}
-    </SafeKeyboardOnboardingScreen>
+    </Screen>
+  )
+}
+
+function TitleRow(): JSX.Element {
+  const { t } = useTranslation()
+
+  return (
+    <Flex centered gap="$spacing12" m="$spacing12">
+      <Text
+        $short={{ variant: 'subheading1' }}
+        allowFontScaling={false}
+        textAlign="center"
+        variant="heading3">
+        {t('Choose a profile photo')}
+      </Text>
+      <Text
+        $short={{ variant: 'body3', maxFontSizeMultiplier: 1.1 }}
+        color="$neutral2"
+        maxFontSizeMultiplier={fonts.body2.maxFontSizeMultiplier}
+        textAlign="center"
+        variant="body2">
+        {t('Upload your own or stick with your unique Unicon. You can always change this later.')}
+      </Text>
+    </Flex>
   )
 }
 
diff --git a/apps/mobile/src/features/unitags/ChooseUnitag.tsx b/apps/mobile/src/features/unitags/ChooseUnitag.tsx
new file mode 100644
index 00000000000..b7ecc8b5756
--- /dev/null
+++ b/apps/mobile/src/features/unitags/ChooseUnitag.tsx
@@ -0,0 +1,176 @@
+import { ADDRESS_ZERO } from '@uniswap/v3-sdk'
+import React, { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Keyboard } from 'react-native'
+import { navigate } from 'src/app/navigation/rootNavigation'
+import { Pill } from 'src/components/text/Pill'
+import { TooltipInfoButton } from 'src/components/tooltip/TooltipButton'
+import { ScreenRow } from 'src/components/unitags/ScreenRow'
+import { UNITAG_SUFFIX } from 'src/features/unitags/constants'
+import { UnitagInput } from 'src/features/unitags/UnitagInput'
+import { OnboardingScreens, Screens, UnitagScreens } from 'src/screens/Screens'
+import { useKeyboardLayout } from 'src/utils/useKeyboardLayout'
+import { Button, Flex, Icons, Text, useSporeColors } from 'ui/src'
+import { fonts, iconSizes } from 'ui/src/theme'
+import { ImportType, OnboardingEntryPoint } from 'wallet/src/features/onboarding/types'
+import { useUnitagError } from 'wallet/src/features/unitags/hooks'
+import { useActiveAccountAddress, usePendingAccounts } from 'wallet/src/features/wallet/hooks'
+import { shortenAddress } from 'wallet/src/utils/addresses'
+
+const LIVE_CHECK_DELAY_MS = 1000
+
+export function ChooseUnitag({
+  entryPoint,
+}: {
+  entryPoint: OnboardingScreens.Landing | Screens.Home
+}): JSX.Element {
+  const colors = useSporeColors()
+  const keyboard = useKeyboardLayout()
+  const compact = keyboard.isVisible && keyboard.containerHeight !== 0
+  const minHeight = compact ? keyboard.containerHeight : 0
+  const { t } = useTranslation()
+  const activeAddress = useActiveAccountAddress()
+  const pendingAccountAddress = Object.values(usePendingAccounts())?.[0]?.address
+  const unitagAddress = activeAddress || pendingAccountAddress
+  const [unitag, setUnitag] = useState<string | undefined>(undefined)
+  const [showLiveCheck, setShowLiveCheck] = useState(false)
+  const { unitagError, loading } = useUnitagError(unitagAddress, unitag)
+  const isUnitagValid = !unitagError && !loading && !!unitag
+  const showValidUnitagLogo = isUnitagValid && showLiveCheck
+
+  const onChange = (text: string | undefined): void => {
+    if (unitag !== text?.trim()) {
+      setShowLiveCheck(false)
+    }
+    setUnitag(text?.trim())
+  }
+
+  const onSubmit = (): void => {
+    Keyboard.dismiss()
+  }
+
+  const onPressContinue = (): void => {
+    if (unitag) {
+      navigate(Screens.UnitagStack, {
+        screen: UnitagScreens.ChooseProfilePicture,
+        params: { entryPoint, unitag },
+      })
+    }
+  }
+
+  const onPressMaybeLater = (): void => {
+    navigate(Screens.OnboardingStack, {
+      screen: OnboardingScreens.EditName,
+      params: {
+        importType: ImportType.CreateNew,
+        entryPoint: OnboardingEntryPoint.FreshInstallOrReplace,
+      },
+    })
+  }
+
+  useEffect(() => {
+    const delayFn = setTimeout(() => {
+      setShowLiveCheck(true)
+    }, LIVE_CHECK_DELAY_MS)
+
+    return () => {
+      clearTimeout(delayFn)
+    }
+  }, [unitag])
+
+  return (
+    <Flex
+      grow
+      $short={{ gap: '$spacing8' }}
+      flexGrow={compact ? 0 : 1}
+      gap="$spacing16"
+      minHeight={minHeight}
+      pb="$spacing16"
+      px="$spacing16">
+      <ScreenRow
+        tooltipButton={
+          <TooltipInfoButton
+            backgroundIconColor={colors.surface1.get()}
+            closeText={t('Got it')}
+            modalIcon={
+              <Flex centered row gap="$spacing4">
+                <Pill
+                  customBackgroundColor={colors.surface2.val}
+                  label={shortenAddress(unitagAddress ?? ADDRESS_ZERO)}
+                  px="$spacing8"
+                />
+                <Icons.LinkHorizontalAlt color={colors.neutral2.get()} size={iconSizes.icon24} />
+                <Pill
+                  customBackgroundColor={colors.surface2.val}
+                  foregroundColor={colors.accent1.val}
+                  label={unitag && unitag !== '' ? unitag : t('yourusername')}
+                  px="$spacing8"
+                />
+              </Flex>
+            }
+            modalText={t(
+              `This username is a simple, user-friendly way to use your address in transactions. Your current address remains unchanged and secure.`
+            )}
+            modalTitle={t('An easier way to receive')}
+            size={iconSizes.icon24}
+          />
+        }
+      />
+      <TitleRow />
+      <Flex fill justifyContent="space-between">
+        <UnitagInput
+          activeAddress={entryPoint === Screens.Home ? activeAddress : null}
+          errorMessage={unitagError}
+          inputSuffix={!showValidUnitagLogo ? UNITAG_SUFFIX : undefined}
+          liveCheck={showLiveCheck}
+          loading={!!unitag && (loading || !showLiveCheck)}
+          placeholderLabel="yourname"
+          showUnitagLogo={showValidUnitagLogo} // TODO (MOB-2125): add Unitag logo animation when continue button is pressed
+          value={unitag}
+          onChange={onChange}
+          onSubmit={onSubmit}
+        />
+        <Flex gap="$spacing8">
+          {entryPoint === OnboardingScreens.Landing && (
+            <Button color="$accent1" size="medium" theme="branded" onPress={onPressMaybeLater}>
+              {t('Maybe later')}
+            </Button>
+          )}
+          <Button
+            disabled={!showValidUnitagLogo}
+            size="medium"
+            theme="primary"
+            onPress={onPressContinue}>
+            {t('Continue')}
+          </Button>
+        </Flex>
+      </Flex>
+    </Flex>
+  )
+}
+
+function TitleRow(): JSX.Element {
+  const { t } = useTranslation()
+
+  return (
+    <Flex centered gap="$spacing12" m="$spacing12">
+      <Text
+        $short={{ variant: 'subheading1' }}
+        allowFontScaling={false}
+        textAlign="center"
+        variant="heading3">
+        {t('Claim your username')}
+      </Text>
+      <Text
+        $short={{ variant: 'body3', maxFontSizeMultiplier: 1.1 }}
+        color="$neutral2"
+        maxFontSizeMultiplier={fonts.body2.maxFontSizeMultiplier}
+        textAlign="center"
+        variant="body2">
+        {t(
+          'This is your unique name that people can send funds to and use to find you across defi.'
+        )}
+      </Text>
+    </Flex>
+  )
+}
diff --git a/apps/mobile/src/features/unitags/ClaimUnitagScreen.tsx b/apps/mobile/src/features/unitags/ClaimUnitagScreen.tsx
index 2112f3c608b..2a67bff2743 100644
--- a/apps/mobile/src/features/unitags/ClaimUnitagScreen.tsx
+++ b/apps/mobile/src/features/unitags/ClaimUnitagScreen.tsx
@@ -1,418 +1,38 @@
-import { NativeStackScreenProps } from '@react-navigation/native-stack'
-import { ADDRESS_ZERO } from '@uniswap/v3-sdk'
-import { default as React, useCallback, useEffect, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { ActivityIndicator, Keyboard } from 'react-native'
-import { useAnimatedStyle, useSharedValue, withDelay, withTiming } from 'react-native-reanimated'
-import { navigate } from 'src/app/navigation/rootNavigation'
-import { UnitagStackParamList } from 'src/app/navigation/types'
-import Trace from 'src/components/Trace/Trace'
-import { SafeKeyboardOnboardingScreen } from 'src/features/onboarding/SafeKeyboardOnboardingScreen'
-import { OnboardingScreens, Screens, UnitagScreens } from 'src/screens/Screens'
-import { useAddBackButton } from 'src/utils/useAddBackButton'
-import {
-  AnimatePresence,
-  AnimatedFlex,
-  Button,
-  Flex,
-  Icons,
-  Text,
-  TouchableArea,
-  useSporeColors,
-} from 'ui/src'
-import Unitag from 'ui/src/assets/graphics/unitag.svg'
-import InfoCircle from 'ui/src/assets/icons/info-circle.svg'
-import { fonts, iconSizes, imageSizes, spacing } from 'ui/src/theme'
-import { ONE_SECOND_MS } from 'utilities/src/time/time'
-import { TextInput } from 'wallet/src/components/input/TextInput'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { Pill } from 'wallet/src/components/text/Pill'
-import { OnboardingEntryPoint } from 'wallet/src/features/onboarding/types'
-import { UNITAG_SUFFIX } from 'wallet/src/features/unitags/constants'
-import { useCanClaimUnitagName } from 'wallet/src/features/unitags/hooks'
-import { useActiveAccountAddress, usePendingAccounts } from 'wallet/src/features/wallet/hooks'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
-import { shortenAddress } from 'wallet/src/utils/addresses'
-import { useDynamicFontSizing } from 'wallet/src/utils/useDynamicFontSizing'
-
-const MAX_UNITAG_CHAR_LENGTH = 20
-
-const MAX_INPUT_FONT_SIZE = 36
-const MIN_INPUT_FONT_SIZE = 22
-const MAX_CHAR_PIXEL_WIDTH = 20
-
-// Used in dynamic font size width calculation to ignore `.` characters
-const UNITAG_SUFFIX_CHARS_ONLY = UNITAG_SUFFIX.replaceAll('.', '')
-const TEXT_INPUT_PLACEHOLDER = 'yourname'
-
-// Accounts for height of image, gap between image and name, and spacing from top of titles
-const UNITAG_NAME_ANIMATE_DISTANCE_Y = imageSizes.image100 + spacing.spacing36 + spacing.spacing48
-
-type Props = NativeStackScreenProps<UnitagStackParamList, UnitagScreens.ClaimUnitag>
-
-export function ClaimUnitagScreen({ navigation, route }: Props): JSX.Element {
-  const { entryPoint, importType } = route.params
-
-  useAddBackButton(navigation)
-  const { t } = useTranslation()
-  const colors = useSporeColors()
-
-  const activeAddress = useActiveAccountAddress()
-  const pendingAccountAddress = Object.values(usePendingAccounts())?.[0]?.address
-  const unitagAddress = activeAddress || pendingAccountAddress
-
-  const [showInfoModal, setShowInfoModal] = useState(false)
-  const [showTextInputView, setShowTextInputView] = useState(true)
-  const [unitagInputValue, setUnitagInputValue] = useState<string | undefined>(undefined)
-  const [isCheckingUnitag, setIsCheckingUnitag] = useState(false)
-  const [unitagToCheck, setUnitagToCheck] = useState<string | undefined>(undefined)
-
-  const addressViewOpacity = useSharedValue(1)
-  const unitagInputContainerTranslateY = useSharedValue(0)
-  const addressViewAnimatedStyle = useAnimatedStyle(() => {
-    return {
-      opacity: addressViewOpacity.value,
-    }
-  })
-
-  const { error: canClaimUnitagNameError, loading: loadingUnitagErrorCheck } =
-    useCanClaimUnitagName(unitagAddress, unitagToCheck)
-
-  const { onLayout, fontSize, onSetFontSize } = useDynamicFontSizing(
-    MAX_CHAR_PIXEL_WIDTH,
-    MAX_INPUT_FONT_SIZE,
-    MIN_INPUT_FONT_SIZE
-  )
-
-  useEffect(() => {
-    const unsubscribe = navigation.addListener('focus', () => {
-      // Reset the Unitag to check
-      setUnitagToCheck(undefined)
-
-      // When returning back to this screen, handle animating the Unitag logo out and text input in
-      if (showTextInputView) {
-        return
-      }
-
-      unitagInputContainerTranslateY.value = withTiming(
-        unitagInputContainerTranslateY.value - UNITAG_NAME_ANIMATE_DISTANCE_Y,
-        {
-          duration: ONE_SECOND_MS / 2,
-        }
-      )
-      setTimeout(() => {
-        setShowTextInputView(true)
-        addressViewOpacity.value = withTiming(1, { duration: 500 })
-      }, ONE_SECOND_MS)
-    })
-
-    return unsubscribe
-  }, [
-    navigation,
-    showTextInputView,
-    setShowTextInputView,
-    addressViewOpacity,
-    unitagInputContainerTranslateY,
-  ])
-
-  const onChangeTextInput = useCallback(
-    (text: string): void => {
-      if (text.length > MAX_UNITAG_CHAR_LENGTH) {
-        return
-      }
-
-      if (text.length === 0) {
-        onSetFontSize(TEXT_INPUT_PLACEHOLDER + UNITAG_SUFFIX_CHARS_ONLY)
-      } else {
-        onSetFontSize(text + UNITAG_SUFFIX_CHARS_ONLY)
-      }
-
-      setUnitagInputValue(text?.trim())
-    },
-    [onSetFontSize, setUnitagInputValue]
-  )
-
-  const onPressAddressTooltip = (): void => {
-    Keyboard.dismiss()
-    setShowInfoModal(true)
-  }
-
-  const onPressMaybeLater = (): void => {
-    navigate(Screens.OnboardingStack, {
-      screen: OnboardingScreens.EditName,
-      params: {
-        importType,
-        entryPoint:
-          entryPoint === OnboardingScreens.Landing
-            ? OnboardingEntryPoint.FreshInstallOrReplace
-            : OnboardingEntryPoint.Sidebar,
-      },
-    })
-  }
-
-  const navigateWithAnimation = useCallback(
-    (unitag: string) => {
-      // Animate the Unitag logo in and text input out
-      setShowTextInputView(false)
-      addressViewOpacity.value = withTiming(0, { duration: 500 })
-      // Intentionally delay 1s to allow enter/exit animations to finish
-      unitagInputContainerTranslateY.value = withDelay(
-        ONE_SECOND_MS,
-        withTiming(unitagInputContainerTranslateY.value + UNITAG_NAME_ANIMATE_DISTANCE_Y, {
-          duration: ONE_SECOND_MS / 2,
-        })
-      )
-      // Navigate to ChooseProfilePicture screen after 1s delay to allow animations to finish
-      setTimeout(() => {
-        navigate(
-          entryPoint === OnboardingScreens.Landing || entryPoint === OnboardingEntryPoint.Sidebar
-            ? Screens.OnboardingStack
-            : Screens.UnitagStack,
-          {
-            screen: UnitagScreens.ChooseProfilePicture,
-            params: { entryPoint, unitag, importType },
-          }
-        )
-      }, ONE_SECOND_MS)
-    },
-    [addressViewOpacity, entryPoint, importType, unitagInputContainerTranslateY]
-  )
-
-  // Handle when useUnitagError completes loading and returns a result after onPressContinue is called
-  useEffect(() => {
-    if (isCheckingUnitag && !!unitagToCheck && !loadingUnitagErrorCheck) {
-      setIsCheckingUnitag(false)
-      // If unitagError is defined, it's rendered in UI
-      if (!canClaimUnitagNameError) {
-        navigateWithAnimation(unitagToCheck)
-      }
-    }
-  }, [
-    canClaimUnitagNameError,
-    loadingUnitagErrorCheck,
-    unitagToCheck,
-    isCheckingUnitag,
-    navigateWithAnimation,
-  ])
-
-  const onPressContinue = (): void => {
-    if (unitagInputValue !== unitagToCheck) {
-      setIsCheckingUnitag(true)
-      setUnitagToCheck(unitagInputValue)
-    }
-  }
+import { useHeaderHeight } from '@react-navigation/elements'
+import React from 'react'
+import { KeyboardAvoidingView, StyleSheet } from 'react-native'
+import { UnitagStackScreenProp } from 'src/app/navigation/types'
+import { Screen, SHORT_SCREEN_HEADER_HEIGHT_RATIO } from 'src/components/layout/Screen'
+import { ChooseUnitag } from 'src/features/unitags/ChooseUnitag'
+import { UnitagScreens } from 'src/screens/Screens'
+import { useDeviceInsets } from 'ui/src'
+import { isIOS } from 'wallet/src/utils/platform'
+
+export function ClaimUnitagScreen({
+  route,
+}: UnitagStackScreenProp<UnitagScreens.ClaimUnitag>): JSX.Element {
+  const { entryPoint } = route.params
+  const headerHeight = useHeaderHeight()
+  const insets = useDeviceInsets()
 
   return (
-    <SafeKeyboardOnboardingScreen
-      subtitle={t('This is your personalized address that people can send crypto to.')}
-      title={t('Claim your username')}>
-      <Flex
-        centered
-        gap="$spacing16"
-        onLayout={(event): void => {
-          onLayout(event)
-          onSetFontSize(TEXT_INPUT_PLACEHOLDER + UNITAG_SUFFIX_CHARS_ONLY)
-        }}>
-        {/* Fixed text that animates in when TextInput is animated out */}
-        <AnimatedFlex
-          centered
-          height={fonts.heading2.lineHeight}
-          style={{ transform: [{ translateY: unitagInputContainerTranslateY }] }}>
-          {!showTextInputView && (
-            <Flex
-              row
-              alignSelf="center"
-              animation="lazy"
-              // eslint-disable-next-line react-native/no-inline-styles
-              enterStyle={{ o: 0 }}
-              // eslint-disable-next-line react-native/no-inline-styles
-              exitStyle={{ o: 0 }}
-              gap="$spacing20"
-              opacity={showTextInputView ? 0 : 1}
-              position="absolute">
-              <Text
-                color="$neutral1"
-                fontFamily="$heading"
-                fontSize={fontSize}
-                fontWeight={fonts.heading2.fontWeight}
-                lineHeight={fonts.heading2.lineHeight}>
-                {unitagInputValue}
-              </Text>
-              <Flex
-                row
-                animation="lazy"
-                // eslint-disable-next-line react-native/no-inline-styles
-                enterStyle={{ o: 0, scale: 0.8, x: 20 }}
-                // eslint-disable-next-line react-native/no-inline-styles
-                exitStyle={{ o: 0, scale: 0.8, x: -20 }}
-                position="absolute"
-                right={-iconSizes.icon8}
-                top={-iconSizes.icon8}>
-                <Unitag height={iconSizes.icon24} width={iconSizes.icon24} />
-              </Flex>
-            </Flex>
-          )}
-          <AnimatePresence>
-            {showTextInputView && (
-              <Flex
-                key="input-container"
-                row
-                animation="quick"
-                // eslint-disable-next-line react-native/no-inline-styles
-                enterStyle={{ o: 0, x: 40 }}
-                // eslint-disable-next-line react-native/no-inline-styles
-                exitStyle={{ o: 0, x: 40 }}
-                gap="$none">
-                <TextInput
-                  autoFocus
-                  blurOnSubmit
-                  autoCapitalize="none"
-                  autoCorrect={false}
-                  borderWidth={0}
-                  fontFamily="$heading"
-                  fontSize={fontSize}
-                  fontWeight="$large"
-                  numberOfLines={1}
-                  p="$none"
-                  placeholder={TEXT_INPUT_PLACEHOLDER}
-                  placeholderTextColor="$neutral3"
-                  returnKeyType="done"
-                  textAlign="left"
-                  value={unitagInputValue}
-                  onChangeText={onChangeTextInput}
-                />
-                <Text
-                  key={UNITAG_SUFFIX}
-                  animation="lazy"
-                  color="$neutral1"
-                  // eslint-disable-next-line react-native/no-inline-styles
-                  enterStyle={{ o: 0, x: 40 }}
-                  // eslint-disable-next-line react-native/no-inline-styles
-                  exitStyle={{ o: 0, x: 40 }}
-                  fontFamily="$heading"
-                  fontSize={fontSize}
-                  fontWeight={fonts.heading2.fontWeight}
-                  lineHeight={fonts.heading2.lineHeight}>
-                  {UNITAG_SUFFIX}
-                </Text>
-              </Flex>
-            )}
-          </AnimatePresence>
-        </AnimatedFlex>
-        <AnimatedFlex
-          row
-          alignItems="center"
-          gap="$spacing8"
-          style={addressViewAnimatedStyle}
-          onPress={onPressAddressTooltip}>
-          <Text color="$neutral2" variant="subheading2">
-            {shortenAddress(unitagAddress ?? ADDRESS_ZERO)}
-          </Text>
-          <TouchableArea
-            onPress={(): void => {
-              Keyboard.dismiss()
-              setShowInfoModal(true)
-            }}>
-            <InfoCircle color={colors.neutral2.get()} height={20} width={20} />
-          </TouchableArea>
-        </AnimatedFlex>
-        {canClaimUnitagNameError && unitagToCheck === unitagInputValue && (
-          <Flex centered row gap="$spacing8">
-            <Text color="$statusCritical" variant="body2">
-              {canClaimUnitagNameError}
-            </Text>
-          </Flex>
-        )}
-      </Flex>
-      <Flex gap="$spacing24" justifyContent="flex-end">
-        {(entryPoint === OnboardingScreens.Landing ||
-          entryPoint === OnboardingEntryPoint.Sidebar) && (
-          <Trace logPress element={ElementName.Skip}>
-            <TouchableArea onPress={onPressMaybeLater}>
-              <Text color="$accent1" textAlign="center" variant="buttonLabel2">
-                {t('Maybe later')}
-              </Text>
-            </TouchableArea>
-          </Trace>
-        )}
-        <Button
-          disabled={!unitagInputValue || isCheckingUnitag}
-          size="medium"
-          theme="primary"
-          onPress={onPressContinue}>
-          {isCheckingUnitag ? (
-            <Flex height={fonts.buttonLabel1.lineHeight}>
-              <ActivityIndicator color={colors.sporeWhite.val} />
-            </Flex>
-          ) : (
-            t('Continue')
-          )}
-        </Button>
-      </Flex>
-      {showInfoModal && (
-        <InfoModal
-          unitag={unitagInputValue}
-          unitagAddress={unitagAddress}
-          onClose={(): void => setShowInfoModal(false)}
-        />
-      )}
-    </SafeKeyboardOnboardingScreen>
+    <Screen
+      $short={{ pt: headerHeight * SHORT_SCREEN_HEADER_HEIGHT_RATIO }}
+      edges={['right', 'left']}
+      pt={headerHeight}>
+      <KeyboardAvoidingView
+        enabled
+        behavior={isIOS ? 'padding' : undefined}
+        style={[styles.base, { marginTop: insets.top, marginBottom: insets.bottom }]}>
+        <ChooseUnitag entryPoint={entryPoint} />
+      </KeyboardAvoidingView>
+    </Screen>
   )
 }
 
-const InfoModal = ({
-  unitag,
-  unitagAddress,
-  onClose,
-}: {
-  unitag: string | undefined
-  unitagAddress: string | undefined
-  onClose: () => void
-}): JSX.Element => {
-  const colors = useSporeColors()
-  const { t } = useTranslation()
-
-  return (
-    <WarningModal
-      backgroundIconColor={colors.surface1.get()}
-      caption={t(
-        `Usernames are free, readable names that map to your 0x address. They’re easier to remember and share than a typical crypto address.`
-      )}
-      closeText={t('Close')}
-      icon={
-        <Flex centered row gap="$spacing4">
-          <Pill
-            customBackgroundColor={colors.surface1.val}
-            foregroundColor={colors.neutral2.val}
-            label={shortenAddress(unitagAddress ?? ADDRESS_ZERO)}
-            px="$spacing12"
-            shadowColor="$neutral3"
-            shadowOpacity={0.4}
-            shadowRadius="$spacing4"
-            textVariant="buttonLabel4"
-          />
-          <Flex p="$spacing2" shadowColor="$accent1" shadowOpacity={1} shadowRadius="$spacing16">
-            <Icons.LinkHorizontalAlt color={colors.neutral2.get()} size={iconSizes.icon24} />
-          </Flex>
-          <Pill
-            customBackgroundColor={colors.surface1.val}
-            foregroundColor={colors.accent1.val}
-            px="$spacing12"
-            shadowColor="$neutral3"
-            shadowOpacity={0.4}
-            shadowRadius="$spacing4">
-            <Text color="$accent1" variant="buttonLabel4">
-              {unitag ? unitag : TEXT_INPUT_PLACEHOLDER}
-              <Text color="$neutral2" variant="buttonLabel4">
-                {UNITAG_SUFFIX}
-              </Text>
-            </Text>
-          </Pill>
-        </Flex>
-      }
-      modalName={ModalName.TooltipContent}
-      title={t('A simplified address')}
-      onClose={onClose}
-    />
-  )
-}
+const styles = StyleSheet.create({
+  base: {
+    flex: 1,
+    justifyContent: 'flex-end',
+  },
+})
diff --git a/apps/mobile/src/features/unitags/ConfirmationElements.tsx b/apps/mobile/src/features/unitags/ConfirmationElements.tsx
deleted file mode 100644
index c1a31913f90..00000000000
--- a/apps/mobile/src/features/unitags/ConfirmationElements.tsx
+++ /dev/null
@@ -1,177 +0,0 @@
-import { Flex, Image, Text, useSporeColors } from 'ui/src'
-import { DAI_LOGO, ENS_LOGO, ETH_LOGO, FROGGY, OPENSEA_LOGO, USDC_LOGO } from 'ui/src/assets'
-import HeartIcon from 'ui/src/assets/icons/heart.svg'
-import SendIcon from 'ui/src/assets/icons/send-action.svg'
-import { colors, iconSizes, imageSizes, opacify } from 'ui/src/theme'
-import { Arrow } from 'wallet/src/components/icons/Arrow'
-
-export const FroggyElement = (): JSX.Element => {
-  return (
-    <Flex
-      bg="$surface3"
-      borderRadius="$rounded12"
-      p="$spacing8"
-      transform={[{ rotateZ: '-10deg' }]}>
-      <Image
-        height={imageSizes.image48}
-        resizeMode="contain"
-        source={FROGGY}
-        width={imageSizes.image48}
-      />
-    </Flex>
-  )
-}
-
-export const OpenseaElement = (): JSX.Element => {
-  return (
-    <Flex bg="$blue400" borderRadius="$roundedFull" p="$spacing4">
-      <Image
-        height={imageSizes.image32}
-        resizeMode="contain"
-        source={OPENSEA_LOGO}
-        width={imageSizes.image32}
-      />
-    </Flex>
-  )
-}
-
-export const SwapElement = (): JSX.Element => {
-  const sporeColors = useSporeColors()
-  return (
-    <Flex
-      centered
-      row
-      borderRadius="$rounded12"
-      gap="$spacing4"
-      p="$spacing12"
-      transform={[{ rotateZ: '5deg' }]}>
-      <Flex
-        centered
-        row
-        borderRadius="$roundedFull"
-        gap="$spacing8"
-        p="$spacing8"
-        style={{ backgroundColor: opacify(20, colors.blue200) }}>
-        <Image
-          height={imageSizes.image24}
-          resizeMode="contain"
-          source={ETH_LOGO}
-          width={imageSizes.image24}
-        />
-        <Text color="$blue400" textAlign="center" variant="body2">
-          ETH
-        </Text>
-      </Flex>
-      <Arrow color={sporeColors.neutral3.val} direction="e" size={iconSizes.icon20} />
-      <Flex
-        centered
-        row
-        borderRadius="$roundedFull"
-        gap="$spacing8"
-        p="$spacing8"
-        style={{ backgroundColor: opacify(20, colors.yellow100) }}>
-        <Image
-          height={imageSizes.image24}
-          resizeMode="contain"
-          source={DAI_LOGO}
-          width={imageSizes.image24}
-        />
-        <Text color="$yellow200" textAlign="center" variant="body2">
-          DAI
-        </Text>
-      </Flex>
-    </Flex>
-  )
-}
-
-export const ENSElement = (): JSX.Element => {
-  return (
-    <Flex
-      borderRadius="$rounded12"
-      p="$spacing12"
-      style={{ backgroundColor: opacify(20, colors.blue300) }}
-      transform={[{ rotateZ: '8deg' }]}>
-      <Image
-        height={imageSizes.image24}
-        resizeMode="contain"
-        source={ENS_LOGO}
-        width={imageSizes.image24}
-      />
-    </Flex>
-  )
-}
-
-export const ReceiveUSDCElement = (): JSX.Element => {
-  return (
-    <Flex
-      centered
-      row
-      borderRadius="$roundedFull"
-      gap="$spacing8"
-      p="$spacing8"
-      style={{ backgroundColor: opacify(20, colors.blue300) }}
-      transform={[{ rotateZ: '-1deg' }]}>
-      <Text color="$blue400" textAlign="center" variant="buttonLabel3">
-        +100
-      </Text>
-      <Image
-        height={imageSizes.image24}
-        resizeMode="contain"
-        source={USDC_LOGO}
-        width={imageSizes.image24}
-      />
-    </Flex>
-  )
-}
-
-export const SendElement = (): JSX.Element => {
-  return (
-    <Flex
-      borderRadius="$rounded12"
-      p="$spacing8"
-      style={{ backgroundColor: opacify(20, colors.green300) }}
-      transform={[{ rotateZ: '-4deg' }]}>
-      <SendIcon color={colors.green200} height={iconSizes.icon28} width={iconSizes.icon28} />
-    </Flex>
-  )
-}
-
-export const HeartElement = (): JSX.Element => {
-  return (
-    <Flex
-      borderRadius="$rounded12"
-      p="$spacing8"
-      style={{ backgroundColor: opacify(20, colors.red200) }}
-      transform={[{ rotateZ: '-4deg' }]}>
-      <HeartIcon color={colors.red300} height={iconSizes.icon20} width={iconSizes.icon20} />
-    </Flex>
-  )
-}
-
-export const TextElement = ({ text }: { text: string }): JSX.Element => {
-  return (
-    <Flex
-      bg="$surface2"
-      borderRadius="$rounded12"
-      p="$spacing12"
-      transform={[{ rotateZ: '18deg' }]}>
-      <Text color="$neutral2" textAlign="center" variant="buttonLabel3">
-        {text}
-      </Text>
-    </Flex>
-  )
-}
-
-export const EmojiElement = ({ emoji }: { emoji: string }): JSX.Element => {
-  return (
-    <Flex
-      borderRadius="$roundedFull"
-      p="$spacing8"
-      style={{ backgroundColor: opacify(20, colors.yellow200) }}
-      transform={[{ rotateZ: '5deg' }]}>
-      <Text color="$neutral2" textAlign="center" variant="buttonLabel3">
-        {emoji}
-      </Text>
-    </Flex>
-  )
-}
diff --git a/apps/mobile/src/features/unitags/EditProfileScreen.tsx b/apps/mobile/src/features/unitags/EditProfileScreen.tsx
new file mode 100644
index 00000000000..a6e8e3a9252
--- /dev/null
+++ b/apps/mobile/src/features/unitags/EditProfileScreen.tsx
@@ -0,0 +1,229 @@
+import { isEqual } from 'lodash'
+import React, { useEffect, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { Keyboard } from 'react-native'
+import { UnitagStackScreenProp } from 'src/app/navigation/types'
+import { TextInput } from 'src/components/input/TextInput'
+import { Screen } from 'src/components/layout/Screen'
+import { ChoosePhotoOptionsModal } from 'src/components/unitags/ChoosePhotoOptionsModal'
+import { ScreenRow } from 'src/components/unitags/ScreenRow'
+import { UnitagProfilePicture } from 'src/components/unitags/UnitagProfilePicture'
+import { UNITAG_SUFFIX } from 'src/features/unitags/constants'
+import { UnitagScreens } from 'src/screens/Screens'
+import { Button, Flex, Icons, Text, useDeviceInsets } from 'ui/src'
+import { iconSizes, imageSizes } from 'ui/src/theme'
+import { ChainId } from 'wallet/src/constants/chains'
+import { useENS } from 'wallet/src/features/ens/useENS'
+import { useUnitagUpdateMetadataMutation } from 'wallet/src/features/unitags/api'
+import { useUnitag } from 'wallet/src/features/unitags/hooks'
+import { ProfileMetadata } from 'wallet/src/features/unitags/types'
+import { shortenAddress } from 'wallet/src/utils/addresses'
+
+const isProfileMetadataEdited = (
+  loading: boolean,
+  updatedMetadata: ProfileMetadata,
+  initialMetadata?: ProfileMetadata
+): boolean => {
+  return !!initialMetadata && !loading && isEqual(updatedMetadata, initialMetadata)
+}
+
+export function EditProfileScreen({
+  route,
+}: UnitagStackScreenProp<UnitagScreens.EditProfile>): JSX.Element {
+  const { address } = route.params
+  const unitag = useUnitag(address)
+  const { name: ensName } = useENS(ChainId.Mainnet, address)
+  const insets = useDeviceInsets()
+  const { t } = useTranslation()
+  const [showModal, setShowModal] = useState(false)
+  const [imageUri, setImageUri] = useState<string>()
+  const [bioInput, setBioInput] = useState<string>()
+  const [urlInput, setUrlInput] = useState<string>()
+  const [twitterInput, setTwitterInput] = useState<string>()
+  const updatedMetadata: ProfileMetadata = {
+    avatar: imageUri,
+    description: bioInput,
+    url: urlInput,
+    twitter: twitterInput,
+  }
+  const [
+    updateUnitagMetadata,
+    { called: updateRequestMade, loading: updateResponseLoading, data: updateResponse },
+  ] = useUnitagUpdateMetadataMutation(unitag?.username ?? address) // Save button can't be pressed until unitag is loaded anyways so this is fine
+  const profileMetadataEdited = isProfileMetadataEdited(
+    updateResponseLoading,
+    updatedMetadata,
+    updateResponse?.metadata ?? unitag?.metadata
+  )
+
+  useEffect(() => {
+    // Only want to set values on first time unitag loads, when we have not yet made the PUT request
+    if (!updateRequestMade && unitag?.metadata) {
+      setImageUri(unitag.metadata.avatar)
+      setBioInput(unitag.metadata.description)
+      setUrlInput(unitag.metadata.url)
+      setTwitterInput(unitag.metadata.twitter)
+    }
+  }, [updateRequestMade, unitag?.metadata])
+
+  const openModal = (): void => {
+    setShowModal(true)
+  }
+
+  const onCloseModal = (): void => {
+    setShowModal(false)
+  }
+
+  const onPressSaveChanges = async (): Promise<void> => {
+    await updateUnitagMetadata({
+      address,
+      metadata: updatedMetadata,
+    })
+  }
+
+  return (
+    <Screen edges={['right', 'left']}>
+      <Flex
+        grow
+        $short={{ gap: '$none' }}
+        gap="$spacing16"
+        pb="$spacing16"
+        px="$spacing16"
+        style={{ marginTop: insets.top, marginBottom: insets.bottom }}
+        onPress={Keyboard.dismiss}>
+        <ScreenRow
+          headingText={t('Edit profile')}
+          tooltipButton={<Flex width={iconSizes.icon16} />} //  Need this to center Edit profile text
+        />
+        <Flex fill justifyContent="space-between">
+          <Flex gap="$spacing24" justifyContent="flex-start" py="$spacing24">
+            <Flex pb="$spacing48">
+              <Flex
+                backgroundColor="$accentSoft"
+                borderRadius="$rounded20"
+                height={imageSizes.image100}
+              />
+              <Flex bottom={0} mx="$spacing16" position="absolute" width={imageSizes.image100}>
+                <Flex onPress={openModal}>
+                  <UnitagProfilePicture
+                    address={address}
+                    profilePictureUri={imageUri}
+                    size={imageSizes.image100}
+                  />
+                </Flex>
+                <Flex
+                  backgroundColor="$neutral1"
+                  borderRadius="$roundedFull"
+                  bottom={0}
+                  p="$spacing8"
+                  position="absolute"
+                  right={0}
+                  onPress={openModal}>
+                  <Icons.Edit color="$surface1" size={iconSizes.icon16} />
+                </Flex>
+              </Flex>
+            </Flex>
+
+            <Flex gap="$spacing4" px="$spacing16">
+              <Text color="$neutral1" variant="heading2">
+                {unitag?.username}
+                {UNITAG_SUFFIX}
+              </Text>
+              <Text color="$neutral2" variant="subheading2">
+                {shortenAddress(address)}
+              </Text>
+            </Flex>
+            <Flex gap="$spacing24" px="$spacing16">
+              <Flex row alignItems="flex-start" justifyContent="flex-start">
+                <Text color="$neutral2" flex={1} pt="$spacing4" variant="subheading1">
+                  {t('Bio')}
+                </Text>
+                <TextInput
+                  autoCorrect
+                  blurOnSubmit
+                  multiline
+                  flex={2}
+                  fontFamily="$body"
+                  fontSize="$small"
+                  numberOfLines={6}
+                  p="$none"
+                  placeholder={t('Type a bio for your profile')}
+                  placeholderTextColor="$neutral3"
+                  returnKeyType="done"
+                  textAlign="left"
+                  value={bioInput}
+                  onChangeText={setBioInput}
+                />
+              </Flex>
+              <Flex row alignItems="flex-start" justifyContent="flex-start">
+                <Text color="$neutral2" flex={1} pt="$spacing4" variant="subheading1">
+                  {t('Website')}
+                </Text>
+                <TextInput
+                  autoCorrect
+                  blurOnSubmit
+                  multiline
+                  flex={2}
+                  fontFamily="$body"
+                  fontSize="$small"
+                  numberOfLines={6}
+                  p="$none"
+                  placeholder={t('Type your website url here')}
+                  placeholderTextColor="$neutral3"
+                  returnKeyType="done"
+                  textAlign="left"
+                  value={urlInput}
+                  onChangeText={setUrlInput}
+                />
+              </Flex>
+              <Flex row alignItems="flex-end" justifyContent="flex-start">
+                <Text color="$neutral2" flex={1} variant="subheading1">
+                  {t('Twitter')}
+                </Text>
+                <TextInput
+                  autoCorrect
+                  blurOnSubmit
+                  flex={2}
+                  fontFamily="$body"
+                  fontSize="$small"
+                  p="$none"
+                  placeholder={t('Type your handle here')}
+                  placeholderTextColor="$neutral3"
+                  returnKeyType="done"
+                  textAlign="left"
+                  value={twitterInput}
+                  onChangeText={setTwitterInput}
+                />
+              </Flex>
+              {ensName && (
+                <Flex row justifyContent="flex-start">
+                  <Text color="$neutral2" flex={1} variant="subheading1">
+                    {t('ENS')}
+                  </Text>
+                  <Text color="$neutral2" flex={2} variant="body2">
+                    {ensName}
+                  </Text>
+                </Flex>
+              )}
+            </Flex>
+          </Flex>
+          <Button
+            disabled={!profileMetadataEdited}
+            size="medium"
+            theme="primary"
+            onPress={onPressSaveChanges}>
+            {t('Save changes')}
+          </Button>
+        </Flex>
+      </Flex>
+      {showModal && (
+        <ChoosePhotoOptionsModal
+          address={address}
+          setPhotoUri={setImageUri}
+          showRemoveOption={!!imageUri}
+          onClose={onCloseModal}
+        />
+      )}
+    </Screen>
+  )
+}
diff --git a/apps/mobile/src/features/unitags/EditUnitagProfileScreen.tsx b/apps/mobile/src/features/unitags/EditUnitagProfileScreen.tsx
deleted file mode 100644
index 041a32ed2b5..00000000000
--- a/apps/mobile/src/features/unitags/EditUnitagProfileScreen.tsx
+++ /dev/null
@@ -1,403 +0,0 @@
-import { isEqual } from 'lodash'
-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 { UnitagStackScreenProp } from 'src/app/navigation/types'
-import { BackHeader } from 'src/components/layout/BackHeader'
-import { Screen } from 'src/components/layout/Screen'
-import { ChangeUnitagModal } from 'src/components/unitags/ChangeUnitagModal'
-import { ChoosePhotoOptionsModal } from 'src/components/unitags/ChoosePhotoOptionsModal'
-import { DeleteUnitagModal } from 'src/components/unitags/DeleteUnitagModal'
-import { UnitagProfilePicture } from 'src/components/unitags/UnitagProfilePicture'
-import { HeaderRadial } from 'src/features/externalProfile/ProfileHeader'
-import { tryUploadAvatar } from 'src/features/unitags/avatars'
-import { Screens, UnitagScreens } from 'src/screens/Screens'
-import {
-  Button,
-  Flex,
-  Icons,
-  LinearGradient,
-  ScrollView,
-  Text,
-  useSporeColors,
-  useUniconColors,
-} from 'ui/src'
-import { borderRadii, fonts, iconSizes, imageSizes, spacing } from 'ui/src/theme'
-import { TextInput } from 'wallet/src/components/input/TextInput'
-import { ChainId } from 'wallet/src/constants/chains'
-import { useENS } from 'wallet/src/features/ens/useENS'
-import { pushNotification } from 'wallet/src/features/notifications/slice'
-import { AppNotificationType } from 'wallet/src/features/notifications/types'
-import {
-  useUnitagGetAvatarUploadUrlQuery,
-  useUnitagUpdateMetadataMutation,
-} from 'wallet/src/features/unitags/api'
-import { UNITAG_SUFFIX } from 'wallet/src/features/unitags/constants'
-import { useUnitagUpdater } from 'wallet/src/features/unitags/context'
-import { useUnitagByAddress } from 'wallet/src/features/unitags/hooks'
-import { ProfileMetadata } from 'wallet/src/features/unitags/types'
-import { useAppDispatch } from 'wallet/src/state'
-import { shortenAddress } from 'wallet/src/utils/addresses'
-import { useExtractedColors } from 'wallet/src/utils/colors'
-import { isIOS } from 'wallet/src/utils/platform'
-
-const BIO_TEXT_INPUT_LINES = 6
-
-const isProfileMetadataEdited = (
-  loading: boolean,
-  updatedMetadata: ProfileMetadata,
-  initialMetadata?: ProfileMetadata
-): boolean => {
-  return !loading && !isEqual(updatedMetadata, initialMetadata)
-}
-
-export function EditUnitagProfileScreen({
-  route,
-}: UnitagStackScreenProp<UnitagScreens.EditProfile>): JSX.Element {
-  const { address, unitag, entryPoint } = route.params
-  const { t } = useTranslation()
-  const colors = useSporeColors()
-  const dispatch = useAppDispatch()
-
-  const { name: ensName } = useENS(ChainId.Mainnet, address)
-  const { refetchUnitagsCounter } = useUnitagUpdater()
-  const {
-    unitag: retrievedUnitag,
-    loading,
-    refetch: refetchUnitagByAddress,
-  } = useUnitagByAddress(address)
-  const unitagMetadata = retrievedUnitag?.metadata
-
-  const [showAvatarModal, setShowAvatarModal] = useState(false)
-  const [avatarImageUri, setAvatarImageUri] = useState<string>()
-  const [bioInput, setBioInput] = useState<string>()
-  const [twitterInput, setTwitterInput] = useState<string>()
-  const [showDeleteUnitagModal, setShowDeleteUnitagModal] = useState(false)
-  const [showChangeUnitagModal, setShowChangeUnitagModal] = useState(false)
-
-  const updatedMetadata: ProfileMetadata = {
-    avatar: avatarImageUri,
-    description: bioInput,
-    twitter: twitterInput,
-  }
-
-  const [
-    updateUnitagMetadata,
-    { called: updateRequestMade, loading: updateResponseLoading, data: updateResponse },
-  ] = useUnitagUpdateMetadataMutation(unitag)
-
-  const { loading: avatarUploadUrlLoading, data: avatarUploadUrlResponse } =
-    useUnitagGetAvatarUploadUrlQuery({ username: retrievedUnitag?.username })
-
-  const profileMetadataEdited = isProfileMetadataEdited(
-    updateResponseLoading,
-    updatedMetadata,
-    updateResponse?.metadata ?? unitagMetadata
-  )
-
-  // Force refetch of canClaimUnitag if refetchUnitagsCounter changes
-  useEffect(() => {
-    refetchUnitagByAddress?.()
-  }, [refetchUnitagsCounter, refetchUnitagByAddress])
-
-  useEffect(() => {
-    // Only want to set values on first time unitag loads, when we have not yet made the PUT request
-    if (!updateRequestMade && unitagMetadata) {
-      setAvatarImageUri(unitagMetadata.avatar)
-      setBioInput(unitagMetadata.description)
-      setTwitterInput(unitagMetadata.twitter)
-    }
-  }, [updateRequestMade, unitagMetadata])
-
-  const { colors: avatarColors } = useExtractedColors(avatarImageUri)
-  const { gradientStart: uniconGradientStart, gradientEnd: uniconGradientEnd } =
-    useUniconColors(address)
-
-  // Wait for avatar, then render avatar extracted colors or unicon colors if no avatar
-  const fixedGradientColors = useMemo(() => {
-    if (avatarImageUri || (avatarImageUri && !avatarColors)) {
-      return [colors.surface1.val, colors.surface1.val]
-    }
-    if (avatarImageUri && avatarColors && avatarColors.base) {
-      return [avatarColors.base, avatarColors.base]
-    }
-    return [uniconGradientStart, uniconGradientEnd]
-  }, [avatarColors, avatarImageUri, uniconGradientEnd, uniconGradientStart, colors.surface1.val])
-
-  const openAvatarModal = (): void => {
-    setShowAvatarModal(true)
-  }
-
-  const onCloseAvatarModal = (): void => {
-    setShowAvatarModal(false)
-  }
-
-  const onPressSaveChanges = async (): Promise<void> => {
-    Keyboard.dismiss()
-
-    // Try to upload avatar or skip avatar upload if not needed
-    const { success, skipped } = await tryUploadAvatar({
-      avatarImageUri,
-      avatarUploadUrlResponse,
-      avatarUploadUrlLoading,
-    })
-
-    // Display error if avatar upload failed
-    if (!success) {
-      displayErrorNotification()
-      return
-    }
-
-    try {
-      const uploadedNewAvatar = success && !skipped
-      await updateProfileMetadata(uploadedNewAvatar)
-    } catch (e) {
-      displayErrorNotification()
-    }
-  }
-
-  const updateProfileMetadata = async (uploadedNewAvatar: boolean): Promise<void> => {
-    // If new avatar was uploaded, update metadata.avatar to be the S3 file location
-    const metadata = uploadedNewAvatar
-      ? { ...updatedMetadata, avatar: avatarUploadUrlResponse?.avatarUrl }
-      : updatedMetadata
-
-    await updateUnitagMetadata({ address, metadata, clearAvatar: metadata.avatar === undefined })
-    dispatch(
-      pushNotification({
-        type: AppNotificationType.Success,
-        title: t('Profile updated'),
-      })
-    )
-
-    if (uploadedNewAvatar) {
-      setAvatarImageUri(avatarUploadUrlResponse?.avatarUrl)
-    }
-  }
-
-  const displayErrorNotification = (): void => {
-    dispatch(
-      pushNotification({
-        type: AppNotificationType.Error,
-        errorMessage: t('Error updating profile. Please try again.'),
-      })
-    )
-  }
-
-  const menuActions = useMemo(() => {
-    return [
-      { title: t('Edit username'), systemIcon: 'pencil' },
-      { title: t('Delete username'), systemIcon: 'trash', destructive: true },
-    ]
-  }, [t])
-
-  return (
-    <Screen>
-      <KeyboardAvoidingView
-        behavior={isIOS ? 'padding' : undefined}
-        contentContainerStyle={styles.expand}
-        // Disable the keyboard avoiding view when the modals are open, otherwise background elements will shift up when the user is editing their username
-        enabled={!showDeleteUnitagModal && !showChangeUnitagModal}
-        style={styles.base}>
-        {/* Necessary to handle different header configuration when navigating from SettingsStack vs. UnitagsStack */}
-        {entryPoint === Screens.SettingsWallet ? (
-          <BackHeader
-            alignment="center"
-            endAdornment={
-              <ContextMenu
-                dropdownMenuMode
-                actions={menuActions}
-                onPress={(e): void => {
-                  // Emitted index based on order of menu action array
-                  // Edit username
-                  if (e.nativeEvent.index === 0) {
-                    setShowChangeUnitagModal(true)
-                  }
-                  // Delete username
-                  if (e.nativeEvent.index === 1) {
-                    setShowDeleteUnitagModal(true)
-                  }
-                }}>
-                <Flex pr="$spacing8">
-                  <Icons.TripleDots color="$neutral2" size={iconSizes.icon24} />
-                </Flex>
-              </ContextMenu>
-            }
-            p="$spacing16">
-            <Text variant="body1">{t('Edit profile')}</Text>
-          </BackHeader>
-        ) : (
-          <Flex bg="$surface1" pb="$spacing12" pt="$spacing20" px="$spacing24">
-            <Text textAlign="center" variant="body1">
-              {t('Edit profile')}
-            </Text>
-          </Flex>
-        )}
-        <ScrollView keyboardShouldPersistTaps="handled" px="$spacing24">
-          <Flex grow gap="$spacing36">
-            <Flex fill justifyContent="space-between">
-              <Flex pb="$spacing48">
-                <Flex height={imageSizes.image100}>
-                  <Flex
-                    bg="$surface1"
-                    borderRadius="$rounded20"
-                    bottom={0}
-                    left={0}
-                    position="absolute"
-                    right={0}
-                    top={0}
-                  />
-                  <LinearGradient
-                    colors={fixedGradientColors}
-                    end={{ x: 1, y: 1 }}
-                    start={{ x: 0, y: 1 }}
-                    style={styles.headerGradient}
-                  />
-                  {avatarImageUri && avatarColors?.primary ? (
-                    <HeaderRadial borderRadius={spacing.spacing20} color={avatarColors.primary} />
-                  ) : null}
-                </Flex>
-                <Flex
-                  bottom={spacing.spacing16}
-                  mx="$spacing16"
-                  position="absolute"
-                  onPress={openAvatarModal}>
-                  <UnitagProfilePicture
-                    address={address}
-                    profilePictureUri={avatarImageUri}
-                    size={imageSizes.image64}
-                  />
-                  <Flex
-                    bg="$surface1"
-                    borderRadius="$roundedFull"
-                    bottom={-spacing.spacing4}
-                    p="$spacing4"
-                    position="absolute"
-                    right={-spacing.spacing4}>
-                    <Flex bg="$neutral2" borderRadius="$roundedFull" p="$spacing8">
-                      <Icons.Edit color="$surface1" size={iconSizes.icon12} />
-                    </Flex>
-                  </Flex>
-                </Flex>
-              </Flex>
-
-              <Flex gap="$spacing2" pb="$spacing16" px="$spacing16">
-                <Text color="$neutral1" variant="heading3">
-                  {unitag}
-                  {UNITAG_SUFFIX}
-                </Text>
-                <Text color="$neutral2" variant="subheading2">
-                  {shortenAddress(address)}
-                </Text>
-              </Flex>
-
-              <Flex gap="$spacing24" px="$spacing16">
-                <Flex row>
-                  <Text color="$neutral2" flex={1} pt="$spacing4" variant="subheading1">
-                    {t('Bio')}
-                  </Text>
-                  {!loading ? (
-                    <TextInput
-                      autoCorrect
-                      blurOnSubmit
-                      multiline
-                      flex={2}
-                      fontFamily="$body"
-                      fontSize="$small"
-                      maxHeight={fonts.body1.lineHeight * BIO_TEXT_INPUT_LINES}
-                      numberOfLines={BIO_TEXT_INPUT_LINES}
-                      p="$none"
-                      placeholder={t('Type a bio for your profile')}
-                      placeholderTextColor="$neutral3"
-                      returnKeyType="done"
-                      textAlign="left"
-                      value={bioInput}
-                      onChangeText={setBioInput}
-                    />
-                  ) : null}
-                </Flex>
-                <Flex row>
-                  <Text color="$neutral2" flex={1} variant="subheading1">
-                    {t('Twitter')}
-                  </Text>
-                  {!loading ? (
-                    <TextInput
-                      blurOnSubmit
-                      autoCapitalize="none"
-                      flex={2}
-                      fontFamily="$body"
-                      fontSize="$small"
-                      p="$none"
-                      placeholder={t('Type your handle here')}
-                      placeholderTextColor="$neutral3"
-                      returnKeyType="done"
-                      textAlign="left"
-                      value={twitterInput}
-                      onChangeText={setTwitterInput}
-                    />
-                  ) : null}
-                </Flex>
-                {ensName && (
-                  <Flex row>
-                    <Text color="$neutral2" flex={1} variant="subheading1">
-                      {t('ENS')}
-                    </Text>
-                    <Text color="$neutral2" flex={2} variant="body2">
-                      {ensName}
-                    </Text>
-                  </Flex>
-                )}
-              </Flex>
-            </Flex>
-          </Flex>
-        </ScrollView>
-        <Button
-          disabled={!profileMetadataEdited}
-          mx="$spacing24"
-          size="medium"
-          theme="primary"
-          onPress={onPressSaveChanges}>
-          {t('Save')}
-        </Button>
-        {showAvatarModal && (
-          <ChoosePhotoOptionsModal
-            address={address}
-            setPhotoUri={setAvatarImageUri}
-            showRemoveOption={!!avatarImageUri}
-            onClose={onCloseAvatarModal}
-          />
-        )}
-      </KeyboardAvoidingView>
-      {showDeleteUnitagModal && (
-        <DeleteUnitagModal
-          address={address}
-          unitag={unitag}
-          onClose={(): void => setShowDeleteUnitagModal(false)}
-        />
-      )}
-      {showChangeUnitagModal && (
-        <ChangeUnitagModal
-          address={address}
-          unitag={unitag}
-          onClose={(): void => setShowChangeUnitagModal(false)}
-        />
-      )}
-    </Screen>
-  )
-}
-
-const styles = StyleSheet.create({
-  base: {
-    flex: 1,
-    justifyContent: 'flex-end',
-  },
-  expand: {
-    flexGrow: 1,
-  },
-  headerGradient: {
-    borderRadius: borderRadii.rounded20,
-    flex: 1,
-    opacity: 0.2,
-  },
-})
diff --git a/apps/mobile/src/features/unitags/UnitagConfirmationScreen.tsx b/apps/mobile/src/features/unitags/UnitagConfirmationScreen.tsx
index abebf5b99f1..9eb81b91620 100644
--- a/apps/mobile/src/features/unitags/UnitagConfirmationScreen.tsx
+++ b/apps/mobile/src/features/unitags/UnitagConfirmationScreen.tsx
@@ -1,170 +1,90 @@
-import React, { useMemo } from 'react'
+import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { UnitagStackScreenProp } from 'src/app/navigation/types'
-import { AnimateInOrder } from 'src/components/animation/AnimateInOrder'
 import { Screen } from 'src/components/layout/Screen'
-import { UnitagWithProfilePicture } from 'src/components/unitags/UnitagWithProfilePicture'
-import {
-  EmojiElement,
-  ENSElement,
-  FroggyElement,
-  HeartElement,
-  OpenseaElement,
-  ReceiveUSDCElement,
-  SendElement,
-  SwapElement,
-  TextElement,
-} from 'src/features/unitags/ConfirmationElements'
+import { UnitagProfilePicture } from 'src/components/unitags/UnitagProfilePicture'
+import { UNITAG_SUFFIX } from 'src/features/unitags/constants'
 import { Screens, UnitagScreens } from 'src/screens/Screens'
-import { AnimatePresence, Button, Flex, Text, useDeviceDimensions, useDeviceInsets } from 'ui/src'
-import { spacing } from 'ui/src/theme'
-import { UNITAG_SUFFIX } from 'wallet/src/features/unitags/constants'
+import { Button, Flex, Text, useDeviceInsets } from 'ui/src'
+import { imageSizes } from 'ui/src/theme'
 
 export function UnitagConfirmationScreen({
   route,
 }: UnitagStackScreenProp<UnitagScreens.UnitagConfirmation>): JSX.Element {
   const { unitag, address, profilePictureUri } = route.params
-  const dimensions = useDeviceDimensions()
+
   const insets = useDeviceInsets()
   const { t } = useTranslation()
 
-  const boxWidth = dimensions.fullWidth - insets.left - insets.right - spacing.spacing32
-
   const onPressCustomize = (): void => {
     navigate(Screens.UnitagStack, {
       screen: UnitagScreens.EditProfile,
       params: {
         address,
-        unitag,
-        entryPoint: UnitagScreens.UnitagConfirmation,
       },
     })
   }
 
-  const onPressDone = (): void => {
+  const onPressHome = (): void => {
     navigate(Screens.Home)
   }
 
-  const elementsToAnimate = useMemo(
-    () => [
-      { element: <FroggyElement />, coordinates: { x: 5, y: 0 } },
-      { element: <ReceiveUSDCElement />, coordinates: { x: 10, y: 2 } },
-      { element: <OpenseaElement />, coordinates: { x: 8.2, y: 4 } },
-      { element: <HeartElement />, coordinates: { x: 9, y: 7 } },
-      { element: <SwapElement />, coordinates: { x: 10, y: 10 } },
-      { element: <ENSElement />, coordinates: { x: 1, y: 8.5 } },
-      { element: <TextElement text={t('got it!')} />, coordinates: { x: 0, y: 5 } },
-      { element: <SendElement />, coordinates: { x: 1, y: 2 } },
-      { element: <EmojiElement emoji="👍" />, coordinates: { x: 3.5, y: 2.5 } },
-    ],
-    [t]
-  )
-
   return (
-    <Screen edges={['right', 'left', 'bottom']} pt="$spacing60">
-      <Flex grow gap="$spacing16" justifyContent="space-between" pb="$spacing16" px="$spacing16">
-        <Flex centered grow>
-          <AnimatePresence exitBeforeEnter>
-            <AnimateInOrder
-              // eslint-disable-next-line react-native/no-inline-styles
-              enterStyle={{ o: 0, scale: 0.5 }}
-              // eslint-disable-next-line react-native/no-inline-styles
-              exitStyle={{ o: 0, scale: 0.5 }}
-              index={1}
-              position="absolute">
+    <Screen edges={['right', 'left']}>
+      <Flex
+        grow
+        $short={{ gap: '$none' }}
+        gap="$spacing16"
+        pb="$spacing16"
+        px="$spacing16"
+        style={{ marginTop: insets.top, marginBottom: insets.bottom }}>
+        <Flex fill justifyContent="space-between">
+          <Flex centered grow gap="$spacing36">
+            <Flex centered gap={-8}>
+              <Flex px="$spacing4">
+                <UnitagProfilePicture
+                  address={address}
+                  profilePictureUri={profilePictureUri}
+                  size={imageSizes.image100}
+                />
+              </Flex>
               <Flex
-                aspectRatio={1}
-                borderColor="$surface3"
-                borderRadius="$roundedFull"
-                borderWidth={1}
-                height={boxWidth}
-              />
-            </AnimateInOrder>
-            <AnimateInOrder
-              // eslint-disable-next-line react-native/no-inline-styles
-              enterStyle={{ o: 0, scale: 0.5 }}
-              // eslint-disable-next-line react-native/no-inline-styles
-              exitStyle={{ o: 0, scale: 0.5 }}
-              index={2}
-              position="absolute">
-              <Flex
-                aspectRatio={1}
-                borderColor="$surface3"
-                borderRadius="$roundedFull"
-                borderWidth={1}
-                height={boxWidth * 0.6}
-              />
-            </AnimateInOrder>
-            {elementsToAnimate.map(({ element, coordinates }, index) => (
-              <AnimateInOrder
-                key={index}
-                hapticOnEnter
-                index={index + 3}
-                position="absolute"
-                {...getInsetPropsForCoordinates(boxWidth, coordinates.x, coordinates.y)}>
-                {element}
-              </AnimateInOrder>
-            ))}
-            <AnimateInOrder hapticOnEnter index={12}>
-              <UnitagWithProfilePicture
-                address={address}
-                profilePictureUri={profilePictureUri}
-                unitag={unitag}
-              />
-            </AnimateInOrder>
-          </AnimatePresence>
-        </Flex>
-        <Flex centered gap="$spacing16" pb="$spacing16" px="$spacing24">
-          <Text color="$neutral1" textAlign="center" variant="heading3">
-            {t('You got it!')}
-          </Text>
-          <Text color="$neutral2" textAlign="center" variant="subheading2">
-            {t(
-              '{{unitag}}{{unitagSuffix}} is ready to send and receive crypto. Continue to build out your wallet by customizing your profile',
-              { unitag, unitagSuffix: UNITAG_SUFFIX }
-            )}
-          </Text>
-        </Flex>
-        <Flex gap="$spacing12">
-          <Button size="medium" theme="primary" onPress={onPressDone}>
-            {t('Done')}
-          </Button>
-          <Button size="medium" theme="secondary" onPress={onPressCustomize}>
-            {t('Customize profile')}
-          </Button>
+                row
+                backgroundColor="$accent2"
+                borderRadius="$rounded32"
+                gap="$spacing8"
+                px="$spacing32"
+                py="$spacing4"
+                zIndex="$popover">
+                <Text color="$accent1" variant="heading2">
+                  {unitag}
+                </Text>
+              </Flex>
+            </Flex>
+
+            <Flex centered gap="$spacing16" px="$spacing24">
+              <Text color="$neutral1" textAlign="center" variant="heading3">
+                {t('You’ve got it!')}
+              </Text>
+              <Text color="$neutral2" textAlign="center" variant="body2">
+                {t(
+                  '{{unitag}}{{unitagSuffix}} is ready to send and receive crypto. Continue to build out your wallet by customizing your profile',
+                  { unitag, unitagSuffix: UNITAG_SUFFIX }
+                )}
+              </Text>
+            </Flex>
+          </Flex>
+          <Flex gap="$spacing12">
+            <Button size="medium" theme="primary" onPress={onPressCustomize}>
+              {t('Customize profile')}
+            </Button>
+            <Button size="medium" theme="secondary" onPress={onPressHome}>
+              {t('Return home')}
+            </Button>
+          </Flex>
         </Flex>
       </Flex>
     </Screen>
   )
 }
-
-// Calculates top and left insets for absolute positioned element based
-// on a 10x10 coordinate system where top left is 0,0.
-const getInsetPropsForCoordinates = (
-  boxWidth: number,
-  x: number,
-  y: number
-): { top?: number; right?: number; bottom?: number; left?: number } => {
-  const unitSize = 10
-  const unit = boxWidth / unitSize
-
-  let top
-  let bottom
-  let left
-  let right
-
-  if (x < unitSize / 2) {
-    left = x * unit
-  } else if (x > unitSize / 2) {
-    right = (unitSize - x) * unit
-  }
-
-  if (y < unitSize / 2) {
-    top = y * unit
-  } else if (y > unitSize / 2) {
-    bottom = (unitSize - y) * unit
-  }
-
-  return { top, right, bottom, left }
-}
diff --git a/apps/mobile/src/features/unitags/UnitagInput.tsx b/apps/mobile/src/features/unitags/UnitagInput.tsx
new file mode 100644
index 00000000000..8426f9e1093
--- /dev/null
+++ b/apps/mobile/src/features/unitags/UnitagInput.tsx
@@ -0,0 +1,217 @@
+import React, { useRef, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import {
+  LayoutChangeEvent,
+  LayoutRectangle,
+  StyleSheet,
+  TextInput as NativeTextInput,
+} from 'react-native'
+import { FadeIn, FadeOut } from 'react-native-reanimated'
+import { AddressDisplay } from 'src/components/AddressDisplay'
+import { SpinningLoader } from 'src/components/loading/SpinningLoader'
+import { WalletSelectorModal } from 'src/components/unitags/WalletSelectorModal'
+import InputWithSuffix from 'src/features/import/InputWithSuffix'
+import { UNITAG_SUFFIX } from 'src/features/unitags/constants'
+import { AnimatedFlex, Flex, Icons, Text } from 'ui/src'
+import Unitag from 'ui/src/assets/icons/unitag.svg'
+import { fonts, iconSizes } from 'ui/src/theme'
+import { Account } from 'wallet/src/features/wallet/accounts/types'
+import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
+import { setAccountAsActive } from 'wallet/src/features/wallet/slice'
+import { useAppDispatch } from 'wallet/src/state'
+
+const INPUT_MIN_HEIGHT = 120
+const INPUT_MIN_HEIGHT_SHORT = 90
+
+type UnitagInputProps = {
+  activeAddress: Maybe<Address>
+  value: string | undefined
+  errorMessage: string | undefined
+  onChange: (text: string | undefined) => void
+  placeholderLabel: string | undefined
+  onSubmit?: () => void
+  inputSuffix?: string
+  liveCheck?: boolean
+  loading?: boolean
+  showUnitagLogo: boolean
+  onBlur?: () => void
+  onFocus?: () => void
+}
+
+export function UnitagInput({
+  activeAddress,
+  value,
+  inputSuffix,
+  onBlur,
+  onFocus,
+  onSubmit,
+  onChange,
+  liveCheck,
+  loading,
+  placeholderLabel,
+  showUnitagLogo,
+  errorMessage,
+}: UnitagInputProps): JSX.Element {
+  const { t } = useTranslation()
+  const placeholderUnitag = t('yourname') + UNITAG_SUFFIX
+
+  const [focused, setFocused] = useState(false)
+  const [layout, setLayout] = useState<LayoutRectangle | null>()
+  const [showModal, setShowModal] = useState(false)
+  const textInputRef = useRef<NativeTextInput>(null)
+  const dispatch = useAppDispatch()
+  const activeAccount = useActiveAccount()
+
+  const INPUT_FONT_SIZE = fonts.heading2.fontSize
+  const INPUT_MAX_FONT_SIZE_MULTIPLIER = fonts.heading2.maxFontSizeMultiplier
+
+  const handleBlur = (): void => {
+    setFocused(false)
+    onBlur?.()
+  }
+
+  const handleFocus = (): void => {
+    setFocused(true)
+    onFocus?.()
+    // Need this to allow for focus on click on container.
+    textInputRef?.current?.focus()
+  }
+
+  const handleSubmit = (): void => {
+    onSubmit && onSubmit()
+  }
+
+  const onAddressPress = (): void => setShowModal(true)
+
+  const onCloseModal = (): void => setShowModal(false)
+
+  const onPressAccountOption = (account: Account): void => {
+    dispatch(setAccountAsActive(account.address))
+    setShowModal(false)
+  }
+  return (
+    <>
+      <Flex
+        centered
+        $short={{
+          gap: '$none',
+        }}
+        gap="$spacing8">
+        <Flex centered gap="$spacing16" width="100%" onTouchEnd={handleFocus}>
+          <Flex
+            centered
+            shrink
+            $short={{ px: '$spacing24', py: '$spacing8', minHeight: INPUT_MIN_HEIGHT_SHORT }}
+            backgroundColor="$surface2"
+            borderColor={
+              errorMessage && (liveCheck || !focused) && value ? '$statusCritical' : '$surface2'
+            }
+            borderRadius="$rounded20"
+            borderWidth={1}
+            minHeight={INPUT_MIN_HEIGHT}
+            px="$spacing36"
+            py="$spacing16"
+            width="100%">
+            <Flex row>
+              <InputWithSuffix
+                blurOnSubmit
+                alwaysShowInputSuffix={!showUnitagLogo}
+                autoCorrect={false}
+                inputAlignment="center"
+                inputFontSize={INPUT_FONT_SIZE}
+                inputMaxFontSizeMultiplier={INPUT_MAX_FONT_SIZE_MULTIPLIER}
+                inputSuffix={value ? inputSuffix : placeholderUnitag}
+                inputSuffixColor={value ? '$neutral1' : '$transparent'}
+                layout={layout}
+                multiline={false}
+                textAlign="center"
+                textInputRef={textInputRef}
+                value={value}
+                onBlur={handleBlur}
+                onChangeText={onChange}
+                onFocus={handleFocus}
+                onSubmitEditing={handleSubmit}
+              />
+              {loading && (
+                <AnimatedFlex centered entering={FadeIn} exiting={FadeOut}>
+                  <SpinningLoader size={iconSizes.icon24} />
+                </AnimatedFlex>
+              )}
+              {showUnitagLogo && (
+                <AnimatedFlex centered entering={FadeIn} exiting={FadeOut}>
+                  <Unitag height={iconSizes.icon24} width={iconSizes.icon24} />
+                </AnimatedFlex>
+              )}
+            </Flex>
+            {!value && (
+              <AnimatedFlex
+                centered
+                grow
+                row
+                entering={FadeIn}
+                exiting={FadeOut}
+                pb="$spacing4"
+                position="absolute"
+                width="100%"
+                onLayout={(event: LayoutChangeEvent): void => setLayout(event.nativeEvent.layout)}>
+                {placeholderLabel && (
+                  <Text
+                    adjustsFontSizeToFit
+                    color="$neutral3"
+                    numberOfLines={1}
+                    style={styles.placeholderLabelStyle}
+                    variant="heading2">
+                    {placeholderLabel}
+                  </Text>
+                )}
+                <Text
+                  adjustsFontSizeToFit
+                  color="$neutral1"
+                  numberOfLines={1}
+                  style={styles.placeholderLabelStyle}
+                  variant="heading2">
+                  {UNITAG_SUFFIX}
+                </Text>
+              </AnimatedFlex>
+            )}
+          </Flex>
+          <Flex>
+            {errorMessage && value && (liveCheck || !focused) && (
+              <Flex centered row gap="$spacing8">
+                <Text color="$statusCritical" variant="body2">
+                  {errorMessage}
+                </Text>
+              </Flex>
+            )}
+          </Flex>
+          {activeAddress && (
+            <Flex row alignItems="center" gap="$spacing8" onPress={onAddressPress}>
+              <Icons.ArrowTurnDownRight color="$neutral3" size={iconSizes.icon24} />
+              <Flex row alignItems="center">
+                <AddressDisplay
+                  hideAddressInSubtitle
+                  address={activeAddress}
+                  horizontalGap="$spacing4"
+                />
+                <Icons.AngleRightSmall color="$neutral2" size={iconSizes.icon16} />
+              </Flex>
+            </Flex>
+          )}
+        </Flex>
+      </Flex>
+      {showModal && (
+        <WalletSelectorModal
+          activeAccount={activeAccount}
+          onClose={onCloseModal}
+          onPressAccount={onPressAccountOption}
+        />
+      )}
+    </>
+  )
+}
+
+const styles = StyleSheet.create({
+  placeholderLabelStyle: {
+    flexShrink: 1,
+  },
+})
diff --git a/apps/mobile/src/features/unitags/avatars.ts b/apps/mobile/src/features/unitags/avatars.ts
deleted file mode 100644
index a54ad0818d4..00000000000
--- a/apps/mobile/src/features/unitags/avatars.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import { FetchResult } from '@apollo/client'
-import axios from 'axios'
-import { Platform } from 'react-native'
-import { logger } from 'utilities/src/logger/logger'
-import { getUnitagAvatarUploadUrl } from 'wallet/src/features/unitags/api'
-import {
-  UnitagAvatarUploadCredentials,
-  UnitagGetAvatarUploadUrlResponse,
-  UnitagUpdateMetadataRequestBody,
-  UnitagUpdateMetadataResponse,
-} from 'wallet/src/features/unitags/types'
-
-export function isLocalFileUri(imageUri: string): boolean {
-  const localFilePatterns = [
-    'file://', // iOS local file prefix
-    'content://', // Android Content Provider
-    '/storage/', // Android internal storage (absolute path)
-    '/data/', // Android internal data storage (absolute path)
-  ]
-
-  // Check if the imageUri starts with any of the local file patterns
-  return localFilePatterns.some((pattern) => imageUri.startsWith(pattern))
-}
-
-export async function uploadFileToS3(
-  imageUri: string,
-  creds: UnitagAvatarUploadCredentials
-): Promise<{ success: boolean }> {
-  if (!creds.preSignedUrl || !creds.s3UploadFields) {
-    return { success: false }
-  }
-
-  // Standardize the uri for iOS and Android
-  const uri = Platform.OS === 'android' ? imageUri : imageUri.replace('file://', '')
-  const formData = new FormData()
-
-  // Add the S3 fields to the form data
-  Object.entries(creds.s3UploadFields).forEach(([key, value]) => {
-    formData.append(key, value)
-  })
-
-  // Get the file as a blob to set the Content-Type
-  const response = await fetch(uri)
-  const blob = await response.blob()
-  formData.append('Content-Type', blob.type)
-
-  // Add the file to the form data. We ignore the function signature and input an object with keys uri, type, and name
-  // This is the argument that react-native's FormData expects, but for some reason our project thinks it's using typescript's FormData
-  // Ignoring the typecheck and forcing the object to be Blob works though
-  formData.append('file', {
-    uri,
-    type: blob.type,
-    name: uri,
-  } as unknown as Blob)
-
-  // Send the post request to S3 using pre-signed URL and s3 fields
-  try {
-    await axios.post(creds.preSignedUrl, formData, {
-      headers: {
-        'Content-Type': 'multipart/form-data', // Important for S3 to process the file correctly
-      },
-    })
-    logger.info('unitags/utils.ts', 'uploadFileToS3', 'Avatar uploaded to S3 successfully')
-    return { success: true }
-  } catch (error) {
-    logger.error(error, {
-      tags: { file: 'unitags/utils.ts', function: 'uploadFileToS3' },
-    })
-    return { success: false }
-  }
-}
-
-/**
- * Uploads an image to S3 and updates the avatar for a given username and address.
- * Expects imageUri to be a local file, it uploads the file to S3 and updates the avatar URL in the metadata.
- *
- * @param {string} username - The newly claimed unitag.
- * @param {Address} address - The address of the unitag.
- * @param {string} imageUri - The URI of the new avatar image (either a local file or external url).
- * @param {(variables: UnitagUpdateMetadataRequestBody) => Promise<FetchResult<{data: UnitagUpdateMetadataResponse}>>} updateUnitagMetadata - The function to call to update the metadata on the backend.
- * @returns {Promise<boolean>} - A promise that resolves to a boolean indicating whether the avatar was successfully updated.
- */
-export async function uploadAndUpdateAvatarAfterClaim(
-  username: string,
-  address: Address,
-  imageUri: string,
-  updateUnitagMetadata: (variables: UnitagUpdateMetadataRequestBody) => Promise<
-    FetchResult<{
-      data: UnitagUpdateMetadataResponse
-    }>
-  >
-): Promise<{ success: boolean }> {
-  try {
-    // First get pre-signedUrl and s3UploadFields from the backend
-    const { data: avatarUploadUrlResponse } = await getUnitagAvatarUploadUrl(username)
-
-    // Then upload to S3
-    const { success: uploadSuccess } = await uploadFileToS3(imageUri, {
-      preSignedUrl: avatarUploadUrlResponse.preSignedUrl,
-      s3UploadFields: avatarUploadUrlResponse.s3UploadFields,
-    })
-
-    // Check if upload succeeded
-    if (!uploadSuccess) {
-      return { success: false }
-    }
-
-    // Then update profile metadata with the image url
-    await updateUnitagMetadata({
-      address,
-      metadata: {
-        avatar: avatarUploadUrlResponse.avatarUrl,
-      },
-    })
-    return { success: true }
-  } catch (e) {
-    logger.error(e, {
-      tags: { file: 'unitags/utils.ts', function: 'uploadAndUpdateAvatarAfterClaim' },
-    })
-    return { success: false }
-  }
-}
-
-export const tryUploadAvatar = async ({
-  avatarImageUri,
-  avatarUploadUrlResponse,
-  avatarUploadUrlLoading,
-}: {
-  avatarImageUri: string | undefined
-  avatarUploadUrlResponse: UnitagGetAvatarUploadUrlResponse | undefined
-  avatarUploadUrlLoading: boolean
-}): Promise<{ success: boolean; skipped: boolean }> => {
-  const needsAvatarUpload = !!avatarImageUri && isLocalFileUri(avatarImageUri)
-  const isPreSignedUrlReady =
-    !avatarUploadUrlLoading &&
-    !!avatarUploadUrlResponse?.preSignedUrl &&
-    !!avatarUploadUrlResponse?.s3UploadFields
-  const shouldTryAvatarUpload = needsAvatarUpload && isPreSignedUrlReady
-
-  if (!shouldTryAvatarUpload) {
-    // Return success=true if no upload needed, false if upload needed but can't make request
-    return { success: !needsAvatarUpload, skipped: true }
-  }
-
-  const avatarUploadResult = await uploadFileToS3(avatarImageUri, {
-    preSignedUrl: avatarUploadUrlResponse.preSignedUrl,
-    s3UploadFields: avatarUploadUrlResponse.s3UploadFields,
-  })
-
-  return { ...avatarUploadResult, skipped: false }
-}
diff --git a/apps/mobile/src/features/unitags/constants.ts b/apps/mobile/src/features/unitags/constants.ts
new file mode 100644
index 00000000000..edfe6ca6163
--- /dev/null
+++ b/apps/mobile/src/features/unitags/constants.ts
@@ -0,0 +1 @@
+export const UNITAG_SUFFIX = '.uni.eth'
diff --git a/apps/mobile/src/features/wallet/hooks.ts b/apps/mobile/src/features/wallet/hooks.ts
index a00f3002a7a..b8a8c12a1e5 100644
--- a/apps/mobile/src/features/wallet/hooks.ts
+++ b/apps/mobile/src/features/wallet/hooks.ts
@@ -2,13 +2,13 @@ import { useCallback, useEffect, useState } from 'react'
 import { useAppSelector } from 'src/app/hooks'
 import { openModal } from 'src/features/modals/modalSlice'
 import { selectModalState } from 'src/features/modals/selectModalState'
+import { ModalName } from 'src/features/telemetry/constants'
 import { logger } from 'utilities/src/logger/logger'
 import { FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
 import { useFeatureFlag } from 'wallet/src/features/experiments/hooks'
 import { useNativeAccountExists } from 'wallet/src/features/wallet/hooks'
 import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
 import { useAppDispatch } from 'wallet/src/state'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export function useWalletRestore(params?: { openModalImmediately?: boolean }): {
   walletNeedsRestore: undefined | boolean
diff --git a/apps/mobile/src/features/walletConnect/saga.ts b/apps/mobile/src/features/walletConnect/saga.ts
index 2a745ba7320..4f5f5c49cdf 100644
--- a/apps/mobile/src/features/walletConnect/saga.ts
+++ b/apps/mobile/src/features/walletConnect/saga.ts
@@ -25,7 +25,7 @@ import {
 import { call, fork, put, take } from 'typed-redux-saga'
 import { logger } from 'utilities/src/logger/logger'
 import { config } from 'wallet/src/config'
-import { ALL_SUPPORTED_CHAIN_IDS, CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
+import { ALL_SUPPORTED_CHAIN_IDS, ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
 import { selectAccounts, selectActiveAccountAddress } from 'wallet/src/features/wallet/selectors'
 import { EthEvent, EthMethod } from 'wallet/src/features/walletConnect/types'
 import i18n from 'wallet/src/i18n/i18n'
diff --git a/apps/mobile/src/features/walletConnect/signWcRequestSaga.ts b/apps/mobile/src/features/walletConnect/signWcRequestSaga.ts
index b1bbd488448..ae0ca55f64f 100644
--- a/apps/mobile/src/features/walletConnect/signWcRequestSaga.ts
+++ b/apps/mobile/src/features/walletConnect/signWcRequestSaga.ts
@@ -6,8 +6,8 @@ import { ChainId } from 'wallet/src/constants/chains'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
 import {
-  SendTransactionParams,
   sendTransaction,
+  SendTransactionParams,
 } from 'wallet/src/features/transactions/sendTransactionSaga'
 import { TransactionType } from 'wallet/src/features/transactions/types'
 import { Account } from 'wallet/src/features/wallet/accounts/types'
diff --git a/apps/mobile/src/features/walletConnect/useWalletConnect.ts b/apps/mobile/src/features/walletConnect/useWalletConnect.ts
index 1deb339763c..5a33c7548f0 100644
--- a/apps/mobile/src/features/walletConnect/useWalletConnect.ts
+++ b/apps/mobile/src/features/walletConnect/useWalletConnect.ts
@@ -3,6 +3,7 @@ import { useAppSelector } from 'src/app/hooks'
 import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
 import { AppModalState } from 'src/features/modals/ModalsState'
 import { selectModalState } from 'src/features/modals/selectModalState'
+import { ModalName } from 'src/features/telemetry/constants'
 import {
   makeSelectSessions,
   selectHasPendingSessionError,
@@ -14,7 +15,6 @@ import {
   WalletConnectRequest,
   WalletConnectSession,
 } from 'src/features/walletConnect/walletConnectSlice'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 interface WalletConnect {
   sessions: WalletConnectSession[]
diff --git a/apps/mobile/src/screens/DevScreen.tsx b/apps/mobile/src/screens/DevScreen.tsx
index 15d06bf2964..932918dc635 100644
--- a/apps/mobile/src/screens/DevScreen.tsx
+++ b/apps/mobile/src/screens/DevScreen.tsx
@@ -3,15 +3,15 @@ import { I18nManager, ScrollView } from 'react-native'
 import { useAppDispatch } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { BackButton } from 'src/components/buttons/BackButton'
+import { Switch } from 'src/components/buttons/Switch'
 import { Screen } from 'src/components/layout/Screen'
+import { resetDismissedWarnings } from 'src/features/tokens/tokensSlice'
 import { Screens } from 'src/screens/Screens'
 import { Flex, Text, TouchableArea, useDeviceInsets } from 'ui/src'
 import { spacing } from 'ui/src/theme'
 import { logger } from 'utilities/src/logger/logger'
-import { Switch } from 'wallet/src/components/buttons/Switch'
 import { pushNotification } from 'wallet/src/features/notifications/slice'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
-import { resetDismissedWarnings } from 'wallet/src/features/tokens/tokensSlice'
 import { createAccountActions } from 'wallet/src/features/wallet/create/createAccountSaga'
 import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
 import { resetWallet } from 'wallet/src/features/wallet/slice'
diff --git a/apps/mobile/src/screens/ExploreScreen.tsx b/apps/mobile/src/screens/ExploreScreen.tsx
index ce4e7659ae9..23fe4a18181 100644
--- a/apps/mobile/src/screens/ExploreScreen.tsx
+++ b/apps/mobile/src/screens/ExploreScreen.tsx
@@ -9,18 +9,19 @@ import { useExploreStackNavigation } from 'src/app/navigation/types'
 import { ExploreSections } from 'src/components/explore/ExploreSections'
 import { SearchEmptySection } from 'src/components/explore/search/SearchEmptySection'
 import { SearchResultsSection } from 'src/components/explore/search/SearchResultsSection'
+import { SearchTextInput } from 'src/components/input/SearchTextInput'
 import { Screen } from 'src/components/layout/Screen'
 import { VirtualizedList } from 'src/components/layout/VirtualizedList'
+import { useBottomSheetContext } from 'src/components/modals/BottomSheetContext'
+import { HandleBar } from 'src/components/modals/HandleBar'
 import { useReduxModalBackHandler } from 'src/features/modals/hooks'
 import { selectModalState } from 'src/features/modals/selectModalState'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
+import { ModalName, SectionName } from 'src/features/telemetry/constants'
 import { Screens } from 'src/screens/Screens'
-import { AnimatedFlex, ColorTokens, Flex, flexStyles, useIsDarkMode } from 'ui/src'
+import { AnimatedFlex, ColorTokens, Flex, flexStyles } from 'ui/src'
 import { useDebounce } from 'utilities/src/time/timing'
-import { useBottomSheetContext } from 'wallet/src/components/modals/BottomSheetContext'
-import { HandleBar } from 'wallet/src/components/modals/HandleBar'
-import { SearchTextInput } from 'wallet/src/features/search/SearchTextInput'
-import { ModalName, SectionName } from 'wallet/src/telemetry/constants'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 
 export function ExploreScreen(): JSX.Element {
   const modalInitialState = useAppSelector(selectModalState(ModalName.Explore)).initialState
diff --git a/apps/mobile/src/screens/ExternalProfileScreen.tsx b/apps/mobile/src/screens/ExternalProfileScreen.tsx
index 27c8081043c..2e26343d28f 100644
--- a/apps/mobile/src/screens/ExternalProfileScreen.tsx
+++ b/apps/mobile/src/screens/ExternalProfileScreen.tsx
@@ -8,16 +8,16 @@ import { ActivityTab } from 'src/components/home/ActivityTab'
 import { NftsTab } from 'src/components/home/NftsTab'
 import { TokensTab } from 'src/components/home/TokensTab'
 import { Screen } from 'src/components/layout/Screen'
-import { renderTabLabel, TAB_STYLES, TabContentProps } from 'src/components/layout/TabHelpers'
+import { renderTabLabel, TabContentProps, TAB_STYLES } from 'src/components/layout/TabHelpers'
 import Trace from 'src/components/Trace/Trace'
 import TraceTabView from 'src/components/Trace/TraceTabView'
 import { ProfileHeader } from 'src/features/externalProfile/ProfileHeader'
+import { SectionName } from 'src/features/telemetry/constants'
 import { ExploreModalAwareView } from 'src/screens/ModalAwareView'
 import { Screens } from 'src/screens/Screens'
 import { Flex, useDeviceInsets, useSporeColors } from 'ui/src'
 import { spacing } from 'ui/src/theme'
 import { useDisplayName } from 'wallet/src/features/wallet/hooks'
-import { SectionName, SectionNameType } from 'wallet/src/telemetry/constants'
 
 type Props = NativeStackScreenProps<AppStackParamList, Screens.ExternalProfile> & {
   renderedInModal?: boolean
@@ -76,7 +76,7 @@ export function ExternalProfileScreen({
       route,
     }: {
       route: {
-        key: SectionNameType
+        key: SectionName
         title: string
       }
     }) => {
diff --git a/apps/mobile/src/screens/FiatOnRampConnecting.tsx b/apps/mobile/src/screens/FiatOnRampConnecting.tsx
deleted file mode 100644
index f90099fe41a..00000000000
--- a/apps/mobile/src/screens/FiatOnRampConnecting.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import { skipToken } from '@reduxjs/toolkit/query/react'
-import React, { useCallback, useEffect, useState } from 'react'
-
-import { useTranslation } from 'react-i18next'
-import { useAppDispatch } from 'src/app/hooks'
-import { Loader } from 'src/components/loading'
-import { useTimeout } from 'utilities/src/time/timing'
-import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-
-import { NativeStackScreenProps } from '@react-navigation/native-stack'
-import { FiatOnRampStackParamList } from 'src/app/navigation/types'
-import {
-  FiatOnRampConnectingView,
-  SERVICE_PROVIDER_ICON_SIZE,
-} from 'src/features/fiatOnRamp/FiatOnRampConnecting'
-import { useFiatOnRampContext } from 'src/features/fiatOnRamp/FiatOnRampContext'
-import { useFiatOnRampTransactionCreator } from 'src/features/fiatOnRamp/hooks'
-import { getServiceProviderForQuote } from 'src/features/fiatOnRamp/meldUtils'
-import { FiatOnRampScreens } from 'src/screens/Screens'
-import { ONE_SECOND_MS } from 'utilities/src/time/time'
-import { useFiatOnRampAggregatorWidgetQuery } from 'wallet/src/features/fiatOnRamp/api'
-import { pushNotification } from 'wallet/src/features/notifications/slice'
-import { AppNotificationType } from 'wallet/src/features/notifications/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
-
-type Props = NativeStackScreenProps<FiatOnRampStackParamList, FiatOnRampScreens.Connecting>
-
-export function FiatOnRampConnectingScreen({ navigation }: Props): JSX.Element | null {
-  const { t } = useTranslation()
-  const dispatch = useAppDispatch()
-  const { addFiatSymbolToNumber } = useLocalizationContext()
-  const [timeoutElapsed, setTimeoutElapsed] = useState(false)
-  const activeAccountAddress = useActiveAccountAddressWithThrow()
-
-  const { externalTransactionId, dispatchAddTransaction } =
-    useFiatOnRampTransactionCreator(activeAccountAddress)
-  const { selectedQuote, serviceProviders, countryCode, baseCurrencyInfo, quoteCurrency, amount } =
-    useFiatOnRampContext()
-  const serviceProvider = getServiceProviderForQuote(selectedQuote, serviceProviders)
-
-  const onError = useCallback((): void => {
-    dispatch(
-      pushNotification({
-        type: AppNotificationType.Error,
-        errorMessage: t('Something went wrong.'),
-      })
-    )
-    navigation.goBack()
-  }, [dispatch, navigation, t])
-
-  const {
-    data: widgetData,
-    isLoading: widgetLoading,
-    error: widgetError,
-  } = useFiatOnRampAggregatorWidgetQuery(
-    serviceProvider && quoteCurrency?.currencyInfo?.currency.symbol && baseCurrencyInfo && amount
-      ? {
-          serviceProvider: serviceProvider.serviceProvider,
-          countryCode,
-          destinationCurrencyCode: quoteCurrency?.currencyInfo?.currency.symbol,
-          sourceAmount: amount,
-          sourceCurrencyCode: baseCurrencyInfo.code,
-          walletAddress: activeAccountAddress,
-          externalCustomerId: activeAccountAddress,
-          externalSessionId: externalTransactionId,
-        }
-      : skipToken
-  )
-
-  useTimeout(() => {
-    setTimeoutElapsed(true)
-  }, CONNECTING_TIMEOUT)
-
-  useEffect(() => {
-    if (!baseCurrencyInfo || !serviceProvider || widgetError) {
-      onError()
-      return
-    }
-    if (timeoutElapsed && !widgetLoading && widgetData) {
-      navigation.goBack()
-      openUri(widgetData.widgetUrl).catch(onError)
-      // TODO: Uncomment this when https://linear.app/uniswap/issue/MOB-2585/implement-polling-of-transaction-once-user-has-checked-out is implmented
-      // dispatchAddTransaction()
-    }
-  }, [
-    navigation,
-    timeoutElapsed,
-    widgetData,
-    widgetLoading,
-    widgetError,
-    onError,
-    dispatchAddTransaction,
-    baseCurrencyInfo,
-    serviceProvider,
-  ])
-
-  return baseCurrencyInfo && serviceProvider ? (
-    <FiatOnRampConnectingView
-      amount={addFiatSymbolToNumber({
-        value: amount,
-        currencyCode: baseCurrencyInfo?.code,
-        currencySymbol: baseCurrencyInfo?.symbol,
-      })}
-      quoteCurrencyCode={quoteCurrency.currencyInfo?.currency.symbol}
-      serviceProviderLogo={
-        <Loader.Box
-          borderRadius="$rounded20"
-          height={SERVICE_PROVIDER_ICON_SIZE}
-          width={SERVICE_PROVIDER_ICON_SIZE}
-        />
-      }
-      serviceProviderName={serviceProvider.name}
-    />
-  ) : null
-}
diff --git a/apps/mobile/src/screens/FiatOnRampScreen.tsx b/apps/mobile/src/screens/FiatOnRampScreen.tsx
deleted file mode 100644
index d174a5ba20a..00000000000
--- a/apps/mobile/src/screens/FiatOnRampScreen.tsx
+++ /dev/null
@@ -1,302 +0,0 @@
-import { NativeStackScreenProps } from '@react-navigation/native-stack'
-import React, { ComponentProps, useEffect, useRef, useState } from 'react'
-import { useTranslation } from 'react-i18next'
-import { TextInput, TextInputProps } from 'react-native'
-import {
-  FadeIn,
-  FadeOut,
-  FadeOutDown,
-  useAnimatedStyle,
-  useSharedValue,
-  withSpring,
-} from 'react-native-reanimated'
-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'
-import { FiatOnRampAggregatorTokenSelector } from 'src/features/fiatOnRamp/FiatOnRampAggregatorTokenSelector'
-import { FiatOnRampAmountSection } from 'src/features/fiatOnRamp/FiatOnRampAmountSection'
-import { useFiatOnRampContext } from 'src/features/fiatOnRamp/FiatOnRampContext'
-import { FiatOnRampCountryListModal } from 'src/features/fiatOnRamp/FiatOnRampCountryListModal'
-import { FiatOnRampCountryPicker } from 'src/features/fiatOnRamp/FiatOnRampCountryPicker'
-import {
-  useFiatOnRampQuotes,
-  useMeldFiatCurrencySupportInfo,
-  useParseMeldError,
-} from 'src/features/fiatOnRamp/meldHooks'
-import { FiatOnRampCurrency, InitialQuoteSelection } from 'src/features/fiatOnRamp/types'
-import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
-import { MobileEventName } from 'src/features/telemetry/constants'
-import { MobileEventProperties } from 'src/features/telemetry/types'
-import { FiatOnRampScreens } from 'src/screens/Screens'
-import { AnimatedFlex, Flex, Text, useDeviceDimensions } from 'ui/src'
-import { usePrevious } from 'utilities/src/react/hooks'
-import { DecimalPadLegacy } from 'wallet/src/components/legacy/DecimalPadLegacy'
-import { useBottomSheetContext } from 'wallet/src/components/modals/BottomSheetContext'
-import { HandleBar } from 'wallet/src/components/modals/HandleBar'
-import { useFiatOnRampAggregatorServiceProvidersQuery } from 'wallet/src/features/fiatOnRamp/api'
-import { MeldTransaction } from 'wallet/src/features/fiatOnRamp/meld'
-import { FORQuote } from 'wallet/src/features/fiatOnRamp/types'
-import { pushNotification } from 'wallet/src/features/notifications/slice'
-import { AppNotificationType } from 'wallet/src/features/notifications/types'
-import { ANIMATE_SPRING_CONFIG } from 'wallet/src/features/transactions/utils'
-
-type Props = NativeStackScreenProps<FiatOnRampStackParamList, FiatOnRampScreens.AmountInput>
-
-function selectInitialQuote(
-  quotes: FORQuote[] | undefined,
-  lastTransaction: MeldTransaction | undefined
-): { quote: FORQuote | undefined; type: InitialQuoteSelection | undefined } {
-  if (lastTransaction) {
-    // setting "Recently used"
-    // TODO:https://linear.app/uniswap/issue/MOB-2533/implement-recently-used-logic
-  } else {
-    // setting "Best overall"
-    const initialQuote = quotes && quotes.length && quotes[0]
-    if (initialQuote) {
-      return {
-        quote: quotes.reduce<FORQuote>((prev, curr) => {
-          return curr.destinationAmount > prev.destinationAmount ? curr : prev
-        }, initialQuote),
-        type: InitialQuoteSelection.Best,
-      }
-    }
-  }
-  return { quote: undefined, type: undefined }
-}
-
-export function FiatOnRampScreen({ navigation }: Props): JSX.Element {
-  const { t } = useTranslation()
-  const dispatch = useAppDispatch()
-  const { fullWidth } = useDeviceDimensions()
-  const [selection, setSelection] = useState<TextInputProps['selection']>()
-  const [value, setValue] = useState('')
-  const [showTokenSelector, setShowTokenSelector] = useState(false)
-  const inputRef = useRef<TextInput>(null)
-  const [selectingCountry, setSelectingCountry] = useState(false)
-
-  const { isSheetReady } = useBottomSheetContext()
-
-  const {
-    selectedQuote,
-    setSelectedQuote,
-    setQuotesSections,
-    countryCode,
-    setCountryCode,
-    amount,
-    setAmount,
-    setBaseCurrencyInfo,
-    setServiceProviders,
-    quoteCurrency,
-    setQuoteCurrency,
-  } = useFiatOnRampContext()
-
-  const resetSelection = (start: number, end?: number): void => {
-    setSelection({ start, end: end ?? start })
-  }
-
-  const { showNativeKeyboard, onDecimalPadLayout, isLayoutPending, onInputPanelLayout } =
-    useShouldShowNativeKeyboard()
-
-  const { appFiatCurrencySupportedInMeld, meldSupportedFiatCurrency } =
-    useMeldFiatCurrencySupportInfo()
-
-  const {
-    error: quotesError,
-    loading: quotesLoading,
-    quotes,
-  } = useFiatOnRampQuotes({
-    baseCurrencyAmount: amount,
-    baseCurrencyCode: meldSupportedFiatCurrency.code,
-    quoteCurrencyCode: quoteCurrency.currencyInfo?.currency.symbol,
-    countryCode,
-  })
-
-  const {
-    currentData: serviceProvidersResponse,
-    isFetching: serviceProvidersLoading,
-    error: serviceProvidersError,
-  } = useFiatOnRampAggregatorServiceProvidersQuery()
-
-  const { errorText, errorColor } = useParseMeldError(quotesError || serviceProvidersError)
-
-  const prevQuotes = usePrevious(quotes)
-  useEffect(() => {
-    if (quotes && (!selectedQuote || prevQuotes !== quotes)) {
-      const { quote, type } = selectInitialQuote(quotes, undefined)
-      if (!quote) {
-        return
-      }
-      const otherQuotes = quotes.filter((item) => item !== quote)
-      setQuotesSections([
-        { data: [quote], type },
-        ...(otherQuotes.length ? [{ data: otherQuotes }] : []),
-      ])
-      setSelectedQuote(quote)
-    }
-  }, [prevQuotes, quotes, selectedQuote, setQuotesSections, setSelectedQuote, t])
-
-  useEffect(() => {
-    if (!quotes && (quotesError || serviceProvidersError || !amount)) {
-      setQuotesSections(undefined)
-      setSelectedQuote(undefined)
-    }
-  }, [amount, quotesError, serviceProvidersError, quotes, setQuotesSections, setSelectedQuote])
-
-  const onSelectCountry: ComponentProps<typeof FiatOnRampCountryListModal>['onSelectCountry'] = (
-    country
-  ): void => {
-    dispatch(
-      pushNotification({
-        type: AppNotificationType.ChooseCountry,
-        countryName: country.displayName,
-        countryCode: country.countryCode,
-      })
-    )
-    setSelectingCountry(false)
-    setCountryCode(country.countryCode)
-  }
-
-  const onChangeValue =
-    (source: MobileEventProperties[MobileEventName.FiatOnRampAmountEntered]['source']) =>
-    (newAmount: string): void => {
-      sendMobileAnalyticsEvent(MobileEventName.FiatOnRampAmountEntered, {
-        source,
-      })
-      setValue(newAmount)
-      setAmount(newAmount ? parseFloat(newAmount) : 0)
-    }
-
-  // hide keyboard when user goes to token selector screen
-  useEffect(() => {
-    if (showTokenSelector) {
-      inputRef.current?.blur()
-    } else if (showNativeKeyboard) {
-      inputRef.current?.focus()
-    }
-  }, [showNativeKeyboard, showTokenSelector])
-
-  // we only show loading when there are no errors and quote value is not empty
-  const buttonDisabled =
-    serviceProvidersLoading ||
-    !!serviceProvidersError ||
-    quotesLoading ||
-    !!quotesError ||
-    !selectedQuote?.destinationAmount
-
-  const screenXOffset = useSharedValue(showTokenSelector ? -fullWidth : 0)
-  useEffect(() => {
-    const screenOffset = showTokenSelector ? 1 : 0
-    screenXOffset.value = withSpring(-(fullWidth * screenOffset), ANIMATE_SPRING_CONFIG)
-  }, [screenXOffset, showTokenSelector, fullWidth])
-  const wrapperStyle = useAnimatedStyle(() => ({
-    transform: [{ translateX: screenXOffset.value }],
-  }))
-
-  const onContinue = (): void => {
-    if (
-      quotes &&
-      serviceProvidersResponse?.serviceProviders &&
-      serviceProvidersResponse?.serviceProviders.length > 0 &&
-      quoteCurrency?.currencyInfo?.currency
-    ) {
-      setBaseCurrencyInfo(meldSupportedFiatCurrency)
-      setServiceProviders(serviceProvidersResponse.serviceProviders)
-      navigation.navigate(FiatOnRampScreens.ServiceProviders)
-    }
-  }
-
-  return (
-    <Screen edges={['top']}>
-      <HandleBar backgroundColor="none" />
-      <AnimatedFlex row height="100%" pt="$spacing12" style={wrapperStyle}>
-        {isSheetReady && (
-          <AnimatedFlex
-            entering={FadeIn}
-            exiting={FadeOut}
-            gap="$spacing16"
-            px="$spacing24"
-            width="100%">
-            <Flex row alignItems="center" justifyContent="space-between">
-              <Text variant="subheading1">{t('Buy')}</Text>
-              <FiatOnRampCountryPicker
-                countryCode={countryCode}
-                onPress={(): void => {
-                  setSelectingCountry(true)
-                }}
-              />
-            </Flex>
-            <FiatOnRampAmountSection
-              predefinedAmountsSupported
-              appFiatCurrencySupported={appFiatCurrencySupportedInMeld}
-              currency={quoteCurrency}
-              errorColor={errorColor}
-              errorText={errorText}
-              fiatCurrencyInfo={meldSupportedFiatCurrency}
-              inputRef={inputRef}
-              quoteAmount={selectedQuote?.destinationAmount ?? 0}
-              quoteCurrencyAmountReady={Boolean(amount && selectedQuote)}
-              selectTokenLoading={quotesLoading}
-              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}
-              pb="$spacing24"
-              position="absolute"
-              px="$spacing24"
-              right={0}
-              onLayout={onDecimalPadLayout}>
-              {!showNativeKeyboard && (
-                <DecimalPadLegacy
-                  resetSelection={resetSelection}
-                  selection={selection}
-                  setValue={onChangeValue('textInput')}
-                  value={value}
-                />
-              )}
-              <FiatOnRampCtaButton
-                eligible
-                continueButtonText={t('Continue')}
-                disabled={buttonDisabled}
-                onPress={onContinue}
-              />
-            </AnimatedFlex>
-          </AnimatedFlex>
-        )}
-        {showTokenSelector && countryCode && (
-          <FiatOnRampAggregatorTokenSelector
-            countryCode={countryCode}
-            sourceCurrencyCode={meldSupportedFiatCurrency.code}
-            onBack={(): void => setShowTokenSelector(false)}
-            onSelectCurrency={(newCurrency: FiatOnRampCurrency): void => {
-              setQuoteCurrency(newCurrency)
-              setShowTokenSelector(false)
-            }}
-          />
-        )}
-      </AnimatedFlex>
-      {Boolean(selectingCountry) && countryCode && (
-        <FiatOnRampCountryListModal
-          countryCode={countryCode}
-          onClose={(): void => {
-            setSelectingCountry(false)
-          }}
-          onSelectCountry={onSelectCountry}
-        />
-      )}
-    </Screen>
-  )
-}
diff --git a/apps/mobile/src/screens/FiatOnRampServiceProviders.tsx b/apps/mobile/src/screens/FiatOnRampServiceProviders.tsx
deleted file mode 100644
index fd943e1cab1..00000000000
--- a/apps/mobile/src/screens/FiatOnRampServiceProviders.tsx
+++ /dev/null
@@ -1,139 +0,0 @@
-import { BottomSheetSectionList } from '@gorhom/bottom-sheet'
-import { NativeStackScreenProps } from '@react-navigation/native-stack'
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { ListRenderItemInfo, SectionListData } from 'react-native'
-import { FadeIn, FadeOut } from 'react-native-reanimated'
-import { FiatOnRampStackParamList } from 'src/app/navigation/types'
-import { BackButton } from 'src/components/buttons/BackButton'
-import { FORQuoteItem } from 'src/components/fiatOnRamp/QuoteItem'
-import { Screen } from 'src/components/layout/Screen'
-import { useFiatOnRampContext } from 'src/features/fiatOnRamp/FiatOnRampContext'
-import { getServiceProviderForQuote } from 'src/features/fiatOnRamp/meldUtils'
-import { InitialQuoteSelection } from 'src/features/fiatOnRamp/types'
-import { MobileEventName } from 'src/features/telemetry/constants'
-import { FiatOnRampScreens } from 'src/screens/Screens'
-import { AnimatedFlex, Button, Flex, Icons, Inset, Separator, Text } from 'ui/src'
-import { Trace } from 'utilities/src/telemetry/trace/Trace'
-import { HandleBar } from 'wallet/src/components/modals/HandleBar'
-import { useBottomSheetFocusHook } from 'wallet/src/components/modals/hooks'
-import { FORQuote } from 'wallet/src/features/fiatOnRamp/types'
-import { ElementName } from 'wallet/src/telemetry/constants'
-
-type Props = NativeStackScreenProps<FiatOnRampStackParamList, FiatOnRampScreens.ServiceProviders>
-
-const key = (item: FORQuote): string => item.serviceProvider
-
-export function FiatOnRampServiceProvidersScreen({ navigation }: Props): JSX.Element {
-  const { t } = useTranslation()
-  const {
-    selectedQuote,
-    setSelectedQuote,
-    quotesSections,
-    quoteCurrency,
-    baseCurrencyInfo,
-    serviceProviders,
-  } = useFiatOnRampContext()
-
-  const renderItem = ({ item }: ListRenderItemInfo<FORQuote>): JSX.Element => {
-    return (
-      <Flex px="$spacing12" py="$spacing8">
-        {baseCurrencyInfo && (
-          <FORQuoteItem
-            active={selectedQuote === item}
-            baseCurrency={baseCurrencyInfo}
-            currency={quoteCurrency?.currencyInfo?.currency}
-            loading={false}
-            quote={item}
-            serviceProvider={getServiceProviderForQuote(item, serviceProviders)}
-            onPress={(): void => {
-              setSelectedQuote(item)
-            }}
-          />
-        )}
-      </Flex>
-    )
-  }
-
-  const renderSectionHeader = ({
-    section: { type },
-  }: {
-    section: SectionListData<FORQuote, { type?: InitialQuoteSelection }>
-  }): JSX.Element => {
-    return (
-      <Flex px="$spacing12">
-        {type ? (
-          <Flex row alignItems="center" pl="$spacing8">
-            <Icons.Verified color="$accent1" size="$icon.16" />
-            <Text color="$neutral2" pl="$spacing4" variant="body3">
-              {type === InitialQuoteSelection.Best ? t('Best overall') : t('Recently used')}
-            </Text>
-          </Flex>
-        ) : (
-          <Flex centered row gap="$spacing12" my="$spacing12">
-            <Separator />
-            <Text color="$neutral3" variant="body3">
-              {t('Other options')}
-            </Text>
-            <Separator />
-          </Flex>
-        )}
-      </Flex>
-    )
-  }
-
-  const onContinue = (): void => {
-    const serviceProvider = getServiceProviderForQuote(selectedQuote, serviceProviders)
-    if (serviceProvider) {
-      navigation.navigate(FiatOnRampScreens.Connecting)
-    }
-  }
-
-  return (
-    <Screen edges={['top']}>
-      <HandleBar backgroundColor="none" />
-      <Flex height="100%">
-        <Flex
-          row
-          alignItems="center"
-          justifyContent="space-between"
-          pb="$spacing16"
-          pt="$spacing12"
-          px="$spacing16">
-          <BackButton />
-          <Text color="$neutral1" mt="$spacing2" textAlign="center" variant="subheading1">
-            {t('Checkout with')}
-          </Text>
-          <Flex width="$spacing24" />
-        </Flex>
-        <Flex grow gap="$spacing16" px="$spacing16">
-          <AnimatedFlex grow entering={FadeIn} exiting={FadeOut} pb="$spacing24" pt="$spacing4">
-            <BottomSheetSectionList
-              bounces
-              ListEmptyComponent={<Flex />}
-              ListFooterComponent={<Inset all="$spacing36" />}
-              focusHook={useBottomSheetFocusHook}
-              keyExtractor={key}
-              keyboardDismissMode="on-drag"
-              keyboardShouldPersistTaps="always"
-              renderItem={renderItem}
-              renderSectionHeader={renderSectionHeader}
-              sections={quotesSections ?? []}
-              showsVerticalScrollIndicator={false}
-              stickySectionHeadersEnabled={false}
-              windowSize={5}
-            />
-            <Trace
-              logPress
-              element={ElementName.FiatOnRampWidgetButton}
-              pressEvent={MobileEventName.FiatOnRampWidgetOpened}>
-              <Button size="large" theme="primary" onPress={onContinue}>
-                {t('Checkout')}
-              </Button>
-            </Trace>
-          </AnimatedFlex>
-        </Flex>
-      </Flex>
-    </Screen>
-  )
-}
diff --git a/apps/mobile/src/screens/HomeScreen.tsx b/apps/mobile/src/screens/HomeScreen.tsx
index 84631b08e59..4b42817365c 100644
--- a/apps/mobile/src/screens/HomeScreen.tsx
+++ b/apps/mobile/src/screens/HomeScreen.tsx
@@ -8,9 +8,9 @@ import { useTranslation } from 'react-i18next'
 import { FlatList, StyleProp, View, ViewProps, ViewStyle } from 'react-native'
 import { TapGestureHandler, TapGestureHandlerGestureEvent } from 'react-native-gesture-handler'
 import Animated, {
+  cancelAnimation,
   FadeIn,
   FadeOut,
-  cancelAnimation,
   interpolateColor,
   runOnJS,
   useAnimatedGestureHandler,
@@ -25,32 +25,39 @@ import { SceneRendererProps, TabBar } from 'react-native-tab-view'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { NavBar, SWAP_BUTTON_HEIGHT } from 'src/app/navigation/NavBar'
 import { AppStackScreenProp } from 'src/app/navigation/types'
-import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
-import Trace from 'src/components/Trace/Trace'
-import TraceTabView from 'src/components/Trace/TraceTabView'
 import { AccountHeader } from 'src/components/accounts/AccountHeader'
 import { pulseAnimation } from 'src/components/buttons/utils'
-import { ACTIVITY_TAB_DATA_DEPENDENCIES, ActivityTab } from 'src/components/home/ActivityTab'
-import { FEED_TAB_DATA_DEPENDENCIES, FeedTab } from 'src/components/home/FeedTab'
-import { NFTS_TAB_DATA_DEPENDENCIES, NftsTab } from 'src/components/home/NftsTab'
-import { TOKENS_TAB_DATA_DEPENDENCIES, TokensTab } from 'src/components/home/TokensTab'
+import { ActivityTab, ACTIVITY_TAB_DATA_DEPENDENCIES } from 'src/components/home/ActivityTab'
+import { FeedTab, FEED_TAB_DATA_DEPENDENCIES } from 'src/components/home/FeedTab'
+import { NftsTab, NFTS_TAB_DATA_DEPENDENCIES } from 'src/components/home/NftsTab'
+import { TokensTab, TOKENS_TAB_DATA_DEPENDENCIES } from 'src/components/home/TokensTab'
 import { Screen } from 'src/components/layout/Screen'
 import {
   HeaderConfig,
+  renderTabLabel,
   ScrollPair,
+  TabContentProps,
   TAB_BAR_HEIGHT,
   TAB_STYLES,
   TAB_VIEW_SCROLL_THROTTLE,
-  TabContentProps,
-  renderTabLabel,
   useScrollSync,
 } from 'src/components/layout/TabHelpers'
+import { ScannerModalState } from 'src/components/QRCodeScanner/constants'
+import { TokenBalanceListRow } from 'src/components/TokenBalanceList/TokenBalanceListContext'
+import Trace from 'src/components/Trace/Trace'
+import TraceTabView from 'src/components/Trace/TraceTabView'
 import { UnitagBanner } from 'src/components/unitags/UnitagBanner'
 import { apolloClient } from 'src/data/usePersistedApolloClient'
 import { PortfolioBalance } from 'src/features/balances/PortfolioBalance'
 import { openModal } from 'src/features/modals/modalSlice'
 import { selectSomeModalOpen } from 'src/features/modals/selectSomeModalOpen'
-import { MobileEventName } from 'src/features/telemetry/constants'
+import { useSelectAddressHasNotifications } from 'src/features/notifications/hooks'
+import {
+  ElementName,
+  MobileEventName,
+  ModalName,
+  SectionName,
+} from 'src/features/telemetry/constants'
 import { useHeartbeatReporter, useLastBalancesReporter } from 'src/features/telemetry/hooks'
 import { useWalletRestore } from 'src/features/wallet/hooks'
 import { removePendingSession } from 'src/features/walletConnect/walletConnectSlice'
@@ -66,7 +73,7 @@ import {
   useMedia,
   useSporeColors,
 } from 'ui/src'
-import ReceiveIcon from 'ui/src/assets/icons/arrow-down-circle.svg'
+import ReceiveIcon from 'ui/src/assets/icons/arrow-down-circle-filled.svg'
 import BuyIcon from 'ui/src/assets/icons/buy.svg'
 import ScanIcon from 'ui/src/assets/icons/scan-home.svg'
 import SendIcon from 'ui/src/assets/icons/send-action.svg'
@@ -75,20 +82,10 @@ import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { useInterval, useTimeout } from 'utilities/src/time/timing'
 import { FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
 import { useFeatureFlag } from 'wallet/src/features/experiments/hooks'
-import { useSelectAddressHasNotifications } from 'wallet/src/features/notifications/hooks'
 import { setNotificationStatus } from 'wallet/src/features/notifications/slice'
-import { TokenBalanceListRow } from 'wallet/src/features/portfolio/TokenBalanceListContext'
-import { useUnitagUpdater } from 'wallet/src/features/unitags/context'
 import { useCanActiveAddressClaimUnitag } from 'wallet/src/features/unitags/hooks'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
-import {
-  ElementName,
-  ElementNameType,
-  ModalName,
-  SectionName,
-  SectionNameType,
-} from 'wallet/src/telemetry/constants'
 import { HomeScreenTabIndex } from './HomeScreenTabIndex'
 
 const CONTENT_HEADER_HEIGHT_ESTIMATE = 270
@@ -132,7 +129,7 @@ export function HomeScreen(props?: AppStackScreenProp<Screens.Home>): JSX.Elemen
   const feedTitle = t('Feed')
 
   const routes = useMemo(() => {
-    const tabs: Array<{ key: SectionNameType; title: string }> = [
+    const tabs = [
       { key: SectionName.HomeTokensTab, title: tokensTitle },
       { key: SectionName.HomeNFTsTab, title: nftsTitle },
       { key: SectionName.HomeActivityTab, title: activityTitle },
@@ -381,20 +378,7 @@ export function HomeScreen(props?: AppStackScreenProp<Screens.Home>): JSX.Elemen
     ]
   )
 
-  const { refetchUnitagsCounter } = useUnitagUpdater()
-  const { canClaimUnitag, refetch: refetchCanActiveAddressClaimUnitag } =
-    useCanActiveAddressClaimUnitag()
-
-  // Force refetch of canClaimUnitag if refetchUnitagsCounter changes
-  useEffect(() => {
-    refetchCanActiveAddressClaimUnitag?.()
-  }, [refetchUnitagsCounter, refetchCanActiveAddressClaimUnitag])
-
-  const shouldPromptUnitag =
-    activeAccount.type === AccountType.SignerMnemonic &&
-    activeAccount.skippedUnitagPrompt !== true &&
-    canClaimUnitag
-
+  const hasClaimEligibility = useCanActiveAddressClaimUnitag()
   const viewOnlyLabel = t('This is a view-only wallet')
   const contentHeader = useMemo(() => {
     return (
@@ -414,7 +398,7 @@ export function HomeScreen(props?: AppStackScreenProp<Screens.Home>): JSX.Elemen
             </Flex>
           </TouchableArea>
         )}
-        {shouldPromptUnitag && (
+        {hasClaimEligibility && (
           <AnimatedFlex entering={FadeIn} exiting={FadeOut}>
             <UnitagBanner />
           </AnimatedFlex>
@@ -424,10 +408,10 @@ export function HomeScreen(props?: AppStackScreenProp<Screens.Home>): JSX.Elemen
   }, [
     activeAccount.address,
     isSignerAccount,
+    viewOnlyLabel,
     actions,
+    hasClaimEligibility,
     onPressViewOnlyLabel,
-    viewOnlyLabel,
-    shouldPromptUnitag,
   ])
 
   const contentContainerStyle = useMemo<StyleProp<ViewStyle>>(
@@ -561,7 +545,7 @@ export function HomeScreen(props?: AppStackScreenProp<Screens.Home>): JSX.Elemen
       route,
     }: {
       route: {
-        key: SectionNameType
+        key: SectionName
         title: string
       }
     }) => {
@@ -684,7 +668,7 @@ type QuickAction = {
   eventName?: MobileEventName
   iconScale?: number
   label: string
-  name: ElementNameType
+  name: ElementName
   sentryLabel: string
   onPress: () => void
 }
@@ -719,7 +703,7 @@ function ActionButton({
   iconScale = 1,
 }: {
   eventName?: MobileEventName
-  name: ElementNameType
+  name: ElementName
   label: string
   Icon: React.FC<SvgProps>
   onPress: () => void
diff --git a/apps/mobile/src/screens/Import/ImportMethodScreen.tsx b/apps/mobile/src/screens/Import/ImportMethodScreen.tsx
index 85e650eb5b4..eb7891f6c0a 100644
--- a/apps/mobile/src/screens/Import/ImportMethodScreen.tsx
+++ b/apps/mobile/src/screens/Import/ImportMethodScreen.tsx
@@ -8,11 +8,12 @@ import Trace from 'src/components/Trace/Trace'
 import { isCloudStorageAvailable } from 'src/features/CloudBackup/RNCloudStorageBackupsManager'
 import { OnboardingScreen } from 'src/features/onboarding/OnboardingScreen'
 import { OptionCard } from 'src/features/onboarding/OptionCard'
+import { ElementName } from 'src/features/telemetry/constants'
 import { OnboardingScreens } from 'src/screens/Screens'
+import { openSettings } from 'src/utils/linking'
 import { useAddBackButton } from 'src/utils/useAddBackButton'
 import { Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
 import EyeIcon from 'ui/src/assets/icons/eye.svg'
-import { useIsDarkMode } from 'ui/src/hooks/useIsDarkMode'
 import { AppTFunction } from 'ui/src/i18n/types'
 import { iconSizes } from 'ui/src/theme'
 import { ImportType, OnboardingEntryPoint } from 'wallet/src/features/onboarding/types'
@@ -20,8 +21,6 @@ import {
   PendingAccountActions,
   pendingAccountActions,
 } from 'wallet/src/features/wallet/create/pendingAccountsSaga'
-import { ElementName, ElementNameType } from 'wallet/src/telemetry/constants'
-import { openSettings } from 'wallet/src/utils/linking'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 interface ImportMethodOption {
@@ -30,7 +29,7 @@ interface ImportMethodOption {
   icon: React.ReactNode
   nav: OnboardingScreens
   importType: ImportType
-  name: ElementNameType
+  name: ElementName
 }
 
 const options: ImportMethodOption[] = [
@@ -60,7 +59,6 @@ type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.
 export function ImportMethodScreen({ navigation, route: { params } }: Props): JSX.Element {
   const { t } = useTranslation()
   const colors = useSporeColors()
-  const isDarkMode = useIsDarkMode()
   const dispatch = useAppDispatch()
   const entryPoint = params?.entryPoint
 
@@ -116,16 +114,11 @@ export function ImportMethodScreen({ navigation, route: { params } }: Props): JS
       : options
 
   return (
-    <OnboardingScreen title={t('Choose how you want to add your wallet')}>
-      <Flex
-        grow
-        gap="$spacing12"
-        mt="$spacing4"
-        shadowColor="$surface3"
-        shadowRadius={!isDarkMode ? '$spacing8' : undefined}>
-        {importOptions.map(({ title, blurb, icon, nav, importType, name }, i) => (
+    <OnboardingScreen title={t('How do you want to add your wallet?')}>
+      <Flex grow gap="$spacing12" mt="$spacing4">
+        {importOptions.map(({ title, blurb, icon, nav, importType, name }) => (
           <OptionCard
-            key={'connection-option-' + name + i}
+            key={'connection-option-' + title}
             hapticFeedback
             blurb={blurb(t)}
             elementName={name}
@@ -137,7 +130,7 @@ export function ImportMethodScreen({ navigation, route: { params } }: Props): JS
       </Flex>
       <Trace logPress element={ElementName.OnboardingImportBackup}>
         <TouchableArea alignItems="center" hitSlop={16} mb="$spacing12">
-          <Flex row alignItems="center" gap="$spacing8">
+          <Flex row alignItems="center" gap="$spacing4">
             <EyeIcon
               color={colors.accent1.get()}
               height={iconSizes.icon20}
diff --git a/apps/mobile/src/screens/Import/RestoreCloudBackupPasswordScreen.tsx b/apps/mobile/src/screens/Import/RestoreCloudBackupPasswordScreen.tsx
index 8cf60d4c158..f68b3fa300a 100644
--- a/apps/mobile/src/screens/Import/RestoreCloudBackupPasswordScreen.tsx
+++ b/apps/mobile/src/screens/Import/RestoreCloudBackupPasswordScreen.tsx
@@ -16,6 +16,7 @@ import { restoreMnemonicFromCloudStorage } from 'src/features/CloudBackup/RNClou
 import { selectLockoutEndTime, selectPasswordAttempts } from 'src/features/CloudBackup/selectors'
 import { OnboardingScreen } from 'src/features/onboarding/OnboardingScreen'
 import { PasswordError } from 'src/features/onboarding/PasswordError'
+import { ElementName } from 'src/features/telemetry/constants'
 import { OnboardingScreens } from 'src/screens/Screens'
 import { useAddBackButton } from 'src/utils/useAddBackButton'
 import { Button, Flex, Text, TouchableArea } from 'ui/src'
@@ -24,7 +25,6 @@ import { ImportType } from 'wallet/src/features/onboarding/types'
 import { importAccountActions } from 'wallet/src/features/wallet/import/importAccountSaga'
 import { ImportAccountType } from 'wallet/src/features/wallet/import/types'
 import { NUMBER_OF_WALLETS_TO_IMPORT } from 'wallet/src/features/wallet/import/utils'
-import { ElementName } from 'wallet/src/telemetry/constants'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 type Props = NativeStackScreenProps<
@@ -159,7 +159,11 @@ export function RestoreCloudBackupPasswordScreen({
           ? t('This password is required to recover your recovery phrase backup from Google Drive.')
           : t('This password is required to recover your recovery phrase backup from iCloud.')
       }
-      title={t('Enter backup password')}>
+      title={
+        isAndroid
+          ? t('Enter your Google Drive backup password')
+          : t('Enter your iCloud backup password')
+      }>
       <Flex>
         <PasswordInput
           ref={inputRef}
diff --git a/apps/mobile/src/screens/Import/RestoreCloudBackupScreen.tsx b/apps/mobile/src/screens/Import/RestoreCloudBackupScreen.tsx
index fc7698ddd0c..0f7681d8d99 100644
--- a/apps/mobile/src/screens/Import/RestoreCloudBackupScreen.tsx
+++ b/apps/mobile/src/screens/Import/RestoreCloudBackupScreen.tsx
@@ -5,13 +5,13 @@ import { useTranslation } from 'react-i18next'
 import { ScrollView } from 'react-native-gesture-handler'
 import { useAppDispatch } from 'src/app/hooks'
 import { OnboardingStackParamList } from 'src/app/navigation/types'
+import { Unicon } from 'src/components/unicons/Unicon'
 import { useCloudBackups } from 'src/features/CloudBackup/hooks'
 import { CloudStorageMnemonicBackup } from 'src/features/CloudBackup/types'
 import { OnboardingScreen } from 'src/features/onboarding/OnboardingScreen'
 import { OnboardingScreens } from 'src/screens/Screens'
 import { useAddBackButton } from 'src/utils/useAddBackButton'
-import { Flex, Icons, Text, TouchableArea, Unicon, useIsDarkMode } from 'ui/src'
-import { iconSizes } from 'ui/src/theme'
+import { Flex, Icons, Text, TouchableArea } from 'ui/src'
 import {
   PendingAccountActions,
   pendingAccountActions,
@@ -24,7 +24,6 @@ type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.
 export function RestoreCloudBackupScreen({ navigation, route: { params } }: Props): JSX.Element {
   const { t } = useTranslation()
   const dispatch = useAppDispatch()
-  const isDarkMode = useIsDarkMode()
   // const backups = useMockCloudBackups(4) // returns 4 mock backups with random mnemonicIds and createdAt dates
   const backups = useCloudBackups()
   const sortedBackups = backups.slice().sort((a, b) => b.createdAt - a.createdAt)
@@ -49,7 +48,7 @@ export function RestoreCloudBackupScreen({ navigation, route: { params } }: Prop
           ? t('There are multiple recovery phrases backed up to your Google Drive.')
           : t('There are multiple recovery phrases backed up to your iCloud.')
       }
-      title={t('Select a backup to restore')}>
+      title={t('Select backup to restore')}>
       <ScrollView>
         <Flex gap="$spacing8">
           {sortedBackups.map((backup) => {
@@ -57,13 +56,11 @@ export function RestoreCloudBackupScreen({ navigation, route: { params } }: Prop
             return (
               <TouchableArea
                 key={backup.mnemonicId}
-                backgroundColor={isDarkMode ? '$surface2' : '$surface1'}
-                borderColor="$surface3"
-                borderRadius="$rounded20"
+                backgroundColor="$surface2"
+                borderColor="$surface2"
+                borderRadius="$rounded16"
                 borderWidth={1}
                 p="$spacing16"
-                shadowColor="$surface3"
-                shadowRadius={!isDarkMode ? '$spacing4' : undefined}
                 onPress={(): Promise<void> => onPressRestoreBackup(backup)}>
                 <Flex row alignItems="center" justifyContent="space-between">
                   <Flex centered row gap="$spacing12">
@@ -73,16 +70,11 @@ export function RestoreCloudBackupScreen({ navigation, route: { params } }: Prop
                         {sanitizeAddressText(shortenAddress(mnemonicId))}
                       </Text>
                       <Text adjustsFontSizeToFit color="$neutral2" variant="buttonLabel4">
-                        {dayjs.unix(createdAt).format('MMM D, YYYY [at] h:mma')}
+                        {dayjs.unix(createdAt).format('MMM D, YYYY, h:mma')}
                       </Text>
                     </Flex>
                   </Flex>
-                  <Icons.RotatableChevron
-                    color="$neutral2"
-                    direction="end"
-                    height={iconSizes.icon20}
-                    width={iconSizes.icon20}
-                  />
+                  <Icons.RotatableChevron color="$neutral2" direction="end" />
                 </Flex>
               </TouchableArea>
             )
diff --git a/apps/mobile/src/screens/Import/SeedPhraseInputScreen.test.tsx b/apps/mobile/src/screens/Import/SeedPhraseInputScreen.test.tsx
index 37cb28d298e..ee21fad6eb8 100644
--- a/apps/mobile/src/screens/Import/SeedPhraseInputScreen.test.tsx
+++ b/apps/mobile/src/screens/Import/SeedPhraseInputScreen.test.tsx
@@ -23,7 +23,7 @@ const routeProp = { params: { importType: ImportType.CreateNew } } as RouteProp<
 >
 
 describe(SeedPhraseInputScreen, () => {
-  it.skip('seed phrase initial screen rendering', async () => {
+  it('seed phrase initial screen rendering', async () => {
     const tree = render(<SeedPhraseInputScreen navigation={navigationProp} route={routeProp} />)
 
     expect(tree.toJSON()).toMatchSnapshot()
diff --git a/apps/mobile/src/screens/Import/SeedPhraseInputScreen.tsx b/apps/mobile/src/screens/Import/SeedPhraseInputScreen.tsx
index e205db7c06b..8f983f2f6dc 100644
--- a/apps/mobile/src/screens/Import/SeedPhraseInputScreen.tsx
+++ b/apps/mobile/src/screens/Import/SeedPhraseInputScreen.tsx
@@ -7,9 +7,11 @@ import Trace from 'src/components/Trace/Trace'
 import { useLockScreenOnBlur } from 'src/features/authentication/lockScreenContext'
 import { GenericImportForm } from 'src/features/import/GenericImportForm'
 import { SafeKeyboardOnboardingScreen } from 'src/features/onboarding/SafeKeyboardOnboardingScreen'
+import { ElementName } from 'src/features/telemetry/constants'
 import { OnboardingScreens } from 'src/screens/Screens'
+import { openUri } from 'src/utils/linking'
 import { useAddBackButton } from 'src/utils/useAddBackButton'
-import { Button, Flex, Icons, Text, TouchableArea } from 'ui/src'
+import { Button, Flex, Text, TouchableArea } from 'ui/src'
 import { uniswapUrls } from 'wallet/src/constants/urls'
 import { ImportType } from 'wallet/src/features/onboarding/types'
 import { useNonPendingSignerAccounts } from 'wallet/src/features/wallet/hooks'
@@ -17,8 +19,6 @@ import { importAccountActions } from 'wallet/src/features/wallet/import/importAc
 import { ImportAccountType } from 'wallet/src/features/wallet/import/types'
 import { NUMBER_OF_WALLETS_TO_IMPORT } from 'wallet/src/features/wallet/import/utils'
 import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
-import { ElementName } from 'wallet/src/telemetry/constants'
-import { openUri } from 'wallet/src/utils/linking'
 import {
   MnemonicValidationError,
   translateMnemonicErrorMessage,
@@ -44,6 +44,7 @@ export function SeedPhraseInputScreen({ navigation, route: { params } }: Props):
   useLockScreenOnBlur(pastePermissionModalOpen)
 
   const [value, setValue] = useState<string | undefined>(undefined)
+  const [showSuccess, setShowSuccess] = useState(false)
   const [errorMessage, setErrorMessage] = useState<string | undefined>(undefined)
 
   const isRestoringMnemonic = params.importType === ImportType.RestoreMnemonic
@@ -87,12 +88,20 @@ export function SeedPhraseInputScreen({ navigation, route: { params } }: Props):
   const onBlur = useCallback(() => {
     const { error, invalidWord } = validateMnemonic(value)
     if (error) {
+      setShowSuccess(false)
       setErrorMessage(translateMnemonicErrorMessage(error, invalidWord, t))
     }
   }, [t, value])
 
   const onChange = (text: string | undefined): void => {
-    const { error, invalidWord } = validateSetOfWords(text)
+    const { error, invalidWord, isValidLength } = validateSetOfWords(text)
+
+    // always show success UI if phrase is valid length
+    if (isValidLength) {
+      setShowSuccess(true)
+    } else {
+      setShowSuccess(false)
+    }
 
     // suppress error messages if the  user is not done typing a word
     const suppressError =
@@ -123,30 +132,24 @@ export function SeedPhraseInputScreen({ navigation, route: { params } }: Props):
           : t('Your recovery phrase will only be stored locally on your device.')
       }
       title={isRestoringMnemonic ? t('No backups found') : t('Enter your recovery phrase')}>
-      <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('Type your recovery phrase')}
-            textAlign="left"
-            value={value}
-            onBlur={onBlur}
-            onChange={onChange}
-          />
-        </Flex>
+      <Flex $short={{ gap: '$none' }} gap="$spacing8">
+        <GenericImportForm
+          blurOnSubmit
+          liveCheck
+          afterPasteButtonPress={(): void => setPastePermissionModalOpen(false)}
+          beforePasteButtonPress={(): void => setPastePermissionModalOpen(true)}
+          errorMessage={errorMessage}
+          placeholderLabel={t('Enter recovery phrase')}
+          showSuccess={showSuccess}
+          value={value}
+          onBlur={onBlur}
+          onChange={onChange}
+        />
         <Flex centered>
           <Trace logPress element={ElementName.RecoveryHelpButton}>
             <TouchableArea
-              flexDirection="row"
-              gap="$spacing8"
               onPress={isRestoringMnemonic ? onPressTryAgainButton : onPressRecoveryHelpButton}>
-              <Icons.QuestionInCircleFilled color="$surface1" size="$icon.20" />
-              <Text $short={{ variant: 'body3' }} color="$neutral3" variant="body2">
+              <Text $short={{ variant: 'body3' }} color="$accent1" variant="subheading2">
                 {isRestoringMnemonic
                   ? t('Try searching again')
                   : t('How do I find my recovery phrase?')}
@@ -155,6 +158,7 @@ export function SeedPhraseInputScreen({ navigation, route: { params } }: Props):
           </Trace>
         </Flex>
       </Flex>
+
       <Trace logPress element={ElementName.Next}>
         <Button disabled={!!errorMessage || !value} testID="seed-input-submit" onPress={onSubmit}>
           {t('Continue')}
diff --git a/apps/mobile/src/screens/Import/SeedPhraseInputScreenV2.tsx b/apps/mobile/src/screens/Import/SeedPhraseInputScreenV2.tsx
index f3f8c987653..31170e9c3f5 100644
--- a/apps/mobile/src/screens/Import/SeedPhraseInputScreenV2.tsx
+++ b/apps/mobile/src/screens/Import/SeedPhraseInputScreenV2.tsx
@@ -7,6 +7,7 @@ import { OnboardingStackParamList } from 'src/app/navigation/types'
 import Trace from 'src/components/Trace/Trace'
 import { useLockScreenOnBlur } from 'src/features/authentication/lockScreenContext'
 import { SafeKeyboardOnboardingScreen } from 'src/features/onboarding/SafeKeyboardOnboardingScreen'
+import { ElementName } from 'src/features/telemetry/constants'
 import {
   InputValidatedEvent,
   MnemonicStoredEvent,
@@ -15,6 +16,7 @@ import {
   useSeedPhraseInputRef,
 } from 'src/screens/Import/SeedPhraseInput'
 import { OnboardingScreens } from 'src/screens/Screens'
+import { openUri } from 'src/utils/linking'
 import { useAddBackButton } from 'src/utils/useAddBackButton'
 import { Button } from 'ui/src'
 import { uniswapUrls } from 'wallet/src/constants/urls'
@@ -23,8 +25,6 @@ import { useNonPendingSignerAccounts } from 'wallet/src/features/wallet/hooks'
 import { importAccountActions } from 'wallet/src/features/wallet/import/importAccountSaga'
 import { ImportAccountType } from 'wallet/src/features/wallet/import/types'
 import { NUMBER_OF_WALLETS_TO_IMPORT } from 'wallet/src/features/wallet/import/utils'
-import { ElementName } from 'wallet/src/telemetry/constants'
-import { openUri } from 'wallet/src/utils/linking'
 
 type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.SeedPhraseInput>
 
diff --git a/apps/mobile/src/screens/Import/SelectWalletScreen.tsx b/apps/mobile/src/screens/Import/SelectWalletScreen.tsx
index 4872b9ac40d..1ef3dd19f81 100644
--- a/apps/mobile/src/screens/Import/SelectWalletScreen.tsx
+++ b/apps/mobile/src/screens/Import/SelectWalletScreen.tsx
@@ -7,6 +7,7 @@ import { OnboardingStackParamList } from 'src/app/navigation/types'
 import { Loader } from 'src/components/loading'
 import WalletPreviewCard from 'src/features/import/WalletPreviewCard'
 import { OnboardingScreen } from 'src/features/onboarding/OnboardingScreen'
+import { ElementName } from 'src/features/telemetry/constants'
 import { OnboardingScreens } from 'src/screens/Screens'
 import { Button, Flex } from 'ui/src'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
@@ -26,7 +27,6 @@ import {
 import { usePendingAccounts } from 'wallet/src/features/wallet/hooks'
 import { NUMBER_OF_WALLETS_TO_IMPORT } from 'wallet/src/features/wallet/import/utils'
 import { setAccountAsActive } from 'wallet/src/features/wallet/slice'
-import { ElementName } from 'wallet/src/telemetry/constants'
 
 const FORCED_LOADING_DURATION = 3 * ONE_SECOND_MS // 3s
 
@@ -201,7 +201,11 @@ export function SelectWalletScreen({ navigation, route: { params } }: Props): JS
     ? t('One wallet found')
     : t('Select wallets to import')
 
-  const subtitle = isLoading ? t('Your wallets will appear below.') : undefined
+  const subtitle = isLoading
+    ? t('Your wallets will appear below.')
+    : isOnlyOneAccount
+    ? t('Please confirm that the wallet below is the one you’d like to import.')
+    : t('We found several wallets associated with your recovery phrase.')
 
   return (
     <>
diff --git a/apps/mobile/src/screens/Import/WatchWalletScreen.tsx b/apps/mobile/src/screens/Import/WatchWalletScreen.tsx
index 1be7e460ca8..bd0ea5d2e99 100644
--- a/apps/mobile/src/screens/Import/WatchWalletScreen.tsx
+++ b/apps/mobile/src/screens/Import/WatchWalletScreen.tsx
@@ -9,18 +9,18 @@ import { GenericImportForm } from 'src/features/import/GenericImportForm'
 import { useCompleteOnboardingCallback } from 'src/features/onboarding/hooks'
 import { SafeKeyboardOnboardingScreen } from 'src/features/onboarding/SafeKeyboardOnboardingScreen'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
+import { ElementName } from 'src/features/telemetry/constants'
+import { useIsSmartContractAddress } from 'src/features/transactions/transfer/hooks'
 import { OnboardingScreens } from 'src/screens/Screens'
 import { useAddBackButton } from 'src/utils/useAddBackButton'
-import { Button, Flex, Icons, Text } from 'ui/src'
+import { Button, Flex } from 'ui/src'
 import { normalizeTextInput } from 'utilities/src/primitives/string'
 import { ChainId } from 'wallet/src/constants/chains'
 import { usePortfolioBalances } from 'wallet/src/features/dataApi/balances'
 import { useENS } from 'wallet/src/features/ens/useENS'
-import { useIsSmartContractAddress } from 'wallet/src/features/transactions/transfer/hooks/useIsSmartContractAddress'
 import { useAccounts } from 'wallet/src/features/wallet/hooks'
 import { importAccountActions } from 'wallet/src/features/wallet/import/importAccountSaga'
 import { ImportAccountType } from 'wallet/src/features/wallet/import/types'
-import { ElementName } from 'wallet/src/telemetry/constants'
 import { getValidAddress } from 'wallet/src/utils/addresses'
 
 type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.WatchWallet>
@@ -66,7 +66,7 @@ const getErrorText = ({
   } else if (isSmartContractAddress) {
     return t('Address is a smart contract')
   } else if (!loading) {
-    return t('Address not found')
+    return t('Address does not exist')
   }
   return undefined
 }
@@ -165,38 +165,25 @@ export function WatchWalletScreen({ navigation, route: { params } }: Props): JSX
   }, [value])
 
   return (
-    <SafeKeyboardOnboardingScreen title={t('Enter a wallet address')}>
-      <Flex $short={{ gap: '$none' }} gap="$spacing12">
+    <SafeKeyboardOnboardingScreen
+      subtitle={t(
+        'Enter an Ethereum wallet address (starting with 0x) or ENS name (ending in .eth).'
+      )}
+      title={t('Enter a wallet address')}>
+      <Flex $short={{ gap: '$none' }} gap="$spacing8">
         <GenericImportForm
           blurOnSubmit
           errorMessage={errorText}
-          inputAlignment="flex-start"
           inputSuffix={isAddress || hasSuffixIncluded ? undefined : '.eth'}
           liveCheck={showLiveCheck}
-          placeholderLabel={t('ENS or address')}
-          shouldUseMinHeight={false}
-          textAlign="left"
+          placeholderLabel={t('Enter address or ENS')}
+          showSuccess={Boolean(isValid)}
           value={value}
           onChange={onChange}
           onSubmit={(): void => {
             isValid && Keyboard.dismiss()
           }}
         />
-        <Flex
-          grow
-          row
-          alignItems="center"
-          backgroundColor="$surface2"
-          borderRadius="$rounded16"
-          gap="$spacing16"
-          p="$spacing16">
-          <Icons.GraduationCap color="$neutral2" size="$icon.20" />
-          <Text color="$neutral2" flexShrink={1} variant="body3">
-            {t(
-              'Adding a view-only wallet allows you to try out the app or track a wallet. You will not be able to swap or send funds.'
-            )}
-          </Text>
-        </Flex>
       </Flex>
       <Button disabled={!isValid} testID={ElementName.Next} onPress={onSubmit}>
         {t('Continue')}
diff --git a/apps/mobile/src/screens/Import/__snapshots__/RestoreCloudBackupPasswordScreen.test.tsx.snap b/apps/mobile/src/screens/Import/__snapshots__/RestoreCloudBackupPasswordScreen.test.tsx.snap
index c8a407942c4..4f73c5f9e54 100644
--- a/apps/mobile/src/screens/Import/__snapshots__/RestoreCloudBackupPasswordScreen.test.tsx.snap
+++ b/apps/mobile/src/screens/Import/__snapshots__/RestoreCloudBackupPasswordScreen.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`RestoreCloudBackupPasswordScreen renders correctly 1`] = `
   sentry-label="Screen"
   style={
     {
+      "alignItems": "stretch",
       "backgroundColor": "#FFFFFF",
       "flex": 1,
       "flexDirection": "column",
@@ -44,6 +45,7 @@ exports[`RestoreCloudBackupPasswordScreen renders correctly 1`] = `
       exiting={[Function]}
       style={
         {
+          "alignItems": "stretch",
           "flexDirection": "column",
           "flexGrow": 1,
           "gap": 16,
@@ -82,7 +84,7 @@ exports[`RestoreCloudBackupPasswordScreen renders correctly 1`] = `
           }
           suppressHighlighting={true}
         >
-          Enter backup password
+          Enter your iCloud backup password
         </Text>
         <Text
           allowFontScaling={true}
@@ -104,6 +106,7 @@ exports[`RestoreCloudBackupPasswordScreen renders correctly 1`] = `
       <View
         style={
           {
+            "alignItems": "stretch",
             "flex": 1,
             "flexDirection": "column",
             "flexGrow": 1,
@@ -114,6 +117,7 @@ exports[`RestoreCloudBackupPasswordScreen renders correctly 1`] = `
         <View
           style={
             {
+              "alignItems": "stretch",
               "flexDirection": "column",
             }
           }
@@ -122,10 +126,10 @@ exports[`RestoreCloudBackupPasswordScreen renders correctly 1`] = `
             style={
               {
                 "alignItems": "center",
-                "backgroundColor": "#FFFFFF",
+                "backgroundColor": "#F9F9F9",
                 "borderBottomColor": "#2222220D",
-                "borderBottomLeftRadius": 16,
-                "borderBottomRightRadius": 16,
+                "borderBottomLeftRadius": 12,
+                "borderBottomRightRadius": 12,
                 "borderBottomWidth": 1,
                 "borderLeftColor": "#2222220D",
                 "borderLeftWidth": 1,
@@ -133,15 +137,11 @@ exports[`RestoreCloudBackupPasswordScreen renders correctly 1`] = `
                 "borderRightWidth": 1,
                 "borderStyle": "solid",
                 "borderTopColor": "#2222220D",
-                "borderTopLeftRadius": 16,
-                "borderTopRightRadius": 16,
+                "borderTopLeftRadius": 12,
+                "borderTopRightRadius": 12,
                 "borderTopWidth": 1,
                 "flexDirection": "row",
                 "justifyContent": "center",
-                "paddingBottom": 4,
-                "paddingLeft": 4,
-                "paddingRight": 4,
-                "paddingTop": 4,
               }
             }
           >
@@ -171,9 +171,7 @@ exports[`RestoreCloudBackupPasswordScreen renders correctly 1`] = `
                 clearTextOnFocus={false}
                 editable={true}
                 focusable={true}
-                onBlur={[Function]}
                 onChangeText={[Function]}
-                onFocus={[Function]}
                 onSubmitEditing={[Function]}
                 outlineWidth={0}
                 placeholder="Enter password"
@@ -221,6 +219,7 @@ exports[`RestoreCloudBackupPasswordScreen renders correctly 1`] = `
                 collapsable={false}
                 style={
                   {
+                    "alignItems": "stretch",
                     "flexDirection": "column",
                     "marginLeft": 12,
                     "marginRight": 12,
@@ -287,6 +286,7 @@ exports[`RestoreCloudBackupPasswordScreen renders correctly 1`] = `
         <View
           style={
             {
+              "alignItems": "stretch",
               "flexDirection": "column",
             }
           }
diff --git a/apps/mobile/src/screens/Import/__snapshots__/RestoreCloudBackupScreen.test.tsx.snap b/apps/mobile/src/screens/Import/__snapshots__/RestoreCloudBackupScreen.test.tsx.snap
index e2b996bebf0..6a77ac08319 100644
--- a/apps/mobile/src/screens/Import/__snapshots__/RestoreCloudBackupScreen.test.tsx.snap
+++ b/apps/mobile/src/screens/Import/__snapshots__/RestoreCloudBackupScreen.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`RestoreCloudBackupScreen renders correctly 1`] = `
   sentry-label="Screen"
   style={
     {
+      "alignItems": "stretch",
       "backgroundColor": "#FFFFFF",
       "flex": 1,
       "flexDirection": "column",
@@ -44,6 +45,7 @@ exports[`RestoreCloudBackupScreen renders correctly 1`] = `
       exiting={[Function]}
       style={
         {
+          "alignItems": "stretch",
           "flexDirection": "column",
           "flexGrow": 1,
           "gap": 16,
@@ -82,7 +84,7 @@ exports[`RestoreCloudBackupScreen renders correctly 1`] = `
           }
           suppressHighlighting={true}
         >
-          Select a backup to restore
+          Select backup to restore
         </Text>
         <Text
           allowFontScaling={true}
@@ -104,6 +106,7 @@ exports[`RestoreCloudBackupScreen renders correctly 1`] = `
       <View
         style={
           {
+            "alignItems": "stretch",
             "flex": 1,
             "flexDirection": "column",
             "flexGrow": 1,
@@ -129,6 +132,7 @@ exports[`RestoreCloudBackupScreen renders correctly 1`] = `
             <View
               style={
                 {
+                  "alignItems": "stretch",
                   "flexDirection": "column",
                   "gap": 8,
                 }
diff --git a/apps/mobile/src/screens/Import/__snapshots__/SeedPhraseInputScreen.test.tsx.snap b/apps/mobile/src/screens/Import/__snapshots__/SeedPhraseInputScreen.test.tsx.snap
index 5b324912380..bbc10ab38d6 100644
--- a/apps/mobile/src/screens/Import/__snapshots__/SeedPhraseInputScreen.test.tsx.snap
+++ b/apps/mobile/src/screens/Import/__snapshots__/SeedPhraseInputScreen.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`SeedPhraseInputScreen seed phrase initial screen rendering 1`] = `
   sentry-label="Screen"
   style={
     {
+      "alignItems": "stretch",
       "backgroundColor": "#FFFFFF",
       "flex": 1,
       "flexDirection": "column",
@@ -49,6 +50,7 @@ exports[`SeedPhraseInputScreen seed phrase initial screen rendering 1`] = `
           exiting={[Function]}
           style={
             {
+              "alignItems": "stretch",
               "flexDirection": "column",
               "flexGrow": 1,
               "gap": 16,
@@ -63,6 +65,7 @@ exports[`SeedPhraseInputScreen seed phrase initial screen rendering 1`] = `
           <View
             style={
               {
+                "alignItems": "stretch",
                 "flexDirection": "column",
                 "gap": 12,
                 "marginBottom": 12,
@@ -109,6 +112,7 @@ exports[`SeedPhraseInputScreen seed phrase initial screen rendering 1`] = `
           <View
             style={
               {
+                "alignItems": "stretch",
                 "flexDirection": "column",
                 "flexGrow": 1,
                 "justifyContent": "space-between",
@@ -118,329 +122,310 @@ exports[`SeedPhraseInputScreen seed phrase initial screen rendering 1`] = `
             <View
               style={
                 {
+                  "alignItems": "stretch",
                   "flexDirection": "column",
-                  "gap": 16,
+                  "gap": 8,
                 }
               }
             >
               <View
+                onStartShouldSetResponder={[Function]}
+                onTouchEnd={[Function]}
                 style={
                   {
+                    "alignItems": "stretch",
                     "flexDirection": "column",
-                    "paddingLeft": 8,
-                    "paddingRight": 8,
+                    "gap": 16,
                   }
                 }
               >
                 <View
-                  onStartShouldSetResponder={[Function]}
-                  onTouchEnd={[Function]}
                   style={
                     {
+                      "alignItems": "center",
+                      "backgroundColor": "#F9F9F9",
+                      "borderBottomColor": "#F9F9F9",
+                      "borderBottomLeftRadius": 20,
+                      "borderBottomRightRadius": 20,
+                      "borderBottomWidth": 1,
+                      "borderLeftColor": "#F9F9F9",
+                      "borderLeftWidth": 1,
+                      "borderRightColor": "#F9F9F9",
+                      "borderRightWidth": 1,
+                      "borderStyle": "solid",
+                      "borderTopColor": "#F9F9F9",
+                      "borderTopLeftRadius": 20,
+                      "borderTopRightRadius": 20,
+                      "borderTopWidth": 1,
                       "flexDirection": "column",
-                      "gap": 12,
+                      "flexShrink": 1,
+                      "justifyContent": "center",
+                      "minHeight": 120,
+                      "paddingBottom": 16,
+                      "paddingLeft": 36,
+                      "paddingRight": 36,
+                      "paddingTop": 16,
+                      "width": "100%",
                     }
                   }
                 >
                   <View
                     style={
                       {
-                        "backgroundColor": "#FFFFFF",
-                        "borderBottomColor": "#2222220D",
-                        "borderBottomLeftRadius": 20,
-                        "borderBottomRightRadius": 20,
-                        "borderBottomWidth": 1,
-                        "borderLeftColor": "#2222220D",
-                        "borderLeftWidth": 1,
-                        "borderRightColor": "#2222220D",
-                        "borderRightWidth": 1,
-                        "borderStyle": "solid",
-                        "borderTopColor": "#2222220D",
-                        "borderTopLeftRadius": 20,
-                        "borderTopRightRadius": 20,
-                        "borderTopWidth": 1,
-                        "flexDirection": "column",
-                        "flexShrink": 1,
-                        "minHeight": 120,
-                        "paddingBottom": 16,
-                        "paddingLeft": 24,
-                        "paddingRight": 24,
-                        "paddingTop": 16,
+                        "alignItems": "flex-end",
+                        "flexDirection": "row",
+                        "justifyContent": "center",
                         "width": "100%",
                       }
                     }
                   >
-                    <View
+                    <TextInput
+                      autoCapitalize="none"
+                      autoComplete="off"
+                      autoCorrect={false}
+                      autoFocus={true}
+                      blurOnSubmit={true}
+                      editable={true}
+                      focusable={true}
+                      maxFontSizeMultiplier={1.4}
+                      multiline={true}
+                      onBlur={[Function]}
+                      onChangeText={[Function]}
+                      onFocus={[Function]}
+                      onSubmitEditing={[Function]}
+                      outlineWidth={0}
+                      placeholderTextColor="#CECECE"
+                      returnKeyType="done"
+                      scrollEnabled={false}
+                      selectionColor="#222222"
+                      spellCheck={false}
                       style={
                         {
-                          "alignItems": "flex-end",
-                          "flexDirection": "row",
-                          "justifyContent": "flex-start",
-                          "width": "100%",
+                          "backgroundColor": "transparent",
+                          "borderBottomColor": "transparent",
+                          "borderBottomLeftRadius": 12,
+                          "borderBottomRightRadius": 12,
+                          "borderBottomWidth": 1,
+                          "borderLeftColor": "transparent",
+                          "borderLeftWidth": 1,
+                          "borderRightColor": "transparent",
+                          "borderRightWidth": 1,
+                          "borderStyle": "solid",
+                          "borderTopColor": "transparent",
+                          "borderTopLeftRadius": 12,
+                          "borderTopRightRadius": 12,
+                          "borderTopWidth": 1,
+                          "color": "#222222",
+                          "fontFamily": "Basel-Book",
+                          "fontSize": 19,
+                          "height": "auto",
+                          "justifyContent": "center",
+                          "lineHeight": 19,
+                          "minWidth": 0,
+                          "paddingBottom": 0,
+                          "paddingLeft": 0,
+                          "paddingRight": 0,
+                          "paddingTop": 0,
+                          "textAlign": "left",
+                          "width": 8,
                         }
                       }
-                    >
-                      <TextInput
-                        autoCapitalize="none"
-                        autoComplete="off"
-                        autoCorrect={false}
-                        autoFocus={true}
-                        blurOnSubmit={true}
-                        focusable={true}
-                        maxFontSizeMultiplier={1.4}
-                        multiline={true}
-                        onBlur={[Function]}
-                        onChangeText={[Function]}
-                        onFocus={[Function]}
-                        onSubmitEditing={[Function]}
-                        outlineWidth={0}
-                        placeholderTextColor="#CECECE"
-                        returnKeyType="done"
-                        scrollEnabled={false}
-                        selectionColor="#222222"
-                        spellCheck={false}
-                        style={
-                          {
-                            "backgroundColor": "transparent",
-                            "borderBottomColor": "transparent",
-                            "borderBottomLeftRadius": 12,
-                            "borderBottomRightRadius": 12,
-                            "borderBottomWidth": 1,
-                            "borderLeftColor": "transparent",
-                            "borderLeftWidth": 1,
-                            "borderRightColor": "transparent",
-                            "borderRightWidth": 1,
-                            "borderStyle": "solid",
-                            "borderTopColor": "transparent",
-                            "borderTopLeftRadius": 12,
-                            "borderTopRightRadius": 12,
-                            "borderTopWidth": 1,
-                            "color": "#222222",
-                            "fontFamily": "Basel-Book",
-                            "fontSize": 17,
-                            "height": "auto",
-                            "justifyContent": "center",
-                            "lineHeight": 17,
-                            "minWidth": 0,
-                            "paddingBottom": 0,
-                            "paddingLeft": 0,
-                            "paddingRight": 0,
-                            "paddingTop": 0,
-                            "textAlign": "left",
-                            "width": 8,
-                          }
-                        }
-                        testID="import_account_form/input"
-                        textAlignVertical="bottom"
-                      />
-                    </View>
-                    <View
-                      onLayout={[Function]}
+                      testID="import_account_form/input"
+                      textAlignVertical="bottom"
+                    />
+                  </View>
+                  <View
+                    onLayout={[Function]}
+                    style={
+                      {
+                        "alignItems": "center",
+                        "flexDirection": "row",
+                        "flexGrow": 1,
+                        "gap": 8,
+                        "justifyContent": "center",
+                        "paddingTop": 4,
+                        "position": "absolute",
+                      }
+                    }
+                  >
+                    <Text
+                      adjustsFontSizeToFit={true}
+                      allowFontScaling={true}
+                      maxFontSizeMultiplier={1.4}
+                      numberOfLines={1}
                       style={
                         {
-                          "alignItems": "center",
-                          "flexDirection": "row",
-                          "flexGrow": 1,
-                          "gap": 8,
-                          "paddingLeft": 24,
-                          "paddingRight": 24,
-                          "paddingTop": 16,
-                          "position": "absolute",
-                          "width": "100%",
+                          "color": "#7D7D7D",
+                          "flexShrink": 1,
+                          "fontFamily": "Basel-Book",
+                          "fontSize": 19,
+                          "lineHeight": 24,
                         }
                       }
+                      suppressHighlighting={true}
                     >
-                      <Text
-                        adjustsFontSizeToFit={true}
-                        allowFontScaling={true}
-                        maxFontSizeMultiplier={1.4}
-                        numberOfLines={1}
-                        style={
-                          {
-                            "color": "#7D7D7D",
-                            "flexShrink": 1,
-                            "fontFamily": "Basel-Book",
-                            "fontSize": 17,
-                            "lineHeight": 24,
-                          }
-                        }
-                        suppressHighlighting={true}
-                      >
-                        Type your recovery phrase
-                      </Text>
-                    </View>
+                      Enter recovery phrase
+                    </Text>
                     <View
+                      cancelable={true}
+                      focusable={true}
+                      minPressDuration={0}
+                      onBlur={[Function]}
+                      onFocus={[Function]}
+                      onMouseEnter={[Function]}
+                      onMouseLeave={[Function]}
+                      onPress={[Function]}
+                      onPressIn={[Function]}
+                      onPressOut={[Function]}
                       style={
                         {
                           "alignItems": "center",
-                          "flexDirection": "column",
+                          "backgroundColor": "#2222220D",
+                          "borderBottomColor": "transparent",
+                          "borderBottomLeftRadius": 8,
+                          "borderBottomRightRadius": 8,
+                          "borderBottomWidth": 1,
+                          "borderLeftColor": "transparent",
+                          "borderLeftWidth": 1,
+                          "borderRightColor": "transparent",
+                          "borderRightWidth": 1,
+                          "borderStyle": "solid",
+                          "borderTopColor": "transparent",
+                          "borderTopLeftRadius": 8,
+                          "borderTopRightRadius": 8,
+                          "borderTopWidth": 1,
+                          "flexDirection": "row",
+                          "gap": 4,
+                          "height": "auto",
                           "justifyContent": "center",
-                          "width": "100%",
+                          "opacity": 1,
+                          "paddingBottom": 8,
+                          "paddingLeft": 8,
+                          "paddingRight": 8,
+                          "paddingTop": 8,
                         }
                       }
                     >
-                      <View
+                      <RNSVGSvgView
+                        align="xMidYMid"
+                        bbHeight="16"
+                        bbWidth="16"
+                        fill="none"
+                        focusable={false}
+                        meetOrSlice={0}
+                        minX={0}
+                        minY={0}
+                        strokeWidth={8}
                         style={
-                          {
-                            "flexDirection": "column",
-                            "paddingTop": 64,
-                            "position": "absolute",
-                            "top": 0,
-                          }
-                        }
-                      >
-                        <View
-                          accessibilityState={
-                            {
-                              "busy": undefined,
-                              "checked": undefined,
-                              "disabled": undefined,
-                              "expanded": undefined,
-                              "selected": undefined,
-                            }
-                          }
-                          accessibilityValue={
+                          [
                             {
-                              "max": undefined,
-                              "min": undefined,
-                              "now": undefined,
-                              "text": undefined,
-                            }
-                          }
-                          accessible={true}
-                          collapsable={false}
-                          focusable={true}
-                          hitSlop={
+                              "backgroundColor": "transparent",
+                              "borderWidth": 0,
+                            },
                             {
-                              "bottom": 5,
-                              "left": 5,
-                              "right": 5,
-                              "top": 5,
-                            }
-                          }
-                          onClick={[Function]}
-                          onResponderGrant={[Function]}
-                          onResponderMove={[Function]}
-                          onResponderRelease={[Function]}
-                          onResponderTerminate={[Function]}
-                          onResponderTerminationRequest={[Function]}
-                          onStartShouldSetResponder={[Function]}
-                          style={
+                              "color": "#222222",
+                              "height": 16,
+                              "width": 16,
+                            },
                             {
-                              "backgroundColor": "#FFEFFF",
-                              "borderBottomLeftRadius": 12,
-                              "borderBottomRightRadius": 12,
-                              "borderTopLeftRadius": 12,
-                              "borderTopRightRadius": 12,
-                              "onPressIn": [Function],
-                              "opacity": 1,
-                              "paddingBottom": 8,
-                              "paddingLeft": 8,
-                              "paddingRight": 8,
-                              "paddingTop": 8,
-                            }
+                              "flex": 0,
+                              "height": 16,
+                              "width": 16,
+                            },
+                          ]
+                        }
+                        tintColor="#222222"
+                        vbHeight={14}
+                        vbWidth={15}
+                      >
+                        <RNSVGGroup
+                          fill={null}
+                          propList={
+                            [
+                              "fill",
+                              "strokeWidth",
+                            ]
                           }
+                          strokeWidth="8"
                         >
-                          <View
-                            style={
+                          <RNSVGPath
+                            d="M8.0835 1.16602H4.00016C3.69074 1.16602 3.394 1.28893 3.1752 1.50772C2.95641 1.72652 2.8335 2.02326 2.8335 2.33268V11.666C2.8335 11.9754 2.95641 12.2722 3.1752 12.491C3.394 12.7098 3.69074 12.8327 4.00016 12.8327H11.0002C11.3096 12.8327 11.6063 12.7098 11.8251 12.491C12.0439 12.2722 12.1668 11.9754 12.1668 11.666V5.24935L8.0835 1.16602Z"
+                            fill={
                               {
-                                "alignItems": "center",
-                                "flexDirection": "row",
-                                "gap": 4,
-                                "justifyContent": "center",
+                                "payload": 4278190080,
+                                "type": 0,
                               }
                             }
-                          >
-                            <Text
-                              allowFontScaling={true}
-                              maxFontSizeMultiplier={1.2}
-                              style={
-                                {
-                                  "color": "#FC72FF",
-                                  "fontFamily": "Basel-Medium",
-                                  "fontSize": 13,
-                                  "fontWeight": "500",
-                                  "lineHeight": 16,
-                                }
+                            propList={
+                              [
+                                "stroke",
+                                "strokeWidth",
+                                "strokeLinecap",
+                                "strokeLinejoin",
+                              ]
+                            }
+                            stroke={
+                              {
+                                "type": 2,
                               }
-                              suppressHighlighting={true}
-                            >
-                              Paste
-                            </Text>
-                            <RNSVGSvgView
-                              align="xMidYMid"
-                              bbHeight="16"
-                              bbWidth="16"
-                              fill="currentColor"
-                              focusable={false}
-                              meetOrSlice={0}
-                              minX={0}
-                              minY={0}
-                              strokeWidth={8}
-                              style={
-                                [
-                                  {
-                                    "backgroundColor": "transparent",
-                                    "borderWidth": 0,
-                                  },
-                                  {
-                                    "color": "#FC72FF",
-                                    "height": 16,
-                                    "width": 16,
-                                  },
-                                  {
-                                    "flex": 0,
-                                    "height": 16,
-                                    "width": 16,
-                                  },
-                                ]
+                            }
+                            strokeLinecap={1}
+                            strokeLinejoin={1}
+                            strokeWidth="1.5"
+                          />
+                          <RNSVGPath
+                            d="M8.0835 1.16602V5.24935H12.1668"
+                            fill={
+                              {
+                                "payload": 4278190080,
+                                "type": 0,
                               }
-                              tintColor="#FC72FF"
-                              vbHeight={16}
-                              vbWidth={16}
-                            >
-                              <RNSVGGroup
-                                fill={
-                                  {
-                                    "type": 2,
-                                  }
-                                }
-                                propList={
-                                  [
-                                    "fill",
-                                    "strokeWidth",
-                                  ]
-                                }
-                                strokeWidth="8"
-                              >
-                                <RNSVGPath
-                                  d="M14 4.24666V8.56665C14 8.71332 13.9866 8.86 13.9533 9H11.2533C10.0066 9 9 10.0067 9 11.2533V13.9534C8.86 13.9867 8.7134 14 8.56673 14H4.25326C2.74659 14 2 13.2467 2 11.7467V4.24666C2 2.74666 2.74659 2 4.25326 2H11.7467C13.2534 2 14 2.74666 14 4.24666ZM10 11.2533V13.48C10.06 13.44 10.1067 13.3933 10.16 13.34L13.34 10.16C13.3933 10.1067 13.44 10.06 13.48 10H11.2533C10.5599 10 10 10.56 10 11.2533Z"
-                                  fill={
-                                    {
-                                      "type": 2,
-                                    }
-                                  }
-                                  propList={
-                                    [
-                                      "fill",
-                                    ]
-                                  }
-                                />
-                              </RNSVGGroup>
-                            </RNSVGSvgView>
-                          </View>
-                        </View>
-                      </View>
+                            }
+                            propList={
+                              [
+                                "stroke",
+                                "strokeWidth",
+                                "strokeLinecap",
+                                "strokeLinejoin",
+                              ]
+                            }
+                            stroke={
+                              {
+                                "type": 2,
+                              }
+                            }
+                            strokeLinecap={1}
+                            strokeLinejoin={1}
+                            strokeWidth="1.5"
+                          />
+                        </RNSVGGroup>
+                      </RNSVGSvgView>
+                      <Text
+                        maxFontSizeMultiplier={1.2}
+                        style={
+                          {
+                            "color": "#222222",
+                            "fontFamily": "Basel-Medium",
+                            "fontSize": 17,
+                            "fontWeight": "500",
+                            "lineHeight": 24,
+                          }
+                        }
+                        suppressHighlighting={true}
+                      >
+                        Paste
+                      </Text>
                     </View>
                   </View>
-                  <View
-                    style={
-                      {
-                        "flexDirection": "column",
-                      }
-                    }
-                  />
                 </View>
+                <View
+                  style={
+                    {
+                      "alignItems": "stretch",
+                      "flexDirection": "column",
+                    }
+                  }
+                />
               </View>
               <View
                 style={
@@ -489,142 +474,16 @@ exports[`SeedPhraseInputScreen seed phrase initial screen rendering 1`] = `
                   onStartShouldSetResponder={[Function]}
                   style={
                     {
-                      "flexDirection": "row",
-                      "gap": 8,
                       "opacity": 1,
                     }
                   }
                 >
-                  <RNSVGSvgView
-                    align="xMidYMid"
-                    bbHeight="20"
-                    bbWidth="20"
-                    fill="#CECECE"
-                    focusable={false}
-                    meetOrSlice={0}
-                    minX={0}
-                    minY={0}
-                    strokeWidth={8}
-                    style={
-                      [
-                        {
-                          "backgroundColor": "transparent",
-                          "borderWidth": 0,
-                        },
-                        {
-                          "color": "#FFFFFF",
-                          "height": 20,
-                          "width": 20,
-                        },
-                        {
-                          "flex": 0,
-                          "height": 20,
-                          "width": 20,
-                        },
-                      ]
-                    }
-                    tintColor="#FFFFFF"
-                    vbHeight={24}
-                    vbWidth={24}
-                  >
-                    <RNSVGGroup
-                      fill={
-                        {
-                          "payload": 4291743438,
-                          "type": 0,
-                        }
-                      }
-                      propList={
-                        [
-                          "fill",
-                          "strokeWidth",
-                        ]
-                      }
-                      strokeWidth="8"
-                    >
-                      <RNSVGPath
-                        d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z"
-                        fill={
-                          {
-                            "payload": 4278190080,
-                            "type": 0,
-                          }
-                        }
-                        propList={
-                          [
-                            "stroke",
-                            "strokeWidth",
-                            "strokeLinecap",
-                            "strokeLinejoin",
-                          ]
-                        }
-                        stroke={
-                          {
-                            "type": 2,
-                          }
-                        }
-                        strokeLinecap={1}
-                        strokeLinejoin={1}
-                        strokeWidth="1.5"
-                      />
-                      <RNSVGPath
-                        d="M9.08997 9.00001C9.32507 8.33167 9.78912 7.76811 10.3999 7.40914C11.0107 7.05016 11.7289 6.91894 12.4271 7.03872C13.1254 7.15849 13.7588 7.52153 14.215 8.06353C14.6713 8.60554 14.921 9.29153 14.92 10C14.92 12 11.92 13 11.92 13"
-                        fill={
-                          {
-                            "payload": 4278190080,
-                            "type": 0,
-                          }
-                        }
-                        propList={
-                          [
-                            "stroke",
-                            "strokeWidth",
-                            "strokeLinecap",
-                            "strokeLinejoin",
-                          ]
-                        }
-                        stroke={
-                          {
-                            "type": 2,
-                          }
-                        }
-                        strokeLinecap={1}
-                        strokeLinejoin={1}
-                        strokeWidth="1.5"
-                      />
-                      <RNSVGPath
-                        d="M12 17H12.01"
-                        fill={
-                          {
-                            "payload": 4278190080,
-                            "type": 0,
-                          }
-                        }
-                        propList={
-                          [
-                            "stroke",
-                            "strokeWidth",
-                            "strokeLinecap",
-                            "strokeLinejoin",
-                          ]
-                        }
-                        stroke={
-                          {
-                            "type": 2,
-                          }
-                        }
-                        strokeLinecap={1}
-                        strokeLinejoin={1}
-                        strokeWidth="1.5"
-                      />
-                    </RNSVGGroup>
-                  </RNSVGSvgView>
                   <Text
                     allowFontScaling={true}
                     maxFontSizeMultiplier={1.4}
                     style={
                       {
-                        "color": "#CECECE",
+                        "color": "#FC72FF",
                         "fontFamily": "Basel-Book",
                         "fontSize": 17,
                         "lineHeight": 24,
diff --git a/apps/mobile/src/screens/ModalAwareView.tsx b/apps/mobile/src/screens/ModalAwareView.tsx
index 6746984ad40..60a81b34f85 100644
--- a/apps/mobile/src/screens/ModalAwareView.tsx
+++ b/apps/mobile/src/screens/ModalAwareView.tsx
@@ -3,10 +3,10 @@ import React from 'react'
 import { View } from 'react-native'
 import { useAppSelector } from 'src/app/hooks'
 import { HorizontalEdgeGestureTarget } from 'src/components/layout/screens/EdgeGestureTarget'
+import { HandleBar } from 'src/components/modals/HandleBar'
 import { selectModalState } from 'src/features/modals/selectModalState'
+import { ModalName } from 'src/features/telemetry/constants'
 import { Flex, flexStyles, useDeviceInsets, useSporeColors } from 'ui/src'
-import { HandleBar } from 'wallet/src/components/modals/HandleBar'
-import { ModalName } from 'wallet/src/telemetry/constants'
 /**
  * Wrapper view to correctly render screens within BottomSheetModal as needed. This is required
  * to enable both full screen, and bottom sheet drag gestures on a screen within a modal.
diff --git a/apps/mobile/src/screens/NFTCollectionScreen.tsx b/apps/mobile/src/screens/NFTCollectionScreen.tsx
index 6820d282231..fd3490f035d 100644
--- a/apps/mobile/src/screens/NFTCollectionScreen.tsx
+++ b/apps/mobile/src/screens/NFTCollectionScreen.tsx
@@ -6,10 +6,10 @@ import { useTranslation } from 'react-i18next'
 import { ListRenderItemInfo } from 'react-native'
 import { useAnimatedScrollHandler, useSharedValue, withTiming } from 'react-native-reanimated'
 import { AppStackScreenProp, useAppStackNavigation } from 'src/app/navigation/types'
-import Trace from 'src/components/Trace/Trace'
 import { Screen } from 'src/components/layout/Screen'
 import { ScrollHeader } from 'src/components/layout/screens/ScrollHeader'
 import { Loader } from 'src/components/loading'
+import Trace from 'src/components/Trace/Trace'
 import { ListPriceBadge } from 'src/features/nfts/collection/ListPriceCard'
 import { NFTCollectionContextMenu } from 'src/features/nfts/collection/NFTCollectionContextMenu'
 import {
@@ -29,11 +29,11 @@ import {
 } from 'ui/src'
 import { iconSizes, spacing } from 'ui/src/theme'
 import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
+import { isError } from 'wallet/src/data/utils'
 import {
   NftCollectionScreenQuery,
   useNftCollectionScreenQuery,
 } from 'wallet/src/data/__generated__/types-and-hooks'
-import { isError } from 'wallet/src/data/utils'
 import { NFTViewer } from 'wallet/src/features/images/NFTViewer'
 import { NFTItem } from 'wallet/src/features/nfts/types'
 import { getNFTAssetKey } from 'wallet/src/features/nfts/utils'
diff --git a/apps/mobile/src/screens/NFTItemScreen.tsx b/apps/mobile/src/screens/NFTItemScreen.tsx
index 91af4af7ca1..8b8e8774e97 100644
--- a/apps/mobile/src/screens/NFTItemScreen.tsx
+++ b/apps/mobile/src/screens/NFTItemScreen.tsx
@@ -8,6 +8,7 @@ import { StatusBar, StyleSheet, TouchableOpacity } from 'react-native'
 import ContextMenu from 'react-native-context-menu-view'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
 import { AppStackScreenProp, useAppStackNavigation } from 'src/app/navigation/types'
+import { AddressDisplay } from 'src/components/AddressDisplay'
 import { HeaderScrollScreen } from 'src/components/layout/screens/HeaderScrollScreen'
 import { Loader } from 'src/components/loading'
 import { LongMarkdownText } from 'src/components/text/LongMarkdownText'
@@ -18,13 +19,14 @@ import { useNFTMenu } from 'src/features/nfts/hooks'
 import { BlurredImageBackground } from 'src/features/nfts/item/BlurredImageBackground'
 import { CollectionPreviewCard } from 'src/features/nfts/item/CollectionPreviewCard'
 import { NFTTraitList } from 'src/features/nfts/item/traits'
+import { ModalName } from 'src/features/telemetry/constants'
 import { ExploreModalAwareView } from 'src/screens/ModalAwareView'
 import { Screens } from 'src/screens/Screens'
+import { setClipboardImage } from 'src/utils/clipboard'
 import { Flex, getTokenValue, Text, Theme, TouchableArea, useSporeColors } from 'ui/src'
 import EllipsisIcon from 'ui/src/assets/icons/ellipsis.svg'
 import ShareIcon from 'ui/src/assets/icons/share.svg'
 import { colorsDark, fonts, iconSizes } from 'ui/src/theme'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
 import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
 import { PollingInterval } from 'wallet/src/constants/misc'
 import {
@@ -37,9 +39,7 @@ import { GQLNftAsset } from 'wallet/src/features/nfts/hooks'
 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 { ModalName } from 'wallet/src/telemetry/constants'
 import { areAddressesEqual } from 'wallet/src/utils/addresses'
-import { setClipboardImage } from 'wallet/src/utils/clipboard'
 import {
   MIN_COLOR_CONTRAST_THRESHOLD,
   passesContrast,
diff --git a/apps/mobile/src/screens/Onboarding/BackupScreen.tsx b/apps/mobile/src/screens/Onboarding/BackupScreen.tsx
index 91e400a5990..ab2d129f5b2 100644
--- a/apps/mobile/src/screens/Onboarding/BackupScreen.tsx
+++ b/apps/mobile/src/screens/Onboarding/BackupScreen.tsx
@@ -15,16 +15,16 @@ import Trace from 'src/components/Trace/Trace'
 import { isCloudStorageAvailable } from 'src/features/CloudBackup/RNCloudStorageBackupsManager'
 import { OnboardingScreen } from 'src/features/onboarding/OnboardingScreen'
 import { OptionCard } from 'src/features/onboarding/OptionCard'
+import { ElementName } from 'src/features/telemetry/constants'
 import { OnboardingScreens, Screens } from 'src/screens/Screens'
-import { Button, Flex, Icons, Text, TouchableArea, useIsDarkMode, useSporeColors } from 'ui/src'
+import { openSettings } from 'src/utils/linking'
+import { Button, Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
 import PaperIcon from 'ui/src/assets/icons/paper-stack.svg'
 import { iconSizes } from 'ui/src/theme'
 import { useAsyncData } from 'utilities/src/react/hooks'
 import { ImportType } from 'wallet/src/features/onboarding/types'
 import { BackupType } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
-import { ElementName } from 'wallet/src/telemetry/constants'
-import { openSettings } from 'wallet/src/utils/linking'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 type Props = CompositeScreenProps<
@@ -35,7 +35,6 @@ type Props = CompositeScreenProps<
 export function BackupScreen({ navigation, route: { params } }: Props): JSX.Element {
   const { t } = useTranslation()
   const colors = useSporeColors()
-  const isDarkMode = useIsDarkMode()
   const { navigate } = useOnboardingStackNavigation()
 
   const { data: cloudStorageAvailable } = useAsyncData(isCloudStorageAvailable)
@@ -123,7 +122,9 @@ export function BackupScreen({ navigation, route: { params } }: Props): JSX.Elem
   const hasManualBackup = activeAccountBackups?.some((backup) => backup === BackupType.Manual)
 
   const isCreatingNew = params?.importType === ImportType.CreateNew
-  const screenTitle = isCreatingNew ? t('Choose a backup method') : t('Back up your wallet')
+  const screenTitle = isCreatingNew
+    ? t('Choose a backup for your wallet')
+    : t('Back up your wallet')
   const options = []
   options.push(
     <OptionCard
@@ -140,7 +141,7 @@ export function BackupScreen({ navigation, route: { params } }: Props): JSX.Elem
     options.push(
       <OptionCard
         key={ElementName.AddManualBackup}
-        blurb={t('Write your recovery phrase down and store it in a safe location')}
+        blurb={t('Save your recovery phrase in a safe location')}
         disabled={hasManualBackup}
         elementName={ElementName.AddManualBackup}
         icon={<PaperIcon color={colors.accent1.get()} height={iconSizes.icon16} />}
@@ -155,26 +156,17 @@ export function BackupScreen({ navigation, route: { params } }: Props): JSX.Elem
       subtitle={t('Backups let you restore your wallet if you delete the app or lose your device')}
       title={screenTitle}>
       <Flex grow justifyContent="space-between">
-        <Flex gap="$spacing24">
-          <Flex
-            gap="$spacing12"
-            shadowColor="$surface3"
-            shadowRadius={!isDarkMode ? '$spacing8' : undefined}>
-            {options}
-          </Flex>
-          {!isCreatingNew && (
-            <RecoveryPhraseTooltip onPressEducationButton={onPressEducationButton} />
-          )}
-        </Flex>
-
+        <Flex gap="$spacing12">{options}</Flex>
         <Flex gap="$spacing12" justifyContent="flex-end">
-          {isCreatingNew && (
-            <RecoveryPhraseTooltip onPressEducationButton={onPressEducationButton} />
-          )}
+          <TouchableArea alignSelf="center" py="$spacing8" onPress={onPressEducationButton}>
+            <Text color="$neutral2" variant="buttonLabel3">
+              {t('Learn more')}
+            </Text>
+          </TouchableArea>
           {showSkipOption && (
             <Trace logPress element={ElementName.Next}>
               <Button theme="tertiary" onPress={onPressNext}>
-                {t('Maybe later')}
+                {t('Skip for now')}
               </Button>
             </Trace>
           )}
@@ -183,25 +175,3 @@ export function BackupScreen({ navigation, route: { params } }: Props): JSX.Elem
     </OnboardingScreen>
   )
 }
-
-function RecoveryPhraseTooltip({
-  onPressEducationButton,
-}: {
-  onPressEducationButton: () => void
-}): JSX.Element {
-  const { t } = useTranslation()
-  return (
-    <TouchableArea
-      alignItems="center"
-      alignSelf="center"
-      flexDirection="row"
-      gap="$spacing8"
-      py="$spacing8"
-      onPress={onPressEducationButton}>
-      <Icons.QuestionInCircleFilled color="$surface1" size="$icon.20" />
-      <Text color="$neutral3" variant="body2">
-        {t('What is a recovery phrase?')}
-      </Text>
-    </TouchableArea>
-  )
-}
diff --git a/apps/mobile/src/screens/Onboarding/CloudBackupPasswordCreateScreen.tsx b/apps/mobile/src/screens/Onboarding/CloudBackupPasswordCreateScreen.tsx
index ed1356f76f5..8ebe476e313 100644
--- a/apps/mobile/src/screens/Onboarding/CloudBackupPasswordCreateScreen.tsx
+++ b/apps/mobile/src/screens/Onboarding/CloudBackupPasswordCreateScreen.tsx
@@ -30,7 +30,9 @@ export function CloudBackupPasswordCreateScreen({
 
   return (
     <SafeKeyboardOnboardingScreen
-      subtitle={t('You’ll need to enter this password to recover your wallet.')}
+      subtitle={t(
+        'You’ll need to enter this password to recover your account. It’s not stored anywhere, so it can’t be recovered by anyone else.'
+      )}
       title={t('Create your backup password')}>
       <CloudBackupPasswordForm navigateToNextScreen={navigateToNextScreen} />
     </SafeKeyboardOnboardingScreen>
diff --git a/apps/mobile/src/screens/Onboarding/EditNameScreen.tsx b/apps/mobile/src/screens/Onboarding/EditNameScreen.tsx
index db68ef47289..e184510d5bf 100644
--- a/apps/mobile/src/screens/Onboarding/EditNameScreen.tsx
+++ b/apps/mobile/src/screens/Onboarding/EditNameScreen.tsx
@@ -1,16 +1,17 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import React, { Dispatch, SetStateAction, useEffect, useRef, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { ActivityIndicator, TextInput as NativeTextInput, StyleSheet } from 'react-native'
+import { ActivityIndicator, StyleSheet, TextInput as NativeTextInput } from 'react-native'
 import { useAppDispatch } from 'src/app/hooks'
 import { OnboardingStackParamList } from 'src/app/navigation/types'
+import { TextInput } from 'src/components/input/TextInput'
 import Trace from 'src/components/Trace/Trace'
 import { SafeKeyboardOnboardingScreen } from 'src/features/onboarding/SafeKeyboardOnboardingScreen'
+import { ElementName } from 'src/features/telemetry/constants'
 import { OnboardingScreens } from 'src/screens/Screens'
 import { useAddBackButton } from 'src/utils/useAddBackButton'
-import { AnimatePresence, Button, Flex, Icons, Text } from 'ui/src'
+import { AnimatePresence, Button, Flex, Icons, Text, useMedia } from 'ui/src'
 import { fonts } from 'ui/src/theme'
-import { TextInput } from 'wallet/src/components/input/TextInput'
 import { NICKNAME_MAX_LENGTH } from 'wallet/src/constants/accounts'
 import { ImportType } from 'wallet/src/features/onboarding/types'
 import {
@@ -23,7 +24,6 @@ import {
   pendingAccountActions,
 } from 'wallet/src/features/wallet/create/pendingAccountsSaga'
 import { usePendingAccounts } from 'wallet/src/features/wallet/hooks'
-import { ElementName } from 'wallet/src/telemetry/constants'
 import { shortenAddress } from 'wallet/src/utils/addresses'
 import { isAndroid } from 'wallet/src/utils/platform'
 
@@ -64,7 +64,7 @@ export function EditNameScreen({ navigation, route: { params } }: Props): JSX.El
     navigation.navigate({
       name:
         params?.importType === ImportType.CreateNew
-          ? OnboardingScreens.WelcomeWallet
+          ? OnboardingScreens.QRAnimation
           : OnboardingScreens.Notifications,
       merge: true,
       params,
@@ -113,6 +113,7 @@ function CustomizationSection({
   setAccountName: Dispatch<SetStateAction<string>>
 }): JSX.Element {
   const { t } = useTranslation()
+  const media = useMedia()
   const textInputRef = useRef<NativeTextInput>(null)
 
   // we default it to `true` to avoid flickering of a pencil icon,
@@ -123,6 +124,8 @@ function CustomizationSection({
     textInputRef.current?.focus()
   }
 
+  const inputSize = media.short ? fonts.heading3.fontSize : fonts.heading2.fontSize
+
   return (
     <Flex
       centered
@@ -130,46 +133,39 @@ function CustomizationSection({
         gap: '$none',
       }}
       gap="$spacing24">
-      <Flex centered gap="$spacing24" h={200} px="$spacing16" width="100%">
-        <Flex
-          borderColor="$surface3"
-          borderRadius="$rounded16"
-          borderWidth={1}
-          py="$spacing12"
-          width="100%">
-          <Flex centered row>
-            <TextInput
-              ref={textInputRef}
-              autoFocus
-              fontSize={fonts.heading3.fontSize}
-              maxFontSizeMultiplier={fonts.heading3.maxFontSizeMultiplier}
-              maxLength={NICKNAME_MAX_LENGTH}
-              placeholder={t('Nickname')}
-              placeholderTextColor="$neutral3"
-              style={isAndroid ? styles.noHorizontalPadding : {}}
-              testID="customize/name"
-              textAlign="center"
-              value={accountName}
-              onBlur={(): void => {
-                setFocused(false)
-                setAccountName(accountName.trim())
-              }}
-              onChangeText={setAccountName}
-              onFocus={(): void => setFocused(true)}
-            />
-            <AnimatePresence>
-              {!focused && (
-                <Button
-                  fadeIn
-                  fadeOut
-                  animation="lazy"
-                  icon={<Icons.Pencil color="$neutral2" />}
-                  theme="secondary"
-                  onPress={focusInputWithKeyboard}
-                />
-              )}
-            </AnimatePresence>
-          </Flex>
+      <Flex centered gap="$spacing24" h={200} width="100%">
+        <Flex centered row>
+          <TextInput
+            ref={textInputRef}
+            autoFocus
+            fontSize={inputSize}
+            maxFontSizeMultiplier={fonts.heading2.maxFontSizeMultiplier}
+            maxLength={NICKNAME_MAX_LENGTH}
+            placeholder={t('Nickname')}
+            placeholderTextColor="$neutral3"
+            style={isAndroid ? styles.noHorizontalPadding : {}}
+            testID="customize/name"
+            textAlign="center"
+            value={accountName}
+            onBlur={(): void => {
+              setFocused(false)
+              setAccountName(accountName.trim())
+            }}
+            onChangeText={setAccountName}
+            onFocus={(): void => setFocused(true)}
+          />
+          <AnimatePresence>
+            {!focused && (
+              <Button
+                fadeIn
+                fadeOut
+                animation="lazy"
+                icon={<Icons.Pencil color="$neutral2" />}
+                theme="secondary"
+                onPress={focusInputWithKeyboard}
+              />
+            )}
+          </AnimatePresence>
         </Flex>
         <Flex centered gap="$spacing4">
           <Text color="$neutral3" variant="body3">
diff --git a/apps/mobile/src/screens/Onboarding/LandingScreen.tsx b/apps/mobile/src/screens/Onboarding/LandingScreen.tsx
index 58c05d92c5c..3b40a15d0ba 100644
--- a/apps/mobile/src/screens/Onboarding/LandingScreen.tsx
+++ b/apps/mobile/src/screens/Onboarding/LandingScreen.tsx
@@ -1,7 +1,7 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import { selectionAsync } from 'expo-haptics'
 import React from 'react'
-import { useTranslation } from 'react-i18next'
+import { Trans, useTranslation } from 'react-i18next'
 import { useAppDispatch } from 'src/app/hooks'
 import { navigate } from 'src/app/navigation/rootNavigation'
 import { OnboardingStackParamList } from 'src/app/navigation/types'
@@ -9,12 +9,15 @@ import { LandingBackground } from 'src/components/gradients/LandingBackground'
 import { Screen } from 'src/components/layout/Screen'
 import Trace from 'src/components/Trace/Trace'
 import { openModal } from 'src/features/modals/modalSlice'
-import { TermsOfService } from 'src/screens/Onboarding/TermsOfService'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { OnboardingScreens, Screens, UnitagScreens } from 'src/screens/Screens'
+import { openUri } from 'src/utils/linking'
 import { hideSplashScreen } from 'src/utils/splashScreen'
 import { isDevBuild } from 'src/utils/version'
-import { Button, Flex, Text, TouchableArea, useIsDarkMode } from 'ui/src'
+import { Button, Flex, Text, TouchableArea } from 'ui/src'
 import { useTimeout } from 'utilities/src/time/timing'
+import { uniswapUrls } from 'wallet/src/constants/urls'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { ImportType, OnboardingEntryPoint } from 'wallet/src/features/onboarding/types'
 import { useCanAddressClaimUnitag } from 'wallet/src/features/unitags/hooks'
 import { createAccountActions } from 'wallet/src/features/wallet/create/createAccountSaga'
@@ -22,7 +25,6 @@ import {
   PendingAccountActions,
   pendingAccountActions,
 } from 'wallet/src/features/wallet/create/pendingAccountsSaga'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 
 type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.Landing>
 
@@ -36,11 +38,10 @@ export function LandingScreen({ navigation }: Props): JSX.Element {
     dispatch(pendingAccountActions.trigger(PendingAccountActions.Delete))
     dispatch(createAccountActions.trigger())
     if (canClaimUnitag) {
-      navigate(Screens.OnboardingStack, {
+      navigate(Screens.UnitagStack, {
         screen: UnitagScreens.ClaimUnitag,
         params: {
           entryPoint: OnboardingScreens.Landing,
-          importType: ImportType.CreateNew,
         },
       })
     } else {
@@ -106,7 +107,25 @@ export function LandingScreen({ navigation }: Props): JSX.Element {
               </TouchableArea>
             </Trace>
             <Flex $short={{ py: '$none', mx: '$spacing12' }} mx="$spacing24" py="$spacing12">
-              <TermsOfService />
+              <Text color="$neutral2" mx="$spacing4" textAlign="center" variant="buttonLabel4">
+                <Trans t={t}>
+                  By continuing, I agree to the{' '}
+                  <Text
+                    color="$accent1"
+                    variant="buttonLabel4"
+                    onPress={(): Promise<void> => openUri(uniswapUrls.termsOfServiceUrl)}>
+                    Terms of Service
+                  </Text>{' '}
+                  and consent to the{' '}
+                  <Text
+                    color="$accent1"
+                    variant="buttonLabel4"
+                    onPress={(): Promise<void> => openUri(uniswapUrls.privacyPolicyUrl)}>
+                    Privacy Policy
+                  </Text>
+                  .
+                </Trans>
+              </Text>
             </Flex>
           </Flex>
         </Flex>
diff --git a/apps/mobile/src/screens/Onboarding/ManualBackupScreen.tsx b/apps/mobile/src/screens/Onboarding/ManualBackupScreen.tsx
index f8c8404de09..af3288a72f9 100644
--- a/apps/mobile/src/screens/Onboarding/ManualBackupScreen.tsx
+++ b/apps/mobile/src/screens/Onboarding/ManualBackupScreen.tsx
@@ -3,28 +3,28 @@ import { SharedEventName } from '@uniswap/analytics-events'
 import { addScreenshotListener } from 'expo-screen-capture'
 import React, { useEffect, useReducer, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { TouchableOpacity } from 'react-native-gesture-handler'
 import { useAppDispatch } from 'src/app/hooks'
 import { OnboardingStackParamList } from 'src/app/navigation/types'
 import { HiddenMnemonicWordView } from 'src/components/mnemonic/HiddenMnemonicWordView'
 import { MnemonicConfirmation } from 'src/components/mnemonic/MnemonicConfirmation'
 import { MnemonicDisplay } from 'src/components/mnemonic/MnemonicDisplay'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
 import { useLockScreenOnBlur } from 'src/features/authentication/lockScreenContext'
 import { OnboardingScreen } from 'src/features/onboarding/OnboardingScreen'
 import { sendMobileAnalyticsEvent } from 'src/features/telemetry'
-import { ManualPageViewScreen } from 'src/features/telemetry/constants'
+import { ElementName, ManualPageViewScreen, ModalName } from 'src/features/telemetry/constants'
 import { OnboardingScreens } from 'src/screens/Screens'
 import { Button, Flex, Text, useMedia, useSporeColors } from 'ui/src'
 import LockIcon from 'ui/src/assets/icons/lock.svg'
 import { iconSizes } from 'ui/src/theme'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
 import {
   EditAccountAction,
   editAccountActions,
 } from 'wallet/src/features/wallet/accounts/editAccountSaga'
 import { BackupType, SignerMnemonicAccount } from 'wallet/src/features/wallet/accounts/types'
 import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 
 type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.BackupManual>
 
@@ -105,7 +105,7 @@ export function ManualBackupScreen({ navigation, route: { params } }: Props): JS
     case View.SeedPhrase:
       return (
         <OnboardingScreen
-          subtitle={t('You can check this in settings at any time.')}
+          subtitle={t('Remember to record your words in the same order as they appear below.')}
           title={t('Write down your recovery phrase in order')}>
           {showScreenShotWarningModal && (
             <WarningModal
@@ -173,7 +173,7 @@ const SeedWarningModal = ({ onPress }: { onPress: () => void }): JSX.Element =>
       <Flex centered gap="$spacing16" pb="$spacing24" pt="$spacing24" px="$spacing24">
         <Flex centered backgroundColor="$surface2" borderRadius="$rounded12" p="$spacing12">
           <LockIcon
-            color={colors.neutral1.val}
+            color={colors.neutral2.val}
             height={iconSizes.icon24}
             width={iconSizes.icon24}
           />
@@ -183,12 +183,14 @@ const SeedWarningModal = ({ onPress }: { onPress: () => void }): JSX.Element =>
         </Text>
         <Text color="$neutral2" textAlign="center" variant="body2">
           {t(
-            'Your recovery phrase is what grants you (and anyone who has it) access to your funds. Be sure to keep it to yourself.'
+            'Your recovery phrase is what grants you (and anyone who has it) access to your funds. Be sure to store it in a safe place.'
           )}
         </Text>
-        <Button flexGrow={1} mt="$spacing16" theme="primary" width="100%" onPress={onPress}>
-          {t('I’m ready')}
-        </Button>
+        <TouchableOpacity hitSlop={24} onPress={onPress}>
+          <Text color="$accent1" pt="$spacing24" variant="buttonLabel2">
+            {t('Continue')}
+          </Text>
+        </TouchableOpacity>
       </Flex>
     </BottomSheetModal>
   )
diff --git a/apps/mobile/src/screens/Onboarding/NotificationsSetupScreen.tsx b/apps/mobile/src/screens/Onboarding/NotificationsSetupScreen.tsx
index 87de4e84a56..46207726b9b 100644
--- a/apps/mobile/src/screens/Onboarding/NotificationsSetupScreen.tsx
+++ b/apps/mobile/src/screens/Onboarding/NotificationsSetupScreen.tsx
@@ -11,9 +11,12 @@ import { useBiometricAppSettings } from 'src/features/biometrics/hooks'
 import { promptPushPermission } from 'src/features/notifications/Onesignal'
 import { useCompleteOnboardingCallback } from 'src/features/onboarding/hooks'
 import { OnboardingScreen } from 'src/features/onboarding/OnboardingScreen'
+import { ElementName } from 'src/features/telemetry/constants'
 import { OnboardingScreens } from 'src/screens/Screens'
-import { Button, Flex, Text, TouchableArea, useIsDarkMode } from 'ui/src'
+import { openSettings } from 'src/utils/linking'
+import { Button, Flex, Text, TouchableArea } from 'ui/src'
 import { ONBOARDING_NOTIFICATIONS_DARK, ONBOARDING_NOTIFICATIONS_LIGHT } from 'ui/src/assets'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { ImportType, OnboardingEntryPoint } from 'wallet/src/features/onboarding/types'
 import {
   EditAccountAction,
@@ -22,8 +25,6 @@ import {
 import { useNativeAccountExists } from 'wallet/src/features/wallet/hooks'
 import { selectAccounts } from 'wallet/src/features/wallet/selectors'
 import i18n from 'wallet/src/i18n/i18n'
-import { ElementName } from 'wallet/src/telemetry/constants'
-import { openSettings } from 'wallet/src/utils/linking'
 import { isIOS } from 'wallet/src/utils/platform'
 
 type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.Notifications>
diff --git a/apps/mobile/src/screens/Onboarding/QRAnimation/QRAnimation.tsx b/apps/mobile/src/screens/Onboarding/QRAnimation/QRAnimation.tsx
index f27c500c677..73a7d20f79e 100644
--- a/apps/mobile/src/screens/Onboarding/QRAnimation/QRAnimation.tsx
+++ b/apps/mobile/src/screens/Onboarding/QRAnimation/QRAnimation.tsx
@@ -11,21 +11,25 @@ import {
 import { ResizeMode, Video } from 'expo-av'
 import React, { useEffect, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
-import { StyleSheet } from 'react-native'
+import { StyleProp, StyleSheet, ViewStyle } from 'react-native'
 import {
+  AnimateStyle,
   Easing,
   EntryExitAnimationFunction,
   runOnJS,
-  StyleProps,
   useAnimatedStyle,
   useSharedValue,
   withDelay,
   withTiming,
 } from 'react-native-reanimated'
+import { AddressDisplay } from 'src/components/AddressDisplay'
 import { GradientBackground } from 'src/components/gradients/GradientBackground'
 import { UniconThemedGradient } from 'src/components/gradients/UniconThemedGradient'
+import { Arrow } from 'src/components/icons/Arrow'
 import { QRCodeDisplay } from 'src/components/QRCodeScanner/QRCode'
 import Trace from 'src/components/Trace/Trace'
+import { useUniconColors } from 'src/components/unicons/utils'
+import { ElementName } from 'src/features/telemetry/constants'
 import {
   flashWipeAnimation,
   letsGoButtonFadeIn,
@@ -38,22 +42,12 @@ import {
   textSlideUpAtEnd,
   videoFadeOut,
 } from 'src/screens/Onboarding/QRAnimation/animations'
-import {
-  Button,
-  Flex,
-  Text,
-  useIsDarkMode,
-  useMedia,
-  useSporeColors,
-  useUniconColors,
-} from 'ui/src'
+import { Button, Flex, Text, useMedia, useSporeColors } from 'ui/src'
 import { ONBOARDING_QR_ETCHING_VIDEO_DARK, ONBOARDING_QR_ETCHING_VIDEO_LIGHT } from 'ui/src/assets'
 import LockIcon from 'ui/src/assets/icons/lock.svg'
 import { AnimatedFlex, flexStyles } from 'ui/src/components/layout'
-import { fonts, iconSizes, opacify, spacing } from 'ui/src/theme'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
-import { Arrow } from 'wallet/src/components/icons/Arrow'
-import { ElementName } from 'wallet/src/telemetry/constants'
+import { fonts, iconSizes, opacify } from 'ui/src/theme'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 
 export function QRAnimation({
   activeAddress,
@@ -87,7 +81,7 @@ export function QRAnimation({
   // the config for this animation is defined in the animations.ts file in the same folder as this component, but because of the callback it made more sense to leave the actual animation definition in this file
   const qrSlideUpAndFadeIn: EntryExitAnimationFunction = () => {
     'worklet'
-    const animations: StyleProps = {
+    const animations: AnimateStyle<StyleProp<ViewStyle>> = {
       opacity: withDelay(
         qrSlideUpAndFadeInConfig.opacity.delay,
         withTiming(qrSlideUpAndFadeInConfig.opacity.endValue, {
@@ -107,7 +101,9 @@ export function QRAnimation({
         },
       ],
     }
-    const initialValues: StyleProps = {
+    // <StyleProp<ViewStyle>> doesn't quite work because of translateY
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const initialValues: AnimateStyle<any> = {
       opacity: qrSlideUpAndFadeInConfig.opacity.startValue,
       transform: [{ translateY: qrSlideUpAndFadeInConfig.translateY.startValue }],
     }
@@ -163,7 +159,7 @@ export function QRAnimation({
 
   // used throughout the page the get the size of the QR code container
   // setting as a constant so that it doesn't get defined by padding and screen size and give us less design control
-  const QR_CONTAINER_SIZE = media.short ? 175 : 242
+  const QR_CONTAINER_SIZE = media.short ? 160 : 242
   const QR_CODE_SIZE = media.short ? 140 : 190
   const UNICON_SIZE = 64
 
@@ -183,7 +179,7 @@ export function QRAnimation({
         <Flex centered grow gap="$spacing36" mb="$spacing12" mt="$spacing12">
           <Flex centered gap="$spacing12" pt="$spacing48">
             <AnimatedFlex entering={qrSlideUpAndFadeIn}>
-              <AnimatedFlex centered entering={qrSlideUpAtEnd}>
+              <AnimatedFlex entering={qrSlideUpAtEnd}>
                 <AnimatedFlex entering={flashWipeAnimation} style={styles.behindQrBlur}>
                   <Canvas style={flexStyles.fill}>
                     <Group transform={[{ translateX: 50 }, { translateY: 50 }]}>
@@ -260,35 +256,34 @@ export function QRAnimation({
                     />
                   </AnimatedFlex>
                 </AnimatedFlex>
+                <AnimatedFlex entering={textSlideUpAtEnd}>
+                  <Flex centered mt="$spacing24">
+                    <AddressDisplay
+                      showCopy
+                      address={activeAddress}
+                      captionTextColor="$neutral3"
+                      captionVariant="subheading2"
+                      showAccountIcon={false}
+                      variant="heading3"
+                    />
+                  </Flex>
+                </AnimatedFlex>
               </AnimatedFlex>
             </AnimatedFlex>
-            {/* negative top margin required because the glow around the QR code is absolute with -50 margin */}
-            <AnimatedFlex entering={textSlideUpAtEnd} style={{ marginTop: -spacing.spacing48 }}>
-              <Flex centered mt={-spacing.spacing4}>
-                <AddressDisplay
-                  showCopy
-                  address={activeAddress}
-                  captionTextColor="$neutral3"
-                  captionVariant="subheading2"
-                  showAccountIcon={false}
-                  variant="heading3"
-                />
-              </Flex>
-            </AnimatedFlex>
           </Flex>
-          <AnimatedFlex entering={textSlideUpAtEnd} pt="$spacing4" style={[styles.textContainer]}>
+          <AnimatedFlex entering={textSlideUpAtEnd} style={[styles.textContainer]}>
             <Text
-              $short={{ variant: 'subheading2' }}
-              maxFontSizeMultiplier={media.short ? 1.1 : fonts.heading3.maxFontSizeMultiplier}
+              $short={{ variant: 'subheading2', maxFontSizeMultiplier: 1.1 }}
+              maxFontSizeMultiplier={fonts.heading3.maxFontSizeMultiplier}
               pb="$spacing12"
               textAlign="center"
               variant="subheading1">
               {t('Welcome to your new wallet')}
             </Text>
             <Text
-              $short={{ variant: 'body3' }}
+              $short={{ variant: 'body3', maxFontSizeMultiplier: 1.1 }}
               color="$neutral2"
-              maxFontSizeMultiplier={media.short ? 1.1 : fonts.body1.maxFontSizeMultiplier}
+              maxFontSizeMultiplier={fonts.body1.maxFontSizeMultiplier}
               textAlign="center"
               variant="body2">
               {isNewWallet
@@ -359,7 +354,6 @@ const styles = StyleSheet.create({
     flexDirection: 'column',
     justifyContent: 'center',
     marginHorizontal: 28,
-    marginTop: spacing.spacing60,
   },
   video: {
     bottom: 4,
diff --git a/apps/mobile/src/screens/Onboarding/QRAnimation/animations.ts b/apps/mobile/src/screens/Onboarding/QRAnimation/animations.ts
index e00627b5d97..7be1406deec 100644
--- a/apps/mobile/src/screens/Onboarding/QRAnimation/animations.ts
+++ b/apps/mobile/src/screens/Onboarding/QRAnimation/animations.ts
@@ -1,7 +1,7 @@
 import {
+  AnimateStyle,
   Easing,
   EntryExitAnimationFunction,
-  StyleProps,
   withDelay,
   withSequence,
   withTiming,
@@ -49,7 +49,7 @@ const qrScaleInConfig = {
 
 export const qrScaleIn: EntryExitAnimationFunction = () => {
   'worklet'
-  const animations: StyleProps = {
+  const animations: AnimateStyle<unknown> = {
     transform: [
       {
         scale: withDelay(
@@ -62,7 +62,7 @@ export const qrScaleIn: EntryExitAnimationFunction = () => {
       },
     ],
   }
-  const initialValues: StyleProps = {
+  const initialValues: AnimateStyle<unknown> = {
     transform: [{ scale: qrScaleInConfig.scale.startValue }],
   }
   return {
@@ -118,7 +118,7 @@ export const flashWipeConfig = {
 
 export const flashWipeAnimation: EntryExitAnimationFunction = () => {
   'worklet'
-  const animations: StyleProps = {
+  const animations: AnimateStyle<unknown> = {
     opacity: withSequence(
       withDelay(
         flashWipeConfig.opacityIn.delay,
@@ -144,7 +144,7 @@ export const flashWipeAnimation: EntryExitAnimationFunction = () => {
       },
     ],
   }
-  const initialValues: StyleProps = {
+  const initialValues: AnimateStyle<unknown> = {
     opacity: flashWipeConfig.opacityIn.startValue,
     transform: [{ scale: flashWipeConfig.scale.startValue }],
   }
@@ -238,7 +238,7 @@ const textSlideUpAndFadeInConfig = {
 
 export const textSlideUpAtEnd: EntryExitAnimationFunction = () => {
   'worklet'
-  const animations: StyleProps = {
+  const animations: AnimateStyle<unknown> = {
     opacity: withDelay(
       textSlideUpAndFadeInConfig.opacityOut.delay,
       withTiming(textSlideUpAndFadeInConfig.opacityOut.endValue, {
@@ -258,7 +258,7 @@ export const textSlideUpAtEnd: EntryExitAnimationFunction = () => {
       },
     ],
   }
-  const initialValues: StyleProps = {
+  const initialValues: AnimateStyle<unknown> = {
     transform: [{ translateY: textSlideUpAndFadeInConfig.translateY.startValue }],
     opacity: textSlideUpAndFadeInConfig.opacityOut.startValue,
   }
@@ -300,7 +300,7 @@ const qrSlideUpAtEndConfig = {
 
 export const qrSlideUpAtEnd: EntryExitAnimationFunction = () => {
   'worklet'
-  const animations: StyleProps = {
+  const animations: AnimateStyle<unknown> = {
     transform: [
       {
         translateY: withDelay(
@@ -313,7 +313,7 @@ export const qrSlideUpAtEnd: EntryExitAnimationFunction = () => {
       },
     ],
   }
-  const initialValues: StyleProps = {
+  const initialValues: AnimateStyle<unknown> = {
     transform: [{ translateY: qrSlideUpAndFadeInConfig.translateY.startValue }],
   }
   return {
diff --git a/apps/mobile/src/screens/Onboarding/QRAnimationScreen.tsx b/apps/mobile/src/screens/Onboarding/QRAnimationScreen.tsx
new file mode 100644
index 00000000000..b70de3ce56c
--- /dev/null
+++ b/apps/mobile/src/screens/Onboarding/QRAnimationScreen.tsx
@@ -0,0 +1,39 @@
+import { CompositeScreenProps } from '@react-navigation/core'
+import { NativeStackScreenProps } from '@react-navigation/native-stack'
+import React from 'react'
+import { AppStackParamList, OnboardingStackParamList } from 'src/app/navigation/types'
+import { Screen } from 'src/components/layout/Screen'
+import { QRAnimation } from 'src/screens/Onboarding/QRAnimation/QRAnimation'
+import { OnboardingScreens, Screens } from 'src/screens/Screens'
+import { ImportType } from 'wallet/src/features/onboarding/types'
+import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
+
+type Props = CompositeScreenProps<
+  NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.QRAnimation>,
+  NativeStackScreenProps<AppStackParamList, Screens.Home, undefined>
+>
+
+export function QRAnimationScreen({ navigation, route: { params } }: Props): JSX.Element {
+  const activeAddress = useActiveAccountAddressWithThrow()
+
+  const onPressNext = (): void => {
+    navigation.navigate({
+      name:
+        params?.importType === ImportType.CreateNew
+          ? OnboardingScreens.Backup
+          : OnboardingScreens.Notifications,
+      merge: true,
+      params,
+    })
+  }
+
+  return (
+    <Screen>
+      <QRAnimation
+        activeAddress={activeAddress}
+        isNewWallet={params?.importType === ImportType.CreateNew}
+        onPressNext={onPressNext}
+      />
+    </Screen>
+  )
+}
diff --git a/apps/mobile/src/screens/Onboarding/SecuritySetupScreen.tsx b/apps/mobile/src/screens/Onboarding/SecuritySetupScreen.tsx
index 1431060e7e1..abd0ffc38a7 100644
--- a/apps/mobile/src/screens/Onboarding/SecuritySetupScreen.tsx
+++ b/apps/mobile/src/screens/Onboarding/SecuritySetupScreen.tsx
@@ -20,16 +20,17 @@ import {
 import { setRequiredForTransactions } from 'src/features/biometrics/slice'
 import { useCompleteOnboardingCallback } from 'src/features/onboarding/hooks'
 import { OnboardingScreen } from 'src/features/onboarding/OnboardingScreen'
+import { ElementName } from 'src/features/telemetry/constants'
 import { OnboardingScreens } from 'src/screens/Screens'
-import { Button, Flex, Text, TouchableArea, useIsDarkMode, useSporeColors } from 'ui/src'
+import { openSettings } from 'src/utils/linking'
+import { Button, Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { SECURITY_SCREEN_BACKGROUND_DARK, SECURITY_SCREEN_BACKGROUND_LIGHT } from 'ui/src/assets'
 import FaceIcon from 'ui/src/assets/icons/faceid-thin.svg'
 import FingerprintIcon from 'ui/src/assets/icons/fingerprint.svg'
 import { borderRadii, imageSizes } from 'ui/src/theme'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { ImportType } from 'wallet/src/features/onboarding/types'
-import { ElementName } from 'wallet/src/telemetry/constants'
 import { opacify } from 'wallet/src/utils/colors'
-import { openSettings } from 'wallet/src/utils/linking'
 import { isIOS } from 'wallet/src/utils/platform'
 
 type Props = NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.Security>
diff --git a/apps/mobile/src/screens/Onboarding/TermsOfService.tsx b/apps/mobile/src/screens/Onboarding/TermsOfService.tsx
deleted file mode 100644
index 4b200ce49e2..00000000000
--- a/apps/mobile/src/screens/Onboarding/TermsOfService.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Trans, useTranslation } from 'react-i18next'
-import { Text } from 'ui/src'
-import { uniswapUrls } from 'wallet/src/constants/urls'
-import { openUri } from 'wallet/src/utils/linking'
-
-export function TermsOfService(): JSX.Element {
-  const { t } = useTranslation()
-  return (
-    <Text color="$neutral2" mx="$spacing4" textAlign="center" variant="buttonLabel4">
-      <Trans t={t}>
-        By continuing, I agree to the{' '}
-        <Text
-          color="$accent1"
-          variant="buttonLabel4"
-          onPress={(): Promise<void> => openUri(uniswapUrls.termsOfServiceUrl)}>
-          Terms of Service
-        </Text>{' '}
-        and consent to the{' '}
-        <Text
-          color="$accent1"
-          variant="buttonLabel4"
-          onPress={(): Promise<void> => openUri(uniswapUrls.privacyPolicyUrl)}>
-          Privacy Policy
-        </Text>
-        .
-      </Trans>
-    </Text>
-  )
-}
diff --git a/apps/mobile/src/screens/Onboarding/WelcomeWalletScreen.tsx b/apps/mobile/src/screens/Onboarding/WelcomeWalletScreen.tsx
deleted file mode 100644
index d80062e67ed..00000000000
--- a/apps/mobile/src/screens/Onboarding/WelcomeWalletScreen.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { CompositeScreenProps } from '@react-navigation/core'
-import { NativeStackScreenProps } from '@react-navigation/native-stack'
-import React from 'react'
-import { useTranslation } from 'react-i18next'
-import { AppStackParamList, OnboardingStackParamList } from 'src/app/navigation/types'
-import AnimatedNumber from 'src/components/AnimatedNumber'
-import { Screen } from 'src/components/layout/Screen'
-import Trace from 'src/components/Trace/Trace'
-import { OnboardingScreens, Screens } from 'src/screens/Screens'
-import { Button, Flex, Loader, Text, useMedia, useSporeColors } from 'ui/src'
-import LockIcon from 'ui/src/assets/icons/lock.svg'
-import { fonts, iconSizes, opacify } from 'ui/src/theme'
-import { NumberType } from 'utilities/src/format/types'
-import { AccountIcon } from 'wallet/src/components/accounts/AccountIcon'
-import { DisplayNameText } from 'wallet/src/components/accounts/DisplayNameText'
-import { Arrow } from 'wallet/src/components/icons/Arrow'
-import { useENSAvatar } from 'wallet/src/features/ens/api'
-import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { useActiveAccountAddressWithThrow, useDisplayName } from 'wallet/src/features/wallet/hooks'
-import { ElementName } from 'wallet/src/telemetry/constants'
-
-type Props = CompositeScreenProps<
-  NativeStackScreenProps<OnboardingStackParamList, OnboardingScreens.WelcomeWallet>,
-  NativeStackScreenProps<AppStackParamList, Screens.Home, undefined>
->
-
-export function WelcomeWalletScreen({ navigation, route: { params } }: Props): JSX.Element {
-  const colors = useSporeColors()
-  const { t } = useTranslation()
-  const { convertFiatAmountFormatted } = useLocalizationContext()
-  const media = useMedia()
-
-  const activeAddress = useActiveAccountAddressWithThrow()
-  const displayName = useDisplayName(activeAddress)
-  const { data: avatar } = useENSAvatar(activeAddress)
-
-  const onPressNext = (): void => {
-    navigation.navigate({
-      name: OnboardingScreens.Backup,
-      merge: true,
-      params,
-    })
-  }
-
-  const zeroBalance = convertFiatAmountFormatted(0, NumberType.PortfolioBalance)
-
-  return (
-    <Screen mb="$spacing12" mx="$spacing24">
-      <Flex fill gap="$spacing36" justifyContent="center">
-        <Flex gap="$spacing12" px="$spacing16">
-          <AccountIcon
-            address={activeAddress}
-            avatarUri={avatar}
-            showBackground={true}
-            showBorder={false}
-            showViewOnlyBadge={false}
-            size={iconSizes.icon64}
-          />
-          <DisplayNameText
-            displayName={displayName}
-            justifyContent="flex-start"
-            textProps={{ variant: 'body1' }}
-          />
-          <AnimatedNumber
-            colorIndicationDuration={0}
-            loading={false}
-            loadingPlaceholderText="0.00"
-            shouldFadeDecimals={true}
-            value={zeroBalance}
-            warmLoading={false}
-          />
-          <Loader.Token repeat={2} />
-        </Flex>
-        <Flex gap="$spacing16" py="$spacing16">
-          <Text
-            $short={{ variant: 'heading3' }}
-            maxFontSizeMultiplier={media.short ? 1.1 : fonts.heading3.maxFontSizeMultiplier}
-            textAlign="center"
-            variant="heading3">
-            {t('Welcome to your new wallet')}
-          </Text>
-          <Text
-            $short={{ variant: 'subheading2' }}
-            color="$neutral2"
-            maxFontSizeMultiplier={media.short ? 1.1 : fonts.body1.maxFontSizeMultiplier}
-            textAlign="center"
-            variant="subheading2">
-            {t(
-              'This is your personal space for tokens, NFTs, and all of your trades. Finish setting it up to keep your funds safe.'
-            )}
-          </Text>
-        </Flex>
-      </Flex>
-      <Trace logPress element={ElementName.Next}>
-        <Button
-          icon={
-            <Flex grow row alignItems="center" justifyContent="space-between">
-              <Flex row alignItems="center" gap="$spacing8">
-                <Flex
-                  borderRadius="$roundedFull"
-                  p="$spacing8"
-                  style={{ backgroundColor: opacify(10, colors.sporeWhite.val) }}>
-                  <LockIcon
-                    color={colors.sporeWhite.val}
-                    height={iconSizes.icon16}
-                    width={iconSizes.icon16}
-                  />
-                </Flex>
-                <Text color="$sporeWhite" variant="buttonLabel2">
-                  {t('Let’s keep it safe')}
-                </Text>
-              </Flex>
-              <Arrow color={colors.sporeWhite.val} direction="e" size={iconSizes.icon24} />
-            </Flex>
-          }
-          onPress={onPressNext}
-        />
-      </Trace>
-    </Screen>
-  )
-}
diff --git a/apps/mobile/src/screens/Onboarding/__snapshots__/BackupScreen.test.tsx.snap b/apps/mobile/src/screens/Onboarding/__snapshots__/BackupScreen.test.tsx.snap
index 417a88bb6da..aa46843c62b 100644
--- a/apps/mobile/src/screens/Onboarding/__snapshots__/BackupScreen.test.tsx.snap
+++ b/apps/mobile/src/screens/Onboarding/__snapshots__/BackupScreen.test.tsx.snap
@@ -5,6 +5,7 @@ exports[`BackupScreen renders backup options when none are completed 1`] = `
   sentry-label="Screen"
   style={
     {
+      "alignItems": "stretch",
       "backgroundColor": "#FFFFFF",
       "flex": 1,
       "flexDirection": "column",
@@ -44,6 +45,7 @@ exports[`BackupScreen renders backup options when none are completed 1`] = `
       exiting={[Function]}
       style={
         {
+          "alignItems": "stretch",
           "flexDirection": "column",
           "flexGrow": 1,
           "gap": 16,
@@ -82,7 +84,7 @@ exports[`BackupScreen renders backup options when none are completed 1`] = `
           }
           suppressHighlighting={true}
         >
-          Choose a backup method
+          Choose a backup for your wallet
         </Text>
         <Text
           allowFontScaling={true}
@@ -104,6 +106,7 @@ exports[`BackupScreen renders backup options when none are completed 1`] = `
       <View
         style={
           {
+            "alignItems": "stretch",
             "flex": 1,
             "flexDirection": "column",
             "flexGrow": 1,
@@ -114,6 +117,7 @@ exports[`BackupScreen renders backup options when none are completed 1`] = `
         <View
           style={
             {
+              "alignItems": "stretch",
               "flexDirection": "column",
               "flexGrow": 1,
               "justifyContent": "space-between",
@@ -123,391 +127,378 @@ exports[`BackupScreen renders backup options when none are completed 1`] = `
           <View
             style={
               {
+                "alignItems": "stretch",
                 "flexDirection": "column",
-                "gap": 24,
+                "gap": 12,
               }
             }
           >
             <View
-              style={
+              accessibilityState={
                 {
-                  "flexDirection": "column",
-                  "gap": 12,
-                  "shadowColor": "rgb(34,34,34)",
-                  "shadowOffset": {
-                    "height": 0,
-                    "width": 0,
-                  },
-                  "shadowOpacity": 0.050980392156862744,
-                  "shadowRadius": 8,
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": undefined,
+                  "expanded": undefined,
+                  "selected": undefined,
                 }
               }
-            >
-              <View
-                accessibilityState={
-                  {
-                    "busy": undefined,
-                    "checked": undefined,
-                    "disabled": undefined,
-                    "expanded": undefined,
-                    "selected": undefined,
-                  }
+              accessibilityValue={
+                {
+                  "max": undefined,
+                  "min": undefined,
+                  "now": undefined,
+                  "text": undefined,
                 }
-                accessibilityValue={
-                  {
-                    "max": undefined,
-                    "min": undefined,
-                    "now": undefined,
-                    "text": undefined,
-                  }
+              }
+              accessible={true}
+              collapsable={false}
+              focusable={true}
+              hitSlop={
+                {
+                  "bottom": 5,
+                  "left": 5,
+                  "right": 5,
+                  "top": 5,
                 }
-                accessible={true}
-                collapsable={false}
-                focusable={true}
-                hitSlop={
-                  {
-                    "bottom": 5,
-                    "left": 5,
-                    "right": 5,
-                    "top": 5,
-                  }
+              }
+              onClick={[Function]}
+              onResponderGrant={[Function]}
+              onResponderMove={[Function]}
+              onResponderRelease={[Function]}
+              onResponderTerminate={[Function]}
+              onResponderTerminationRequest={[Function]}
+              onStartShouldSetResponder={[Function]}
+              style={
+                {
+                  "backgroundColor": "#F9F9F9",
+                  "borderBottomColor": "#2222220D",
+                  "borderBottomLeftRadius": 20,
+                  "borderBottomRightRadius": 20,
+                  "borderLeftColor": "#2222220D",
+                  "borderRightColor": "#2222220D",
+                  "borderStyle": "solid",
+                  "borderTopColor": "#2222220D",
+                  "borderTopLeftRadius": 20,
+                  "borderTopRightRadius": 20,
+                  "borderWidth": 1,
+                  "opacity": 1,
+                  "paddingBottom": 16,
+                  "paddingLeft": 16,
+                  "paddingRight": 16,
+                  "paddingTop": 16,
                 }
-                onClick={[Function]}
-                onResponderGrant={[Function]}
-                onResponderMove={[Function]}
-                onResponderRelease={[Function]}
-                onResponderTerminate={[Function]}
-                onResponderTerminationRequest={[Function]}
-                onStartShouldSetResponder={[Function]}
+              }
+              testID="add-cloud-backup"
+            >
+              <View
                 style={
                   {
-                    "backgroundColor": "#FFFFFF",
-                    "borderBottomColor": "#2222220D",
-                    "borderBottomLeftRadius": 20,
-                    "borderBottomRightRadius": 20,
-                    "borderLeftColor": "#2222220D",
-                    "borderRightColor": "#2222220D",
-                    "borderStyle": "solid",
-                    "borderTopColor": "#2222220D",
-                    "borderTopLeftRadius": 20,
-                    "borderTopRightRadius": 20,
-                    "borderWidth": 1,
-                    "opacity": 1,
-                    "paddingBottom": 16,
-                    "paddingLeft": 16,
-                    "paddingRight": 16,
-                    "paddingTop": 16,
+                    "alignContent": "center",
+                    "alignItems": "center",
+                    "flexDirection": "row",
+                    "gap": 16,
                   }
                 }
-                testID="add-cloud-backup"
               >
                 <View
                   style={
                     {
-                      "alignContent": "center",
-                      "alignItems": "flex-start",
-                      "flexDirection": "row",
-                      "gap": 16,
+                      "alignItems": "center",
+                      "backgroundColor": "#FC72FF1f",
+                      "borderBottomLeftRadius": 999999,
+                      "borderBottomRightRadius": 999999,
+                      "borderTopLeftRadius": 999999,
+                      "borderTopRightRadius": 999999,
+                      "flexDirection": "column",
+                      "height": 36,
+                      "justifyContent": "center",
+                      "paddingBottom": 16,
+                      "paddingLeft": 16,
+                      "paddingRight": 16,
+                      "paddingTop": 16,
+                      "width": 36,
                     }
                   }
                 >
-                  <View
+                  <RNSVGSvgView
+                    align="xMidYMid"
+                    bbHeight="16"
+                    bbWidth="16"
+                    fill="none"
+                    focusable={false}
+                    meetOrSlice={0}
+                    minX={0}
+                    minY={0}
+                    strokeWidth={8}
                     style={
-                      {
-                        "alignItems": "center",
-                        "backgroundColor": "#FC72FF1f",
-                        "borderBottomLeftRadius": 999999,
-                        "borderBottomRightRadius": 999999,
-                        "borderTopLeftRadius": 999999,
-                        "borderTopRightRadius": 999999,
-                        "flexDirection": "column",
-                        "height": 24,
-                        "justifyContent": "center",
-                        "paddingBottom": 16,
-                        "paddingLeft": 16,
-                        "paddingRight": 16,
-                        "paddingTop": 16,
-                        "width": 24,
-                      }
+                      [
+                        {
+                          "backgroundColor": "transparent",
+                          "borderWidth": 0,
+                        },
+                        {
+                          "color": "#FC72FF",
+                          "height": 16,
+                          "width": 16,
+                        },
+                        {
+                          "flex": 0,
+                          "height": 16,
+                          "width": 16,
+                        },
+                      ]
                     }
+                    tintColor="#FC72FF"
+                    vbHeight={24}
+                    vbWidth={24}
                   >
-                    <RNSVGSvgView
-                      align="xMidYMid"
-                      bbHeight="16"
-                      bbWidth="16"
-                      fill="none"
-                      focusable={false}
-                      meetOrSlice={0}
-                      minX={0}
-                      minY={0}
-                      strokeWidth={8}
-                      style={
+                    <RNSVGGroup
+                      fill={null}
+                      propList={
                         [
-                          {
-                            "backgroundColor": "transparent",
-                            "borderWidth": 0,
-                          },
-                          {
-                            "color": "#FC72FF",
-                            "height": 16,
-                            "width": 16,
-                          },
-                          {
-                            "flex": 0,
-                            "height": 16,
-                            "width": 16,
-                          },
+                          "fill",
+                          "strokeWidth",
                         ]
                       }
-                      tintColor="#FC72FF"
-                      vbHeight={24}
-                      vbWidth={24}
+                      strokeWidth="8"
                     >
-                      <RNSVGGroup
-                        fill={null}
+                      <RNSVGPath
+                        d="M15.03 9.09003C15.35 9.03003 15.67 9 16 9C18.76 9 21 11.24 21 14C21 16.76 18.76 19 16 19H9.5C5.91 19 3 16.09 3 12.5C3 8.91 5.91 6 9.5 6C11.146 6 12.648 6.61297 13.792 7.62097C14.274 8.04597 14.692 8.54103 15.03 9.09003Z"
+                        fill={
+                          {
+                            "type": 2,
+                          }
+                        }
                         propList={
                           [
                             "fill",
-                            "strokeWidth",
                           ]
                         }
-                        strokeWidth="8"
-                      >
-                        <RNSVGPath
-                          d="M15.03 9.09003C15.35 9.03003 15.67 9 16 9C18.76 9 21 11.24 21 14C21 16.76 18.76 19 16 19H9.5C5.91 19 3 16.09 3 12.5C3 8.91 5.91 6 9.5 6C11.146 6 12.648 6.61297 13.792 7.62097C14.274 8.04597 14.692 8.54103 15.03 9.09003Z"
-                          fill={
-                            {
-                              "type": 2,
-                            }
-                          }
-                          propList={
-                            [
-                              "fill",
-                            ]
-                          }
-                        />
-                      </RNSVGGroup>
-                    </RNSVGSvgView>
-                  </View>
+                      />
+                    </RNSVGGroup>
+                  </RNSVGSvgView>
+                </View>
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
+                      "flexDirection": "row",
+                      "gap": 4,
+                      "paddingRight": 60,
+                    }
+                  }
+                >
                   <View
                     style={
                       {
-                        "alignItems": "center",
-                        "flexDirection": "row",
+                        "alignItems": "flex-start",
+                        "flex": 1,
+                        "flexDirection": "column",
                         "gap": 4,
-                        "paddingRight": 60,
+                        "justifyContent": "space-around",
                       }
                     }
                   >
                     <View
                       style={
                         {
-                          "alignItems": "flex-start",
-                          "flex": 1,
-                          "flexDirection": "column",
-                          "gap": 4,
-                          "justifyContent": "space-around",
+                          "alignItems": "stretch",
+                          "flexDirection": "row",
+                          "gap": 8,
                         }
                       }
                     >
-                      <View
-                        style={
-                          {
-                            "flexDirection": "row",
-                            "gap": 8,
-                          }
-                        }
-                      >
-                        <Text
-                          allowFontScaling={false}
-                          maxFontSizeMultiplier={1.4}
-                          style={
-                            {
-                              "color": "#222222",
-                              "fontFamily": "Basel-Book",
-                              "fontSize": 17,
-                              "lineHeight": 24,
-                            }
-                          }
-                          suppressHighlighting={true}
-                        >
-                          iCloud backup
-                        </Text>
-                      </View>
                       <Text
                         allowFontScaling={false}
                         maxFontSizeMultiplier={1.4}
                         style={
                           {
-                            "color": "#7D7D7D",
+                            "color": "#222222",
                             "fontFamily": "Basel-Book",
-                            "fontSize": 15,
-                            "lineHeight": 20,
+                            "fontSize": 19,
+                            "lineHeight": 24,
                           }
                         }
                         suppressHighlighting={true}
                       >
-                        Encrypt your recovery phrase with a secure password
+                        iCloud backup
                       </Text>
                     </View>
+                    <Text
+                      allowFontScaling={false}
+                      maxFontSizeMultiplier={1.4}
+                      style={
+                        {
+                          "color": "#7D7D7D",
+                          "fontFamily": "Basel-Book",
+                          "fontSize": 17,
+                          "lineHeight": 24,
+                        }
+                      }
+                      suppressHighlighting={true}
+                    >
+                      Encrypt your recovery phrase with a secure password
+                    </Text>
                   </View>
                 </View>
               </View>
-              <View
-                accessibilityState={
-                  {
-                    "busy": undefined,
-                    "checked": undefined,
-                    "disabled": undefined,
-                    "expanded": undefined,
-                    "selected": undefined,
-                  }
+            </View>
+            <View
+              accessibilityState={
+                {
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": undefined,
+                  "expanded": undefined,
+                  "selected": undefined,
                 }
-                accessibilityValue={
-                  {
-                    "max": undefined,
-                    "min": undefined,
-                    "now": undefined,
-                    "text": undefined,
-                  }
+              }
+              accessibilityValue={
+                {
+                  "max": undefined,
+                  "min": undefined,
+                  "now": undefined,
+                  "text": undefined,
                 }
-                accessible={true}
-                collapsable={false}
-                focusable={true}
-                hitSlop={
-                  {
-                    "bottom": 5,
-                    "left": 5,
-                    "right": 5,
-                    "top": 5,
-                  }
+              }
+              accessible={true}
+              collapsable={false}
+              focusable={true}
+              hitSlop={
+                {
+                  "bottom": 5,
+                  "left": 5,
+                  "right": 5,
+                  "top": 5,
+                }
+              }
+              onClick={[Function]}
+              onResponderGrant={[Function]}
+              onResponderMove={[Function]}
+              onResponderRelease={[Function]}
+              onResponderTerminate={[Function]}
+              onResponderTerminationRequest={[Function]}
+              onStartShouldSetResponder={[Function]}
+              style={
+                {
+                  "backgroundColor": "#F9F9F9",
+                  "borderBottomColor": "#2222220D",
+                  "borderBottomLeftRadius": 20,
+                  "borderBottomRightRadius": 20,
+                  "borderLeftColor": "#2222220D",
+                  "borderRightColor": "#2222220D",
+                  "borderStyle": "solid",
+                  "borderTopColor": "#2222220D",
+                  "borderTopLeftRadius": 20,
+                  "borderTopRightRadius": 20,
+                  "borderWidth": 1,
+                  "opacity": 1,
+                  "paddingBottom": 16,
+                  "paddingLeft": 16,
+                  "paddingRight": 16,
+                  "paddingTop": 16,
                 }
-                onClick={[Function]}
-                onResponderGrant={[Function]}
-                onResponderMove={[Function]}
-                onResponderRelease={[Function]}
-                onResponderTerminate={[Function]}
-                onResponderTerminationRequest={[Function]}
-                onStartShouldSetResponder={[Function]}
+              }
+              testID="add-manual-backup"
+            >
+              <View
                 style={
                   {
-                    "backgroundColor": "#FFFFFF",
-                    "borderBottomColor": "#2222220D",
-                    "borderBottomLeftRadius": 20,
-                    "borderBottomRightRadius": 20,
-                    "borderLeftColor": "#2222220D",
-                    "borderRightColor": "#2222220D",
-                    "borderStyle": "solid",
-                    "borderTopColor": "#2222220D",
-                    "borderTopLeftRadius": 20,
-                    "borderTopRightRadius": 20,
-                    "borderWidth": 1,
-                    "opacity": 1,
-                    "paddingBottom": 16,
-                    "paddingLeft": 16,
-                    "paddingRight": 16,
-                    "paddingTop": 16,
+                    "alignContent": "center",
+                    "alignItems": "center",
+                    "flexDirection": "row",
+                    "gap": 16,
                   }
                 }
-                testID="add-manual-backup"
               >
                 <View
                   style={
                     {
-                      "alignContent": "center",
-                      "alignItems": "flex-start",
+                      "alignItems": "center",
+                      "backgroundColor": "#FC72FF1f",
+                      "borderBottomLeftRadius": 999999,
+                      "borderBottomRightRadius": 999999,
+                      "borderTopLeftRadius": 999999,
+                      "borderTopRightRadius": 999999,
+                      "flexDirection": "column",
+                      "height": 36,
+                      "justifyContent": "center",
+                      "paddingBottom": 16,
+                      "paddingLeft": 16,
+                      "paddingRight": 16,
+                      "paddingTop": 16,
+                      "width": 36,
+                    }
+                  }
+                >
+                  <svg
+                    color="#FC72FF"
+                    data-file-name="SvgPaperStack"
+                    height={16}
+                  />
+                </View>
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
                       "flexDirection": "row",
-                      "gap": 16,
+                      "gap": 4,
+                      "paddingRight": 60,
                     }
                   }
                 >
                   <View
                     style={
                       {
-                        "alignItems": "center",
-                        "backgroundColor": "#FC72FF1f",
-                        "borderBottomLeftRadius": 999999,
-                        "borderBottomRightRadius": 999999,
-                        "borderTopLeftRadius": 999999,
-                        "borderTopRightRadius": 999999,
+                        "alignItems": "flex-start",
+                        "flex": 1,
                         "flexDirection": "column",
-                        "height": 24,
-                        "justifyContent": "center",
-                        "paddingBottom": 16,
-                        "paddingLeft": 16,
-                        "paddingRight": 16,
-                        "paddingTop": 16,
-                        "width": 24,
-                      }
-                    }
-                  >
-                    <svg
-                      color="#FC72FF"
-                      data-file-name="SvgPaperStack"
-                      height={16}
-                    />
-                  </View>
-                  <View
-                    style={
-                      {
-                        "alignItems": "center",
-                        "flexDirection": "row",
                         "gap": 4,
-                        "paddingRight": 60,
+                        "justifyContent": "space-around",
                       }
                     }
                   >
                     <View
                       style={
                         {
-                          "alignItems": "flex-start",
-                          "flex": 1,
-                          "flexDirection": "column",
-                          "gap": 4,
-                          "justifyContent": "space-around",
+                          "alignItems": "stretch",
+                          "flexDirection": "row",
+                          "gap": 8,
                         }
                       }
                     >
-                      <View
-                        style={
-                          {
-                            "flexDirection": "row",
-                            "gap": 8,
-                          }
-                        }
-                      >
-                        <Text
-                          allowFontScaling={false}
-                          maxFontSizeMultiplier={1.4}
-                          style={
-                            {
-                              "color": "#222222",
-                              "fontFamily": "Basel-Book",
-                              "fontSize": 17,
-                              "lineHeight": 24,
-                            }
-                          }
-                          suppressHighlighting={true}
-                        >
-                          Manual backup
-                        </Text>
-                      </View>
                       <Text
                         allowFontScaling={false}
                         maxFontSizeMultiplier={1.4}
                         style={
                           {
-                            "color": "#7D7D7D",
+                            "color": "#222222",
                             "fontFamily": "Basel-Book",
-                            "fontSize": 15,
-                            "lineHeight": 20,
+                            "fontSize": 19,
+                            "lineHeight": 24,
                           }
                         }
                         suppressHighlighting={true}
                       >
-                        Write your recovery phrase down and store it in a safe location
+                        Manual backup
                       </Text>
                     </View>
+                    <Text
+                      allowFontScaling={false}
+                      maxFontSizeMultiplier={1.4}
+                      style={
+                        {
+                          "color": "#7D7D7D",
+                          "fontFamily": "Basel-Book",
+                          "fontSize": 17,
+                          "lineHeight": 24,
+                        }
+                      }
+                      suppressHighlighting={true}
+                    >
+                      Save your recovery phrase in a safe location
+                    </Text>
                   </View>
                 </View>
               </View>
@@ -516,6 +507,7 @@ exports[`BackupScreen renders backup options when none are completed 1`] = `
           <View
             style={
               {
+                "alignItems": "stretch",
                 "flexDirection": "column",
                 "gap": 12,
                 "justifyContent": "flex-end",
@@ -560,154 +552,28 @@ exports[`BackupScreen renders backup options when none are completed 1`] = `
               onStartShouldSetResponder={[Function]}
               style={
                 {
-                  "alignItems": "center",
                   "alignSelf": "center",
-                  "flexDirection": "row",
-                  "gap": 8,
                   "opacity": 1,
                   "paddingBottom": 8,
                   "paddingTop": 8,
                 }
               }
             >
-              <RNSVGSvgView
-                align="xMidYMid"
-                bbHeight="20"
-                bbWidth="20"
-                fill="#CECECE"
-                focusable={false}
-                meetOrSlice={0}
-                minX={0}
-                minY={0}
-                strokeWidth={8}
-                style={
-                  [
-                    {
-                      "backgroundColor": "transparent",
-                      "borderWidth": 0,
-                    },
-                    {
-                      "color": "#FFFFFF",
-                      "height": 20,
-                      "width": 20,
-                    },
-                    {
-                      "flex": 0,
-                      "height": 20,
-                      "width": 20,
-                    },
-                  ]
-                }
-                tintColor="#FFFFFF"
-                vbHeight={24}
-                vbWidth={24}
-              >
-                <RNSVGGroup
-                  fill={
-                    {
-                      "payload": 4291743438,
-                      "type": 0,
-                    }
-                  }
-                  propList={
-                    [
-                      "fill",
-                      "strokeWidth",
-                    ]
-                  }
-                  strokeWidth="8"
-                >
-                  <RNSVGPath
-                    d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z"
-                    fill={
-                      {
-                        "payload": 4278190080,
-                        "type": 0,
-                      }
-                    }
-                    propList={
-                      [
-                        "stroke",
-                        "strokeWidth",
-                        "strokeLinecap",
-                        "strokeLinejoin",
-                      ]
-                    }
-                    stroke={
-                      {
-                        "type": 2,
-                      }
-                    }
-                    strokeLinecap={1}
-                    strokeLinejoin={1}
-                    strokeWidth="1.5"
-                  />
-                  <RNSVGPath
-                    d="M9.08997 9.00001C9.32507 8.33167 9.78912 7.76811 10.3999 7.40914C11.0107 7.05016 11.7289 6.91894 12.4271 7.03872C13.1254 7.15849 13.7588 7.52153 14.215 8.06353C14.6713 8.60554 14.921 9.29153 14.92 10C14.92 12 11.92 13 11.92 13"
-                    fill={
-                      {
-                        "payload": 4278190080,
-                        "type": 0,
-                      }
-                    }
-                    propList={
-                      [
-                        "stroke",
-                        "strokeWidth",
-                        "strokeLinecap",
-                        "strokeLinejoin",
-                      ]
-                    }
-                    stroke={
-                      {
-                        "type": 2,
-                      }
-                    }
-                    strokeLinecap={1}
-                    strokeLinejoin={1}
-                    strokeWidth="1.5"
-                  />
-                  <RNSVGPath
-                    d="M12 17H12.01"
-                    fill={
-                      {
-                        "payload": 4278190080,
-                        "type": 0,
-                      }
-                    }
-                    propList={
-                      [
-                        "stroke",
-                        "strokeWidth",
-                        "strokeLinecap",
-                        "strokeLinejoin",
-                      ]
-                    }
-                    stroke={
-                      {
-                        "type": 2,
-                      }
-                    }
-                    strokeLinecap={1}
-                    strokeLinejoin={1}
-                    strokeWidth="1.5"
-                  />
-                </RNSVGGroup>
-              </RNSVGSvgView>
               <Text
                 allowFontScaling={true}
-                maxFontSizeMultiplier={1.4}
+                maxFontSizeMultiplier={1.2}
                 style={
                   {
-                    "color": "#CECECE",
-                    "fontFamily": "Basel-Book",
+                    "color": "#7D7D7D",
+                    "fontFamily": "Basel-Medium",
                     "fontSize": 17,
+                    "fontWeight": "500",
                     "lineHeight": 24,
                   }
                 }
                 suppressHighlighting={true}
               >
-                What is a recovery phrase?
+                Learn more
               </Text>
             </View>
           </View>
@@ -723,6 +589,7 @@ exports[`BackupScreen renders backup options when some are completed 1`] = `
   sentry-label="Screen"
   style={
     {
+      "alignItems": "stretch",
       "backgroundColor": "#FFFFFF",
       "flex": 1,
       "flexDirection": "column",
@@ -762,6 +629,7 @@ exports[`BackupScreen renders backup options when some are completed 1`] = `
       exiting={[Function]}
       style={
         {
+          "alignItems": "stretch",
           "flexDirection": "column",
           "flexGrow": 1,
           "gap": 16,
@@ -800,7 +668,7 @@ exports[`BackupScreen renders backup options when some are completed 1`] = `
           }
           suppressHighlighting={true}
         >
-          Choose a backup method
+          Choose a backup for your wallet
         </Text>
         <Text
           allowFontScaling={true}
@@ -822,6 +690,7 @@ exports[`BackupScreen renders backup options when some are completed 1`] = `
       <View
         style={
           {
+            "alignItems": "stretch",
             "flex": 1,
             "flexDirection": "column",
             "flexGrow": 1,
@@ -832,6 +701,7 @@ exports[`BackupScreen renders backup options when some are completed 1`] = `
         <View
           style={
             {
+              "alignItems": "stretch",
               "flexDirection": "column",
               "flexGrow": 1,
               "justifyContent": "space-between",
@@ -841,391 +711,378 @@ exports[`BackupScreen renders backup options when some are completed 1`] = `
           <View
             style={
               {
+                "alignItems": "stretch",
                 "flexDirection": "column",
-                "gap": 24,
+                "gap": 12,
               }
             }
           >
             <View
-              style={
+              accessibilityState={
                 {
-                  "flexDirection": "column",
-                  "gap": 12,
-                  "shadowColor": "rgb(34,34,34)",
-                  "shadowOffset": {
-                    "height": 0,
-                    "width": 0,
-                  },
-                  "shadowOpacity": 0.050980392156862744,
-                  "shadowRadius": 8,
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": true,
+                  "expanded": undefined,
+                  "selected": undefined,
                 }
               }
-            >
-              <View
-                accessibilityState={
-                  {
-                    "busy": undefined,
-                    "checked": undefined,
-                    "disabled": true,
-                    "expanded": undefined,
-                    "selected": undefined,
-                  }
+              accessibilityValue={
+                {
+                  "max": undefined,
+                  "min": undefined,
+                  "now": undefined,
+                  "text": undefined,
                 }
-                accessibilityValue={
-                  {
-                    "max": undefined,
-                    "min": undefined,
-                    "now": undefined,
-                    "text": undefined,
-                  }
+              }
+              accessible={true}
+              collapsable={false}
+              focusable={true}
+              hitSlop={
+                {
+                  "bottom": 5,
+                  "left": 5,
+                  "right": 5,
+                  "top": 5,
                 }
-                accessible={true}
-                collapsable={false}
-                focusable={true}
-                hitSlop={
-                  {
-                    "bottom": 5,
-                    "left": 5,
-                    "right": 5,
-                    "top": 5,
-                  }
+              }
+              onClick={[Function]}
+              onResponderGrant={[Function]}
+              onResponderMove={[Function]}
+              onResponderRelease={[Function]}
+              onResponderTerminate={[Function]}
+              onResponderTerminationRequest={[Function]}
+              onStartShouldSetResponder={[Function]}
+              style={
+                {
+                  "backgroundColor": "#F9F9F9",
+                  "borderBottomColor": "#2222220D",
+                  "borderBottomLeftRadius": 20,
+                  "borderBottomRightRadius": 20,
+                  "borderLeftColor": "#2222220D",
+                  "borderRightColor": "#2222220D",
+                  "borderStyle": "solid",
+                  "borderTopColor": "#2222220D",
+                  "borderTopLeftRadius": 20,
+                  "borderTopRightRadius": 20,
+                  "borderWidth": 1,
+                  "opacity": 0.5,
+                  "paddingBottom": 16,
+                  "paddingLeft": 16,
+                  "paddingRight": 16,
+                  "paddingTop": 16,
                 }
-                onClick={[Function]}
-                onResponderGrant={[Function]}
-                onResponderMove={[Function]}
-                onResponderRelease={[Function]}
-                onResponderTerminate={[Function]}
-                onResponderTerminationRequest={[Function]}
-                onStartShouldSetResponder={[Function]}
+              }
+              testID="add-cloud-backup"
+            >
+              <View
                 style={
                   {
-                    "backgroundColor": "#FFFFFF",
-                    "borderBottomColor": "#2222220D",
-                    "borderBottomLeftRadius": 20,
-                    "borderBottomRightRadius": 20,
-                    "borderLeftColor": "#2222220D",
-                    "borderRightColor": "#2222220D",
-                    "borderStyle": "solid",
-                    "borderTopColor": "#2222220D",
-                    "borderTopLeftRadius": 20,
-                    "borderTopRightRadius": 20,
-                    "borderWidth": 1,
-                    "opacity": 0.5,
-                    "paddingBottom": 16,
-                    "paddingLeft": 16,
-                    "paddingRight": 16,
-                    "paddingTop": 16,
+                    "alignContent": "center",
+                    "alignItems": "center",
+                    "flexDirection": "row",
+                    "gap": 16,
                   }
                 }
-                testID="add-cloud-backup"
               >
                 <View
                   style={
                     {
-                      "alignContent": "center",
-                      "alignItems": "flex-start",
-                      "flexDirection": "row",
-                      "gap": 16,
+                      "alignItems": "center",
+                      "backgroundColor": "#FC72FF1f",
+                      "borderBottomLeftRadius": 999999,
+                      "borderBottomRightRadius": 999999,
+                      "borderTopLeftRadius": 999999,
+                      "borderTopRightRadius": 999999,
+                      "flexDirection": "column",
+                      "height": 36,
+                      "justifyContent": "center",
+                      "paddingBottom": 16,
+                      "paddingLeft": 16,
+                      "paddingRight": 16,
+                      "paddingTop": 16,
+                      "width": 36,
                     }
                   }
                 >
-                  <View
+                  <RNSVGSvgView
+                    align="xMidYMid"
+                    bbHeight="16"
+                    bbWidth="16"
+                    fill="none"
+                    focusable={false}
+                    meetOrSlice={0}
+                    minX={0}
+                    minY={0}
+                    strokeWidth={8}
                     style={
-                      {
-                        "alignItems": "center",
-                        "backgroundColor": "#FC72FF1f",
-                        "borderBottomLeftRadius": 999999,
-                        "borderBottomRightRadius": 999999,
-                        "borderTopLeftRadius": 999999,
-                        "borderTopRightRadius": 999999,
-                        "flexDirection": "column",
-                        "height": 24,
-                        "justifyContent": "center",
-                        "paddingBottom": 16,
-                        "paddingLeft": 16,
-                        "paddingRight": 16,
-                        "paddingTop": 16,
-                        "width": 24,
-                      }
+                      [
+                        {
+                          "backgroundColor": "transparent",
+                          "borderWidth": 0,
+                        },
+                        {
+                          "color": "#FC72FF",
+                          "height": 16,
+                          "width": 16,
+                        },
+                        {
+                          "flex": 0,
+                          "height": 16,
+                          "width": 16,
+                        },
+                      ]
                     }
+                    tintColor="#FC72FF"
+                    vbHeight={24}
+                    vbWidth={24}
                   >
-                    <RNSVGSvgView
-                      align="xMidYMid"
-                      bbHeight="16"
-                      bbWidth="16"
-                      fill="none"
-                      focusable={false}
-                      meetOrSlice={0}
-                      minX={0}
-                      minY={0}
-                      strokeWidth={8}
-                      style={
+                    <RNSVGGroup
+                      fill={null}
+                      propList={
                         [
-                          {
-                            "backgroundColor": "transparent",
-                            "borderWidth": 0,
-                          },
-                          {
-                            "color": "#FC72FF",
-                            "height": 16,
-                            "width": 16,
-                          },
-                          {
-                            "flex": 0,
-                            "height": 16,
-                            "width": 16,
-                          },
+                          "fill",
+                          "strokeWidth",
                         ]
                       }
-                      tintColor="#FC72FF"
-                      vbHeight={24}
-                      vbWidth={24}
+                      strokeWidth="8"
                     >
-                      <RNSVGGroup
-                        fill={null}
+                      <RNSVGPath
+                        d="M15.03 9.09003C15.35 9.03003 15.67 9 16 9C18.76 9 21 11.24 21 14C21 16.76 18.76 19 16 19H9.5C5.91 19 3 16.09 3 12.5C3 8.91 5.91 6 9.5 6C11.146 6 12.648 6.61297 13.792 7.62097C14.274 8.04597 14.692 8.54103 15.03 9.09003Z"
+                        fill={
+                          {
+                            "type": 2,
+                          }
+                        }
                         propList={
                           [
                             "fill",
-                            "strokeWidth",
                           ]
                         }
-                        strokeWidth="8"
-                      >
-                        <RNSVGPath
-                          d="M15.03 9.09003C15.35 9.03003 15.67 9 16 9C18.76 9 21 11.24 21 14C21 16.76 18.76 19 16 19H9.5C5.91 19 3 16.09 3 12.5C3 8.91 5.91 6 9.5 6C11.146 6 12.648 6.61297 13.792 7.62097C14.274 8.04597 14.692 8.54103 15.03 9.09003Z"
-                          fill={
-                            {
-                              "type": 2,
-                            }
-                          }
-                          propList={
-                            [
-                              "fill",
-                            ]
-                          }
-                        />
-                      </RNSVGGroup>
-                    </RNSVGSvgView>
-                  </View>
+                      />
+                    </RNSVGGroup>
+                  </RNSVGSvgView>
+                </View>
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
+                      "flexDirection": "row",
+                      "gap": 4,
+                      "paddingRight": 60,
+                    }
+                  }
+                >
                   <View
                     style={
                       {
-                        "alignItems": "center",
-                        "flexDirection": "row",
+                        "alignItems": "flex-start",
+                        "flex": 1,
+                        "flexDirection": "column",
                         "gap": 4,
-                        "paddingRight": 60,
+                        "justifyContent": "space-around",
                       }
                     }
                   >
                     <View
                       style={
                         {
-                          "alignItems": "flex-start",
-                          "flex": 1,
-                          "flexDirection": "column",
-                          "gap": 4,
-                          "justifyContent": "space-around",
+                          "alignItems": "stretch",
+                          "flexDirection": "row",
+                          "gap": 8,
                         }
                       }
                     >
-                      <View
-                        style={
-                          {
-                            "flexDirection": "row",
-                            "gap": 8,
-                          }
-                        }
-                      >
-                        <Text
-                          allowFontScaling={false}
-                          maxFontSizeMultiplier={1.4}
-                          style={
-                            {
-                              "color": "#222222",
-                              "fontFamily": "Basel-Book",
-                              "fontSize": 17,
-                              "lineHeight": 24,
-                            }
-                          }
-                          suppressHighlighting={true}
-                        >
-                          iCloud backup
-                        </Text>
-                      </View>
                       <Text
                         allowFontScaling={false}
                         maxFontSizeMultiplier={1.4}
                         style={
                           {
-                            "color": "#7D7D7D",
+                            "color": "#222222",
                             "fontFamily": "Basel-Book",
-                            "fontSize": 15,
-                            "lineHeight": 20,
+                            "fontSize": 19,
+                            "lineHeight": 24,
                           }
                         }
                         suppressHighlighting={true}
                       >
-                        Encrypt your recovery phrase with a secure password
+                        iCloud backup
                       </Text>
                     </View>
+                    <Text
+                      allowFontScaling={false}
+                      maxFontSizeMultiplier={1.4}
+                      style={
+                        {
+                          "color": "#7D7D7D",
+                          "fontFamily": "Basel-Book",
+                          "fontSize": 17,
+                          "lineHeight": 24,
+                        }
+                      }
+                      suppressHighlighting={true}
+                    >
+                      Encrypt your recovery phrase with a secure password
+                    </Text>
                   </View>
                 </View>
               </View>
-              <View
-                accessibilityState={
-                  {
-                    "busy": undefined,
-                    "checked": undefined,
-                    "disabled": false,
-                    "expanded": undefined,
-                    "selected": undefined,
-                  }
+            </View>
+            <View
+              accessibilityState={
+                {
+                  "busy": undefined,
+                  "checked": undefined,
+                  "disabled": false,
+                  "expanded": undefined,
+                  "selected": undefined,
                 }
-                accessibilityValue={
-                  {
-                    "max": undefined,
-                    "min": undefined,
-                    "now": undefined,
-                    "text": undefined,
-                  }
+              }
+              accessibilityValue={
+                {
+                  "max": undefined,
+                  "min": undefined,
+                  "now": undefined,
+                  "text": undefined,
                 }
-                accessible={true}
-                collapsable={false}
-                focusable={true}
-                hitSlop={
-                  {
-                    "bottom": 5,
-                    "left": 5,
-                    "right": 5,
-                    "top": 5,
-                  }
+              }
+              accessible={true}
+              collapsable={false}
+              focusable={true}
+              hitSlop={
+                {
+                  "bottom": 5,
+                  "left": 5,
+                  "right": 5,
+                  "top": 5,
+                }
+              }
+              onClick={[Function]}
+              onResponderGrant={[Function]}
+              onResponderMove={[Function]}
+              onResponderRelease={[Function]}
+              onResponderTerminate={[Function]}
+              onResponderTerminationRequest={[Function]}
+              onStartShouldSetResponder={[Function]}
+              style={
+                {
+                  "backgroundColor": "#F9F9F9",
+                  "borderBottomColor": "#2222220D",
+                  "borderBottomLeftRadius": 20,
+                  "borderBottomRightRadius": 20,
+                  "borderLeftColor": "#2222220D",
+                  "borderRightColor": "#2222220D",
+                  "borderStyle": "solid",
+                  "borderTopColor": "#2222220D",
+                  "borderTopLeftRadius": 20,
+                  "borderTopRightRadius": 20,
+                  "borderWidth": 1,
+                  "opacity": 1,
+                  "paddingBottom": 16,
+                  "paddingLeft": 16,
+                  "paddingRight": 16,
+                  "paddingTop": 16,
                 }
-                onClick={[Function]}
-                onResponderGrant={[Function]}
-                onResponderMove={[Function]}
-                onResponderRelease={[Function]}
-                onResponderTerminate={[Function]}
-                onResponderTerminationRequest={[Function]}
-                onStartShouldSetResponder={[Function]}
+              }
+              testID="add-manual-backup"
+            >
+              <View
                 style={
                   {
-                    "backgroundColor": "#FFFFFF",
-                    "borderBottomColor": "#2222220D",
-                    "borderBottomLeftRadius": 20,
-                    "borderBottomRightRadius": 20,
-                    "borderLeftColor": "#2222220D",
-                    "borderRightColor": "#2222220D",
-                    "borderStyle": "solid",
-                    "borderTopColor": "#2222220D",
-                    "borderTopLeftRadius": 20,
-                    "borderTopRightRadius": 20,
-                    "borderWidth": 1,
-                    "opacity": 1,
-                    "paddingBottom": 16,
-                    "paddingLeft": 16,
-                    "paddingRight": 16,
-                    "paddingTop": 16,
+                    "alignContent": "center",
+                    "alignItems": "center",
+                    "flexDirection": "row",
+                    "gap": 16,
                   }
                 }
-                testID="add-manual-backup"
               >
                 <View
                   style={
                     {
-                      "alignContent": "center",
-                      "alignItems": "flex-start",
+                      "alignItems": "center",
+                      "backgroundColor": "#FC72FF1f",
+                      "borderBottomLeftRadius": 999999,
+                      "borderBottomRightRadius": 999999,
+                      "borderTopLeftRadius": 999999,
+                      "borderTopRightRadius": 999999,
+                      "flexDirection": "column",
+                      "height": 36,
+                      "justifyContent": "center",
+                      "paddingBottom": 16,
+                      "paddingLeft": 16,
+                      "paddingRight": 16,
+                      "paddingTop": 16,
+                      "width": 36,
+                    }
+                  }
+                >
+                  <svg
+                    color="#FC72FF"
+                    data-file-name="SvgPaperStack"
+                    height={16}
+                  />
+                </View>
+                <View
+                  style={
+                    {
+                      "alignItems": "center",
                       "flexDirection": "row",
-                      "gap": 16,
+                      "gap": 4,
+                      "paddingRight": 60,
                     }
                   }
                 >
                   <View
                     style={
                       {
-                        "alignItems": "center",
-                        "backgroundColor": "#FC72FF1f",
-                        "borderBottomLeftRadius": 999999,
-                        "borderBottomRightRadius": 999999,
-                        "borderTopLeftRadius": 999999,
-                        "borderTopRightRadius": 999999,
+                        "alignItems": "flex-start",
+                        "flex": 1,
                         "flexDirection": "column",
-                        "height": 24,
-                        "justifyContent": "center",
-                        "paddingBottom": 16,
-                        "paddingLeft": 16,
-                        "paddingRight": 16,
-                        "paddingTop": 16,
-                        "width": 24,
-                      }
-                    }
-                  >
-                    <svg
-                      color="#FC72FF"
-                      data-file-name="SvgPaperStack"
-                      height={16}
-                    />
-                  </View>
-                  <View
-                    style={
-                      {
-                        "alignItems": "center",
-                        "flexDirection": "row",
                         "gap": 4,
-                        "paddingRight": 60,
+                        "justifyContent": "space-around",
                       }
                     }
                   >
                     <View
                       style={
                         {
-                          "alignItems": "flex-start",
-                          "flex": 1,
-                          "flexDirection": "column",
-                          "gap": 4,
-                          "justifyContent": "space-around",
+                          "alignItems": "stretch",
+                          "flexDirection": "row",
+                          "gap": 8,
                         }
                       }
                     >
-                      <View
-                        style={
-                          {
-                            "flexDirection": "row",
-                            "gap": 8,
-                          }
-                        }
-                      >
-                        <Text
-                          allowFontScaling={false}
-                          maxFontSizeMultiplier={1.4}
-                          style={
-                            {
-                              "color": "#222222",
-                              "fontFamily": "Basel-Book",
-                              "fontSize": 17,
-                              "lineHeight": 24,
-                            }
-                          }
-                          suppressHighlighting={true}
-                        >
-                          Manual backup
-                        </Text>
-                      </View>
                       <Text
                         allowFontScaling={false}
                         maxFontSizeMultiplier={1.4}
                         style={
                           {
-                            "color": "#7D7D7D",
+                            "color": "#222222",
                             "fontFamily": "Basel-Book",
-                            "fontSize": 15,
-                            "lineHeight": 20,
+                            "fontSize": 19,
+                            "lineHeight": 24,
                           }
                         }
                         suppressHighlighting={true}
                       >
-                        Write your recovery phrase down and store it in a safe location
+                        Manual backup
                       </Text>
                     </View>
+                    <Text
+                      allowFontScaling={false}
+                      maxFontSizeMultiplier={1.4}
+                      style={
+                        {
+                          "color": "#7D7D7D",
+                          "fontFamily": "Basel-Book",
+                          "fontSize": 17,
+                          "lineHeight": 24,
+                        }
+                      }
+                      suppressHighlighting={true}
+                    >
+                      Save your recovery phrase in a safe location
+                    </Text>
                   </View>
                 </View>
               </View>
@@ -1234,6 +1091,7 @@ exports[`BackupScreen renders backup options when some are completed 1`] = `
           <View
             style={
               {
+                "alignItems": "stretch",
                 "flexDirection": "column",
                 "gap": 12,
                 "justifyContent": "flex-end",
@@ -1278,154 +1136,28 @@ exports[`BackupScreen renders backup options when some are completed 1`] = `
               onStartShouldSetResponder={[Function]}
               style={
                 {
-                  "alignItems": "center",
                   "alignSelf": "center",
-                  "flexDirection": "row",
-                  "gap": 8,
                   "opacity": 1,
                   "paddingBottom": 8,
                   "paddingTop": 8,
                 }
               }
             >
-              <RNSVGSvgView
-                align="xMidYMid"
-                bbHeight="20"
-                bbWidth="20"
-                fill="#CECECE"
-                focusable={false}
-                meetOrSlice={0}
-                minX={0}
-                minY={0}
-                strokeWidth={8}
-                style={
-                  [
-                    {
-                      "backgroundColor": "transparent",
-                      "borderWidth": 0,
-                    },
-                    {
-                      "color": "#FFFFFF",
-                      "height": 20,
-                      "width": 20,
-                    },
-                    {
-                      "flex": 0,
-                      "height": 20,
-                      "width": 20,
-                    },
-                  ]
-                }
-                tintColor="#FFFFFF"
-                vbHeight={24}
-                vbWidth={24}
-              >
-                <RNSVGGroup
-                  fill={
-                    {
-                      "payload": 4291743438,
-                      "type": 0,
-                    }
-                  }
-                  propList={
-                    [
-                      "fill",
-                      "strokeWidth",
-                    ]
-                  }
-                  strokeWidth="8"
-                >
-                  <RNSVGPath
-                    d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z"
-                    fill={
-                      {
-                        "payload": 4278190080,
-                        "type": 0,
-                      }
-                    }
-                    propList={
-                      [
-                        "stroke",
-                        "strokeWidth",
-                        "strokeLinecap",
-                        "strokeLinejoin",
-                      ]
-                    }
-                    stroke={
-                      {
-                        "type": 2,
-                      }
-                    }
-                    strokeLinecap={1}
-                    strokeLinejoin={1}
-                    strokeWidth="1.5"
-                  />
-                  <RNSVGPath
-                    d="M9.08997 9.00001C9.32507 8.33167 9.78912 7.76811 10.3999 7.40914C11.0107 7.05016 11.7289 6.91894 12.4271 7.03872C13.1254 7.15849 13.7588 7.52153 14.215 8.06353C14.6713 8.60554 14.921 9.29153 14.92 10C14.92 12 11.92 13 11.92 13"
-                    fill={
-                      {
-                        "payload": 4278190080,
-                        "type": 0,
-                      }
-                    }
-                    propList={
-                      [
-                        "stroke",
-                        "strokeWidth",
-                        "strokeLinecap",
-                        "strokeLinejoin",
-                      ]
-                    }
-                    stroke={
-                      {
-                        "type": 2,
-                      }
-                    }
-                    strokeLinecap={1}
-                    strokeLinejoin={1}
-                    strokeWidth="1.5"
-                  />
-                  <RNSVGPath
-                    d="M12 17H12.01"
-                    fill={
-                      {
-                        "payload": 4278190080,
-                        "type": 0,
-                      }
-                    }
-                    propList={
-                      [
-                        "stroke",
-                        "strokeWidth",
-                        "strokeLinecap",
-                        "strokeLinejoin",
-                      ]
-                    }
-                    stroke={
-                      {
-                        "type": 2,
-                      }
-                    }
-                    strokeLinecap={1}
-                    strokeLinejoin={1}
-                    strokeWidth="1.5"
-                  />
-                </RNSVGGroup>
-              </RNSVGSvgView>
               <Text
                 allowFontScaling={true}
-                maxFontSizeMultiplier={1.4}
+                maxFontSizeMultiplier={1.2}
                 style={
                   {
-                    "color": "#CECECE",
-                    "fontFamily": "Basel-Book",
+                    "color": "#7D7D7D",
+                    "fontFamily": "Basel-Medium",
                     "fontSize": 17,
+                    "fontWeight": "500",
                     "lineHeight": 24,
                   }
                 }
                 suppressHighlighting={true}
               >
-                What is a recovery phrase?
+                Learn more
               </Text>
             </View>
           </View>
diff --git a/apps/mobile/src/screens/Screens.ts b/apps/mobile/src/screens/Screens.ts
index b9af0512f85..33626769886 100644
--- a/apps/mobile/src/screens/Screens.ts
+++ b/apps/mobile/src/screens/Screens.ts
@@ -36,7 +36,7 @@ export enum OnboardingScreens {
   Landing = 'OnboardingLanding',
   EditName = 'EditName',
   Notifications = 'OnboardingNotifications',
-  WelcomeWallet = 'WelcomeWallet',
+  QRAnimation = 'QRAnimation',
   Security = 'OnboardingSecurity',
 
   // import
@@ -56,10 +56,4 @@ export enum UnitagScreens {
   EditProfile = 'EditProfile',
 }
 
-export enum FiatOnRampScreens {
-  AmountInput = 'FiatOnRampAmountInput',
-  ServiceProviders = 'FiatOnRampServiceProviders',
-  Connecting = 'FiatOnRampConnecting',
-}
-
-export type AppScreen = Screens | OnboardingScreens | UnitagScreens | FiatOnRampScreens
+export type AppScreen = Screens | OnboardingScreens | UnitagScreens
diff --git a/apps/mobile/src/screens/SettingsBiometricAuthScreen.tsx b/apps/mobile/src/screens/SettingsBiometricAuthScreen.tsx
index 008bd0c9eec..9fbe452dfd4 100644
--- a/apps/mobile/src/screens/SettingsBiometricAuthScreen.tsx
+++ b/apps/mobile/src/screens/SettingsBiometricAuthScreen.tsx
@@ -3,6 +3,7 @@ import { useTranslation } from 'react-i18next'
 import { Alert, ListRenderItemInfo } from 'react-native'
 import { FlatList } from 'react-native-gesture-handler'
 import { useAppDispatch } from 'src/app/hooks'
+import { Switch } from 'src/components/buttons/Switch'
 import { BackHeader } from 'src/components/layout/BackHeader'
 import { Screen } from 'src/components/layout/Screen'
 import { BiometricAuthWarningModal } from 'src/components/Settings/BiometricAuthWarningModal'
@@ -19,9 +20,8 @@ import {
   setRequiredForAppAccess,
   setRequiredForTransactions,
 } from 'src/features/biometrics/slice'
+import { openSettings } from 'src/utils/linking'
 import { Flex, Text, TouchableArea } from 'ui/src'
-import { Switch } from 'wallet/src/components/buttons/Switch'
-import { openSettings } from 'wallet/src/utils/linking'
 import { isIOS } from 'wallet/src/utils/platform'
 
 interface BiometricAuthSetting {
@@ -114,10 +114,8 @@ export function SettingsBiometricAuthScreen(): JSX.Element {
           }
 
           await trigger({
-            params: {
-              biometricAppSettingType: BiometricSettingType.RequiredForAppAccess,
-              newValue: newRequiredForAppAccessValue,
-            },
+            biometricAppSettingType: BiometricSettingType.RequiredForAppAccess,
+            newValue: newRequiredForAppAccessValue,
           })
         },
         value: requiredForAppAccess,
@@ -144,11 +142,11 @@ export function SettingsBiometricAuthScreen(): JSX.Element {
           }
 
           await trigger({
-            params: {
-              biometricAppSettingType: BiometricSettingType.RequiredForTransactions,
-              newValue: newRequiredForTransactionsValue,
-            },
+            biometricAppSettingType: BiometricSettingType.RequiredForTransactions,
+            newValue: newRequiredForTransactionsValue,
           })
+
+          handleOSBiometricAuthTurnedOff()
         },
         value: requiredForTransactions,
         text: t('Transactions'),
@@ -198,13 +196,11 @@ export function SettingsBiometricAuthScreen(): JSX.Element {
           onClose={onCloseModal}
           onConfirm={async (): Promise<void> => {
             await trigger({
-              params: {
-                biometricAppSettingType: unsafeWarningModalType,
-                // flip the bit
-                newValue: !(unsafeWarningModalType === BiometricSettingType.RequiredForAppAccess
-                  ? requiredForAppAccess
-                  : requiredForTransactions),
-              },
+              biometricAppSettingType: unsafeWarningModalType,
+              // flip the bit
+              newValue: !(unsafeWarningModalType === BiometricSettingType.RequiredForAppAccess
+                ? requiredForAppAccess
+                : requiredForTransactions),
             })
             setShowUnsafeWarningModal(false)
             setUnsafeWarningModalType(null)
diff --git a/apps/mobile/src/screens/SettingsCloudBackupPasswordCreateScreen.tsx b/apps/mobile/src/screens/SettingsCloudBackupPasswordCreateScreen.tsx
index 624674780d4..288d23b2507 100644
--- a/apps/mobile/src/screens/SettingsCloudBackupPasswordCreateScreen.tsx
+++ b/apps/mobile/src/screens/SettingsCloudBackupPasswordCreateScreen.tsx
@@ -5,11 +5,11 @@ import { ScrollView } from 'react-native'
 import { SettingsStackParamList } from 'src/app/navigation/types'
 import { BackHeader } from 'src/components/layout/BackHeader'
 import { Screen } from 'src/components/layout/Screen'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { CloudBackupPasswordForm } from 'src/features/CloudBackup/CloudBackupPasswordForm'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { Screens } from 'src/screens/Screens'
 import { Button, Flex, Icons, Text, useSporeColors } from 'ui/src'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 type Props = NativeStackScreenProps<
diff --git a/apps/mobile/src/screens/SettingsCloudBackupStatus.tsx b/apps/mobile/src/screens/SettingsCloudBackupStatus.tsx
index a144a3daaaf..7cce95c372f 100644
--- a/apps/mobile/src/screens/SettingsCloudBackupStatus.tsx
+++ b/apps/mobile/src/screens/SettingsCloudBackupStatus.tsx
@@ -4,18 +4,19 @@ import { useTranslation } from 'react-i18next'
 import { Alert } from 'react-native'
 import { useAppDispatch } from 'src/app/hooks'
 import { SettingsStackParamList } from 'src/app/navigation/types'
+import { AddressDisplay } from 'src/components/AddressDisplay'
 import { BackHeader } from 'src/components/layout/BackHeader'
 import { Screen } from 'src/components/layout/Screen'
+import WarningModal from 'src/components/modals/WarningModal/WarningModal'
 import { useBiometricAppSettings, useBiometricPrompt } from 'src/features/biometrics/hooks'
 import { useCloudBackups } from 'src/features/CloudBackup/hooks'
 import { deleteCloudStorageMnemonicBackup } from 'src/features/CloudBackup/RNCloudStorageBackupsManager'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { Screens } from 'src/screens/Screens'
 import { Button, Flex, Text, useSporeColors } from 'ui/src'
 import Checkmark from 'ui/src/assets/icons/check.svg'
 import { iconSizes } from 'ui/src/theme'
 import { logger } from 'utilities/src/logger/logger'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
 import {
   EditAccountAction,
   editAccountActions,
@@ -26,7 +27,6 @@ import {
   SignerMnemonicAccount,
 } from 'wallet/src/features/wallet/accounts/types'
 import { useAccounts } from 'wallet/src/features/wallet/hooks'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 type Props = NativeStackScreenProps<SettingsStackParamList, Screens.SettingsCloudBackupStatus>
diff --git a/apps/mobile/src/screens/SettingsFiatCurrencyModal.tsx b/apps/mobile/src/screens/SettingsFiatCurrencyModal.tsx
index d92dd2ff267..c2e8100a49d 100644
--- a/apps/mobile/src/screens/SettingsFiatCurrencyModal.tsx
+++ b/apps/mobile/src/screens/SettingsFiatCurrencyModal.tsx
@@ -3,13 +3,14 @@ import { useTranslation } from 'react-i18next'
 import { Action } from 'redux'
 import { useAppDispatch } from 'src/app/hooks'
 import { VirtualizedList } from 'src/components/layout/VirtualizedList'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { closeModal } from 'src/features/modals/modalSlice'
-import { Flex, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
+import { ModalName } from 'src/features/telemetry/constants'
+import { Flex, Text, TouchableArea, useSporeColors } from 'ui/src'
+import { Check } from 'ui/src/components/icons'
 import { FiatCurrency, ORDERED_CURRENCIES } from 'wallet/src/features/fiatCurrency/constants'
 import { useAppFiatCurrency, useFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
 import { setCurrentFiatCurrency } from 'wallet/src/features/fiatCurrency/slice'
-import { ModalName } from 'wallet/src/telemetry/constants'
 
 export function SettingsFiatCurrencyModal(): JSX.Element {
   const dispatch = useAppDispatch()
@@ -80,7 +81,7 @@ function FiatCurrencyOption({ active, currency, onPress }: FiatCurrencyOptionPro
             {code}
           </Text>
         </Flex>
-        {active && <Icons.Check color={colors.accent1.val} size="$icon.24" />}
+        {active && <Check color={colors.accent1.val} size="$icon.24" />}
       </Flex>
     </TouchableArea>
   )
diff --git a/apps/mobile/src/screens/SettingsLanguageModal.tsx b/apps/mobile/src/screens/SettingsLanguageModal.tsx
index d6c6dfb43ba..9b49761dce2 100644
--- a/apps/mobile/src/screens/SettingsLanguageModal.tsx
+++ b/apps/mobile/src/screens/SettingsLanguageModal.tsx
@@ -3,10 +3,10 @@ import { useTranslation } from 'react-i18next'
 import { Linking } from 'react-native'
 import { Action } from 'redux'
 import { useAppDispatch } from 'src/app/hooks'
+import { BottomSheetModal } from 'src/components/modals/BottomSheetModal'
 import { closeModal } from 'src/features/modals/modalSlice'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { Button, Flex, Icons, Text } from 'ui/src'
-import { BottomSheetModal } from 'wallet/src/components/modals/BottomSheetModal'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 // TODO(MOB-1190): this is DEP_blue_300 at 10% opacity, remove when we have a named color for this
diff --git a/apps/mobile/src/screens/SettingsPrivacyScreen.tsx b/apps/mobile/src/screens/SettingsPrivacyScreen.tsx
index 0cc1b201ada..2e5b5996d87 100644
--- a/apps/mobile/src/screens/SettingsPrivacyScreen.tsx
+++ b/apps/mobile/src/screens/SettingsPrivacyScreen.tsx
@@ -1,12 +1,12 @@
 import React from 'react'
 import { useTranslation } from 'react-i18next'
 import { useAppDispatch, useAppSelector } from 'src/app/hooks'
+import { Switch } from 'src/components/buttons/Switch'
 import { BackHeader } from 'src/components/layout/BackHeader'
 import { Screen } from 'src/components/layout/Screen'
 import { selectAllowAnalytics } from 'src/features/telemetry/selectors'
 import { setAllowAnalytics } from 'src/features/telemetry/slice'
 import { Flex, Text } from 'ui/src'
-import { Switch } from 'wallet/src/components/buttons/Switch'
 
 export function SettingsPrivacyScreen(): JSX.Element {
   const { t } = useTranslation()
diff --git a/apps/mobile/src/screens/SettingsScreen.tsx b/apps/mobile/src/screens/SettingsScreen.tsx
index fc2eb01dc2e..ddc7cfd1341 100644
--- a/apps/mobile/src/screens/SettingsScreen.tsx
+++ b/apps/mobile/src/screens/SettingsScreen.tsx
@@ -12,6 +12,7 @@ import {
   SettingsStackNavigationProp,
   useSettingsStackNavigation,
 } from 'src/app/navigation/types'
+import { AddressDisplay } from 'src/components/AddressDisplay'
 import { HeaderScrollScreen } from 'src/components/layout/screens/HeaderScrollScreen'
 import {
   SettingsRow,
@@ -22,6 +23,7 @@ import {
 import { APP_FEEDBACK_LINK } from 'src/constants/urls'
 import { useBiometricContext } from 'src/features/biometrics/context'
 import { useBiometricName, useDeviceSupportsBiometricAuth } from 'src/features/biometrics/hooks'
+import { ModalName } from 'src/features/telemetry/constants'
 import { useWalletRestore } from 'src/features/wallet/hooks'
 import { OnboardingScreens, Screens } from 'src/screens/Screens'
 import { getFullAppVersion } from 'src/utils/version'
@@ -34,7 +36,6 @@ import {
   Text,
   TouchableArea,
   useDeviceInsets,
-  useIsDarkMode,
   useSporeColors,
 } from 'ui/src'
 import { AVATARS_DARK, AVATARS_LIGHT } from 'ui/src/assets'
@@ -49,9 +50,8 @@ import UniswapIcon from 'ui/src/assets/icons/uniswap-logo.svg'
 import { iconSizes, spacing } from 'ui/src/theme'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { useTimeout } from 'utilities/src/time/timing'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
 import { uniswapUrls } from 'wallet/src/constants/urls'
-import { useCurrentAppearanceSetting } from 'wallet/src/features/appearance/hooks'
+import { useCurrentAppearanceSetting, useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
 import { useFeatureFlag } from 'wallet/src/features/experiments/hooks'
 import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
@@ -74,7 +74,6 @@ import {
   setHideSmallBalances,
   setHideSpamTokens,
 } from 'wallet/src/features/wallet/slice'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { isAndroid } from 'wallet/src/utils/platform'
 
 export function SettingsScreen(): JSX.Element {
diff --git a/apps/mobile/src/screens/SettingsWallet.tsx b/apps/mobile/src/screens/SettingsWallet.tsx
index ddcb7b3d553..a34ca6e9784 100644
--- a/apps/mobile/src/screens/SettingsWallet.tsx
+++ b/apps/mobile/src/screens/SettingsWallet.tsx
@@ -11,6 +11,8 @@ import {
   SettingsStackNavigationProp,
   SettingsStackParamList,
 } from 'src/app/navigation/types'
+import { AddressDisplay } from 'src/components/AddressDisplay'
+import { Switch } from 'src/components/buttons/Switch'
 import { BackHeader } from 'src/components/layout/BackHeader'
 import { Screen } from 'src/components/layout/Screen'
 import {
@@ -23,8 +25,9 @@ import { openModal } from 'src/features/modals/modalSlice'
 import {
   NotificationPermission,
   useNotificationOSPermissionsEnabled,
-} from 'src/features/notifications/hooks/useNotificationOSPermissionsEnabled'
+} from 'src/features/notifications/hooks'
 import { promptPushPermission } from 'src/features/notifications/Onesignal'
+import { ElementName, ModalName } from 'src/features/telemetry/constants'
 import { showNotificationSettingsAlert } from 'src/screens/Onboarding/NotificationsSetupScreen'
 import { Screens, UnitagScreens } from 'src/screens/Screens'
 import { Button, Flex, Text, useSporeColors } from 'ui/src'
@@ -32,20 +35,17 @@ import NotificationIcon from 'ui/src/assets/icons/bell.svg'
 import GlobalIcon from 'ui/src/assets/icons/global.svg'
 import TextEditIcon from 'ui/src/assets/icons/textEdit.svg'
 import { iconSizes } from 'ui/src/theme'
-import { AddressDisplay } from 'wallet/src/components/accounts/AddressDisplay'
-import { Switch } from 'wallet/src/components/buttons/Switch'
 import { ChainId } from 'wallet/src/constants/chains'
 import { useENS } from 'wallet/src/features/ens/useENS'
 import { FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
 import { useFeatureFlag } from 'wallet/src/features/experiments/hooks'
-import { useUnitagByAddress } from 'wallet/src/features/unitags/hooks'
+import { useUnitag } from 'wallet/src/features/unitags/hooks'
 import {
   EditAccountAction,
   editAccountActions,
 } from 'wallet/src/features/wallet/accounts/editAccountSaga'
 import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useAccounts, useSelectAccountNotificationSetting } from 'wallet/src/features/wallet/hooks'
-import { ElementName, ModalName } from 'wallet/src/telemetry/constants'
 
 type Props = NativeStackScreenProps<SettingsStackParamList, Screens.SettingsWallet>
 
@@ -70,8 +70,6 @@ export function SettingsWallet({
   )
   const unitagsFeatureFlagEnabled = useFeatureFlag(FEATURE_FLAGS.Unitags)
 
-  const showEditProfile = unitagsFeatureFlagEnabled && !readonly
-
   useEffect(() => {
     // If the user deletes the account while on this screen, go back
     if (!currentAccount) {
@@ -136,7 +134,7 @@ export function SettingsWallet({
     {
       subTitle: t('Wallet preferences'),
       data: [
-        ...(showEditProfile ? [] : [editNicknameSectionOption]),
+        ...(unitagsFeatureFlagEnabled ? [] : [editNicknameSectionOption]),
         {
           action: (
             <Switch
@@ -200,7 +198,7 @@ export function SettingsWallet({
           <SectionList
             ItemSeparatorComponent={renderItemSeparator}
             ListHeaderComponent={
-              showEditProfile ? <AddressDisplayHeader address={address} /> : undefined
+              unitagsFeatureFlagEnabled ? <AddressDisplayHeader address={address} /> : undefined
             }
             keyExtractor={(_item, index): string => 'wallet_settings' + index}
             renderItem={renderItem}
@@ -230,16 +228,14 @@ const renderItemSeparator = (): JSX.Element => <Flex pt="$spacing8" />
 function AddressDisplayHeader({ address }: { address: Address }): JSX.Element {
   const { t } = useTranslation()
   const ensName = useENS(ChainId.Mainnet, address)?.name
-  const { unitag } = useUnitagByAddress(address)
+  const hasUnitag = !!useUnitag(address)?.username
 
   const onPressEditProfile = (): void => {
-    if (unitag?.username) {
+    if (hasUnitag) {
       navigate(Screens.UnitagStack, {
         screen: UnitagScreens.EditProfile,
         params: {
           address,
-          unitag: unitag.username,
-          entryPoint: Screens.SettingsWallet,
         },
       })
     } else {
@@ -259,14 +255,14 @@ function AddressDisplayHeader({ address }: { address: Address }): JSX.Element {
           variant="body1"
         />
       </Flex>
-      {(!ensName || !!unitag) && (
+      {(!ensName || hasUnitag) && (
         <Button
           color="$neutral1"
           fontSize="$small"
           size="medium"
           theme="tertiary"
           onPress={onPressEditProfile}>
-          {unitag?.username ? t('Edit profile') : t('Edit label')}
+          {hasUnitag ? t('Edit profile') : t('Edit label')}
         </Button>
       )}
     </Flex>
diff --git a/apps/mobile/src/screens/SettingsWalletEdit.tsx b/apps/mobile/src/screens/SettingsWalletEdit.tsx
index 3576392a5e4..fd30883eb09 100644
--- a/apps/mobile/src/screens/SettingsWalletEdit.tsx
+++ b/apps/mobile/src/screens/SettingsWalletEdit.tsx
@@ -4,12 +4,12 @@ import { useTranslation } from 'react-i18next'
 import { Keyboard, KeyboardAvoidingView, StyleSheet } from 'react-native'
 import { useAppDispatch } from 'src/app/hooks'
 import { SettingsStackParamList } from 'src/app/navigation/types'
+import { TextInput } from 'src/components/input/TextInput'
 import { BackHeader } from 'src/components/layout/BackHeader'
 import { Screen } from 'src/components/layout/Screen'
 import { UnitagBanner } from 'src/components/unitags/UnitagBanner'
 import { Button, Flex, Icons, Text } from 'ui/src'
 import { fonts } from 'ui/src/theme'
-import { TextInput } from 'wallet/src/components/input/TextInput'
 import { NICKNAME_MAX_LENGTH } from 'wallet/src/constants/accounts'
 import { ChainId } from 'wallet/src/constants/chains'
 import { useENS } from 'wallet/src/features/ens/useENS'
@@ -19,7 +19,6 @@ import {
   EditAccountAction,
   editAccountActions,
 } from 'wallet/src/features/wallet/accounts/editAccountSaga'
-import { AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useAccounts } from 'wallet/src/features/wallet/hooks'
 import { shortenAddress } from 'wallet/src/utils/addresses'
 import { isIOS } from 'wallet/src/utils/platform'
@@ -40,8 +39,6 @@ export function SettingsWalletEdit({
   const [initialNickname, setInitialNickname] = useState(ensName || activeAccount?.name)
   const [showEditInput, setShowEditInput] = useState(false)
   const unitagsFeatureFlagEnabled = useFeatureFlag(FEATURE_FLAGS.Unitags)
-  const showUnitagBanner =
-    unitagsFeatureFlagEnabled && activeAccount?.type === AccountType.SignerMnemonic
 
   const onPressShowEditInput = (): void => {
     setShowEditInput(true)
@@ -77,7 +74,7 @@ export function SettingsWalletEdit({
         contentContainerStyle={styles.expand}
         style={styles.base}>
         <BackHeader alignment="center" mx="$spacing16" pt="$spacing16">
-          <Text variant="body1">{t('Edit Label')}</Text>
+          <Text variant="body1">{t('Nickname')}</Text>
         </BackHeader>
         <Flex
           grow
@@ -125,10 +122,10 @@ export function SettingsWalletEdit({
                   {!ensName && (
                     <Flex ml="$spacing12">
                       <Button
-                        backgroundless
-                        icon={<Icons.PenLine color="$neutral3" />}
+                        icon={<Icons.Pencil color="$neutral2" />}
                         m="$none"
                         size="medium"
+                        theme="secondary"
                         onPress={onPressShowEditInput}
                       />
                     </Flex>
@@ -138,10 +135,10 @@ export function SettingsWalletEdit({
             </Flex>
             <Flex px="$spacing8" py="$spacing12">
               <Text color="$neutral3">
-                {t('Labels are not public. They are stored locally and only visible to you.')}
+                {t('Nicknames are not public. They are stored locally and only visible to you.')}
               </Text>
             </Flex>
-            {showUnitagBanner && <UnitagBanner compact />}
+            {unitagsFeatureFlagEnabled && <UnitagBanner compact />}
           </Flex>
           <Button
             hapticFeedback
diff --git a/apps/mobile/src/screens/SettingsWalletManageConnection.tsx b/apps/mobile/src/screens/SettingsWalletManageConnection.tsx
index 9b79e40d148..50bdfb9f4b2 100644
--- a/apps/mobile/src/screens/SettingsWalletManageConnection.tsx
+++ b/apps/mobile/src/screens/SettingsWalletManageConnection.tsx
@@ -1,8 +1,8 @@
 import { NativeStackScreenProps } from '@react-navigation/native-stack'
 import React from 'react'
 import { SettingsStackParamList } from 'src/app/navigation/types'
-import { ConnectedDappsList } from 'src/components/WalletConnect/ConnectedDapps/ConnectedDappsList'
 import { Screen } from 'src/components/layout/Screen'
+import { ConnectedDappsList } from 'src/components/WalletConnect/ConnectedDapps/ConnectedDappsList'
 import { useWalletConnect } from 'src/features/walletConnect/useWalletConnect'
 import { Screens } from './Screens'
 
diff --git a/apps/mobile/src/screens/TokenDetailsScreen.tsx b/apps/mobile/src/screens/TokenDetailsScreen.tsx
index 614c3e6105e..79eb9ac73f6 100644
--- a/apps/mobile/src/screens/TokenDetailsScreen.tsx
+++ b/apps/mobile/src/screens/TokenDetailsScreen.tsx
@@ -5,22 +5,25 @@ import ContextMenu from 'react-native-context-menu-view'
 import { FadeIn, FadeInDown, FadeOutDown } from 'react-native-reanimated'
 import { useAppSelector } from 'src/app/hooks'
 import { AppStackScreenProp } from 'src/app/navigation/types'
+import { HeaderScrollScreen } from 'src/components/layout/screens/HeaderScrollScreen'
+import { Loader } from 'src/components/loading'
 import { PriceExplorer } from 'src/components/PriceExplorer/PriceExplorer'
 import { useTokenPriceHistory } from 'src/components/PriceExplorer/usePriceHistory'
+import { useCrossChainBalances } from 'src/components/TokenDetails/hooks'
 import { TokenBalances } from 'src/components/TokenDetails/TokenBalances'
 import { TokenDetailsActionButtons } from 'src/components/TokenDetails/TokenDetailsActionButtons'
 import { TokenDetailsFavoriteButton } from 'src/components/TokenDetails/TokenDetailsFavoriteButton'
 import { TokenDetailsHeader } from 'src/components/TokenDetails/TokenDetailsHeader'
 import { TokenDetailsLinks } from 'src/components/TokenDetails/TokenDetailsLinks'
 import { TokenDetailsStats } from 'src/components/TokenDetails/TokenDetailsStats'
-import { useCrossChainBalances } from 'src/components/TokenDetails/hooks'
+import TokenWarningModal from 'src/components/tokens/TokenWarningModal'
 import Trace from 'src/components/Trace/Trace'
-import { HeaderScrollScreen } from 'src/components/layout/screens/HeaderScrollScreen'
-import { Loader } from 'src/components/loading'
 import { useTokenContextMenu } from 'src/features/balances/hooks'
 import { selectModalState } from 'src/features/modals/selectModalState'
 import { useNavigateToSend } from 'src/features/send/hooks'
 import { useNavigateToSwap } from 'src/features/swap/hooks'
+import { ModalName } from 'src/features/telemetry/constants'
+import { useTokenWarningDismissed } from 'src/features/tokens/safetyHooks'
 import { Screens } from 'src/screens/Screens'
 import { disableOnPress } from 'src/utils/disableOnPress'
 import { useSkeletonLoading } from 'src/utils/useSkeletonLoading'
@@ -31,7 +34,6 @@ import {
   Text,
   TouchableArea,
   useDeviceInsets,
-  useIsDarkMode,
   useSporeColors,
 } from 'ui/src'
 import EllipsisIcon from 'ui/src/assets/icons/ellipsis.svg'
@@ -41,22 +43,20 @@ import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
 import { TokenLogo } from 'wallet/src/components/CurrencyLogo/TokenLogo'
 import { ChainId } from 'wallet/src/constants/chains'
 import { PollingInterval } from 'wallet/src/constants/misc'
+import { isError, isNonPollingRequestInFlight } from 'wallet/src/data/utils'
 import {
   SafetyLevel,
   TokenDetailsScreenQuery,
   useTokenDetailsScreenQuery,
 } from 'wallet/src/data/__generated__/types-and-hooks'
-import { isError, isNonPollingRequestInFlight } from 'wallet/src/data/utils'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { fromGraphQLChain } from 'wallet/src/features/chains/utils'
 import { PortfolioBalance } from 'wallet/src/features/dataApi/types'
 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 TokenWarningModal from 'wallet/src/features/tokens/TokenWarningModal'
-import { useTokenWarningDismissed } from 'wallet/src/features/tokens/safetyHooks'
+import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
 import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
 import { useExtractedTokenColor } from 'wallet/src/utils/colors'
 import { currencyIdToAddress, currencyIdToChain } from 'wallet/src/utils/currencyId'
 
diff --git a/apps/mobile/src/screens/WebViewScreen.tsx b/apps/mobile/src/screens/WebViewScreen.tsx
index 4a1f38d45b8..385c5824979 100644
--- a/apps/mobile/src/screens/WebViewScreen.tsx
+++ b/apps/mobile/src/screens/WebViewScreen.tsx
@@ -1,12 +1,10 @@
-import React, { useCallback, useRef } from 'react'
+import React from 'react'
 import WebView from 'react-native-webview'
 import { AppStackScreenProp, SettingsStackScreenProp } from 'src/app/navigation/types'
 import { BackHeader } from 'src/components/layout/BackHeader'
 import { Screen } from 'src/components/layout/Screen'
 import { Screens } from 'src/screens/Screens'
 import { Separator, Text } from 'ui/src'
-import { uniswapUrls } from 'wallet/src/constants/urls'
-import { useActiveAccountAddress } from 'wallet/src/features/wallet/hooks'
 
 export function WebViewScreen({
   route,
@@ -18,55 +16,12 @@ export function WebViewScreen({
       <BackHeader alignment="center" mb="$spacing16" pt="$spacing4" px="$spacing12">
         <Text variant="body1">{headerTitle}</Text>
       </BackHeader>
-
       <Separator />
-
-      {uriLink === uniswapUrls.helpUrl ? (
-        <ZendeskWebView uriLink={uriLink} />
-      ) : (
-        <WebView source={{ uri: uriLink }} />
-      )}
+      <WebView
+        source={{
+          uri: uriLink,
+        }}
+      />
     </Screen>
   )
 }
-
-function ZendeskWebView({ uriLink }: { uriLink: string }): JSX.Element {
-  const webviewRef = useRef<WebView>(null)
-
-  const zendeskInjectJs = usePrefillAddressInZendeskTicketJs()
-
-  const onNavigationStateChange = useCallback(
-    ({ url }: { url: string }): void => {
-      // Ok to ignore because `uniswapUrls.helpUrl` is hardcoded into our code.
-      // eslint-disable-next-line security/detect-non-literal-regexp
-      if (zendeskInjectJs && new RegExp(`${uniswapUrls.helpUrl}.+/requests/new`).test(url)) {
-        webviewRef.current?.injectJavaScript(zendeskInjectJs)
-      }
-    },
-    [zendeskInjectJs]
-  )
-
-  return (
-    <WebView
-      ref={webviewRef}
-      source={{ uri: uriLink }}
-      onNavigationStateChange={onNavigationStateChange}
-    />
-  )
-}
-
-const WALLET_ADDRESS_QUERY_SELECTOR = '#request_custom_fields_11041337007757'
-
-function usePrefillAddressInZendeskTicketJs(): string | null {
-  const address = useActiveAccountAddress()
-
-  if (!address) {
-    return null
-  }
-
-  return `(function() {
-    var input = document.querySelector('${WALLET_ADDRESS_QUERY_SELECTOR}');
-    if (!input) { return; }
-    input.value = "${address}";
-  })();`
-}
diff --git a/apps/mobile/src/test/render.tsx b/apps/mobile/src/test/render.tsx
index 32bb12cba5b..afa93ac7190 100644
--- a/apps/mobile/src/test/render.tsx
+++ b/apps/mobile/src/test/render.tsx
@@ -16,7 +16,6 @@ import type { MobileState } from 'src/app/reducer'
 import type { AppStore } from 'src/app/store'
 import { persistedReducer } from 'src/app/store'
 import { Resolvers } from 'wallet/src/data/__generated__/types-and-hooks'
-import { UnitagUpdaterContextProvider } from 'wallet/src/features/unitags/context'
 import { SharedProvider } from 'wallet/src/provider'
 import { AutoMockedApolloProvider } from 'wallet/src/test/mocks/provider'
 
@@ -55,9 +54,7 @@ export function renderWithProviders(
     return (
       <AutoMockedApolloProvider resolvers={resolvers}>
         <SharedProvider reduxStore={store}>
-          <UnitagUpdaterContextProvider>
-            <NavigationContainer ref={navigationRef}>{children}</NavigationContainer>
-          </UnitagUpdaterContextProvider>
+          <NavigationContainer ref={navigationRef}>{children}</NavigationContainer>
         </SharedProvider>
       </AutoMockedApolloProvider>
     )
@@ -122,9 +119,7 @@ export function renderHookWithProviders<P extends any[], R>(
     return (
       <AutoMockedApolloProvider resolvers={resolvers}>
         <NavigationContainer ref={navigationRef}>
-          <SharedProvider reduxStore={store}>
-            <UnitagUpdaterContextProvider>{children}</UnitagUpdaterContextProvider>
-          </SharedProvider>
+          <SharedProvider reduxStore={store}>{children}</SharedProvider>
         </NavigationContainer>
       </AutoMockedApolloProvider>
     )
diff --git a/packages/wallet/src/utils/balance.test.ts b/apps/mobile/src/utils/balance.test.ts
similarity index 98%
rename from packages/wallet/src/utils/balance.test.ts
rename to apps/mobile/src/utils/balance.test.ts
index 9fe8895d9a1..14d1226a346 100644
--- a/packages/wallet/src/utils/balance.test.ts
+++ b/apps/mobile/src/utils/balance.test.ts
@@ -1,14 +1,14 @@
 import { CurrencyAmount } from '@uniswap/sdk-core'
 import JSBI from 'jsbi'
-import { DAI } from 'wallet/src/constants/tokens'
-import { ArbitrumEth, MainnetEth, OptimismEth, PolygonMatic } from 'wallet/src/test/fixtures'
 import {
+  maxAmountSpend,
   MIN_ARBITRUM_FOR_GAS,
   MIN_ETH_FOR_GAS,
   MIN_OPTIMISM_FOR_GAS,
   MIN_POLYGON_FOR_GAS,
-  maxAmountSpend,
-} from 'wallet/src/utils/balance'
+} from 'src/utils/balance'
+import { DAI } from 'wallet/src/constants/tokens'
+import { ArbitrumEth, MainnetEth, OptimismEth, PolygonMatic } from 'wallet/src/test/fixtures'
 
 describe(maxAmountSpend, () => {
   it('handles undefined', () => {
diff --git a/packages/wallet/src/utils/balance.ts b/apps/mobile/src/utils/balance.ts
similarity index 94%
rename from packages/wallet/src/utils/balance.ts
rename to apps/mobile/src/utils/balance.ts
index 48fd9f34a64..b35d59dd7b0 100644
--- a/packages/wallet/src/utils/balance.ts
+++ b/apps/mobile/src/utils/balance.ts
@@ -1,15 +1,15 @@
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import JSBI from 'jsbi'
 import { ChainId } from 'wallet/src/constants/chains'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
 const NATIVE_CURRENCY_DECIMALS = 18
 
 // TODO(MOB-181): calculate this in a more scientific way
 export const MIN_ETH_FOR_GAS: JSBI = JSBI.multiply(
   JSBI.exponentiate(JSBI.BigInt(10), JSBI.BigInt(NATIVE_CURRENCY_DECIMALS - 3)),
-  JSBI.BigInt(15)
-) // .015 ETH
+  JSBI.BigInt(12)
+) // .012 ETH
 
 export const MIN_POLYGON_FOR_GAS: JSBI = JSBI.multiply(
   JSBI.exponentiate(JSBI.BigInt(10), JSBI.BigInt(NATIVE_CURRENCY_DECIMALS - 2)),
@@ -18,8 +18,8 @@ export const MIN_POLYGON_FOR_GAS: JSBI = JSBI.multiply(
 
 export const MIN_ARBITRUM_FOR_GAS: JSBI = JSBI.multiply(
   JSBI.exponentiate(JSBI.BigInt(10), JSBI.BigInt(NATIVE_CURRENCY_DECIMALS - 4)),
-  JSBI.BigInt(8)
-) // .0008 ETH
+  JSBI.BigInt(6)
+) // .0006 ETH
 
 export const MIN_OPTIMISM_FOR_GAS: JSBI = MIN_ARBITRUM_FOR_GAS
 
diff --git a/apps/mobile/src/utils/clipboard.test.ts b/apps/mobile/src/utils/clipboard.test.ts
new file mode 100644
index 00000000000..c080baee603
--- /dev/null
+++ b/apps/mobile/src/utils/clipboard.test.ts
@@ -0,0 +1,20 @@
+import * as Clipboard from 'expo-clipboard'
+import { getClipboard, setClipboard } from 'src/utils/clipboard'
+
+describe(setClipboard, () => {
+  it('copies string correctly', async () => {
+    await setClipboard('test')
+    try {
+      expect(await Clipboard.getStringAsync()).toEqual('test')
+    } catch {}
+  })
+})
+
+describe(getClipboard, () => {
+  it('gets string correctly', async () => {
+    try {
+      await Clipboard.setStringAsync('test')
+      expect(await getClipboard()).toEqual('test')
+    } catch {}
+  })
+})
diff --git a/apps/mobile/src/utils/clipboard.ts b/apps/mobile/src/utils/clipboard.ts
new file mode 100644
index 00000000000..be75c2b12d7
--- /dev/null
+++ b/apps/mobile/src/utils/clipboard.ts
@@ -0,0 +1,59 @@
+import * as Clipboard from 'expo-clipboard'
+import { logger } from 'utilities/src/logger/logger'
+
+export async function setClipboard(value: string): Promise<void> {
+  try {
+    await Clipboard.setStringAsync(value)
+  } catch (error) {
+    logger.error(error, { tags: { file: 'clipboard', function: 'setClipboard' } })
+  }
+}
+
+export async function getClipboard(): Promise<string | void> {
+  try {
+    const value = await Clipboard.getStringAsync()
+    return value
+  } catch (error) {
+    logger.error(error, { tags: { file: 'clipboard', function: 'getClipboard' } })
+  }
+}
+
+export async function setClipboardImage(imageUrl: string | undefined): Promise<void> {
+  if (!imageUrl) {
+    return
+  }
+
+  try {
+    // fetch image blob from remote source
+    const res = await fetch(imageUrl)
+    const blob = await res.blob()
+
+    // convert to base64 required for clipboard
+    const base64Encoding = await blobToBase64(blob)
+
+    // extract base64 encoding from result string
+    const formattedEncoding =
+      typeof base64Encoding === 'string' ? base64Encoding.split(',')[1] : null
+
+    // if valid result, copy to clipboard
+    if (formattedEncoding) {
+      await Clipboard.setImageAsync(formattedEncoding)
+    }
+  } catch (error) {
+    logger.error(error, {
+      tags: { file: 'clipboard', function: 'setClipboardImage' },
+      extra: { imageUrl },
+    })
+  }
+}
+
+// Convert image data blob to base64 encoding
+function blobToBase64(blob: Blob): Promise<ArrayBuffer | string | null> {
+  const reader = new FileReader()
+  reader.readAsDataURL(blob)
+  return new Promise((resolve) => {
+    reader.onloadend = (): void => {
+      resolve(reader.result)
+    }
+  })
+}
diff --git a/packages/wallet/src/utils/linking.test.ts b/apps/mobile/src/utils/linking.test.ts
similarity index 93%
rename from packages/wallet/src/utils/linking.test.ts
rename to apps/mobile/src/utils/linking.test.ts
index 2603e26ddbe..029ee6a2133 100644
--- a/packages/wallet/src/utils/linking.test.ts
+++ b/apps/mobile/src/utils/linking.test.ts
@@ -1,5 +1,5 @@
+import { ExplorerDataType, getExplorerLink } from 'src/utils/linking'
 import { ChainId } from 'wallet/src/constants/chains'
-import { ExplorerDataType, getExplorerLink } from 'wallet/src/utils/linking'
 
 describe(getExplorerLink, () => {
   it('handles different link cases', () => {
diff --git a/packages/wallet/src/utils/linking.ts b/apps/mobile/src/utils/linking.ts
similarity index 97%
rename from packages/wallet/src/utils/linking.ts
rename to apps/mobile/src/utils/linking.ts
index 7d6754343cd..f9045a4d915 100644
--- a/packages/wallet/src/utils/linking.ts
+++ b/apps/mobile/src/utils/linking.ts
@@ -2,7 +2,7 @@ import * as WebBrowser from 'expo-web-browser'
 import { Linking } from 'react-native'
 import { colorsLight } from 'ui/src/theme'
 import { logger } from 'utilities/src/logger/logger'
-import { CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
+import { ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
 import { uniswapUrls } from 'wallet/src/constants/urls'
 import { toUniswapWebAppLink } from 'wallet/src/features/chains/utils'
 import { FiatPurchaseTransactionInfo } from 'wallet/src/features/transactions/types'
@@ -30,7 +30,7 @@ export async function openUri(
   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'), {
+    logger.error('User attempted to open potentially unsafe url', {
       tags: {
         file: 'linking',
         function: 'openUri',
diff --git a/packages/wallet/src/utils/number.test.ts b/apps/mobile/src/utils/number.test.ts
similarity index 93%
rename from packages/wallet/src/utils/number.test.ts
rename to apps/mobile/src/utils/number.test.ts
index a1b7ae9ab8b..98a08e63ad3 100644
--- a/packages/wallet/src/utils/number.test.ts
+++ b/apps/mobile/src/utils/number.test.ts
@@ -1,5 +1,5 @@
 import { BigNumber } from 'ethers'
-import { BigNumberMax, isZero, toStringish } from 'wallet/src/utils/number'
+import { BigNumberMax, isZero, toStringish } from 'src/utils/number'
 
 describe(isZero, () => {
   it('identifies 0 on different types', () => {
diff --git a/packages/wallet/src/utils/number.ts b/apps/mobile/src/utils/number.ts
similarity index 100%
rename from packages/wallet/src/utils/number.ts
rename to apps/mobile/src/utils/number.ts
diff --git a/apps/mobile/src/utils/useAddBackButton.tsx b/apps/mobile/src/utils/useAddBackButton.tsx
index 97993f8b4ae..9d97ee01cfa 100644
--- a/apps/mobile/src/utils/useAddBackButton.tsx
+++ b/apps/mobile/src/utils/useAddBackButton.tsx
@@ -1,23 +1,20 @@
 import { NativeStackNavigationProp } from '@react-navigation/native-stack'
 import React, { useEffect } from 'react'
-import { OnboardingStackParamList, UnitagStackParamList } from 'src/app/navigation/types'
+import { OnboardingStackParamList } from 'src/app/navigation/types'
 import { BackButton } from 'src/components/buttons/BackButton'
-import { iconSizes } from 'ui/src/theme'
 
 /**
  * Adds a back button to the navigation header if the screen is the first in the stack.
  * By default react-navigation will only show the back button if the screen is not the first one in the stack.
  */
 export function useAddBackButton(
-  navigation:
-    | NativeStackNavigationProp<OnboardingStackParamList>
-    | NativeStackNavigationProp<UnitagStackParamList>
+  navigation: NativeStackNavigationProp<OnboardingStackParamList>
 ): void {
   useEffect((): void => {
     const shouldRenderBackButton = navigation.getState().index === 0
     if (shouldRenderBackButton) {
       navigation.setOptions({
-        headerLeft: () => <BackButton size={iconSizes.icon28} />,
+        headerLeft: () => <BackButton />,
       })
     }
   }, [navigation])
diff --git a/packages/wallet/src/utils/useKeyboardLayout.android.test.ts b/apps/mobile/src/utils/useKeyboardLayout.android.test.ts
similarity index 87%
rename from packages/wallet/src/utils/useKeyboardLayout.android.test.ts
rename to apps/mobile/src/utils/useKeyboardLayout.android.test.ts
index b2d37320c1e..a1564c1b85a 100644
--- a/packages/wallet/src/utils/useKeyboardLayout.android.test.ts
+++ b/apps/mobile/src/utils/useKeyboardLayout.android.test.ts
@@ -1,7 +1,7 @@
 import { renderHook } from '@testing-library/react-hooks'
 import { DeviceEventEmitter, Dimensions } from 'react-native'
 import { act } from 'react-test-renderer'
-import { useKeyboardLayout } from 'wallet/src/utils/useKeyboardLayout'
+import { useKeyboardLayout } from 'src/utils/useKeyboardLayout'
 
 const KEYBOARD_HEIGHT = 300
 const HIDDEN_KEYBOARD_Y = Dimensions.get('window').height
@@ -31,8 +31,7 @@ jest.mock('react-native/Libraries/Utilities/Platform', () => ({
   OS: 'android',
 }))
 
-// TODO: debug and re-enable this test. It started failing when we moved it to the shared `wallet` package.
-describe.skip(useKeyboardLayout, () => {
+describe(useKeyboardLayout, () => {
   it('returns isVisible as false if keyboard is not visible', () => {
     const { result } = renderHook(() => useKeyboardLayout())
 
diff --git a/packages/wallet/src/utils/useKeyboardLayout.ios.test.ts b/apps/mobile/src/utils/useKeyboardLayout.ios.test.ts
similarity index 95%
rename from packages/wallet/src/utils/useKeyboardLayout.ios.test.ts
rename to apps/mobile/src/utils/useKeyboardLayout.ios.test.ts
index 4ad0d2f02b8..ae8fdaff871 100644
--- a/packages/wallet/src/utils/useKeyboardLayout.ios.test.ts
+++ b/apps/mobile/src/utils/useKeyboardLayout.ios.test.ts
@@ -1,7 +1,7 @@
 import { renderHook } from '@testing-library/react-hooks'
 import { DeviceEventEmitter, Dimensions } from 'react-native'
 import { act } from 'react-test-renderer'
-import { useKeyboardLayout } from 'wallet/src/utils/useKeyboardLayout'
+import { useKeyboardLayout } from 'src/utils/useKeyboardLayout'
 
 const KEYBOARD_HEIGHT = 300
 const HIDDEN_KEYBOARD_Y = Dimensions.get('window').height
diff --git a/packages/wallet/src/utils/useKeyboardLayout.ts b/apps/mobile/src/utils/useKeyboardLayout.ts
similarity index 100%
rename from packages/wallet/src/utils/useKeyboardLayout.ts
rename to apps/mobile/src/utils/useKeyboardLayout.ts
diff --git a/apps/web/.env b/apps/web/.env
index 4fdcebde5fd..9b3fb46e463 100644
--- a/apps/web/.env
+++ b/apps/web/.env
@@ -6,7 +6,6 @@ REACT_APP_AWS_API_ENDPOINT="https://beta.api.uniswap.org/v1/graphql"
 REACT_APP_BNB_RPC_URL="https://rough-sleek-hill.bsc.quiknode.pro/413cc98cbc776cda8fdf1d0f47003583ff73d9bf"
 REACT_APP_INFURA_KEY="4bf032f2d38a4ed6bb975b80d6340847"
 REACT_APP_QUICKNODE_MAINNET_RPC_URL="https://magical-alien-tab.quiknode.pro/669e87e569a8277d3fbd9e202f9df93189f19f4c"
-REACT_APP_QUICKNODE_ARBITRUM_RPC_URL="https://black-ultra-valley.arbitrum-mainnet.quiknode.pro/96d7122781cfdcbccf5377cf0c68187332891e79"
 REACT_APP_MOONPAY_API="https://api.moonpay.com"
 REACT_APP_MOONPAY_LINK="https://us-central1-uniswap-mobile.cloudfunctions.net/signMoonpayLinkV2?platform=web&env=staging"
 REACT_APP_MOONPAY_PUBLISHABLE_KEY="pk_test_DycfESRid31UaSxhI5yWKe1r5E5kKSz"
@@ -14,6 +13,5 @@ REACT_APP_SENTRY_DSN="https://a3c62e400b8748b5a8d007150e2f38b7@o1037921.ingest.s
 REACT_APP_STATSIG_PROXY_URL="https://api.uniswap.org/v1/statsig-proxy"
 REACT_APP_TEMP_API_URL="https://temp.api.uniswap.org/v1"
 REACT_APP_UNISWAP_API_URL="https://api.uniswap.org/v2"
-REACT_APP_UNISWAP_BASE_API_URL="https://api.uniswap.org"
 REACT_APP_UNISWAP_GATEWAY_DNS="https://interface.gateway.uniswap.org/v2"
 REACT_APP_WALLET_CONNECT_PROJECT_ID="c6c9bacd35afa3eb9e6cccf6d8464395"
diff --git a/apps/web/.env.production b/apps/web/.env.production
index f531d778fa7..47965b24172 100644
--- a/apps/web/.env.production
+++ b/apps/web/.env.production
@@ -13,5 +13,4 @@ REACT_APP_SENTRY_ENABLED=true
 REACT_APP_SENTRY_TRACES_SAMPLE_RATE=0.00003
 REACT_APP_STATSIG_PROXY_URL="https://api.uniswap.org/v1/statsig-proxy"
 REACT_APP_QUICKNODE_MAINNET_RPC_URL="https://ultra-blue-flower.quiknode.pro/770b22d5f362c537bc8fe19b034c45b22958f880"
-REACT_APP_QUICKNODE_ARBITRUM_RPC_URL="https://tiniest-stylish-arrow.arbitrum-mainnet.quiknode.pro/d06833352b8de605914d9e24a390d8b4d3aff7ba"
 THE_GRAPH_SCHEMA_ENDPOINT="https://api.thegraph.com/subgraphs/name/uniswap/uniswap-v3?source=uniswap"
diff --git a/apps/web/.eslintrc.js b/apps/web/.eslintrc.js
index 794b9347c44..1189cd1a6af 100644
--- a/apps/web/.eslintrc.js
+++ b/apps/web/.eslintrc.js
@@ -7,7 +7,6 @@ const rulesDirPlugin = require('eslint-plugin-rulesdir')
 rulesDirPlugin.RULES_DIR = 'eslint_rules'
 
 module.exports = {
-  root: true,
   extends: ['@uniswap/eslint-config/react'],
   plugins: ['rulesdir'],
 
diff --git a/apps/web/.gitignore b/apps/web/.gitignore
index a29657898d4..860f545a9d4 100644
--- a/apps/web/.gitignore
+++ b/apps/web/.gitignore
@@ -2,12 +2,17 @@
 
 
 # generated contract types
+/src/types/v3
+/src/abis/types
 /src/locales/**/*.js
 /src/locales/**/*.po
 
 # generated files
 /src/**/__generated__
 
+# schema
+schema.graphql
+
 # dependencies
 /node_modules
 
diff --git a/apps/web/craco.config.cjs b/apps/web/craco.config.cjs
index be37e2583c4..a4aa08c1475 100644
--- a/apps/web/craco.config.cjs
+++ b/apps/web/craco.config.cjs
@@ -143,11 +143,6 @@ module.exports = {
           rule.loader = 'swc-loader'
           // our .swcrc wasn't being picked up in the monorepo, this is a hacky but working fix
           rule.options = JSON.parse(readFileSync('./.swcrc', 'utf-8'))
-
-          rule.include = (inPath) => {
-            // if not a node_module we parse with SWC (so other packages in monorepo are importable)
-            return inPath.indexOf('node_modules') === -1
-          }
         }
         return rule
       })
diff --git a/apps/web/cypress.config.ts b/apps/web/cypress.config.ts
index 75fc1ba332e..2d8a9bc626d 100644
--- a/apps/web/cypress.config.ts
+++ b/apps/web/cypress.config.ts
@@ -2,7 +2,7 @@ import { defineConfig } from 'cypress'
 import { setupHardhatEvents } from 'cypress-hardhat'
 
 export default defineConfig({
-  projectId: 'fabfoi',
+  projectId: 'yp82ef',
   defaultCommandTimeout: 24000, // 2x average block time
   chromeWebSecurity: false,
   experimentalMemoryManagement: true, // better memory management, see https://github.com/cypress-io/cypress/pull/25462
diff --git a/apps/web/cypress/e2e/landing.test.ts b/apps/web/cypress/e2e/landing.test.ts
index b0829fca389..7c614d8e020 100644
--- a/apps/web/cypress/e2e/landing.test.ts
+++ b/apps/web/cypress/e2e/landing.test.ts
@@ -1,5 +1,3 @@
-import { FeatureFlag } from 'featureFlags'
-
 import { getTestSelector } from '../utils'
 import { CONNECTED_WALLET_USER_STATE, DISCONNECTED_WALLET_USER_STATE } from '../utils/user-state'
 
@@ -22,16 +20,10 @@ describe('Landing Page', () => {
     cy.get(getTestSelector('landing-page'))
   })
 
-  it('remains on landing page when account drawer is opened and only redirects after user becomes connected', () => {
-    // Visit landing page with no connection or recent connection, and open account drawer
-    cy.visit('/', { userState: DISCONNECTED_WALLET_USER_STATE })
-    cy.get(getTestSelector('navbar-connect-wallet')).contains('Connect').click()
-    cy.url().should('not.include', '/swap')
-
-    // Connect and verify redirect
-    cy.contains('MetaMask').click()
-    cy.hardhat().then((hardhat) => cy.contains(hardhat.wallet.address.substring(0, 6)))
-    cy.url().should('include', '/swap')
+  it('shows landing page when the unicorn icon in nav is selected', () => {
+    cy.visit('/swap')
+    cy.get(getTestSelector('uniswap-logo')).click()
+    cy.get(getTestSelector('landing-page'))
   })
 
   it('allows navigation to pool', () => {
@@ -93,70 +85,4 @@ describe('Landing Page', () => {
     cy.visit('/swap')
     cy.contains('UK disclaimer')
   })
-
-  it('shows a nav button to download the app when feature is enabled', () => {
-    cy.visit('/?intro=true', {
-      featureFlags: [{ name: FeatureFlag.landingPageV2, value: true }],
-    })
-    cy.get('nav').within(() => {
-      cy.contains('Get the app').should('be.visible')
-    })
-    cy.visit('/swap', {
-      featureFlags: [{ name: FeatureFlag.landingPageV2, value: true }],
-    })
-    cy.get('nav').within(() => {
-      cy.contains('Get the app').should('not.exist')
-    })
-  })
-
-  it('does not show a nav button to download the app when feature is in control', () => {
-    cy.visit('/?intro=true', {
-      featureFlags: [{ name: FeatureFlag.landingPageV2, value: false }],
-    })
-    cy.get('nav').within(() => {
-      cy.contains('Get the app').should('not.exist')
-    })
-  })
-
-  it('hides call to action text on small screen sizes', () => {
-    cy.viewport('iphone-8')
-    cy.visit('/?intro=true', {
-      featureFlags: [{ name: FeatureFlag.landingPageV2, value: true }],
-    })
-    cy.get(getTestSelector('get-the-app-cta')).should('not.be.visible')
-  })
-
-  it('opens modal when Get-the-App button is selected', () => {
-    cy.visit('/?intro=true', {
-      featureFlags: [{ name: FeatureFlag.landingPageV2, value: true }],
-    })
-    cy.get('nav').within(() => {
-      cy.contains('Get the app').should('exist').click()
-    })
-    cy.contains('Download the Uniswap app').should('exist')
-  })
-
-  it('closes modal when close button is selected', () => {
-    cy.visit('/?intro=true', {
-      featureFlags: [{ name: FeatureFlag.landingPageV2, value: true }],
-    })
-    cy.get('nav').within(() => {
-      cy.contains('Get the app').should('exist').click()
-    })
-    cy.contains('Download the Uniswap app').should('exist')
-    cy.get(getTestSelector('get-the-app-close-button')).click()
-    cy.contains('Download the Uniswap app').should('not.exist')
-  })
-
-  it('closes modal when user selects area outside of modal', () => {
-    cy.visit('/?intro=true', {
-      featureFlags: [{ name: FeatureFlag.landingPageV2, value: true }],
-    })
-    cy.get('nav').within(() => {
-      cy.contains('Get the app').should('exist').click()
-    })
-    cy.contains('Download the Uniswap app').should('exist')
-    cy.get('nav').click({ force: true })
-    cy.contains('Download the Uniswap app').should('not.exist')
-  })
 })
diff --git a/apps/web/cypress/e2e/link.test.ts b/apps/web/cypress/e2e/link.test.ts
index b353bda6b98..0d2561029ec 100644
--- a/apps/web/cypress/e2e/link.test.ts
+++ b/apps/web/cypress/e2e/link.test.ts
@@ -1,7 +1,6 @@
 // see https://github.com/Uniswap/interface/pull/4115
 describe('Link', () => {
-  // TODO re-enable web test
-  it.skip('should update route', () => {
+  it('should update route', () => {
     cy.viewport(2000, 1600)
     cy.visit('/swap')
     cy.contains('Pool').click()
diff --git a/apps/web/cypress/e2e/navigation.test.ts b/apps/web/cypress/e2e/navigation.test.ts
deleted file mode 100644
index b28cbe75933..00000000000
--- a/apps/web/cypress/e2e/navigation.test.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { FeatureFlag } from 'featureFlags'
-
-import { getTestSelector } from '../utils'
-
-describe('Navigation', () => {
-  beforeEach(() => {
-    cy.viewport(1400, 900)
-    cy.visit('/?intro=true', {
-      featureFlags: [{ name: FeatureFlag.landingPageV2, value: true }],
-    })
-  })
-  it('displays Swap tab', () => {
-    cy.get('nav').within(() => {
-      cy.contains('Swap').should('be.visible').click()
-    })
-    cy.url().should('include', '/swap')
-  })
-
-  it('displays Tokens tab', () => {
-    cy.get('nav').within(() => {
-      cy.contains('Tokens').should('be.visible').click()
-    })
-    cy.url().should('include', '/tokens')
-  })
-
-  it('displays NFTs tab', () => {
-    cy.get('nav').within(() => {
-      cy.contains('NFTs').should('be.visible').click()
-    })
-    cy.url().should('include', '/nfts')
-  })
-
-  it('displays Pools tab', () => {
-    cy.get('nav').within(() => {
-      cy.contains('Pools').should('be.visible').click()
-    })
-    cy.url().should('include', '/pools')
-  })
-
-  describe('More Menu', () => {
-    it('displays more menu for additional pages and resources', () => {
-      cy.get('nav').within(() => {
-        cy.get(getTestSelector('nav-more-button')).should('be.visible').click()
-      })
-    })
-
-    it('moves pools tab to more menu on smaller screen sizes', () => {
-      cy.viewport(1200, 900)
-      cy.visit('/?intro=true', {
-        featureFlags: [{ name: FeatureFlag.landingPageV2, value: true }],
-      })
-      cy.get('nav').within(() => {
-        cy.contains('Pools').should('not.be.visible')
-        cy.get(getTestSelector('nav-more-button')).should('be.visible').click()
-        cy.get(getTestSelector('nav-more-menu')).within(() => {
-          cy.contains('Pools').should('be.visible').click()
-          cy.url().should('include', '/pools')
-        })
-      })
-    })
-
-    it('lets user open app download modal', () => {
-      cy.get('nav')
-        .within(() => {
-          cy.get(getTestSelector('nav-more-button')).should('be.visible').click()
-          cy.get(getTestSelector('nav-more-menu')).within(() => {
-            cy.contains('Download Uniswap').should('be.visible').click()
-          })
-        })
-        .then(() => {
-          cy.contains('Download the Uniswap app').should('be.visible')
-        })
-    })
-  })
-})
diff --git a/apps/web/cypress/e2e/nfts.test.ts b/apps/web/cypress/e2e/nfts.test.ts
index b110f6510f8..cd882b5e1ff 100644
--- a/apps/web/cypress/e2e/nfts.test.ts
+++ b/apps/web/cypress/e2e/nfts.test.ts
@@ -3,8 +3,7 @@ import { getTestSelector } from '../utils'
 const PUDGY_COLLECTION_ADDRESS = '0xbd3531da5cf5857e7cfaa92426877b022e612cf8'
 
 describe('Testing nfts', () => {
-  // TODO re-enable web test
-  it.skip('should load nft leaderboard', () => {
+  it('should load nft leaderboard', () => {
     cy.visit('/')
     cy.get(getTestSelector('nft-nav')).first().click()
     cy.get(getTestSelector('nft-nav')).first().should('exist')
diff --git a/apps/web/cypress/e2e/service-worker.test.ts b/apps/web/cypress/e2e/service-worker.test.ts
index 125d9ac3d0b..175ba7fc9f1 100644
--- a/apps/web/cypress/e2e/service-worker.test.ts
+++ b/apps/web/cypress/e2e/service-worker.test.ts
@@ -52,8 +52,7 @@ describe('Service Worker', () => {
   })
 
   describe('cache hit', () => {
-    // TODO re-enable web test
-    it.skip('reports the hit to analytics', () => {
+    it('reports the hit to analytics', () => {
       cy.visit('/', { serviceWorker: true })
       cy.wait('@ServiceWorker:hit')
     })
@@ -90,9 +89,7 @@ describe('Service Worker', () => {
         }
       })
     })
-
-    // TODO re-enable web test
-    it.skip('reports the miss to analytics', () => {
+    it('reports the miss to analytics', () => {
       cy.visit('/', { serviceWorker: true })
       cy.wait('@ServiceWorker:miss')
     })
diff --git a/apps/web/cypress/e2e/swap/errors.test.ts b/apps/web/cypress/e2e/swap/errors.test.ts
index 970cc47bd95..cef637adc55 100644
--- a/apps/web/cypress/e2e/swap/errors.test.ts
+++ b/apps/web/cypress/e2e/swap/errors.test.ts
@@ -7,8 +7,7 @@ import { DAI, USDC_MAINNET } from '../../../src/constants/tokens'
 import { getBalance, getTestSelector } from '../../utils'
 
 describe('Swap errors', () => {
-  // TODO re-enable web test
-  it.skip('wallet rejection', () => {
+  it('wallet rejection', () => {
     cy.visit(`/swap?inputCurrency=ETH&outputCurrency=${USDC_MAINNET.address}`)
     cy.hardhat().then((hardhat) => {
       // Stub the wallet to reject any transaction.
@@ -29,8 +28,7 @@ describe('Swap errors', () => {
     })
   })
 
-  // TODO re-enable web test
-  it.skip('transaction past deadline', () => {
+  it('transaction past deadline', () => {
     cy.visit(`/swap?inputCurrency=ETH&outputCurrency=${USDC_MAINNET.address}`)
     cy.hardhat({ automine: false })
     getBalance(USDC_MAINNET).then((initialBalance) => {
diff --git a/apps/web/cypress/e2e/swap/logging.test.ts b/apps/web/cypress/e2e/swap/logging.test.ts
index 0b3731001bc..170573fc50d 100644
--- a/apps/web/cypress/e2e/swap/logging.test.ts
+++ b/apps/web/cypress/e2e/swap/logging.test.ts
@@ -4,8 +4,7 @@ import { USDC_MAINNET } from '../../../src/constants/tokens'
 import { getTestSelector } from '../../utils'
 
 describe('swap flow logging', () => {
-  // TODO re-enable web test
-  it.skip('completes two swaps and verifies the TTS logging for the first, plus all intermediate steps along the way', () => {
+  it('completes two swaps and verifies the TTS logging for the first, plus all intermediate steps along the way', () => {
     cy.visit(`/swap?inputCurrency=ETH&outputCurrency=${USDC_MAINNET.address}`)
     cy.hardhat()
 
diff --git a/apps/web/cypress/e2e/swap/swap.test.ts b/apps/web/cypress/e2e/swap/swap.test.ts
index d10abbe64dd..7ccef02b512 100644
--- a/apps/web/cypress/e2e/swap/swap.test.ts
+++ b/apps/web/cypress/e2e/swap/swap.test.ts
@@ -52,8 +52,7 @@ describe('Swap', () => {
       cy.get(`#swap-currency-output .token-amount-input`).should('not.have.value')
     })
 
-    // TODO re-enable web test
-    it.skip('swaps ETH for USDC', () => {
+    it('swaps ETH for USDC', () => {
       cy.visit('/swap')
       cy.hardhat({ automine: false })
       getBalance(USDC_MAINNET).then((initialBalance) => {
diff --git a/apps/web/cypress/e2e/swap/uniswapx.test.ts b/apps/web/cypress/e2e/swap/uniswapx.test.ts
index 5181fe32ef4..0019deed9be 100644
--- a/apps/web/cypress/e2e/swap/uniswapx.test.ts
+++ b/apps/web/cypress/e2e/swap/uniswapx.test.ts
@@ -42,7 +42,6 @@ function stubSwapTxReceipt() {
 }
 
 // TODO: FIX THESE TESTS where we should NOT stub for pricing requests
-// TODO: add test case for cancelling a uniswapx order
 describe.skip('UniswapX Toggle', () => {
   beforeEach(() => {
     stubNonPriceQuoteWith(QuoteWhereUniswapXIsBetter)
diff --git a/apps/web/cypress/e2e/token-details.test.ts b/apps/web/cypress/e2e/token-details.test.ts
index 67b8ef32f13..8906454d6bd 100644
--- a/apps/web/cypress/e2e/token-details.test.ts
+++ b/apps/web/cypress/e2e/token-details.test.ts
@@ -13,8 +13,7 @@ describe('Token details', () => {
     cy.viewport(1440, 900)
   })
 
-  // TODO WEB-3579
-  it.skip('should have a single h1 tag on smaller screen size', () => {
+  it('should have a single h1 tag on smaller screen size', () => {
     cy.viewport(800, 600)
     cy.visit(`/tokens/ethereum/${UNI_ADDRESS}`, { featureFlags: [{ name: FeatureFlag.infoTDP, value: false }] })
     cy.get('h1').should('have.length', 1)
@@ -163,7 +162,7 @@ describe('Token details', () => {
       cy.get('#swap-currency-output .token-amount-input').clear().type('0.0').should('have.value', '0.0')
     })
 
-    it.skip('should show a L2 token even if the user is connected to a different network', () => {
+    it('should show a L2 token even if the user is connected to a different network', () => {
       cy.visit('/tokens')
       cy.get(getTestSelector('tokens-network-filter-selected')).click()
       cy.get(getTestSelector('tokens-network-filter-option-arbitrum')).click()
diff --git a/apps/web/cypress/e2e/token-explore.test.ts b/apps/web/cypress/e2e/token-explore.test.ts
index 5bd52279b9a..2802a7ac02b 100644
--- a/apps/web/cypress/e2e/token-explore.test.ts
+++ b/apps/web/cypress/e2e/token-explore.test.ts
@@ -50,8 +50,7 @@ describe('Token explore', () => {
     cy.contains('Etherscan').should('exist')
   })
 
-  // TODO re-enable web test
-  it.skip('should update when global network changed', () => {
+  it('should update when global network changed', () => {
     cy.visit('/tokens/ethereum')
     cy.get(getTestSelector('tokens-network-filter-selected')).should('contain', 'Ethereum')
     cy.get(getTestSelector('token-table-row-NATIVE')).should('exist')
@@ -63,8 +62,7 @@ describe('Token explore', () => {
     cy.get(getTestSelector('token-table-row-NATIVE')).find(getTestSelector('name-cell')).should('include.text', 'Matic')
   })
 
-  // TODO re-enable web test
-  it.skip('should update when token explore table network changed', () => {
+  it('should update when token explore table network changed', () => {
     cy.visit('/tokens/ethereum')
     cy.get(getTestSelector('tokens-network-filter-selected')).click()
     cy.get(getTestSelector('tokens-network-filter-option-optimism')).click()
diff --git a/apps/web/cypress/e2e/wallet-connection/switch-network.test.ts b/apps/web/cypress/e2e/wallet-connection/switch-network.test.ts
index d01385ff606..917a719ff8d 100644
--- a/apps/web/cypress/e2e/wallet-connection/switch-network.test.ts
+++ b/apps/web/cypress/e2e/wallet-connection/switch-network.test.ts
@@ -95,8 +95,7 @@ describe('network switching', () => {
     promise.resolve()
   })
 
-  // TODO re-enable web test
-  it.skip('should switch networks', () => {
+  it('should switch networks', () => {
     // Select an output currency
     cy.get('#swap-currency-output .open-currency-select-button').click()
     cy.contains('USDC').click()
diff --git a/apps/web/cypress/staging/t9n.test.ts b/apps/web/cypress/staging/t9n.test.ts
index 028d9e451eb..d59fd7ec7dc 100644
--- a/apps/web/cypress/staging/t9n.test.ts
+++ b/apps/web/cypress/staging/t9n.test.ts
@@ -1,15 +1,13 @@
 import { getTestSelector } from '../utils'
 
 describe('translations', () => {
-  // TODO re-enable web test
-  it.skip('loads locale from the query param', () => {
+  it('loads locale from the query param', () => {
     cy.visit('/?lng=fr-FR')
     cy.contains('Échanger')
     cy.contains('Uniswap disponible en : English')
   })
 
-  // TODO re-enable web test
-  it.skip('loads locale from menu', () => {
+  it('loads locale from menu', () => {
     cy.visit('/')
     cy.get(getTestSelector('web3-status-connected')).click()
     cy.get(getTestSelector('wallet-settings')).click()
diff --git a/apps/web/cypress/tsconfig.json b/apps/web/cypress/tsconfig.json
index 90aec36cd64..1bee07ae6c8 100644
--- a/apps/web/cypress/tsconfig.json
+++ b/apps/web/cypress/tsconfig.json
@@ -5,7 +5,6 @@
     "incremental": true,
     "isolatedModules": false,
     "noImplicitAny": false,
-    "sourceMap": false,
     "target": "ES6",
     "tsBuildInfoFile": "../node_modules/.cache/tsbuildinfo/cypress", // avoid clobbering the build tsbuildinfo
     "types": ["cypress", "node"],
diff --git a/apps/web/cypress/utils/user-state.ts b/apps/web/cypress/utils/user-state.ts
index 3cab361753d..c8488ed9b74 100644
--- a/apps/web/cypress/utils/user-state.ts
+++ b/apps/web/cypress/utils/user-state.ts
@@ -16,7 +16,12 @@ export const DISCONNECTED_WALLET_USER_STATE: Partial<UserState> = { recentConnec
 export function setInitialUserState(win: Cypress.AUTWindow, state: UserState) {
   // Selected wallet should also be reflected in localStorage, so that eager connections work.
   if (state.recentConnectionMeta) {
-    win.localStorage.setItem(connectionMetaKey, JSON.stringify(state.recentConnectionMeta))
+    win.localStorage.setItem(
+      connectionMetaKey,
+      JSON.stringify({
+        type: state.recentConnectionMeta,
+      })
+    )
   }
 
   win.indexedDB.deleteDatabase('redux')
diff --git a/apps/web/functions/api/image/nfts/asset/[[index]].tsx b/apps/web/functions/api/image/nfts/asset/[[index]].tsx
index bc66b3a09a0..ec8015703aa 100644
--- a/apps/web/functions/api/image/nfts/asset/[[index]].tsx
+++ b/apps/web/functions/api/image/nfts/asset/[[index]].tsx
@@ -1,5 +1,6 @@
 /* eslint-disable import/no-unused-modules */
 import { ImageResponse } from '@vercel/og'
+import React from 'react'
 
 import { blocklistedCollections } from '../../../../../src/nft/utils/blocklist'
 import { WATERMARK_URL } from '../../../../constants'
diff --git a/apps/web/functions/api/image/nfts/collection/[index].tsx b/apps/web/functions/api/image/nfts/collection/[index].tsx
index 2475e48f8cc..2ae049a11cf 100644
--- a/apps/web/functions/api/image/nfts/collection/[index].tsx
+++ b/apps/web/functions/api/image/nfts/collection/[index].tsx
@@ -1,5 +1,6 @@
 /* eslint-disable import/no-unused-modules */
 import { ImageResponse } from '@vercel/og'
+import React from 'react'
 
 import { blocklistedCollections } from '../../../../../src/nft/utils/blocklist'
 import { getColor } from '../../../../../src/utils/getColor'
diff --git a/apps/web/functions/api/image/tokens/[[index]].tsx b/apps/web/functions/api/image/tokens/[[index]].tsx
index d02172b2a52..e84121b2352 100644
--- a/apps/web/functions/api/image/tokens/[[index]].tsx
+++ b/apps/web/functions/api/image/tokens/[[index]].tsx
@@ -1,5 +1,6 @@
 /* eslint-disable import/no-unused-modules */
 import { ImageResponse } from '@vercel/og'
+import React from 'react'
 
 import { getColor } from '../../../../src/utils/getColor'
 import { WATERMARK_URL } from '../../../constants'
diff --git a/apps/web/functions/nfts/asset/__snapshots__/nft.test.ts.snap b/apps/web/functions/nfts/asset/__snapshots__/nft.test.ts.snap
new file mode 100644
index 00000000000..06fb618efca
--- /dev/null
+++ b/apps/web/functions/nfts/asset/__snapshots__/nft.test.ts.snap
@@ -0,0 +1,445 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`should inject metadata for valid assets: Azuki 1`] = `
+"<!DOCTYPE html>
+<html translate="no">
+  <head>
+    <meta charset="utf-8" />
+
+    <title>Uniswap Interface</title>
+
+    <!--
+       will be replaced with the URL of the \`public\` folder during build.
+      Only files inside the \`public\` folder can be referenced from the HTML.
+    -->
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+    <link rel="apple-touch-icon" sizes="192x192" href="/images/192x192_App_Icon.png" />
+    <link rel="apple-touch-icon" sizes="512x512" href="/images/512x512_App_Icon.png" />
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta name="theme-color" content="#fff" />
+    <meta
+      http-equiv="Content-Security-Policy"
+      
+        content="script-src 'self' 'unsafe-inline'"
+      
+    />
+
+    <!-- 
+      Apple Smart App Banner for Safari on iOS
+      https://developer.apple.com/documentation/webkit/promoting_apps_with_smart_app_banners
+     -->
+    <meta name="apple-itunes-app" content="app-id=6443944476">
+
+    <!--
+      manifest.json provides metadata used when the app is installed as a PWA.
+      See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="/manifest.json" />
+
+    <link rel="preconnect" href="https://api.uniswap.org/" crossorigin/>
+    <link rel="preconnect" href="https://mainnet.infura.io/" crossorigin/>
+
+    <link rel="preload" href="/fonts/Basel-Book.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff2" as="font" type="font/woff2" crossorigin />
+   
+    <style>
+      * {
+        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: 535;
+        font-style: normal;
+        font-display: block;
+        src: 
+          url('/fonts/Basel-Medium.woff2') format('woff2'),
+          url('/fonts/Basel-Medium.woff') format('woff');
+      }
+
+      @font-face {
+        font-family: 'Basel';
+        font-weight: 485;
+        font-style: normal;
+        font-display: block;
+        src: 
+          url('/fonts/Basel-Book.woff') format('woff2'),
+          url('/fonts/Basel-Book.woff') format('woff');
+      }
+
+      @supports (font-variation-settings: normal) {
+        * {
+          font-family: 'Basel', sans-serif;
+        }
+      }
+
+      html,
+      body {
+        margin: 0;
+        padding: 0;
+      }
+
+      button {
+        user-select: none;
+      }
+
+      html {
+        font-size: 16px;
+        font-weight: 485;
+        font-variant: none;
+        font-smooth: always;
+        text-rendering: optimizeLegibility !important;
+        -webkit-font-smoothing: antialiased !important;
+        -moz-osx-font-smoothing: grayscale;
+        -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+      }
+
+      /* Use this to apply network-specific gradient backgrounds, in RadialGradientByChainUpdater.ts */
+      #background-radial-gradient {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        pointer-events: none;
+        width: 200vw;
+        height: 200vh;
+        transform: translate(-50vw, -100vh);
+        z-index: -1;
+      }
+
+      html,
+      body,
+      #root {
+        min-height: 100%;
+      }
+
+      @media (prefers-color-scheme: dark) {
+        html {
+          background: linear-gradient(rgb(19, 19, 19) 0%, rgb(19, 19, 19) 100%);
+        }
+      }
+
+      @media (prefers-color-scheme: light) {
+        html {
+          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0) 0%, rgba(255, 255, 255, 0) 100%), rgb(255, 255, 255);
+        }
+      }
+    </style>
+  <script defer src="/static/js/bundle.js"></script><meta property="og:title" content="Azuki #2550"/><meta property="og:image" content="http://127.0.0.1:3000/api/image/nfts/asset/0xed5af388653567af2f388e6224dc7c4b3241c544/2550"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Azuki #2550"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/nfts/asset/0xed5af388653567af2f388e6224dc7c4b3241c544/2550"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Azuki #2550"/><meta property="twitter:image" content="http://127.0.0.1:3000/api/image/nfts/asset/0xed5af388653567af2f388e6224dc7c4b3241c544/2550"/><meta property="twitter:image:alt" content="Azuki #2550"/></head>
+
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+
+    <div id="root">
+      <!-- Triggers the font to load immediately and then is replaced by the app -->
+      <div>&emsp;</div>
+    </div>
+
+    <div id="background-radial-gradient"></div>
+  </body>
+</html>
+"
+`;
+
+exports[`should inject metadata for valid assets: Bored Ape Yacht Club 1`] = `
+"<!DOCTYPE html>
+<html translate="no">
+  <head>
+    <meta charset="utf-8" />
+
+    <title>Uniswap Interface</title>
+
+    <!--
+       will be replaced with the URL of the \`public\` folder during build.
+      Only files inside the \`public\` folder can be referenced from the HTML.
+    -->
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+    <link rel="apple-touch-icon" sizes="192x192" href="/images/192x192_App_Icon.png" />
+    <link rel="apple-touch-icon" sizes="512x512" href="/images/512x512_App_Icon.png" />
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta name="theme-color" content="#fff" />
+    <meta
+      http-equiv="Content-Security-Policy"
+      
+        content="script-src 'self' 'unsafe-inline'"
+      
+    />
+
+    <!-- 
+      Apple Smart App Banner for Safari on iOS
+      https://developer.apple.com/documentation/webkit/promoting_apps_with_smart_app_banners
+     -->
+    <meta name="apple-itunes-app" content="app-id=6443944476">
+
+    <!--
+      manifest.json provides metadata used when the app is installed as a PWA.
+      See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="/manifest.json" />
+
+    <link rel="preconnect" href="https://api.uniswap.org/" crossorigin/>
+    <link rel="preconnect" href="https://mainnet.infura.io/" crossorigin/>
+
+    <link rel="preload" href="/fonts/Basel-Book.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff2" as="font" type="font/woff2" crossorigin />
+   
+    <style>
+      * {
+        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: 535;
+        font-style: normal;
+        font-display: block;
+        src: 
+          url('/fonts/Basel-Medium.woff2') format('woff2'),
+          url('/fonts/Basel-Medium.woff') format('woff');
+      }
+
+      @font-face {
+        font-family: 'Basel';
+        font-weight: 485;
+        font-style: normal;
+        font-display: block;
+        src: 
+          url('/fonts/Basel-Book.woff') format('woff2'),
+          url('/fonts/Basel-Book.woff') format('woff');
+      }
+
+      @supports (font-variation-settings: normal) {
+        * {
+          font-family: 'Basel', sans-serif;
+        }
+      }
+
+      html,
+      body {
+        margin: 0;
+        padding: 0;
+      }
+
+      button {
+        user-select: none;
+      }
+
+      html {
+        font-size: 16px;
+        font-weight: 485;
+        font-variant: none;
+        font-smooth: always;
+        text-rendering: optimizeLegibility !important;
+        -webkit-font-smoothing: antialiased !important;
+        -moz-osx-font-smoothing: grayscale;
+        -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+      }
+
+      /* Use this to apply network-specific gradient backgrounds, in RadialGradientByChainUpdater.ts */
+      #background-radial-gradient {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        pointer-events: none;
+        width: 200vw;
+        height: 200vh;
+        transform: translate(-50vw, -100vh);
+        z-index: -1;
+      }
+
+      html,
+      body,
+      #root {
+        min-height: 100%;
+      }
+
+      @media (prefers-color-scheme: dark) {
+        html {
+          background: linear-gradient(rgb(19, 19, 19) 0%, rgb(19, 19, 19) 100%);
+        }
+      }
+
+      @media (prefers-color-scheme: light) {
+        html {
+          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0) 0%, rgba(255, 255, 255, 0) 100%), rgb(255, 255, 255);
+        }
+      }
+    </style>
+  <script defer src="/static/js/bundle.js"></script><meta property="og:title" content="Bored Ape Yacht Club #3735"/><meta property="og:image" content="http://127.0.0.1:3000/api/image/nfts/asset/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d/3735"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="Bored Ape Yacht Club #3735"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/nfts/asset/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d/3735"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="Bored Ape Yacht Club #3735"/><meta property="twitter:image" content="http://127.0.0.1:3000/api/image/nfts/asset/0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d/3735"/><meta property="twitter:image:alt" content="Bored Ape Yacht Club #3735"/></head>
+
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+
+    <div id="root">
+      <!-- Triggers the font to load immediately and then is replaced by the app -->
+      <div>&emsp;</div>
+    </div>
+
+    <div id="background-radial-gradient"></div>
+  </body>
+</html>
+"
+`;
+
+exports[`should inject metadata for valid assets: CryptoPunk 1`] = `
+"<!DOCTYPE html>
+<html translate="no">
+  <head>
+    <meta charset="utf-8" />
+
+    <title>Uniswap Interface</title>
+
+    <!--
+       will be replaced with the URL of the \`public\` folder during build.
+      Only files inside the \`public\` folder can be referenced from the HTML.
+    -->
+    <link rel="shortcut icon" type="image/png" href="/favicon.png" />
+    <link rel="apple-touch-icon" sizes="192x192" href="/images/192x192_App_Icon.png" />
+    <link rel="apple-touch-icon" sizes="512x512" href="/images/512x512_App_Icon.png" />
+
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
+    <meta name="theme-color" content="#fff" />
+    <meta
+      http-equiv="Content-Security-Policy"
+      
+        content="script-src 'self' 'unsafe-inline'"
+      
+    />
+
+    <!-- 
+      Apple Smart App Banner for Safari on iOS
+      https://developer.apple.com/documentation/webkit/promoting_apps_with_smart_app_banners
+     -->
+    <meta name="apple-itunes-app" content="app-id=6443944476">
+
+    <!--
+      manifest.json provides metadata used when the app is installed as a PWA.
+      See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
+    <link rel="manifest" href="/manifest.json" />
+
+    <link rel="preconnect" href="https://api.uniswap.org/" crossorigin/>
+    <link rel="preconnect" href="https://mainnet.infura.io/" crossorigin/>
+
+    <link rel="preload" href="/fonts/Basel-Book.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff2" as="font" type="font/woff2" crossorigin />
+   
+    <style>
+      * {
+        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: 535;
+        font-style: normal;
+        font-display: block;
+        src: 
+          url('/fonts/Basel-Medium.woff2') format('woff2'),
+          url('/fonts/Basel-Medium.woff') format('woff');
+      }
+
+      @font-face {
+        font-family: 'Basel';
+        font-weight: 485;
+        font-style: normal;
+        font-display: block;
+        src: 
+          url('/fonts/Basel-Book.woff') format('woff2'),
+          url('/fonts/Basel-Book.woff') format('woff');
+      }
+
+      @supports (font-variation-settings: normal) {
+        * {
+          font-family: 'Basel', sans-serif;
+        }
+      }
+
+      html,
+      body {
+        margin: 0;
+        padding: 0;
+      }
+
+      button {
+        user-select: none;
+      }
+
+      html {
+        font-size: 16px;
+        font-weight: 485;
+        font-variant: none;
+        font-smooth: always;
+        text-rendering: optimizeLegibility !important;
+        -webkit-font-smoothing: antialiased !important;
+        -moz-osx-font-smoothing: grayscale;
+        -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+      }
+
+      /* Use this to apply network-specific gradient backgrounds, in RadialGradientByChainUpdater.ts */
+      #background-radial-gradient {
+        position: fixed;
+        top: 0;
+        left: 0;
+        right: 0;
+        pointer-events: none;
+        width: 200vw;
+        height: 200vh;
+        transform: translate(-50vw, -100vh);
+        z-index: -1;
+      }
+
+      html,
+      body,
+      #root {
+        min-height: 100%;
+      }
+
+      @media (prefers-color-scheme: dark) {
+        html {
+          background: linear-gradient(rgb(19, 19, 19) 0%, rgb(19, 19, 19) 100%);
+        }
+      }
+
+      @media (prefers-color-scheme: light) {
+        html {
+          background: radial-gradient(100% 100% at 50% 0%, rgba(255, 184, 226, 0) 0%, rgba(255, 255, 255, 0) 100%), rgb(255, 255, 255);
+        }
+      }
+    </style>
+  <script defer src="/static/js/bundle.js"></script><meta property="og:title" content="CryptoPunk #3947"/><meta property="og:image" content="http://127.0.0.1:3000/api/image/nfts/asset/0xb47e3cd837ddf8e4c57f05d70ab865de6e193bbb/3947"/><meta property="og:image:width" content="1200"/><meta property="og:image:height" content="630"/><meta property="og:image:alt" content="CryptoPunk #3947"/><meta property="og:type" content="website"/><meta property="og:url" content="http://127.0.0.1:3000/nfts/asset/0xb47e3cd837ddf8e4c57f05d70ab865de6e193bbb/3947"/><meta property="twitter:card" content="summary_large_image"/><meta property="twitter:title" content="CryptoPunk #3947"/><meta property="twitter:image" content="http://127.0.0.1:3000/api/image/nfts/asset/0xb47e3cd837ddf8e4c57f05d70ab865de6e193bbb/3947"/><meta property="twitter:image:alt" content="CryptoPunk #3947"/></head>
+
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+
+    <div id="root">
+      <!-- Triggers the font to load immediately and then is replaced by the app -->
+      <div>&emsp;</div>
+    </div>
+
+    <div id="background-radial-gradient"></div>
+  </body>
+</html>
+"
+`;
diff --git a/apps/web/functions/nfts/asset/nft.test.ts b/apps/web/functions/nfts/asset/nft.test.ts
index 9f5b2c11064..8adeb471ab4 100644
--- a/apps/web/functions/nfts/asset/nft.test.ts
+++ b/apps/web/functions/nfts/asset/nft.test.ts
@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const assets = [
   {
     address: '0xed5af388653567af2f388e6224dc7c4b3241c544',
@@ -20,27 +19,24 @@ const assets = [
   },
 ]
 
-// TODO re-enable web tests
-// eslint-disable-next-line jest/no-commented-out-tests
-// test.each(assets)('should inject metadata for valid assets', async (nft) => {
-//   const url = 'http://127.0.0.1:3000/nfts/asset/' + nft.address + '/' + nft.assetId
-//   const body = await fetch(new Request(url)).then((res) => res.text())
-//   expect(body).toMatchSnapshot(nft.collectionName)
-//   expect(body).toContain(`<meta property="og:title" content="${nft.collectionName} #${nft.assetId}"/>`)
-//   expect(body).not.toContain(`<meta property="og:description"`)
-//   expect(body).toContain(`<meta property="og:image" content="${nft.image}"/>`)
-//   expect(body).toContain(`<meta property="og:image:width" content="1200"/>`)
-//   expect(body).toContain(`<meta property="og:image:height" content="630"/>`)
-//   expect(body).toContain(`<meta property="og:type" content="website"/>`)
-//   expect(body).toContain(`<meta property="og:url" content="${url}"/>`)
-//   expect(body).toContain(`<meta property="og:image:alt" content="${nft.collectionName} #${nft.assetId}"/>`)
-//   expect(body).toContain(`<meta property="twitter:card" content="summary_large_image"/>`)
-//   expect(body).toContain(`<meta property="twitter:title" content="${nft.collectionName} #${nft.assetId}"/>`)
-//   expect(body).toContain(`<meta property="twitter:image" content="${nft.image}"/>`)
-//   expect(body).toContain(`<meta property="twitter:image:alt" content="${nft.collectionName} #${nft.assetId}"/>`)
-// })
+test.each(assets)('should inject metadata for valid assets', async (nft) => {
+  const url = 'http://127.0.0.1:3000/nfts/asset/' + nft.address + '/' + nft.assetId
+  const body = await fetch(new Request(url)).then((res) => res.text())
+  expect(body).toMatchSnapshot(nft.collectionName)
+  expect(body).toContain(`<meta property="og:title" content="${nft.collectionName} #${nft.assetId}"/>`)
+  expect(body).not.toContain(`<meta property="og:description"`)
+  expect(body).toContain(`<meta property="og:image" content="${nft.image}"/>`)
+  expect(body).toContain(`<meta property="og:image:width" content="1200"/>`)
+  expect(body).toContain(`<meta property="og:image:height" content="630"/>`)
+  expect(body).toContain(`<meta property="og:type" content="website"/>`)
+  expect(body).toContain(`<meta property="og:url" content="${url}"/>`)
+  expect(body).toContain(`<meta property="og:image:alt" content="${nft.collectionName} #${nft.assetId}"/>`)
+  expect(body).toContain(`<meta property="twitter:card" content="summary_large_image"/>`)
+  expect(body).toContain(`<meta property="twitter:title" content="${nft.collectionName} #${nft.assetId}"/>`)
+  expect(body).toContain(`<meta property="twitter:image" content="${nft.image}"/>`)
+  expect(body).toContain(`<meta property="twitter:image:alt" content="${nft.collectionName} #${nft.assetId}"/>`)
+})
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const invalidAssets = [
   'http://127.0.0.1:3000/nfts/asset/0xed5af388653567af2f388e6224dc7c4b3241c544/100000',
   'http://127.0.0.1:3000/nfts/asset/0xed5af388653567af2f388e6224dc7c4b3241c544',
@@ -50,23 +46,17 @@ const invalidAssets = [
   'http://127.0.0.1:3000/nfts/asset/0xed5af388653567af2f388e6224dc7c4b3241c544//2550',
 ]
 
-test('pass', () => {
-  expect(0).toBe(0)
+test.each(invalidAssets)('should not inject metadata for invalid asset calls', async (url) => {
+  const body = await fetch(new Request(url)).then((res) => res.text())
+  expect(body).not.toContain('og:title')
+  expect(body).not.toContain('og:image')
+  expect(body).not.toContain('og:image:width')
+  expect(body).not.toContain('og:image:height')
+  expect(body).not.toContain('og:type')
+  expect(body).not.toContain('og:url')
+  expect(body).not.toContain('og:image:alt')
+  expect(body).not.toContain('twitter:card')
+  expect(body).not.toContain('twitter:title')
+  expect(body).not.toContain('twitter:image')
+  expect(body).not.toContain('twitter:image:alt')
 })
-
-// TODO re-enable web tests
-// eslint-disable-next-line jest/no-commented-out-tests
-// test.each(invalidAssets)('should not inject metadata for invalid asset calls', async (url) => {
-//   const body = await fetch(new Request(url)).then((res) => res.text())
-//   expect(body).not.toContain('og:title')
-//   expect(body).not.toContain('og:image')
-//   expect(body).not.toContain('og:image:width')
-//   expect(body).not.toContain('og:image:height')
-//   expect(body).not.toContain('og:type')
-//   expect(body).not.toContain('og:url')
-//   expect(body).not.toContain('og:image:alt')
-//   expect(body).not.toContain('twitter:card')
-//   expect(body).not.toContain('twitter:title')
-//   expect(body).not.toContain('twitter:image')
-//   expect(body).not.toContain('twitter:image:alt')
-// })
diff --git a/apps/web/functions/nfts/collection/__snapshots__/collection.test.ts.snap b/apps/web/functions/nfts/collection/__snapshots__/collection.test.ts.snap
index 5c17401c2a6..d0c026d8e7d 100644
--- a/apps/web/functions/nfts/collection/__snapshots__/collection.test.ts.snap
+++ b/apps/web/functions/nfts/collection/__snapshots__/collection.test.ts.snap
@@ -18,12 +18,13 @@ exports[`should inject metadata for collections 1`] = `
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <meta name="theme-color" content="#fff" />
-    
     <meta
-      http-equiv="Content-Security-Policy" 
-      content="default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline' 'wasm-unsafe-eval' data: https://translate.googleapis.com/ https://vercel.com https://vercel.live/ https://www.google-analytics.com https://www.googletagmanager.com; style-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src * 'self' blob: data: https://assets.coingecko.com/ https://cdn.center.app/ https://ethereum-optimism.github.io/ https://explorer-api.walletconnect.com/ https://i.seadn.io/ https://lh3.googleusercontent.com/ https://openseauserdata.com/ https://raw.githubusercontent.com/ https://raw.seadn.io/ https://s2.coinmarketcap.com/ https://static.optimism.io/ https://vercel.com https://vercel.live/; frame-src 'self' https://buy.moonpay.com/ https://vercel.com https://vercel.live/ https://verify.walletconnect.com/ https://verify.walletconnect.org/; connect-src * 'self' blob: data: https://api.moonpay.com/ https://api.opensea.io https://api.thegraph.com/ https://api.uniswap.org https://arbitrum-mainnet.infura.io/ https://avalanche-mainnet.infura.io/ https://base-mainnet.infura.io/ https://bridge.arbitrum.io https://celo-org.github.io https://cloudflare-ipfs.com https://explorer-api.walletconnect.com https://forno.celo.org/ https://gateway.ipfs.io/ https://interface.gateway.uniswap.org https://mainnet.infura.io https://o1037921.ingest.sentry.io https://old-wispy-arrow.bsc.quiknode.pro/ https://optimism-mainnet.infura.io/ https://polygon-mainnet.infura.io/ https://raw.githubusercontent.com https://static.optimism.io https://temp.api.uniswap.org/ https://tokenlist.arbitrum.io https://tokens.coingecko.com https://ultra-blue-flower.quiknode.pro https://us-central1-uniswap-mobile.cloudfunctions.net/ https://vercel.com https://vercel.live/ https://www.gemini.com wss://relay.walletconnect.com/ wss://www.walletlink.org/rpc; worker-src * 'self' blob:;"
-    >
-    
+      http-equiv="Content-Security-Policy"
+      
+        content="script-src 'self' 'unsafe-inline'"
+      
+    />
+
     <!-- 
       Apple Smart App Banner for Safari on iOS
       https://developer.apple.com/documentation/webkit/promoting_apps_with_smart_app_banners
@@ -39,10 +40,10 @@ exports[`should inject metadata for collections 1`] = `
     <link rel="preconnect" href="https://api.uniswap.org/" crossorigin/>
     <link rel="preconnect" href="https://mainnet.infura.io/" crossorigin/>
 
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff2" as="font" type="font/woff2" crossorigin />
    
     <style>
       * {
@@ -59,8 +60,8 @@ exports[`should inject metadata for collections 1`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Medium.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Medium.woff') format('woff');
+          url('/fonts/Basel-Medium.woff2') format('woff2'),
+          url('/fonts/Basel-Medium.woff') format('woff');
       }
 
       @font-face {
@@ -69,8 +70,8 @@ exports[`should inject metadata for collections 1`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Book.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Book.woff') format('woff');
+          url('/fonts/Basel-Book.woff') format('woff2'),
+          url('/fonts/Basel-Book.woff') format('woff');
       }
 
       @supports (font-variation-settings: normal) {
@@ -165,12 +166,13 @@ exports[`should inject metadata for collections 2`] = `
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <meta name="theme-color" content="#fff" />
-    
     <meta
-      http-equiv="Content-Security-Policy" 
-      content="default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline' 'wasm-unsafe-eval' data: https://translate.googleapis.com/ https://vercel.com https://vercel.live/ https://www.google-analytics.com https://www.googletagmanager.com; style-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src * 'self' blob: data: https://assets.coingecko.com/ https://cdn.center.app/ https://ethereum-optimism.github.io/ https://explorer-api.walletconnect.com/ https://i.seadn.io/ https://lh3.googleusercontent.com/ https://openseauserdata.com/ https://raw.githubusercontent.com/ https://raw.seadn.io/ https://s2.coinmarketcap.com/ https://static.optimism.io/ https://vercel.com https://vercel.live/; frame-src 'self' https://buy.moonpay.com/ https://vercel.com https://vercel.live/ https://verify.walletconnect.com/ https://verify.walletconnect.org/; connect-src * 'self' blob: data: https://api.moonpay.com/ https://api.opensea.io https://api.thegraph.com/ https://api.uniswap.org https://arbitrum-mainnet.infura.io/ https://avalanche-mainnet.infura.io/ https://base-mainnet.infura.io/ https://bridge.arbitrum.io https://celo-org.github.io https://cloudflare-ipfs.com https://explorer-api.walletconnect.com https://forno.celo.org/ https://gateway.ipfs.io/ https://interface.gateway.uniswap.org https://mainnet.infura.io https://o1037921.ingest.sentry.io https://old-wispy-arrow.bsc.quiknode.pro/ https://optimism-mainnet.infura.io/ https://polygon-mainnet.infura.io/ https://raw.githubusercontent.com https://static.optimism.io https://temp.api.uniswap.org/ https://tokenlist.arbitrum.io https://tokens.coingecko.com https://ultra-blue-flower.quiknode.pro https://us-central1-uniswap-mobile.cloudfunctions.net/ https://vercel.com https://vercel.live/ https://www.gemini.com wss://relay.walletconnect.com/ wss://www.walletlink.org/rpc; worker-src * 'self' blob:;"
-    >
-    
+      http-equiv="Content-Security-Policy"
+      
+        content="script-src 'self' 'unsafe-inline'"
+      
+    />
+
     <!-- 
       Apple Smart App Banner for Safari on iOS
       https://developer.apple.com/documentation/webkit/promoting_apps_with_smart_app_banners
@@ -186,10 +188,10 @@ exports[`should inject metadata for collections 2`] = `
     <link rel="preconnect" href="https://api.uniswap.org/" crossorigin/>
     <link rel="preconnect" href="https://mainnet.infura.io/" crossorigin/>
 
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff2" as="font" type="font/woff2" crossorigin />
    
     <style>
       * {
@@ -206,8 +208,8 @@ exports[`should inject metadata for collections 2`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Medium.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Medium.woff') format('woff');
+          url('/fonts/Basel-Medium.woff2') format('woff2'),
+          url('/fonts/Basel-Medium.woff') format('woff');
       }
 
       @font-face {
@@ -216,8 +218,8 @@ exports[`should inject metadata for collections 2`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Book.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Book.woff') format('woff');
+          url('/fonts/Basel-Book.woff') format('woff2'),
+          url('/fonts/Basel-Book.woff') format('woff');
       }
 
       @supports (font-variation-settings: normal) {
@@ -312,12 +314,13 @@ exports[`should inject metadata for collections 3`] = `
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <meta name="theme-color" content="#fff" />
-    
     <meta
-      http-equiv="Content-Security-Policy" 
-      content="default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline' 'wasm-unsafe-eval' data: https://translate.googleapis.com/ https://vercel.com https://vercel.live/ https://www.google-analytics.com https://www.googletagmanager.com; style-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src * 'self' blob: data: https://assets.coingecko.com/ https://cdn.center.app/ https://ethereum-optimism.github.io/ https://explorer-api.walletconnect.com/ https://i.seadn.io/ https://lh3.googleusercontent.com/ https://openseauserdata.com/ https://raw.githubusercontent.com/ https://raw.seadn.io/ https://s2.coinmarketcap.com/ https://static.optimism.io/ https://vercel.com https://vercel.live/; frame-src 'self' https://buy.moonpay.com/ https://vercel.com https://vercel.live/ https://verify.walletconnect.com/ https://verify.walletconnect.org/; connect-src * 'self' blob: data: https://api.moonpay.com/ https://api.opensea.io https://api.thegraph.com/ https://api.uniswap.org https://arbitrum-mainnet.infura.io/ https://avalanche-mainnet.infura.io/ https://base-mainnet.infura.io/ https://bridge.arbitrum.io https://celo-org.github.io https://cloudflare-ipfs.com https://explorer-api.walletconnect.com https://forno.celo.org/ https://gateway.ipfs.io/ https://interface.gateway.uniswap.org https://mainnet.infura.io https://o1037921.ingest.sentry.io https://old-wispy-arrow.bsc.quiknode.pro/ https://optimism-mainnet.infura.io/ https://polygon-mainnet.infura.io/ https://raw.githubusercontent.com https://static.optimism.io https://temp.api.uniswap.org/ https://tokenlist.arbitrum.io https://tokens.coingecko.com https://ultra-blue-flower.quiknode.pro https://us-central1-uniswap-mobile.cloudfunctions.net/ https://vercel.com https://vercel.live/ https://www.gemini.com wss://relay.walletconnect.com/ wss://www.walletlink.org/rpc; worker-src * 'self' blob:;"
-    >
-    
+      http-equiv="Content-Security-Policy"
+      
+        content="script-src 'self' 'unsafe-inline'"
+      
+    />
+
     <!-- 
       Apple Smart App Banner for Safari on iOS
       https://developer.apple.com/documentation/webkit/promoting_apps_with_smart_app_banners
@@ -333,10 +336,10 @@ exports[`should inject metadata for collections 3`] = `
     <link rel="preconnect" href="https://api.uniswap.org/" crossorigin/>
     <link rel="preconnect" href="https://mainnet.infura.io/" crossorigin/>
 
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff2" as="font" type="font/woff2" crossorigin />
    
     <style>
       * {
@@ -353,8 +356,8 @@ exports[`should inject metadata for collections 3`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Medium.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Medium.woff') format('woff');
+          url('/fonts/Basel-Medium.woff2') format('woff2'),
+          url('/fonts/Basel-Medium.woff') format('woff');
       }
 
       @font-face {
@@ -363,8 +366,8 @@ exports[`should inject metadata for collections 3`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Book.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Book.woff') format('woff');
+          url('/fonts/Basel-Book.woff') format('woff2'),
+          url('/fonts/Basel-Book.woff') format('woff');
       }
 
       @supports (font-variation-settings: normal) {
diff --git a/apps/web/functions/tokens/__snapshots__/token.test.ts.snap b/apps/web/functions/tokens/__snapshots__/token.test.ts.snap
index e5fb38d9a05..e03fee93856 100644
--- a/apps/web/functions/tokens/__snapshots__/token.test.ts.snap
+++ b/apps/web/functions/tokens/__snapshots__/token.test.ts.snap
@@ -18,12 +18,13 @@ exports[`should inject metadata for valid tokens 1`] = `
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <meta name="theme-color" content="#fff" />
-    
     <meta
-      http-equiv="Content-Security-Policy" 
-      content="default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline' 'wasm-unsafe-eval' data: https://translate.googleapis.com/ https://vercel.com https://vercel.live/ https://www.google-analytics.com https://www.googletagmanager.com; style-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src * 'self' blob: data: https://assets.coingecko.com/ https://cdn.center.app/ https://ethereum-optimism.github.io/ https://explorer-api.walletconnect.com/ https://i.seadn.io/ https://lh3.googleusercontent.com/ https://openseauserdata.com/ https://raw.githubusercontent.com/ https://raw.seadn.io/ https://s2.coinmarketcap.com/ https://static.optimism.io/ https://vercel.com https://vercel.live/; frame-src 'self' https://buy.moonpay.com/ https://vercel.com https://vercel.live/ https://verify.walletconnect.com/ https://verify.walletconnect.org/; connect-src * 'self' blob: data: https://api.moonpay.com/ https://api.opensea.io https://api.thegraph.com/ https://api.uniswap.org https://arbitrum-mainnet.infura.io/ https://avalanche-mainnet.infura.io/ https://base-mainnet.infura.io/ https://bridge.arbitrum.io https://celo-org.github.io https://cloudflare-ipfs.com https://explorer-api.walletconnect.com https://forno.celo.org/ https://gateway.ipfs.io/ https://interface.gateway.uniswap.org https://mainnet.infura.io https://o1037921.ingest.sentry.io https://old-wispy-arrow.bsc.quiknode.pro/ https://optimism-mainnet.infura.io/ https://polygon-mainnet.infura.io/ https://raw.githubusercontent.com https://static.optimism.io https://temp.api.uniswap.org/ https://tokenlist.arbitrum.io https://tokens.coingecko.com https://ultra-blue-flower.quiknode.pro https://us-central1-uniswap-mobile.cloudfunctions.net/ https://vercel.com https://vercel.live/ https://www.gemini.com wss://relay.walletconnect.com/ wss://www.walletlink.org/rpc; worker-src * 'self' blob:;"
-    >
-    
+      http-equiv="Content-Security-Policy"
+      
+        content="script-src 'self' 'unsafe-inline'"
+      
+    />
+
     <!-- 
       Apple Smart App Banner for Safari on iOS
       https://developer.apple.com/documentation/webkit/promoting_apps_with_smart_app_banners
@@ -39,10 +40,10 @@ exports[`should inject metadata for valid tokens 1`] = `
     <link rel="preconnect" href="https://api.uniswap.org/" crossorigin/>
     <link rel="preconnect" href="https://mainnet.infura.io/" crossorigin/>
 
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff2" as="font" type="font/woff2" crossorigin />
    
     <style>
       * {
@@ -59,8 +60,8 @@ exports[`should inject metadata for valid tokens 1`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Medium.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Medium.woff') format('woff');
+          url('/fonts/Basel-Medium.woff2') format('woff2'),
+          url('/fonts/Basel-Medium.woff') format('woff');
       }
 
       @font-face {
@@ -69,8 +70,8 @@ exports[`should inject metadata for valid tokens 1`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Book.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Book.woff') format('woff');
+          url('/fonts/Basel-Book.woff') format('woff2'),
+          url('/fonts/Basel-Book.woff') format('woff');
       }
 
       @supports (font-variation-settings: normal) {
@@ -165,12 +166,13 @@ exports[`should inject metadata for valid tokens 2`] = `
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <meta name="theme-color" content="#fff" />
-    
     <meta
-      http-equiv="Content-Security-Policy" 
-      content="default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline' 'wasm-unsafe-eval' data: https://translate.googleapis.com/ https://vercel.com https://vercel.live/ https://www.google-analytics.com https://www.googletagmanager.com; style-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src * 'self' blob: data: https://assets.coingecko.com/ https://cdn.center.app/ https://ethereum-optimism.github.io/ https://explorer-api.walletconnect.com/ https://i.seadn.io/ https://lh3.googleusercontent.com/ https://openseauserdata.com/ https://raw.githubusercontent.com/ https://raw.seadn.io/ https://s2.coinmarketcap.com/ https://static.optimism.io/ https://vercel.com https://vercel.live/; frame-src 'self' https://buy.moonpay.com/ https://vercel.com https://vercel.live/ https://verify.walletconnect.com/ https://verify.walletconnect.org/; connect-src * 'self' blob: data: https://api.moonpay.com/ https://api.opensea.io https://api.thegraph.com/ https://api.uniswap.org https://arbitrum-mainnet.infura.io/ https://avalanche-mainnet.infura.io/ https://base-mainnet.infura.io/ https://bridge.arbitrum.io https://celo-org.github.io https://cloudflare-ipfs.com https://explorer-api.walletconnect.com https://forno.celo.org/ https://gateway.ipfs.io/ https://interface.gateway.uniswap.org https://mainnet.infura.io https://o1037921.ingest.sentry.io https://old-wispy-arrow.bsc.quiknode.pro/ https://optimism-mainnet.infura.io/ https://polygon-mainnet.infura.io/ https://raw.githubusercontent.com https://static.optimism.io https://temp.api.uniswap.org/ https://tokenlist.arbitrum.io https://tokens.coingecko.com https://ultra-blue-flower.quiknode.pro https://us-central1-uniswap-mobile.cloudfunctions.net/ https://vercel.com https://vercel.live/ https://www.gemini.com wss://relay.walletconnect.com/ wss://www.walletlink.org/rpc; worker-src * 'self' blob:;"
-    >
-    
+      http-equiv="Content-Security-Policy"
+      
+        content="script-src 'self' 'unsafe-inline'"
+      
+    />
+
     <!-- 
       Apple Smart App Banner for Safari on iOS
       https://developer.apple.com/documentation/webkit/promoting_apps_with_smart_app_banners
@@ -186,10 +188,10 @@ exports[`should inject metadata for valid tokens 2`] = `
     <link rel="preconnect" href="https://api.uniswap.org/" crossorigin/>
     <link rel="preconnect" href="https://mainnet.infura.io/" crossorigin/>
 
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff2" as="font" type="font/woff2" crossorigin />
    
     <style>
       * {
@@ -206,8 +208,8 @@ exports[`should inject metadata for valid tokens 2`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Medium.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Medium.woff') format('woff');
+          url('/fonts/Basel-Medium.woff2') format('woff2'),
+          url('/fonts/Basel-Medium.woff') format('woff');
       }
 
       @font-face {
@@ -216,8 +218,8 @@ exports[`should inject metadata for valid tokens 2`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Book.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Book.woff') format('woff');
+          url('/fonts/Basel-Book.woff') format('woff2'),
+          url('/fonts/Basel-Book.woff') format('woff');
       }
 
       @supports (font-variation-settings: normal) {
@@ -312,12 +314,13 @@ exports[`should inject metadata for valid tokens 3`] = `
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <meta name="theme-color" content="#fff" />
-    
     <meta
-      http-equiv="Content-Security-Policy" 
-      content="default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline' 'wasm-unsafe-eval' data: https://translate.googleapis.com/ https://vercel.com https://vercel.live/ https://www.google-analytics.com https://www.googletagmanager.com; style-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src * 'self' blob: data: https://assets.coingecko.com/ https://cdn.center.app/ https://ethereum-optimism.github.io/ https://explorer-api.walletconnect.com/ https://i.seadn.io/ https://lh3.googleusercontent.com/ https://openseauserdata.com/ https://raw.githubusercontent.com/ https://raw.seadn.io/ https://s2.coinmarketcap.com/ https://static.optimism.io/ https://vercel.com https://vercel.live/; frame-src 'self' https://buy.moonpay.com/ https://vercel.com https://vercel.live/ https://verify.walletconnect.com/ https://verify.walletconnect.org/; connect-src * 'self' blob: data: https://api.moonpay.com/ https://api.opensea.io https://api.thegraph.com/ https://api.uniswap.org https://arbitrum-mainnet.infura.io/ https://avalanche-mainnet.infura.io/ https://base-mainnet.infura.io/ https://bridge.arbitrum.io https://celo-org.github.io https://cloudflare-ipfs.com https://explorer-api.walletconnect.com https://forno.celo.org/ https://gateway.ipfs.io/ https://interface.gateway.uniswap.org https://mainnet.infura.io https://o1037921.ingest.sentry.io https://old-wispy-arrow.bsc.quiknode.pro/ https://optimism-mainnet.infura.io/ https://polygon-mainnet.infura.io/ https://raw.githubusercontent.com https://static.optimism.io https://temp.api.uniswap.org/ https://tokenlist.arbitrum.io https://tokens.coingecko.com https://ultra-blue-flower.quiknode.pro https://us-central1-uniswap-mobile.cloudfunctions.net/ https://vercel.com https://vercel.live/ https://www.gemini.com wss://relay.walletconnect.com/ wss://www.walletlink.org/rpc; worker-src * 'self' blob:;"
-    >
-    
+      http-equiv="Content-Security-Policy"
+      
+        content="script-src 'self' 'unsafe-inline'"
+      
+    />
+
     <!-- 
       Apple Smart App Banner for Safari on iOS
       https://developer.apple.com/documentation/webkit/promoting_apps_with_smart_app_banners
@@ -333,10 +336,10 @@ exports[`should inject metadata for valid tokens 3`] = `
     <link rel="preconnect" href="https://api.uniswap.org/" crossorigin/>
     <link rel="preconnect" href="https://mainnet.infura.io/" crossorigin/>
 
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff2" as="font" type="font/woff2" crossorigin />
    
     <style>
       * {
@@ -353,8 +356,8 @@ exports[`should inject metadata for valid tokens 3`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Medium.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Medium.woff') format('woff');
+          url('/fonts/Basel-Medium.woff2') format('woff2'),
+          url('/fonts/Basel-Medium.woff') format('woff');
       }
 
       @font-face {
@@ -363,8 +366,8 @@ exports[`should inject metadata for valid tokens 3`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Book.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Book.woff') format('woff');
+          url('/fonts/Basel-Book.woff') format('woff2'),
+          url('/fonts/Basel-Book.woff') format('woff');
       }
 
       @supports (font-variation-settings: normal) {
@@ -459,12 +462,13 @@ exports[`should inject metadata for valid tokens 4`] = `
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no" />
     <meta name="theme-color" content="#fff" />
-    
     <meta
-      http-equiv="Content-Security-Policy" 
-      content="default-src 'self'; script-src 'self' 'unsafe-eval' 'unsafe-inline' 'wasm-unsafe-eval' data: https://translate.googleapis.com/ https://vercel.com https://vercel.live/ https://www.google-analytics.com https://www.googletagmanager.com; style-src 'self' 'unsafe-inline' 'unsafe-eval'; img-src * 'self' blob: data: https://assets.coingecko.com/ https://cdn.center.app/ https://ethereum-optimism.github.io/ https://explorer-api.walletconnect.com/ https://i.seadn.io/ https://lh3.googleusercontent.com/ https://openseauserdata.com/ https://raw.githubusercontent.com/ https://raw.seadn.io/ https://s2.coinmarketcap.com/ https://static.optimism.io/ https://vercel.com https://vercel.live/; frame-src 'self' https://buy.moonpay.com/ https://vercel.com https://vercel.live/ https://verify.walletconnect.com/ https://verify.walletconnect.org/; connect-src * 'self' blob: data: https://api.moonpay.com/ https://api.opensea.io https://api.thegraph.com/ https://api.uniswap.org https://arbitrum-mainnet.infura.io/ https://avalanche-mainnet.infura.io/ https://base-mainnet.infura.io/ https://bridge.arbitrum.io https://celo-org.github.io https://cloudflare-ipfs.com https://explorer-api.walletconnect.com https://forno.celo.org/ https://gateway.ipfs.io/ https://interface.gateway.uniswap.org https://mainnet.infura.io https://o1037921.ingest.sentry.io https://old-wispy-arrow.bsc.quiknode.pro/ https://optimism-mainnet.infura.io/ https://polygon-mainnet.infura.io/ https://raw.githubusercontent.com https://static.optimism.io https://temp.api.uniswap.org/ https://tokenlist.arbitrum.io https://tokens.coingecko.com https://ultra-blue-flower.quiknode.pro https://us-central1-uniswap-mobile.cloudfunctions.net/ https://vercel.com https://vercel.live/ https://www.gemini.com wss://relay.walletconnect.com/ wss://www.walletlink.org/rpc; worker-src * 'self' blob:;"
-    >
-    
+      http-equiv="Content-Security-Policy"
+      
+        content="script-src 'self' 'unsafe-inline'"
+      
+    />
+
     <!-- 
       Apple Smart App Banner for Safari on iOS
       https://developer.apple.com/documentation/webkit/promoting_apps_with_smart_app_banners
@@ -480,10 +484,10 @@ exports[`should inject metadata for valid tokens 4`] = `
     <link rel="preconnect" href="https://api.uniswap.org/" crossorigin/>
     <link rel="preconnect" href="https://mainnet.infura.io/" crossorigin/>
 
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Book.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="/fonts/Basel-Grotesk-Medium.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Book.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="/fonts/Basel-Medium.woff2" as="font" type="font/woff2" crossorigin />
    
     <style>
       * {
@@ -500,8 +504,8 @@ exports[`should inject metadata for valid tokens 4`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Medium.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Medium.woff') format('woff');
+          url('/fonts/Basel-Medium.woff2') format('woff2'),
+          url('/fonts/Basel-Medium.woff') format('woff');
       }
 
       @font-face {
@@ -510,8 +514,8 @@ exports[`should inject metadata for valid tokens 4`] = `
         font-style: normal;
         font-display: block;
         src: 
-          url('/fonts/Basel-Grotesk-Book.woff2') format('woff2'),
-          url('/fonts/Basel-Grotesk-Book.woff') format('woff');
+          url('/fonts/Basel-Book.woff') format('woff2'),
+          url('/fonts/Basel-Book.woff') format('woff');
       }
 
       @supports (font-variation-settings: normal) {
diff --git a/apps/web/functions/tokens/token.test.ts b/apps/web/functions/tokens/token.test.ts
index 3d46f4e78e7..ecf193cf2e1 100644
--- a/apps/web/functions/tokens/token.test.ts
+++ b/apps/web/functions/tokens/token.test.ts
@@ -43,7 +43,6 @@ test.each(tokens)('should inject metadata for valid tokens', async (token) => {
   expect(body).toContain(`<meta property="twitter:image:alt" content="Get ${token.symbol} on Uniswap"/>`)
 })
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 const invalidTokens = [
   'http://127.0.0.1:3000/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb49',
   'http://127.0.0.1:3000/tokens/ethereum',
@@ -53,19 +52,17 @@ const invalidTokens = [
   'http://127.0.0.1:3000/tokens/potato/?potato=1',
 ]
 
-// TODO re-enable web tests
-// eslint-disable-next-line jest/no-commented-out-tests
-// test.each(invalidTokens)('should not inject metadata for invalid tokens', async (url) => {
-//   const body = await fetch(new Request(url)).then((res) => res.text())
-//   expect(body).not.toContain('og:title')
-//   expect(body).not.toContain('og:image')
-//   expect(body).not.toContain('og:image:width')
-//   expect(body).not.toContain('og:image:height')
-//   expect(body).not.toContain('og:type')
-//   expect(body).not.toContain('og:url')
-//   expect(body).not.toContain('og:image:alt')
-//   expect(body).not.toContain('twitter:card')
-//   expect(body).not.toContain('twitter:title')
-//   expect(body).not.toContain('twitter:image')
-//   expect(body).not.toContain('twitter:image:alt')
-// })
+test.each(invalidTokens)('should not inject metadata for invalid tokens', async (url) => {
+  const body = await fetch(new Request(url)).then((res) => res.text())
+  expect(body).not.toContain('og:title')
+  expect(body).not.toContain('og:image')
+  expect(body).not.toContain('og:image:width')
+  expect(body).not.toContain('og:image:height')
+  expect(body).not.toContain('og:type')
+  expect(body).not.toContain('og:url')
+  expect(body).not.toContain('og:image:alt')
+  expect(body).not.toContain('twitter:card')
+  expect(body).not.toContain('twitter:title')
+  expect(body).not.toContain('twitter:image')
+  expect(body).not.toContain('twitter:image:alt')
+})
diff --git a/apps/web/functions/tsconfig.json b/apps/web/functions/tsconfig.json
index 73064133fb4..d79c66505f6 100644
--- a/apps/web/functions/tsconfig.json
+++ b/apps/web/functions/tsconfig.json
@@ -1,12 +1,13 @@
 {
   "extends": "../tsconfig.json",
   "compilerOptions": {
-    "baseUrl": ".",
+    "baseUrl": "functions",
     "composite": false,
     "incremental": true,
     "isolatedModules": false,
+    "jsx": "react",
     "tsBuildInfoFile": "../node_modules/.cache/tsbuildinfo/functions", // avoid clobbering the build tsbuildinfo
-    "types": ["jest", "node", "@cloudflare/workers-types"]
+    "types": ["jest", "node", "@cloudflare/workers-types"],
   },
-  "include": ["**/*.ts", "**/*.tsx"],
-}
+  "include": ["**/*.ts", ".ts", "**/*.tsx"],
+}
\ No newline at end of file
diff --git a/apps/web/functions/utils/getRequest.ts b/apps/web/functions/utils/getRequest.ts
index f1b88cc5c21..d64864c791b 100644
--- a/apps/web/functions/utils/getRequest.ts
+++ b/apps/web/functions/utils/getRequest.ts
@@ -1,5 +1,6 @@
 import { MetaTagInjector } from '../components/metaTagInjector'
-import Cache, { Data } from './cache'
+import Cache from './cache'
+import { Data } from './cache'
 
 export async function getMetadataRequest(
   res: Promise<Response>,
diff --git a/apps/web/functions/utils/getToken.ts b/apps/web/functions/utils/getToken.ts
index bc308e03d64..8a7fc831e7f 100644
--- a/apps/web/functions/utils/getToken.ts
+++ b/apps/web/functions/utils/getToken.ts
@@ -1,4 +1,5 @@
-import { Chain, TokenDocument, TokenQuery } from '../../src/graphql/data/__generated__/types-and-hooks'
+import { TokenDocument, TokenQuery } from '../../src/graphql/data/__generated__/types-and-hooks'
+import { Chain } from '../../src/graphql/data/__generated__/types-and-hooks'
 import client from '../client'
 
 function formatTitleName(symbol: string | undefined, name: string | undefined) {
diff --git a/apps/web/package.json b/apps/web/package.json
index d5c6b553ed6..196e24d0c60 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -9,23 +9,23 @@
     "contracts:compile:abi": "typechain --target ethers-v5 --out-dir src/abis/types \"./src/abis/**/*.json\"",
     "contracts:compile:v3": "typechain --target ethers-v5 --out-dir src/types/v3 \"../../node_modules/@uniswap/**/artifacts/contracts/**/*[!dbg].json\"",
     "contracts": "yarn contracts:compile:abi && yarn contracts:compile:v3",
-    "graphql:schema": "node scripts/fetch-schema.js",
+    "graphql:fetch": "node scripts/fetch-schema.js",
     "graphql:generate:data": "graphql-codegen --config graphql.data.codegen.config.ts",
     "graphql:generate:thegraph": "graphql-codegen --config graphql.thegraph.codegen.config.ts",
     "graphql:generate": "yarn graphql:generate:data && yarn graphql:generate:thegraph",
-    "graphql": "yarn graphql:schema && yarn graphql:generate",
+    "graphql": "yarn graphql:fetch && yarn graphql:generate",
     "sitemap:generate": "node scripts/generate-sitemap.js",
     "i18n:extract": "lingui extract --locale en-US",
     "i18n:compile": "lingui compile",
     "i18n": "yarn i18n:extract --clean && yarn i18n:compile",
-    "prepare": "concurrently \"npm:ajv\" \"npm:i18n\"",
+    "prepare": "concurrently \"npm:ajv\" \"npm:contracts\" \"npm:graphql\" \"npm:i18n\"",
     "start": "craco start",
     "start:cloud": "NODE_OPTIONS=--dns-result-order=ipv4first PORT=3001 npx wrangler pages dev --compatibility-flags=nodejs_compat --compatibility-date=2023-08-01 --proxy=3001 --port=3000 -- yarn start",
     "build:production": "craco build",
     "analyze": "source-map-explorer 'build/static/js/*.js' --no-border-checks --gzip",
     "serve": "serve build -s -l 3000",
     "lint": "yarn eslint --ignore-path .gitignore --cache --cache-location node_modules/.cache/eslint/ .",
-    "typecheck": "tsc && yarn typecheck:cloud && yarn typecheck:cypress",
+    "typecheck": "tsc",
     "typecheck:cloud": "tsc -p functions/tsconfig.json",
     "typecheck:cypress": "tsc -p cypress/tsconfig.json",
     "test": "craco test",
@@ -116,7 +116,7 @@
     "@types/wcag-contrast": "3.0.0",
     "@types/xml2js": "0.4.14",
     "@uniswap/default-token-list": "11.11.0",
-    "@uniswap/eslint-config": "workspace:^",
+    "@uniswap/eslint-config": "1.2.0",
     "@vanilla-extract/jest-transform": "1.1.1",
     "@vanilla-extract/webpack-plugin": "2.3.1",
     "@vercel/og": "0.5.8",
@@ -128,7 +128,7 @@
     "cypress-hardhat": "2.5.0",
     "dotenv": "16.0.3",
     "eslint": "8.44.0",
-    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-import": "2.27",
     "eslint-plugin-rulesdir": "0.2.2",
     "hardhat": "2.14.0",
     "husky": "^8.0.3",
@@ -156,7 +156,8 @@
     "terser-webpack-plugin": "5.3.9",
     "ts-jest": "^29.1.1",
     "tsafe": "1.6.4",
-    "typescript": "5.3.3",
+    "typechain": "5.2.0",
+    "typescript": "4.9.4",
     "webpack": "5.89.0",
     "webpack-retry-chunk-load-plugin": "3.1.1",
     "wrangler": "3.15.0",
@@ -206,10 +207,10 @@
     "@uniswap/universal-router-sdk": "1.5.8",
     "@uniswap/v2-core": "1.0.1",
     "@uniswap/v2-periphery": "1.1.0-beta.0",
-    "@uniswap/v2-sdk": "4.1.0",
+    "@uniswap/v2-sdk": "3.2.3",
     "@uniswap/v3-core": "1.0.1",
     "@uniswap/v3-periphery": "1.4.4",
-    "@uniswap/v3-sdk": "3.10.2",
+    "@uniswap/v3-sdk": "3.10.0",
     "@vanilla-extract/css": "1.14.0",
     "@vanilla-extract/dynamic": "2.1.0",
     "@vanilla-extract/sprinkles": "1.6.1",
@@ -287,10 +288,8 @@
     "styled-components": "5.3.11",
     "tiny-invariant": "1.3.1",
     "use-resize-observer": "9.1.0",
-    "utilities": "workspace:^",
     "uuid": "9.0.0",
     "video-extensions": "1.2.0",
-    "wallet": "workspace:^",
     "wcag-contrast": "3.0.0",
     "web-vitals": "2.1.4",
     "workbox-core": "6.6.0",
diff --git a/apps/web/public/csp.json b/apps/web/public/csp.json
index caec4c2d2f8..cc1eca3f07b 100644
--- a/apps/web/public/csp.json
+++ b/apps/web/public/csp.json
@@ -1,91 +1,9 @@
 {
-  "defaultSrc": [
-    "'self'"
-  ],
-  "scriptSrc": [
-    "'self'",
-    "'unsafe-eval'",
-    "'unsafe-inline'",
-    "'wasm-unsafe-eval'",
-    "data:",
-    "https://translate.googleapis.com/",
-    "https://vercel.com",
-    "https://vercel.live/",
-    "https://www.google-analytics.com",
-    "https://www.googletagmanager.com"
-  ],
-  "styleSrc": [
-    "'self'",
-    "'unsafe-inline'",
-    "'unsafe-eval'"
-  ],
-  "imgSrc": [
-    "*",
-    "'self'",
-    "blob:",
-    "data:",
-    "https://assets.coingecko.com/",
-    "https://cdn.center.app/",
-    "https://ethereum-optimism.github.io/",
-    "https://explorer-api.walletconnect.com/",
-    "https://i.seadn.io/",
-    "https://lh3.googleusercontent.com/",
-    "https://openseauserdata.com/",
-    "https://raw.githubusercontent.com/",
-    "https://raw.seadn.io/",
-    "https://s2.coinmarketcap.com/",
-    "https://static.optimism.io/",
-    "https://vercel.com",
-    "https://vercel.live/"
-  ],
-  "frameSrc": [
-    "'self'",
-    "https://buy.moonpay.com/",
-    "https://vercel.com",
-    "https://vercel.live/",
-    "https://verify.walletconnect.com/",
-    "https://verify.walletconnect.org/"
-  ],
-  "connectSrc": [
-    "*",
-    "'self'",
-    "blob:",
-    "data:",
-    "https://api.moonpay.com/",
-    "https://api.opensea.io",
-    "https://api.thegraph.com/",
-    "https://api.uniswap.org",
-    "https://arbitrum-mainnet.infura.io/",
-    "https://avalanche-mainnet.infura.io/",
-    "https://base-mainnet.infura.io/",
-    "https://bridge.arbitrum.io",
-    "https://celo-org.github.io",
-    "https://cloudflare-ipfs.com",
-    "https://explorer-api.walletconnect.com",
-    "https://forno.celo.org/",
-    "https://gateway.ipfs.io/",
-    "https://interface.gateway.uniswap.org",
-    "https://mainnet.infura.io",
-    "https://o1037921.ingest.sentry.io",
-    "https://old-wispy-arrow.bsc.quiknode.pro/",
-    "https://optimism-mainnet.infura.io/",
-    "https://polygon-mainnet.infura.io/",
-    "https://raw.githubusercontent.com",
-    "https://static.optimism.io",
-    "https://temp.api.uniswap.org/",
-    "https://tokenlist.arbitrum.io",
-    "https://tokens.coingecko.com",
-    "https://ultra-blue-flower.quiknode.pro",
-    "https://us-central1-uniswap-mobile.cloudfunctions.net/",
-    "https://vercel.com",
-    "https://vercel.live/",
-    "https://www.gemini.com",
-    "wss://relay.walletconnect.com/",
-    "wss://www.walletlink.org/rpc"
-  ],
-  "workerSrc": [
-    "*",
-    "'self'",
-    "blob:"
-  ]
+  "defaultSrc": "'self'",
+  "scriptSrc": "'self' 'unsafe-eval' 'wasm-unsafe-eval' 'unsafe-inline' https://www.google-analytics.com https://www.googletagmanager.com https://translate.googleapis.com/ https://vercel.live/ https://vercel.com data:",
+  "styleSrc": "'self' 'unsafe-inline' 'unsafe-eval'",
+  "imgSrc": "* 'self' https://i.seadn.io/ https://cdn.center.app/ https://raw.githubusercontent.com/ https://assets.coingecko.com/ https://static.optimism.io/ https://ethereum-optimism.github.io/ https://explorer-api.walletconnect.com/ https://s2.coinmarketcap.com/ https://openseauserdata.com/ https://raw.seadn.io/ https://lh3.googleusercontent.com/ https://vercel.live/ https://vercel.com data: blob:",
+  "frameSrc": "'self' https://verify.walletconnect.com/ https://verify.walletconnect.org/ https://buy.moonpay.com/ https://vercel.live/ https://vercel.com",
+  "connectSrc": "* 'self' https://api.uniswap.org https://interface.gateway.uniswap.org https://o1037921.ingest.sentry.io https://mainnet.infura.io https://cloudflare-ipfs.com https://raw.githubusercontent.com https://tokens.coingecko.com https://bridge.arbitrum.io https://static.optimism.io https://celo-org.github.io https://www.gemini.com https://tokenlist.arbitrum.io https://gateway.ipfs.io/ https://arbitrum-mainnet.infura.io/ https://optimism-mainnet.infura.io/ https://polygon-mainnet.infura.io/ https://base-mainnet.infura.io/ https://avalanche-mainnet.infura.io/ https://forno.celo.org/ wss://www.walletlink.org/rpc https://explorer-api.walletconnect.com wss://relay.walletconnect.com/ https://temp.api.uniswap.org/ https://us-central1-uniswap-mobile.cloudfunctions.net/ https://ultra-blue-flower.quiknode.pro https://api.thegraph.com/ https://api.moonpay.com/ https://old-wispy-arrow.bsc.quiknode.pro/ https://vercel.live/ https://vercel.com data: blob:",
+  "workerSrc": "* 'self' blob:"
 }
diff --git a/apps/web/public/fonts/Basel-Book.woff b/apps/web/public/fonts/Basel-Book.woff
new file mode 100644
index 00000000000..7cfd4abb6e9
Binary files /dev/null and b/apps/web/public/fonts/Basel-Book.woff differ
diff --git a/apps/web/public/fonts/Basel-Book.woff2 b/apps/web/public/fonts/Basel-Book.woff2
new file mode 100644
index 00000000000..d235fa73f75
Binary files /dev/null and b/apps/web/public/fonts/Basel-Book.woff2 differ
diff --git a/apps/web/public/fonts/Basel-Grotesk-Book.woff b/apps/web/public/fonts/Basel-Grotesk-Book.woff
deleted file mode 100644
index 3f5a304fce9..00000000000
Binary files a/apps/web/public/fonts/Basel-Grotesk-Book.woff and /dev/null differ
diff --git a/apps/web/public/fonts/Basel-Grotesk-Book.woff2 b/apps/web/public/fonts/Basel-Grotesk-Book.woff2
deleted file mode 100644
index 31d5903090d..00000000000
Binary files a/apps/web/public/fonts/Basel-Grotesk-Book.woff2 and /dev/null differ
diff --git a/apps/web/public/fonts/Basel-Grotesk-Medium.woff b/apps/web/public/fonts/Basel-Grotesk-Medium.woff
deleted file mode 100644
index 11147d0409f..00000000000
Binary files a/apps/web/public/fonts/Basel-Grotesk-Medium.woff and /dev/null differ
diff --git a/apps/web/public/fonts/Basel-Grotesk-Medium.woff2 b/apps/web/public/fonts/Basel-Grotesk-Medium.woff2
deleted file mode 100644
index b79bb72b60b..00000000000
Binary files a/apps/web/public/fonts/Basel-Grotesk-Medium.woff2 and /dev/null differ
diff --git a/apps/web/public/fonts/Basel-Medium.woff b/apps/web/public/fonts/Basel-Medium.woff
new file mode 100644
index 00000000000..004a41fcb1c
Binary files /dev/null and b/apps/web/public/fonts/Basel-Medium.woff differ
diff --git a/apps/web/public/fonts/Basel-Medium.woff2 b/apps/web/public/fonts/Basel-Medium.woff2
new file mode 100644
index 00000000000..6da2386e614
Binary files /dev/null and b/apps/web/public/fonts/Basel-Medium.woff2 differ
diff --git a/apps/web/public/images/noise-color.png b/apps/web/public/images/noise-color.png
deleted file mode 100644
index 84f1dbad60b..00000000000
Binary files a/apps/web/public/images/noise-color.png and /dev/null differ
diff --git a/apps/web/public/images/noise-light.png b/apps/web/public/images/noise-light.png
deleted file mode 100644
index 395991c4107..00000000000
Binary files a/apps/web/public/images/noise-light.png and /dev/null differ
diff --git a/apps/web/public/index.html b/apps/web/public/index.html
index a858e3af2b4..cd1a3e64f5c 100644
--- a/apps/web/public/index.html
+++ b/apps/web/public/index.html
@@ -18,7 +18,7 @@
     <% const cspConfig = require('./csp.json'); %>
     <meta
       http-equiv="Content-Security-Policy" 
-      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(' ') %>;"
+      content="default-src <%= cspConfig.defaultSrc %>; script-src <%= cspConfig.scriptSrc %>; style-src <%= cspConfig.styleSrc %>; img-src <%= cspConfig.imgSrc %>; frame-src <%= cspConfig.frameSrc %>; connect-src <%= cspConfig.connectSrc %>; worker-src <%= cspConfig.workerSrc %>;"
     >
     
     <!-- 
@@ -36,10 +36,10 @@
     <link rel="preconnect" href="https://api.uniswap.org/" crossorigin/>
     <link rel="preconnect" href="https://mainnet.infura.io/" crossorigin/>
 
-    <link rel="preload" href="%PUBLIC_URL%/fonts/Basel-Grotesk-Book.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="%PUBLIC_URL%/fonts/Basel-Grotesk-Book.woff2" as="font" type="font/woff2" crossorigin />
-    <link rel="preload" href="%PUBLIC_URL%/fonts/Basel-Grotesk-Medium.woff" as="font" type="font/woff" crossorigin />
-    <link rel="preload" href="%PUBLIC_URL%/fonts/Basel-Grotesk-Medium.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="%PUBLIC_URL%/fonts/Basel-Book.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="%PUBLIC_URL%/fonts/Basel-Book.woff2" as="font" type="font/woff2" crossorigin />
+    <link rel="preload" href="%PUBLIC_URL%/fonts/Basel-Medium.woff" as="font" type="font/woff" crossorigin />
+    <link rel="preload" href="%PUBLIC_URL%/fonts/Basel-Medium.woff2" as="font" type="font/woff2" crossorigin />
    
     <style>
       * {
@@ -56,8 +56,8 @@
         font-style: normal;
         font-display: block;
         src: 
-          url('%PUBLIC_URL%/fonts/Basel-Grotesk-Medium.woff2') format('woff2'),
-          url('%PUBLIC_URL%/fonts/Basel-Grotesk-Medium.woff') format('woff');
+          url('%PUBLIC_URL%/fonts/Basel-Medium.woff2') format('woff2'),
+          url('%PUBLIC_URL%/fonts/Basel-Medium.woff') format('woff');
       }
 
       @font-face {
@@ -66,8 +66,8 @@
         font-style: normal;
         font-display: block;
         src: 
-          url('%PUBLIC_URL%/fonts/Basel-Grotesk-Book.woff2') format('woff2'),
-          url('%PUBLIC_URL%/fonts/Basel-Grotesk-Book.woff') format('woff');
+          url('%PUBLIC_URL%/fonts/Basel-Book.woff') format('woff2'),
+          url('%PUBLIC_URL%/fonts/Basel-Book.woff') format('woff');
       }
 
       @supports (font-variation-settings: normal) {
diff --git a/apps/web/public/rive/landing-page.riv b/apps/web/public/rive/landing-page.riv
deleted file mode 100644
index 5c7e9fc6b7c..00000000000
Binary files a/apps/web/public/rive/landing-page.riv and /dev/null differ
diff --git a/apps/web/public/robots.txt b/apps/web/public/robots.txt
index 72c434b6a88..61713f55336 100644
--- a/apps/web/public/robots.txt
+++ b/apps/web/public/robots.txt
@@ -1,22 +1,6 @@
 # *
 User-agent: *
-
-# Analytics
-Disallow: https://statsigapi.net
-Disallow: https://api.uniswap.org/v1/statsig-proxy
-Disallow: https://api.uniswap.org/v1/amplitude-proxy
-Disallow: https://sentry.io
-
-# Token Lists
-Disallow: https://cloudflare-ipfs.com
-Disallow: https://static.optimism.io
-Disallow: https://raw.githubusercontent.com/plasmadlt/plasma-finance-token-list/master/bnb.json
-Disallow: https://raw.githubusercontent.com/ethereum-optimism/ethereum-optimism.github.io/master/optimism.tokenlist.json
-Disallow: https://tokenlist.arbitrum.io
-Disallow: https://raw.githubusercontent.com/compound-finance/token-list/master/compound.tokenlist.json
-Disallow: https://raw.githubusercontent.com/ava-labs/avalanche-bridge-resources/main/token_list.json
-Disallow: https://raw.githubusercontent.com/SetProtocol/uniswap-tokenlist/main/set.tokenlist.json
-Disallow: https://celo-org.github.io
+Disallow:
 
 # Sitemaps
 Sitemap: https://app.uniswap.org/sitemap.xml
\ No newline at end of file
diff --git a/packages/wallet/src/abis/argent-wallet-contract.json b/apps/web/src/abis/argent-wallet-contract.json
similarity index 100%
rename from packages/wallet/src/abis/argent-wallet-contract.json
rename to apps/web/src/abis/argent-wallet-contract.json
diff --git a/packages/wallet/src/abis/argent-wallet-detector.json b/apps/web/src/abis/argent-wallet-detector.json
similarity index 100%
rename from packages/wallet/src/abis/argent-wallet-detector.json
rename to apps/web/src/abis/argent-wallet-detector.json
diff --git a/apps/web/src/abis/eip_2612.json b/apps/web/src/abis/eip_2612.json
new file mode 100644
index 00000000000..f29906e7ea0
--- /dev/null
+++ b/apps/web/src/abis/eip_2612.json
@@ -0,0 +1,20 @@
+[
+  {
+    "constant": true,
+    "inputs": [{ "name": "owner", "type": "address" }],
+    "name": "nonces",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "DOMAIN_SEPARATOR",
+    "outputs": [{ "name": "", "type": "bytes32" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  }
+]
diff --git a/packages/wallet/src/abis/ens-public-resolver.json b/apps/web/src/abis/ens-public-resolver.json
similarity index 100%
rename from packages/wallet/src/abis/ens-public-resolver.json
rename to apps/web/src/abis/ens-public-resolver.json
diff --git a/packages/wallet/src/abis/ens-registrar.json b/apps/web/src/abis/ens-registrar.json
similarity index 100%
rename from packages/wallet/src/abis/ens-registrar.json
rename to apps/web/src/abis/ens-registrar.json
diff --git a/apps/web/src/abis/erc1155.json b/apps/web/src/abis/erc1155.json
new file mode 100644
index 00000000000..f9c904723e0
--- /dev/null
+++ b/apps/web/src/abis/erc1155.json
@@ -0,0 +1,325 @@
+[
+  {
+    "inputs": [
+      {
+        "internalType": "string",
+        "name": "uri_",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "bool",
+        "name": "approved",
+        "type": "bool"
+      }
+    ],
+    "name": "ApprovalForAll",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256[]",
+        "name": "ids",
+        "type": "uint256[]"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256[]",
+        "name": "values",
+        "type": "uint256[]"
+      }
+    ],
+    "name": "TransferBatch",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "TransferSingle",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "value",
+        "type": "string"
+      },
+      {
+        "indexed": true,
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
+      }
+    ],
+    "name": "URI",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
+      }
+    ],
+    "name": "balanceOf",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address[]",
+        "name": "accounts",
+        "type": "address[]"
+      },
+      {
+        "internalType": "uint256[]",
+        "name": "ids",
+        "type": "uint256[]"
+      }
+    ],
+    "name": "balanceOfBatch",
+    "outputs": [
+      {
+        "internalType": "uint256[]",
+        "name": "",
+        "type": "uint256[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      }
+    ],
+    "name": "isApprovedForAll",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256[]",
+        "name": "ids",
+        "type": "uint256[]"
+      },
+      {
+        "internalType": "uint256[]",
+        "name": "amounts",
+        "type": "uint256[]"
+      },
+      {
+        "internalType": "bytes",
+        "name": "data",
+        "type": "bytes"
+      }
+    ],
+    "name": "safeBatchTransferFrom",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "data",
+        "type": "bytes"
+      }
+    ],
+    "name": "safeTransferFrom",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      },
+      {
+        "internalType": "bool",
+        "name": "approved",
+        "type": "bool"
+      }
+    ],
+    "name": "setApprovalForAll",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes4",
+        "name": "interfaceId",
+        "type": "bytes4"
+      }
+    ],
+    "name": "supportsInterface",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "name": "uri",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  }
+]
diff --git a/apps/web/src/abis/erc20.json b/apps/web/src/abis/erc20.json
new file mode 100644
index 00000000000..dd7bf99d6ea
--- /dev/null
+++ b/apps/web/src/abis/erc20.json
@@ -0,0 +1,117 @@
+[
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "name",
+    "outputs": [{ "name": "", "type": "string" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "_spender", "type": "address" },
+      { "name": "_value", "type": "uint256" }
+    ],
+    "name": "approve",
+    "outputs": [{ "name": "", "type": "bool" }],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "totalSupply",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "_from", "type": "address" },
+      { "name": "_to", "type": "address" },
+      { "name": "_value", "type": "uint256" }
+    ],
+    "name": "transferFrom",
+    "outputs": [{ "name": "", "type": "bool" }],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "decimals",
+    "outputs": [{ "name": "", "type": "uint8" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [{ "name": "_owner", "type": "address" }],
+    "name": "balanceOf",
+    "outputs": [{ "name": "balance", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "symbol",
+    "outputs": [{ "name": "", "type": "string" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      { "name": "_to", "type": "address" },
+      { "name": "_value", "type": "uint256" }
+    ],
+    "name": "transfer",
+    "outputs": [{ "name": "", "type": "bool" }],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      { "name": "_owner", "type": "address" },
+      { "name": "_spender", "type": "address" }
+    ],
+    "name": "allowance",
+    "outputs": [{ "name": "", "type": "uint256" }],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  { "payable": true, "stateMutability": "payable", "type": "fallback" },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "name": "owner", "type": "address" },
+      { "indexed": true, "name": "spender", "type": "address" },
+      { "indexed": false, "name": "value", "type": "uint256" }
+    ],
+    "name": "Approval",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      { "indexed": true, "name": "from", "type": "address" },
+      { "indexed": true, "name": "to", "type": "address" },
+      { "indexed": false, "name": "value", "type": "uint256" }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  }
+]
diff --git a/packages/wallet/src/abis/erc20_bytes32.json b/apps/web/src/abis/erc20_bytes32.json
similarity index 100%
rename from packages/wallet/src/abis/erc20_bytes32.json
rename to apps/web/src/abis/erc20_bytes32.json
diff --git a/apps/web/src/abis/erc721.json b/apps/web/src/abis/erc721.json
new file mode 100644
index 00000000000..1852b1df52c
--- /dev/null
+++ b/apps/web/src/abis/erc721.json
@@ -0,0 +1,673 @@
+[
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "punkContract",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "approved",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "Approval",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "bool",
+        "name": "approved",
+        "type": "bool"
+      }
+    ],
+    "name": "ApprovalForAll",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "previousOwner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "OwnershipTransferred",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      }
+    ],
+    "name": "Paused",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "user",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "proxy",
+        "type": "address"
+      }
+    ],
+    "name": "ProxyRegistered",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      }
+    ],
+    "name": "Unpaused",
+    "type": "event"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "approve",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      }
+    ],
+    "name": "balanceOf",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "baseURI",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "punkIndex",
+        "type": "uint256"
+      }
+    ],
+    "name": "burn",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "getApproved",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      }
+    ],
+    "name": "isApprovedForAll",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "punkIndex",
+        "type": "uint256"
+      }
+    ],
+    "name": "mint",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "name",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "ownerOf",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "pause",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "paused",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "user",
+        "type": "address"
+      }
+    ],
+    "name": "proxyInfo",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "punkContract",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "registerProxy",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "renounceOwnership",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "safeTransferFrom",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "_data",
+        "type": "bytes"
+      }
+    ],
+    "name": "safeTransferFrom",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "bool",
+        "name": "approved",
+        "type": "bool"
+      }
+    ],
+    "name": "setApprovalForAll",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "internalType": "string",
+        "name": "baseUri",
+        "type": "string"
+      }
+    ],
+    "name": "setBaseURI",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "internalType": "bytes4",
+        "name": "interfaceId",
+        "type": "bytes4"
+      }
+    ],
+    "name": "supportsInterface",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "symbol",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "index",
+        "type": "uint256"
+      }
+    ],
+    "name": "tokenByIndex",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "index",
+        "type": "uint256"
+      }
+    ],
+    "name": "tokenOfOwnerByIndex",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "tokenURI",
+    "outputs": [
+      {
+        "internalType": "string",
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "totalSupply",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "transferFrom",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "newOwner",
+        "type": "address"
+      }
+    ],
+    "name": "transferOwnership",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "unpause",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]
diff --git a/packages/wallet/src/abis/fee-on-transfer-detector.json b/apps/web/src/abis/fee-on-transfer-detector.json
similarity index 100%
rename from packages/wallet/src/abis/fee-on-transfer-detector.json
rename to apps/web/src/abis/fee-on-transfer-detector.json
diff --git a/packages/wallet/src/abis/governor-bravo.json b/apps/web/src/abis/governor-bravo.json
similarity index 100%
rename from packages/wallet/src/abis/governor-bravo.json
rename to apps/web/src/abis/governor-bravo.json
diff --git a/packages/wallet/src/abis/permit2.json b/apps/web/src/abis/permit2.json
similarity index 67%
rename from packages/wallet/src/abis/permit2.json
rename to apps/web/src/abis/permit2.json
index c9084fb327a..aefd71a8b50 100644
--- a/packages/wallet/src/abis/permit2.json
+++ b/apps/web/src/abis/permit2.json
@@ -37,23 +37,5 @@
     ],
     "stateMutability": "view",
     "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "wordPos",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "mask",
-        "type": "uint256"
-      }
-    ],
-    "name": "invalidateUnorderedNonces",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
   }
 ]
diff --git a/packages/wallet/src/abis/uniswap-nft-airdrop-claim.json b/apps/web/src/abis/uniswap-nft-airdrop-claim.json
similarity index 100%
rename from packages/wallet/src/abis/uniswap-nft-airdrop-claim.json
rename to apps/web/src/abis/uniswap-nft-airdrop-claim.json
diff --git a/apps/web/src/abis/weth.json b/apps/web/src/abis/weth.json
new file mode 100644
index 00000000000..e171f9ecfb0
--- /dev/null
+++ b/apps/web/src/abis/weth.json
@@ -0,0 +1,279 @@
+[
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "name",
+    "outputs": [
+      {
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "guy",
+        "type": "address"
+      },
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "approve",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "totalSupply",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "src",
+        "type": "address"
+      },
+      {
+        "name": "dst",
+        "type": "address"
+      },
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "transferFrom",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "withdraw",
+    "outputs": [],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "decimals",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint8"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "balanceOf",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [],
+    "name": "symbol",
+    "outputs": [
+      {
+        "name": "",
+        "type": "string"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [
+      {
+        "name": "dst",
+        "type": "address"
+      },
+      {
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "transfer",
+    "outputs": [
+      {
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "constant": false,
+    "inputs": [],
+    "name": "deposit",
+    "outputs": [],
+    "payable": true,
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "constant": true,
+    "inputs": [
+      {
+        "name": "",
+        "type": "address"
+      },
+      {
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "name": "allowance",
+    "outputs": [
+      {
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "payable": false,
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "payable": true,
+    "stateMutability": "payable",
+    "type": "fallback"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "src",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "guy",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "Approval",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "src",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "name": "dst",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "dst",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "Deposit",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "name": "src",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "name": "wad",
+        "type": "uint256"
+      }
+    ],
+    "name": "Withdrawal",
+    "type": "event"
+  }
+]
diff --git a/apps/web/src/analytics/index.tsx b/apps/web/src/analytics/index.tsx
index bc9c0bd8bc2..35bcfaa7286 100644
--- a/apps/web/src/analytics/index.tsx
+++ b/apps/web/src/analytics/index.tsx
@@ -1,18 +1,18 @@
 import {
-  TraceEvent as AnalyticsEvent,
-  Trace as AnalyticsTrace,
   sendAnalyticsEvent as sendAnalyticsTraceEvent,
+  Trace as AnalyticsTrace,
+  TraceEvent as AnalyticsEvent,
 } from '@uniswap/analytics'
 import { atomWithStorage, useAtomValue } from 'jotai/utils'
 import { memo } from 'react'
 
 export {
-  OriginApplication,
+  type ITraceContext,
   getDeviceId,
   initializeAnalytics,
-  useTrace,
+  OriginApplication,
   user,
-  type ITraceContext,
+  useTrace,
 } from '@uniswap/analytics'
 
 const allowAnalyticsAtomKey = 'allow_analytics'
diff --git a/apps/web/src/assets/svg/app-store-badge.svg b/apps/web/src/assets/svg/app-store-badge.svg
deleted file mode 100644
index 6b74a93855b..00000000000
--- a/apps/web/src/assets/svg/app-store-badge.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<svg width="150" height="50" viewBox="0 0 150 50" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_3063_14041)">
-<path d="M137.918 7.08153e-05H12.3275C11.8697 7.08153e-05 11.4174 7.08152e-05 10.9609 0.00257082C10.5787 0.00507082 10.1995 0.0123333 9.81363 0.0184458C8.97534 0.0283231 8.13902 0.102166 7.31194 0.239333C6.48602 0.379487 5.68597 0.643716 4.93885 1.02308C4.19265 1.40566 3.51083 1.90278 2.91811 2.49641C2.32228 3.08837 1.82561 3.77259 1.4472 4.52277C1.06775 5.27146 0.804634 6.07374 0.666946 6.90192C0.527948 7.72905 0.453153 8.56572 0.44323 9.40442C0.431645 9.78767 0.430421 10.1722 0.424316 10.5555V39.4483C0.430421 39.8364 0.431645 40.2124 0.44323 40.6007C0.453156 41.4394 0.527951 42.276 0.666946 43.1031C0.804254 43.9317 1.06738 44.7345 1.4472 45.4834C1.82544 46.2312 2.32218 46.9127 2.91811 47.5013C3.50858 48.0976 4.19085 48.595 4.93885 48.9747C5.68597 49.3551 6.48593 49.6209 7.31194 49.7632C8.13916 49.8993 8.9754 49.9731 9.81363 49.9842C10.1995 49.9927 10.5787 49.9976 10.9609 49.9976C11.4174 50.0001 11.8698 50.0001 12.3275 50.0001H137.918C138.367 50.0001 138.823 50.0001 139.271 49.9976C139.652 49.9976 140.042 49.9927 140.422 49.9842C141.259 49.9737 142.094 49.8998 142.919 49.7632C143.748 49.6199 144.551 49.3541 145.301 48.9747C146.049 48.5948 146.73 48.0974 147.32 47.5013C147.915 46.9103 148.412 46.2294 148.795 45.4834C149.172 44.7339 149.433 43.9313 149.568 43.1031C149.707 42.2759 149.785 41.4394 149.8 40.6007C149.805 40.2124 149.805 39.8364 149.805 39.4483C149.815 38.9942 149.815 38.5426 149.815 38.0811V11.9202C149.815 11.4625 149.815 11.0084 149.805 10.5555C149.805 10.1722 149.805 9.78767 149.8 9.40437C149.785 8.5656 149.707 7.72912 149.568 6.90187C149.433 6.07417 149.172 5.27195 148.795 4.52272C148.025 3.01907 146.803 1.7951 145.301 1.02297C144.551 0.64453 143.748 0.380371 142.919 0.239221C142.094 0.101449 141.259 0.0275805 140.422 0.0182708C140.042 0.0121708 139.652 0.00484582 139.271 0.00240832C138.823 -9.16847e-05 138.367 7.08153e-05 137.918 7.08153e-05Z" fill="#A6A6A6"/>
-<path d="M10.967 48.9062C10.5866 48.9062 10.2154 48.9013 9.83803 48.8928C9.05625 48.8826 8.2763 48.8144 7.50457 48.6889C6.78497 48.5648 6.08787 48.334 5.43627 48.004C4.79064 47.6768 4.20178 47.2477 3.69224 46.7333C3.17532 46.2249 2.74496 45.6352 2.41822 44.9877C2.08788 44.3359 1.85926 43.6373 1.74033 42.9162C1.6119 42.1413 1.54241 41.3578 1.53247 40.5724C1.52456 40.3088 1.51419 39.431 1.51419 39.431V10.5553C1.51419 10.5553 1.52523 9.69107 1.53253 9.43716C1.54205 8.65301 1.61114 7.87073 1.73918 7.09707C1.85833 6.37397 2.08712 5.67334 2.41765 5.01945C2.74319 4.37234 3.17116 3.78223 3.68496 3.27201C4.19819 2.75694 4.78893 2.32566 5.43566 1.99392C6.08576 1.66503 6.78154 1.43582 7.49969 1.314C8.27395 1.1872 9.05661 1.11865 9.8411 1.10892L10.9676 1.09366H139.265L140.405 1.10953C141.182 1.11878 141.958 1.18672 142.725 1.31277C143.451 1.43613 144.154 1.66693 144.811 1.99758C146.107 2.66614 147.161 3.72386 147.826 5.0225C148.151 5.67188 148.377 6.36679 148.494 7.08365C148.624 7.86365 148.696 8.65208 148.711 9.44266C148.715 9.79666 148.715 10.1769 148.715 10.5553C148.725 11.0241 148.725 11.4702 148.725 11.9201V38.0809C148.725 38.535 148.725 38.9782 148.715 39.4249C148.715 39.8314 148.715 40.2038 148.71 40.587C148.695 41.3635 148.624 42.1379 148.497 42.9039C148.38 43.6302 148.153 44.3343 147.822 44.9914C147.493 45.6319 147.066 46.2165 146.555 46.7235C146.045 47.2408 145.455 47.6723 144.808 48.0017C144.152 48.3342 143.45 48.5658 142.725 48.6889C141.954 48.8151 141.173 48.8833 140.392 48.8928C140.026 48.9013 139.643 48.9062 139.271 48.9062L137.918 48.9087L10.967 48.9062Z" fill="black"/>
-<path d="M31.3461 25.3758C31.3595 24.3324 31.6363 23.3095 32.1507 22.402C32.6651 21.4946 33.4003 20.7322 34.2881 20.1857C33.7241 19.3792 32.9801 18.7156 32.1152 18.2474C31.2503 17.7792 30.2882 17.5194 29.3055 17.4886C27.2091 17.2683 25.1767 18.7446 24.1084 18.7446C23.0195 18.7446 21.3747 17.5105 19.6035 17.5469C18.4579 17.584 17.3414 17.9176 16.3628 18.5151C15.3842 19.1127 14.5769 19.9539 14.0195 20.9568C11.6051 25.1423 13.406 31.2936 15.7188 34.6769C16.876 36.3336 18.2284 38.1841 19.9979 38.1185C21.7296 38.0466 22.3763 37.0129 24.4665 37.0129C26.5373 37.0129 27.1441 38.1185 28.9496 38.0768C30.8077 38.0466 31.9784 36.4127 33.0949 34.7404C33.9263 33.5599 34.5661 32.2553 34.9905 30.8747C33.911 30.4176 32.9898 29.6523 32.3417 28.6745C31.6936 27.6966 31.3474 26.5493 31.3461 25.3758Z" fill="white"/>
-<path d="M27.9359 15.2635C28.949 14.0458 29.4482 12.4805 29.3273 10.9002C27.7795 11.063 26.3497 11.8037 25.3229 12.9748C24.8209 13.5468 24.4364 14.2124 24.1914 14.9333C23.9464 15.6543 23.8457 16.4166 23.8951 17.1765C24.6693 17.1845 25.4352 17.0165 26.1351 16.6851C26.8351 16.3537 27.4508 15.8677 27.9359 15.2635Z" fill="white"/>
-<path d="M53.235 33.9245H47.3258L45.9067 38.12H43.4038L49.0009 22.5975H51.6014L57.1985 38.12H54.6529L53.235 33.9245ZM47.9378 31.9884H52.6219L50.3128 25.1793H50.2482L47.9378 31.9884Z" fill="white"/>
-<path d="M69.2864 32.4621C69.2864 35.9789 67.4065 38.2384 64.5695 38.2384C63.8509 38.2761 63.1361 38.1103 62.5072 37.7601C61.8783 37.41 61.3605 36.8895 61.0132 36.2584H60.9596V41.8639H58.6395V26.8029H60.8852V28.6852H60.9279C61.2911 28.0571 61.8176 27.5394 62.4514 27.1871C63.0851 26.8348 63.8024 26.6611 64.5268 26.6845C67.3955 26.6845 69.2864 28.955 69.2864 32.4621ZM66.9017 32.4621C66.9017 30.1708 65.7192 28.6645 63.9148 28.6645C62.1422 28.6645 60.9498 30.2025 60.9498 32.4621C60.9498 34.7423 62.1422 36.2694 63.9148 36.2694C65.7192 36.2694 66.9017 34.7741 66.9017 32.4621Z" fill="white"/>
-<path d="M81.7267 32.4621C81.7267 35.9789 79.8467 38.2384 77.0098 38.2384C76.2911 38.2761 75.5764 38.1103 74.9474 37.7601C74.3185 37.41 73.8008 36.8895 73.4535 36.2584H73.3998V41.8639H71.0798V26.8029H73.3254V28.6852H73.3681C73.7313 28.0571 74.2578 27.5394 74.8916 27.1871C75.5253 26.8348 76.2426 26.6611 76.967 26.6845C79.8358 26.6845 81.7267 28.955 81.7267 32.4621ZM79.342 32.4621C79.342 30.1708 78.1594 28.6645 76.3551 28.6645C74.5824 28.6645 73.3901 30.2025 73.3901 32.4621C73.3901 34.7423 74.5824 36.2694 76.3551 36.2694C78.1594 36.2694 79.342 34.7741 79.342 32.4621Z" fill="white"/>
-<path d="M89.9486 33.7951C90.1205 35.3344 91.614 36.3451 93.6549 36.3451C95.6104 36.3451 97.0173 35.3343 97.0173 33.9464C97.0173 32.7415 96.1688 32.0201 94.1596 31.5257L92.1504 31.0411C89.3037 30.3526 87.9821 29.0196 87.9821 26.8565C87.9821 24.1783 90.3132 22.3387 93.6232 22.3387C96.899 22.3387 99.1447 24.1783 99.2203 26.8565H96.8783C96.7381 25.3075 95.4592 24.3724 93.5902 24.3724C91.7213 24.3724 90.4424 25.3185 90.4424 26.6954C90.4424 27.7928 91.2592 28.4386 93.2574 28.9329L94.9654 29.3528C98.1462 30.106 99.4678 31.3853 99.4678 33.6558C99.4678 36.5599 97.1575 38.3787 93.4829 38.3787C90.0449 38.3787 87.7236 36.6026 87.5737 33.795L89.9486 33.7951Z" fill="white"/>
-<path d="M104.475 24.1247V26.8029H106.624V28.6425H104.475V34.8815C104.475 35.8507 104.905 36.3024 105.85 36.3024C106.105 36.2979 106.36 36.28 106.613 36.2486V38.0773C106.188 38.1567 105.757 38.1927 105.325 38.1847C103.036 38.1847 102.144 37.3241 102.144 35.1293V28.6425H100.5V26.8029H102.144V24.1247H104.475Z" fill="white"/>
-<path d="M107.869 32.4621C107.869 28.9013 109.964 26.6637 113.23 26.6637C116.507 26.6637 118.591 28.9012 118.591 32.4621C118.591 36.0326 116.518 38.2604 113.23 38.2604C109.943 38.2604 107.869 36.0326 107.869 32.4621ZM116.228 32.4621C116.228 30.0194 115.11 28.5778 113.23 28.5778C111.35 28.5778 110.233 30.0304 110.233 32.4621C110.233 34.9145 111.35 36.3451 113.23 36.3451C115.11 36.3451 116.228 34.9145 116.228 32.4621Z" fill="white"/>
-<path d="M120.504 26.8029H122.717V28.7291H122.771C122.92 28.1275 123.272 27.5959 123.768 27.2235C124.263 26.8511 124.871 26.6608 125.489 26.6845C125.757 26.6835 126.023 26.7126 126.284 26.7711V28.944C125.947 28.8407 125.595 28.7933 125.242 28.8036C124.905 28.7899 124.569 28.8494 124.257 28.978C123.945 29.1066 123.665 29.3013 123.435 29.5487C123.205 29.796 123.032 30.0902 122.926 30.4111C122.821 30.7319 122.786 31.0718 122.824 31.4074V38.12H120.504L120.504 26.8029Z" fill="white"/>
-<path d="M136.981 34.796C136.669 36.8505 134.671 38.2604 132.114 38.2604C128.826 38.2604 126.785 36.0546 126.785 32.5158C126.785 28.966 128.837 26.6637 132.017 26.6637C135.144 26.6637 137.11 28.8146 137.11 32.246V33.0419H129.127V33.1823C129.091 33.5988 129.143 34.0184 129.28 34.4132C129.418 34.808 129.638 35.1689 129.925 35.4721C130.213 35.7753 130.561 36.0138 130.948 36.1716C131.335 36.3295 131.751 36.4032 132.168 36.3878C132.716 36.4393 133.266 36.3121 133.737 36.0253C134.207 35.7385 134.572 35.3074 134.778 34.796L136.981 34.796ZM129.138 31.4184H134.789C134.81 31.0439 134.753 30.6691 134.623 30.3176C134.492 29.9661 134.29 29.6454 134.03 29.3757C133.769 29.106 133.456 28.8931 133.11 28.7503C132.763 28.6075 132.391 28.538 132.017 28.546C131.639 28.5438 131.264 28.6165 130.915 28.7599C130.565 28.9033 130.247 29.1147 129.98 29.3817C129.712 29.6487 129.5 29.9662 129.356 30.3158C129.211 30.6653 129.137 31.0401 129.138 31.4184Z" fill="white"/>
-<path d="M47.647 10.9137C48.1334 10.8787 48.6215 10.9523 49.0761 11.1291C49.5307 11.3059 49.9404 11.5815 50.2757 11.936C50.611 12.2905 50.8635 12.7152 51.0151 13.1792C51.1666 13.6433 51.2134 14.1353 51.1521 14.6197C51.1521 17.0025 49.8659 18.3722 47.647 18.3722H44.9564V10.9137H47.647ZM46.1133 17.3174H47.5178C47.8654 17.3382 48.2132 17.2812 48.536 17.1504C48.8587 17.0196 49.1483 16.8184 49.3836 16.5615C49.6189 16.3045 49.7941 15.9983 49.8963 15.665C49.9985 15.3317 50.0252 14.9798 49.9744 14.6349C50.0215 14.2914 49.9921 13.9417 49.8883 13.6108C49.7845 13.28 49.609 12.9762 49.3742 12.7213C49.1394 12.4664 48.8512 12.2667 48.5303 12.1364C48.2093 12.0061 47.8636 11.9485 47.5178 11.9677H46.1133V17.3174Z" fill="white"/>
-<path d="M52.459 15.5553C52.4237 15.1854 52.466 14.8122 52.5831 14.4596C52.7003 14.1071 52.8897 13.7829 53.1393 13.5079C53.3889 13.2329 53.6932 13.0132 54.0326 12.8629C54.372 12.7125 54.739 12.6349 55.1101 12.6349C55.4812 12.6349 55.8482 12.7125 56.1876 12.8629C56.527 13.0132 56.8312 13.2329 57.0809 13.5079C57.3305 13.7829 57.5199 14.1071 57.6371 14.4596C57.7542 14.8122 57.7965 15.1854 57.7611 15.5553C57.7972 15.9256 57.7554 16.2993 57.6386 16.6525C57.5217 17.0056 57.3324 17.3304 57.0827 17.6059C56.833 17.8815 56.5285 18.1016 56.1888 18.2523C55.8491 18.403 55.4816 18.4808 55.1101 18.4808C54.7385 18.4808 54.3711 18.403 54.0314 18.2523C53.6916 18.1016 53.3872 17.8815 53.1375 17.6059C52.8878 17.3304 52.6985 17.0056 52.5816 16.6525C52.4648 16.2993 52.423 15.9256 52.459 15.5553ZM56.62 15.5553C56.62 14.3352 56.0726 13.6217 55.1119 13.6217C54.1476 13.6217 53.6051 14.3352 53.6051 15.5553C53.6051 16.7852 54.1476 17.4932 55.1119 17.4932C56.0726 17.4932 56.62 16.7803 56.62 15.5553Z" fill="white"/>
-<path d="M64.8091 18.3721H63.6582L62.4963 14.2266H62.4086L61.2516 18.3721H60.1117L58.5621 12.7434H59.6874L60.6944 17.0384H60.7773L61.9331 12.7434H62.9974L64.1532 17.0384H64.241L65.2431 12.7434H66.3525L64.8091 18.3721Z" fill="white"/>
-<path d="M67.6558 12.7434H68.7238V13.6376H68.8067C68.9473 13.3164 69.1845 13.0472 69.4852 12.8675C69.7859 12.6877 70.1352 12.6064 70.4842 12.6348C70.7578 12.6142 71.0324 12.6555 71.2878 12.7556C71.5433 12.8557 71.7729 13.0121 71.9598 13.2132C72.1466 13.4142 72.2859 13.6548 72.3673 13.9171C72.4487 14.1793 72.4701 14.4566 72.43 14.7283V18.372H71.3206V15.0072C71.3206 14.1027 70.928 13.6529 70.1075 13.6529C69.9218 13.6442 69.7364 13.6758 69.5641 13.7456C69.3917 13.8154 69.2365 13.9217 69.109 14.0572C68.9815 14.1927 68.8848 14.3541 68.8254 14.5306C68.7661 14.707 68.7456 14.8941 68.7652 15.0792V18.3721H67.6558L67.6558 12.7434Z" fill="white"/>
-<path d="M74.1978 10.5462H75.3072V18.3721H74.1978V10.5462Z" fill="white"/>
-<path d="M76.8494 15.5553C76.8141 15.1854 76.8564 14.8122 76.9736 14.4596C77.0908 14.107 77.2803 13.7828 77.5299 13.5078C77.7795 13.2328 78.0838 13.0131 78.4232 12.8628C78.7626 12.7124 79.1297 12.6348 79.5008 12.6348C79.8719 12.6348 80.239 12.7124 80.5784 12.8628C80.9178 13.0131 81.2221 13.2328 81.4717 13.5078C81.7213 13.7828 81.9108 14.107 82.028 14.4596C82.1452 14.8122 82.1875 15.1854 82.1521 15.5553C82.1881 15.9256 82.1463 16.2994 82.0294 16.6525C81.9126 17.0057 81.7232 17.3304 81.4735 17.6059C81.2238 17.8815 80.9193 18.1016 80.5795 18.2523C80.2398 18.4029 79.8724 18.4808 79.5008 18.4808C79.1292 18.4808 78.7618 18.4029 78.422 18.2523C78.0823 18.1016 77.7778 17.8815 77.5281 17.6059C77.2784 17.3304 77.089 17.0057 76.9721 16.6525C76.8553 16.2994 76.8135 15.9256 76.8494 15.5553ZM81.0104 15.5553C81.0104 14.3352 80.463 13.6217 79.5023 13.6217C78.538 13.6217 77.9955 14.3352 77.9955 15.5553C77.9955 16.7852 78.538 17.4932 79.5023 17.4932C80.463 17.4932 81.0104 16.7803 81.0104 15.5553Z" fill="white"/>
-<path d="M83.3201 16.7803C83.3201 15.7671 84.0735 15.183 85.4109 15.1L86.9337 15.0121V14.5263C86.9337 13.9318 86.5411 13.5961 85.7828 13.5961C85.1635 13.5961 84.7343 13.8238 84.6112 14.2217H83.5371C83.6505 13.2549 84.5588 12.6348 85.834 12.6348C87.2433 12.6348 88.0382 13.3373 88.0382 14.5263V18.3721H86.9702V17.5811H86.8825C86.7043 17.8648 86.4541 18.0961 86.1575 18.2514C85.8608 18.4067 85.5283 18.4803 85.1939 18.4648C84.9579 18.4894 84.7194 18.4642 84.4938 18.3908C84.2681 18.3175 84.0603 18.1976 83.8838 18.0388C83.7072 17.8801 83.5658 17.6861 83.4688 17.4694C83.3717 17.2526 83.321 17.0179 83.3201 16.7803ZM86.9337 16.2993V15.8288L85.5609 15.9167C84.7867 15.9685 84.4356 16.2322 84.4356 16.7284C84.4356 17.235 84.8745 17.5298 85.478 17.5298C85.6549 17.5477 85.8335 17.5299 86.0033 17.4772C86.1731 17.4246 86.3306 17.3384 86.4664 17.2236C86.6022 17.1088 86.7135 16.9678 86.7938 16.809C86.8741 16.6502 86.9217 16.4769 86.9337 16.2993Z" fill="white"/>
-<path d="M89.4963 15.5553C89.4963 13.7768 90.4095 12.6501 91.8298 12.6501C92.1811 12.6339 92.5298 12.7181 92.8351 12.893C93.1403 13.0678 93.3896 13.3261 93.5537 13.6376H93.6366V10.5462H94.746V18.3721H93.6829V17.4828H93.5951C93.4184 17.7922 93.1604 18.0472 92.8492 18.2203C92.5381 18.3934 92.1855 18.478 91.8298 18.4648C90.3997 18.4649 89.4963 17.3382 89.4963 15.5553ZM90.6424 15.5553C90.6424 16.7492 91.2044 17.4676 92.1444 17.4676C93.0794 17.4676 93.6573 16.7388 93.6573 15.5602C93.6573 14.3871 93.0734 13.648 92.1444 13.648C91.2105 13.648 90.6424 14.3712 90.6424 15.5553Z" fill="white"/>
-<path d="M99.3361 15.5553C99.3008 15.1854 99.343 14.8122 99.4602 14.4596C99.5773 14.1071 99.7668 13.7829 100.016 13.5079C100.266 13.2329 100.57 13.0132 100.91 12.8629C101.249 12.7125 101.616 12.6349 101.987 12.6349C102.358 12.6349 102.725 12.7125 103.065 12.8629C103.404 13.0132 103.708 13.2329 103.958 13.5079C104.208 13.7829 104.397 14.1071 104.514 14.4596C104.631 14.8122 104.674 15.1854 104.638 15.5553C104.674 15.9256 104.632 16.2993 104.516 16.6525C104.399 17.0056 104.209 17.3304 103.96 17.6059C103.71 17.8815 103.406 18.1016 103.066 18.2523C102.726 18.403 102.359 18.4808 101.987 18.4808C101.616 18.4808 101.248 18.403 100.908 18.2523C100.569 18.1016 100.264 17.8815 100.015 17.6059C99.7649 17.3304 99.5755 17.0056 99.4587 16.6525C99.3419 16.2993 99.3001 15.9256 99.3361 15.5553ZM103.497 15.5553C103.497 14.3352 102.95 13.6217 101.989 13.6217C101.025 13.6217 100.482 14.3352 100.482 15.5553C100.482 16.7852 101.025 17.4932 101.989 17.4932C102.95 17.4932 103.497 16.7803 103.497 15.5553Z" fill="white"/>
-<path d="M106.127 12.7434H107.195V13.6376H107.278C107.418 13.3164 107.656 13.0472 107.956 12.8675C108.257 12.6877 108.606 12.6064 108.955 12.6348C109.229 12.6142 109.503 12.6555 109.759 12.7556C110.014 12.8557 110.244 13.0121 110.431 13.2132C110.618 13.4142 110.757 13.6548 110.838 13.9171C110.92 14.1793 110.941 14.4566 110.901 14.7283V18.372H109.792V15.0072C109.792 14.1027 109.399 13.6529 108.579 13.6529C108.393 13.6442 108.207 13.6758 108.035 13.7456C107.863 13.8154 107.707 13.9217 107.58 14.0572C107.452 14.1927 107.356 14.3541 107.296 14.5306C107.237 14.707 107.217 14.8941 107.236 15.0792V18.3721H106.127V12.7434Z" fill="white"/>
-<path d="M117.17 11.3421V12.7691H118.388V13.7047H117.17V16.599C117.17 17.1886 117.413 17.4468 117.965 17.4468C118.106 17.4464 118.247 17.4378 118.388 17.4212V18.3465C118.189 18.3821 117.987 18.4011 117.784 18.4032C116.551 18.4032 116.059 17.9686 116.059 16.8834V13.7047H115.167V12.769H116.059V11.3421H117.17Z" fill="white"/>
-<path d="M119.903 10.5462H121.003V13.648H121.091C121.238 13.3238 121.482 13.0531 121.789 12.8726C122.095 12.6922 122.45 12.6109 122.805 12.6397C123.077 12.6248 123.349 12.6703 123.601 12.7729C123.854 12.8754 124.081 13.0325 124.266 13.233C124.451 13.4334 124.589 13.6722 124.671 13.9324C124.753 14.1925 124.777 14.4676 124.741 14.7381V18.3721H123.63V15.0121C123.63 14.113 123.212 13.6577 122.428 13.6577C122.237 13.6421 122.046 13.6683 121.866 13.7346C121.687 13.8009 121.524 13.9057 121.389 14.0417C121.254 14.1776 121.151 14.3413 121.086 14.5215C121.021 14.7017 120.996 14.8939 121.013 15.0847V18.3721H119.903L119.903 10.5462Z" fill="white"/>
-<path d="M131.21 16.8523C131.059 17.3667 130.732 17.8117 130.287 18.1094C129.842 18.4071 129.306 18.5385 128.774 18.4807C128.403 18.4905 128.035 18.4195 127.695 18.2726C127.355 18.1257 127.051 17.9064 126.804 17.63C126.557 17.3536 126.373 17.0266 126.264 16.6718C126.156 16.3171 126.126 15.9429 126.177 15.5755C126.128 15.2069 126.158 14.8319 126.266 14.4761C126.374 14.1203 126.557 13.7918 126.803 13.513C127.049 13.2341 127.351 13.0114 127.691 12.8599C128.03 12.7084 128.398 12.6316 128.769 12.6348C130.333 12.6348 131.277 13.7048 131.277 15.4723V15.8599H127.307V15.9222C127.29 16.1287 127.316 16.3366 127.383 16.5326C127.451 16.7285 127.559 16.9081 127.7 17.06C127.84 17.2118 128.012 17.3324 128.202 17.4142C128.392 17.4959 128.597 17.537 128.804 17.5347C129.07 17.5666 129.339 17.5187 129.577 17.3972C129.815 17.2757 130.012 17.086 130.142 16.8523L131.21 16.8523ZM127.307 15.0384H130.147C130.161 14.8494 130.135 14.6597 130.071 14.4813C130.008 14.3029 129.907 14.1398 129.777 14.0025C129.647 13.8652 129.489 13.7567 129.315 13.6839C129.14 13.6112 128.952 13.5759 128.763 13.5802C128.571 13.5778 128.381 13.6139 128.203 13.6863C128.025 13.7588 127.864 13.8661 127.728 14.002C127.592 14.1379 127.485 14.2996 127.413 14.4776C127.341 14.6556 127.305 14.8462 127.307 15.0384Z" fill="white"/>
-</g>
-<defs>
-<clipPath id="clip0_3063_14041">
-<rect width="149.39" height="50" fill="white" transform="translate(0.424316)"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/apps/web/src/assets/svg/play-store-badge.svg b/apps/web/src/assets/svg/play-store-badge.svg
deleted file mode 100644
index b6a5ea07734..00000000000
--- a/apps/web/src/assets/svg/play-store-badge.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg width="171" height="50" viewBox="0 0 171 50" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<rect x="0.814453" width="169.761" height="50" fill="url(#pattern0)"/>
-<defs>
-<pattern id="pattern0" patternContentUnits="objectBoundingBox" width="1" height="1">
-<use xlink:href="#image0_3063_14044" transform="scale(0.000390625 0.00132626)"/>
-</pattern>
-<image id="image0_3063_14044" width="2560" height="754" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAACgAAAALyCAYAAAAW4Y2tAAAMP2lDQ1BJQ0MgUHJvZmlsZQAASImVVwdYU8kWnltSIbQAAlJCb4JIDSAlhBZAehFshCRAKCEmBBU7uqjg2sUCNnRVRLEDYkfsLIoN+2JBRVkXC3blTQrouq98b75v7vz3nzP/OXPuzL13ANA8wRWL81AtAPJFhZL4sCDG6NQ0BukpoAAToAbIwJvLk4pZsbFRAJaB9u/l3Q2AyNurTnKtf/b/16LNF0h5ACCxEGfwpbx8iA8AgFfxxJJCAIhy3nJSoViOYQW6EhggxPPlOEuJq+Q4Q4n3KGwS49kQtwBAVudyJVkAaFyGPKOIlwU1NHohdhHxhSIANBkQ++fnF/AhTofYDtqIIZbrMzN+0Mn6m2bGoCaXmzWIlXNRFHKwUCrO4075P9Pxv0t+nmzAhw2s6tmS8Hj5nGHebuYWRMqxOsQ9oozoGIh1IP4g5CvsIUap2bLwJKU9asyTsmHOgD7ELnxucCTExhCHivKio1R8RqYwlAMxXCHoZGEhJxFiA4jnC6QhCSqbjZKCeJUvtD5Twmap+HNcicKv3Nd9WW4SS6X/OlvAUeljGsXZiSkQUyG2KhImR0OsAbGzNDchUmUzsjibHT1gI5HFy+O3gjheIAoLUupjRZmS0HiVfVm+dGC+2MZsISdahfcVZieGK/ODtfC4ivjhXLDLAhEraUBHIB0dNTAXviA4RDl37JlAlJSg0vkgLgyKV47FqeK8WJU9biHIC5PzFhC7S4sSVGPx5EK4IJX6eKa4MDZRGSdenMONiFXGgy8BUYANggEDyGDNAAUgBwjbehp64J2yJxRwgQRkAQFwUjEDI1IUPSJ4TQDF4E+IBEA6OC5I0SsARZD/Osgqr04gU9FbpBiRC55AnA8iQR68lylGiQa9JYPHkBH+wzsXVh6MNw9Wef+/5wfY7wwLMlEqRjbgkaE5YEkMIQYTw4mhRHvcCPfHffEoeA2E1RVn4t4D8/huT3hCaCc8JFwndBJuTRCWSH6KchTohPqhqlxk/JgL3AZqeuBBuB9Uh8q4Pm4EnHB36IeFB0DPHpBlq+KWZ4Xxk/bfZvDD01DZUVwoKGUIJZBi9/NIDQcNj0EVea5/zI8y1ozBfLMHe372z/4h+3zYRv5sic3H9mNnsZPYeewI1gAY2HGsEWvFjsrx4Op6rFhdA97iFfHkQh3hP/wNPFl5JqUutS7dLl+UfYWCyfJ3NGAXiKdIhFnZhQwW/CIIGBwRz3kYw9XF1Q0A+fdF+fp6E6f4biD6rd+5OX8A4He8v7//8Hcu4jgAe73g9j/0nbNjwk+HGgDnDvFkkiIlh8svBPiW0IQ7zRCYAktgB+fjCjyBLwgEISACxIBEkArGw+iz4TqXgElgGpgNSkE5WAJWgrVgA9gMtoNdYB9oAEfASXAGXASXwXVwB66eLvAC9IJ34DOCICSEhtARQ8QMsUYcEVeEifgjIUgUEo+kIulIFiJCZMg0ZA5SjixD1iKbkBpkL3IIOYmcR9qRW8gDpBt5jXxCMVQd1UVNUBt0OMpEWWgkmoiOQ7PQiWgxOhddhK5Gq9GdaD16Er2IXkc70RdoHwYwNUwfM8ecMCbGxmKwNCwTk2AzsDKsAqvG6rAm+JyvYp1YD/YRJ+J0nIE7wRUcjifhPHwiPgNfiK/Ft+P1eAt+FX+A9+LfCDSCMcGR4EPgEEYTsgiTCKWECsJWwkHCabiXugjviESiPtGW6AX3YioxhziVuJC4jribeILYTnxE7CORSIYkR5IfKYbEJRWSSklrSDtJx0lXSF2kD2Q1shnZlRxKTiOLyCXkCvIO8jHyFfJT8meKFsWa4kOJofApUyiLKVsoTZRLlC7KZ6o21ZbqR02k5lBnU1dT66inqXepb9TU1CzUvNXi1IRqs9RWq+1RO6f2QO2juo66gzpbfay6TH2R+jb1E+q31N/QaDQbWiAtjVZIW0SroZ2i3ad90KBrOGtwNPgaMzUqNeo1rmi81KRoWmuyNMdrFmtWaO7XvKTZo0XRstFia3G1ZmhVah3S6tDq06Zrj9CO0c7XXqi9Q/u89jMdko6NTogOX2euzmadUzqP6Bjdks6m8+hz6Fvop+ldukRdW12Obo5uue4u3TbdXj0dPXe9ZL3JepV6R/U69TF9G32Ofp7+Yv19+jf0Pw0xGcIaIhiyYEjdkCtD3hsMNQg0EBiUGew2uG7wyZBhGGKYa7jUsMHwnhFu5GAUZzTJaL3RaaOeobpDfYfyhpYN3Tf0tjFq7GAcbzzVeLNxq3GfialJmInYZI3JKZMeU33TQNMc0xWmx0y7zehm/mZCsxVmx82eM/QYLEYeYzWjhdFrbmwebi4z32TeZv7ZwtYiyaLEYrfFPUuqJdMy03KFZbNlr5WZ1SiraVa1VretKdZM62zrVdZnrd/b2Nqk2MyzabB5Zmtgy7Ettq21vWtHswuwm2hXbXfNnmjPtM+1X2d/2QF18HDIdqh0uOSIOno6Ch3XObYPIwzzHiYaVj2sw0ndieVU5FTr9MBZ3znKucS5wfnlcKvhacOXDj87/JuLh0ueyxaXOyN0RkSMKBnRNOK1q4Mrz7XS9ZobzS3UbaZbo9srd0d3gft695sedI9RHvM8mj2+enp5SjzrPLu9rLzSvaq8Opi6zFjmQuY5b4J3kPdM7yPeH308fQp99vn85evkm+u7w/fZSNuRgpFbRj7ys/Dj+m3y6/Rn+Kf7b/TvDDAP4AZUBzwMtAzkB24NfMqyZ+WwdrJeBrkESYIOBr1n+7Cns08EY8FhwWXBbSE6IUkha0Puh1qEZoXWhvaGeYRNDTsRTgiPDF8a3sEx4fA4NZzeCK+I6REtkeqRCZFrIx9GOURJoppGoaMiRi0fdTfaOloU3RADYjgxy2PuxdrGTow9HEeMi42rjHsSPyJ+WvzZBHrChIQdCe8SgxIXJ95JskuSJTUnayaPTa5Jfp8SnLIspXP08NHTR19MNUoVpjamkdKS07am9Y0JGbNyTNdYj7GlY2+Msx03edz58Ubj88YfnaA5gTthfzohPSV9R/oXbgy3mtuXwcmoyujlsXmreC/4gfwV/G6Bn2CZ4GmmX+ayzGdZflnLs7qzA7IrsnuEbOFa4auc8JwNOe9zY3K35fbnpeTtzifnp+cfEumIckUtBaYFkwvaxY7iUnHnRJ+JKyf2SiIlW6WIdJy0sVAX/si3yuxkv8geFPkXVRZ9mJQ8af9k7cmiya1THKYsmPK0OLT4t6n4VN7U5mnm02ZPezCdNX3TDGRGxozmmZYz587smhU2a/ts6uzc2b+XuJQsK3k7J2VO01yTubPmPvol7JfaUo1SSWnHPN95G+bj84Xz2xa4LViz4FsZv+xCuUt5RfmXhbyFF34d8evqX/sXZS5qW+y5eP0S4hLRkhtLA5ZuX6a9rHjZo+WjltevYKwoW/F25YSV5yvcKzasoq6SrepcHbW6cY3VmiVrvqzNXnu9Mqhyd5Vx1YKq9+v4666sD1xft8FkQ/mGTxuFG29uCttUX21TXbGZuLlo85MtyVvO/sb8rWar0dbyrV+3ibZ1bo/f3lLjVVOzw3jH4lq0VlbbvXPszsu7gnc11jnVbdqtv7t8D9gj2/N8b/reG/si9zXvZ+6vO2B9oOog/WBZPVI/pb63IbuhszG1sf1QxKHmJt+mg4edD287Yn6k8qje0cXHqMfmHus/Xny874T4RM/JrJOPmic03zk1+tS1lriWttORp8+dCT1z6izr7PFzfueOnPc5f+gC80LDRc+L9a0erQd/9/j9YJtnW/0lr0uNl70vN7WPbD92JeDKyavBV89c41y7eD36evuNpBs3O8Z2dN7k33x2K+/Wq9tFtz/fmXWXcLfsnta9ivvG96v/sP9jd6dn59EHwQ9aHyY8vPOI9+jFY+njL11zn9CeVDw1e1rzzPXZke7Q7svPxzzveiF+8bmn9E/tP6te2r088FfgX629o3u7Xkle9b9e+Mbwzba37m+b+2L77r/Lf/f5fdkHww/bPzI/nv2U8unp50lfSF9Wf7X/2vQt8tvd/vz+fjFXwlX8CmCwopmZALzeBgAtFQA6PJ9RxyjPf4qCKM+sCgT+E1aeERXFE4A6+P8e1wP/bjoA2LMFHr+gvuZYAGJpACR6A9TNbbAOnNUU50p5IcJzwMaYrxn5GeDfFOWZ84e4f26BXNUd/Nz+C2jifHsfFom7AAAAOGVYSWZNTQAqAAAACAABh2kABAAAAAEAAAAaAAAAAAACoAIABAAAAAEAAAoAoAMABAAAAAEAAALyAAAAAA2VOo4AAEAASURBVHgB7N0HfJXV+TjwJzshBEiYAQTCciuKe1Lb/uqorVVxi7W12uHWtna6Wmut1Y5f7VBba1sXWrVLa1tFWxVREbc4ABERRBDZI5D/ffP7YxUZ4ea9yU3yffu5vbnve85znvN9gzef5LnnFISj2QKHHHJIt8yxW1lJ0U4lZWVblZaWDigtLakuLSnvWlZeWllWVl5eUlJSlByZ54JkwLKysoLCwsJmjy0AAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEWlNg9erVsXz58oYkh5UrVzasyhyZ51XLli1ftmL58sUrVi57Z8WKlW+vWLFi+rJlK56pr6+fOHv27IfuuuuuBa2Zd3sYu7EYrT1MpCXmcPDBB3eqrq4+sLJT+X6VnSt37NKl25CazImqLl2KCgpQtsQ9MAYBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAm1foKGhIRYuWLBq3ttvv71gwfxXFi9aPHHpsqX/nDt3/t1//vOfl7T9GbbMDFStbcD5uOOOqy0rKzm+S5euB9bU1Gzbt29tTUlJ6QZ6uESAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEC2QqsXLki3nzzzQWZusCp8+cvuHfRokU/v+GGG17KNl5776cA8D13eNSoUcUDBgw4qqam6zHdu/fctX///jWZXXvf08KXBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQINBSAslKgbNnzVoy+803n5o//+3bV61q+Ml11123rKXGz/dxOnwBYLKtb23v3l/u2avn8f0326yusrKyMN9vmvwIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQEQUWL168+rXp06e8Neet69+YPfuHHX274A5ZAJis9DdsWN2Z3bv3Oqmurm54RUVFh3ToiP8BMGcCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBNqHwJIlSxpefXXa5Dlz5lzz8stTfjxu3Lj69jGzps+iQxW+jTn66O1qeve4tK5uyEeqq6tLms6kJQECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjkq8CCd95ZNXXatEfnzp13VmaL4PH5mmfaeXWIAsCTTvrMOX379jsns9pfbVFRUdqG4hEgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAHgisWrUqpk2bNnPGjNcuv/ba31yZBynlNIV2WwD4f9v8Djt/yJC6MzPFf51zqig4AQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECOSVwOzZs5dOm/bK7xYvXn5GZlXAZXmVXErJtLsCwAMOOKDLsCGDrxm2+fBPde3arTglJ2EIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAoA0KzJ//dv2LL7542+zZc04aO3bsojY4hfWm3G4KAA8++OBOAwb0vXL48C1PrK6uLlnvjF0gQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgQ4nsOCdd1a9MPn5GxctWvq59rIiYJsvALzgggsK35w188ebb7nVKQr/Oty/SRMmQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAJgnMmzdv5fPPv3BVbW3t2Zn6s9Wb1DnPGhflWT6blM6YMWOO69275wNbbb3N3hUVFW16Lps0cY0JECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAICuBpNZswIDNdlu2bOm5A/pvNueJSZMmZhUoDzq1yRUAxxx99Hab1Q364/DNNx9SUNAmp5AHt14KBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQ6NgCDQ0NMfmFF158bcbrh/3ud797pq1ptLnquZNPPvmKHXfc4cxOnTq1udzb2jeHfAkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQINARBJYtW9bw1FOT/tCjR+8T2tK2wG2miO7EE4/fd/DgYX8cOHBgTb5+Q61atSrmz58fc+e+FW+//Xa8M/+dWLx48f89liyO+pX1UV9fHytWLM/XKciLAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECWQmUlpZFcXFxFJcUR2WnyqisrIzOnTtHl65doqamJvPoHt26dYuioqKs4rdEp2nTpr39/PMvHH7jjTfe2xLjNXeMvC8AzFRTFs6dM+fGETuOOKKkpLS5802t/7x582L69Onxxhsz4/UZr8fMma83Fv0lRYAOAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEPigQFL8V11dHf369Y++/fpGbW3fGDBgQGOB4Adbt86ZFStWxKRJE2/KrAZ4bL6vBpjXBYDHH3/8lkOHDr2vrm5Q79a5lf8d9fXXZ8RLL70cU6dMiSlTXol33nnnvxd9RYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJZC3Tt2i2GDBkcdXVDYtjwYdG3b9+sY6XVccrLL895/uln9rv59tufSStm2nHytgDw5JNOOn/7HUZ8u6qqqjDtSTclXlLF+dxzz8bzzz2feX4uU/A3vyndtCFAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBZgp061YdW221ZWyx5Vax9dZbR0lJSTMjZtd94cKFq594YtK3rrnmmkuyi5DbXnlXAJhs+Tt//ty/7LDDyAMKClo2vZUrV8aLkyfHE09MjCeffDKWL1+eW33RCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQGCDAiUlpbH55pvHDjvsENuPGBGlpaUbbJ/2xYaGhnjqqafGP/74xL3HjRtXn3b85sRr2Qq7jWR65JFHDtl6663GDxo0qMdGmqZ6edYbb8Sjj06IBx98MJYsWZJqbMEIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAIB2B8vLyGDlyZOyx516x2WabpRO0iVGmTZs259lnn9v95ptvfqWJXXLeLG8KAMeMGXPkyJE7/L66uqY457PODFBfXx+PPfZY/OffD8T06dNbYkhjECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEBKAgMHDoi999k3dtxxZBQXt0jZWbz99tsrMysBHnP99dffmtI0mhUmLwoAP/vZz35tt912/W5ZWVnO81m2bFk8Mv6R+Ne//hnz57/dLDydCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQKB1Bbp06RJ7ZlYE3HfUqOjUqVPOk1mxYkXDo49MuPiXV199fs4H28gAOS+428j4cfrpX/r9DjuMPLaoqGhjTZt1Pdna9957/xX3jxsXy5cvb1YsnQkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEAgvwQyC9DFqA/tF/vtt19UVFTkNLlVq1bFo48+cuNVV/3ymJwOtJHgrVYAeMEFFxQuXrzg4W233X6XjeTYrMtJsd+9//pXjBt3byxduqxZsXQmQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgfwWSIr/9tvvw5liwA9FUhSYy+PJJ58cX1XVZc9MPdzqXI6zvti5XXZvPaOOHj26tGuXqme33mbb7dbTpNmnGxoa4rFHH41f/uqX8eyzz0R9fX2zYwpAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAvktkNSKvfTSi/HII49kCgDLY7PNNouCgtysldenT5/+s2a9cWRxcckvp02b1uJFgLmZ1Qbu72mnnVbWtWvX54cPH1a3gWbNujR1ypS49dax8dprrzUrjs4ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAg0LYFBg4cGIcdPjoGDRqUs4lMnjz51RdffGnLsWPHLs3ZIOsI3KIrAB5wwAFdhgwZ/PKwYcM2W0cuzT6VbPd7++23xy233BzvvPNOs+MJQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJtWyCpJRs//uFYsmRxDBkyNIqLi1OfUI8ePboVFxed2KtXr18999xzK1IfYD0BW2wFwGTlv+7dq18ZPHhIv/Xk0qzTzz37bNx0000xf/7bzYqjMwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAi0T4Gampo48sijY8uttszJBF9++eU3pk9/bfB11123LCcDrBW0RVYAHDVqVPGwYUNfzKz8N2Ct8Zv9cuXKFXHnHbfHbbfdFsuWtejqic3OXQACBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQaDmBpUuXxmOPPRpz574VW2y5ZRQVpVtClykwrMrUtB1bWFj0s2nTpq3O9cxyvgLgBRdcULh8+dKnt9xyq63Snswbb8yM3153XcycOTPt0OIRIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQDsW6N2nT5xwwgnRv/9mqc/yheeef6m0vHyLTP1cTosAC1PPfK2Aixa981Auiv8efPA/8YPLLlP8t5a3lwQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCwcYHZs2bFFVdcEQ899NDGG29iiy222nLYggXv/HsTu21y83TXL1xr+FNP/cJvd9xxp4PWOt2sl/X19XHLzTfF3XfdFatX57Q4sll56kyAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEC+S2Q1KA988zTjVsCb7lVulsC9+nTZ7N+/Wq3mDDhsdtypZCzAsBTPve5b+6y665nFRamt8jggnfeiZ/97H8z4M/kykNcAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEOhgAq+//npMfuGF2HabbaOsrCy12ffpU7tNjx49VjzxxBP/SS3oewLlpABwzJgxh++x5x5XlZSUFLxnrGZ9+cYbM+OnP/lJzJ49u1lxdCZAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAmsLvJNZoG7SpCdiiy23iM6dq9a+nNXrZAG92to++1VXV0968sknJ2cVZAOdUi8APP744+t22mnkuM6dO6cWe/LkF+LnV/0sFi5ctIGpuESAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBLIXWLp0aTz22GMxcODA6N69R/aB3tOzuLi4oGvXbod17979+qeffvqd91xq9pepFeklmYwaNap45MgdX6itrU2n/DETM9lf+ZprrokVy1c0e7ICECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBDQnU19fHxIkTo3efPtEn80jj6NSpoihzHJ2J9aNp06atTiNmEiPVAsBDDz3k/i0zR1rJTXz8sbjuuutiVQbUQYAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEWkJg9erV8eSTk6Kme03069c/lSEz2wB3jmjYe/z4R36bSsBMkNQKAE866aSv77LLLicWFBSkktv48Q/H73//+0ggHQQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAoCUFGhoaIrNlb2QK96J//81SGTqzomBdz57ViydOnPRQGgFTKQAcM2bM8MzWv7eVl5enUv03adIT8fvf/S4SQAcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEGgtgWeeeSZ69ewVffv2bXYKyQJ71dU1H+7WrfrGTHHhvOYGLGxugKR/XV3d/V26dEkl1lNPPRm/zWz7a+W/NO6MGAQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQHIFkIbvf/e76eOKJic0J827fTK1d0dChQ+5/90Qzvmj2CoCnnvrFG7bddtvdm5HDu10nT54c115zdaxaterdc74gQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQKtKZAUAT6T2Q548JDB0b1792anUlNTU9WvX+3gCRMeu6M5wZpVAHjiiSfuscsuu1xRVFTU7K1/Z73xRvzi51fF8uXLmzMffQkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQOoCya62Tz35ZGy9zTZRVVXV7Pg9e/baPrMd8H1PPvnkq9kGa9a2vXV1g+4sLS1tdvHfwgUL4he/+HksWbIk23noR4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEciqwbNmy+NUvfxELMjVvzT0ytXcxZMjgW5sTJ+sVAL/4xVN+tc022+7dnMGTvvX19fHzq34Wb2RWAHQQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIF8Fli6dGlMmfpK7LzzLlFY2Kw1+KJbt26Vffv07v7oY4/flc2csyoAPPbYY7fKbP17TUlJSbNX/xt7y83xdGZvZAcBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEGgLAvPnz49FixfHNpntgJt7dKuu3rlr1243Zuro5m1qrKzKDwds1v/2Tp06Nbv479EJE+LBBx/c1Jy1J0CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECrSrw4H/+HePHP9zsHDp37lw4YEC/P2YTaJNXAPz0pz991E477XRKQUHz6v9mznw9fvWrX8Xq1auzyVsfAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQqgIvvDA5tttu26iqqmpWHjU13Xt161b1zJNPPvX8pgTa5BUAhw0b8vPm7ltcX18f1//2+qhfuXJTctWWAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAjkjcDKlSviN7/+TSTPzTmKiopi2LDNr97UGJu0AuDJJ598+bbbbrvfpg6ydvvbb78tnnn66bVPe02AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBNqUwKJFi2LF8uWx5VZbNSvvrl27VvTs2av88ccf/1dTAzW5AHD06NGlO+ww4o5OnTo1uc+6knjhhRfitltvXdcl5wgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQJsTePXVV2Pw4CHRo0ePZuVeUVGx86BBg76fKQJc3ZRATd4CuGfPHldlkittStD1tVmZ2fL3lptvioaGhvU1cZ4AAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECLQpgaQm7sYb/hArVjRvK+CePXuWFRXGj5s6+Sat5nfwwQd32mWXnW/MVBc2qf36Bv/TnXfEc889t77LzhMgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgTYpsHTp0li1alVsscUWzcq/srLziD59an8wadKk+o0FatIKgAMGbPar6urqko0F29D16dOnx/3337+hJq4RIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIE2KzBu3H0xY8Zrzcq/pqampLKy4qqmBNloAeDo0aNLhw8ffkRTgq2vTbK84R9vuy1Wr27StsTrC+M8AQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDIW4FkBcCxY8dGUjPXnGPo0GHHjho1qnhjMTZaAJhZ+e/S5q7+N/Hxx2PKlFc2lovrBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgTQtMnTIlnnjiiWbNoXv37snCfRdvLMhGCwDr6gZ9bmNBNnR95coVceedd26oiWsECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQKDdCPzpzjsiqZ1rzlFXN/CLG+tftKEGJ530mS9tu+22h2yozcau3XffvfHkk5M21sx1AgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQLgSWLl0alZWVUVdXl/V8unTpUlbTrXrWE5MmPb6+IBtcAbC2T9+vrq9jU84vX7487rv33qY01YYAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECLQbgX/cc08kNXTNOfr07fu1DfVfbwHgmDFjhtcNrttsQ503dm3cfffFwoULN9bMdQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAg0K4EFi1aFP9+4P5mzWnIkMEDjz766C3WF2S9BYDV1V2uKC4uXl+/jZ5vXP0vs/2vgwABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIdESBf/7zn81aBTCp4evVq/v31me33gLAgQPrPrK+Tk05/9BDD8WSJUua0lQbAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQ7gSSGrrxD49v1rwytXwHXnDBBeus9Vvnyc9+9tNf7NGjR1m2o65atSruH3dftt31I0CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEC7UJg3Lh7I6mpy/bI1PKVvvbqlM+sq/86CwC7d+/xhXU1buq5J5+cFPPmzWtqc+0IECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEC7FJg7d24kNXXNOWq69/rSuvp/oABw9OjRpQMHDtpqXY2beu7fD/y7qU21I0CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAEC7VqguTV1AwcN3C6p7Vsb6QMFgN26dT69qqrqA+fX7ri+17Nnz44pU15Z32XnCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAhxJ45ZWXY/asWVnPuUuXLoVVVZWnrB3gA4V+PXr0OnHtRpvy+qEHH4yGhoZN6aItAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBBo1wLjxz/crPn17Nnzc2sHeF8B4AUXXFDYr1//zddu1NTXq1atikcfndDU5toRIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIEOITBhwoRIauyyPfr167fl2n3fVwA4bdq0wzJLBRat3aiprye/8EIsWrSoqc21I0CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECHUJg4cKF8dJLL2U9127dqos/++lPH/zeAO8rAOzateqz7724qV9PnDhxU7toT4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOoTAxMcfb9Y8K7tUvW8b4PcVAPbu3Xu3bKPX19fHM888nW13/QgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQLsWePLJSZHU2mV79OzZa8/39n23APD444/vVVvbt+t7L27K1y+9+GIsWbJkU7poS4AAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIEOozA0qVLm7UNcL9+fWs++9nRNWvA3i0ALC8vHlNUVLTm/CY/P/vcs5vcRwcCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQINCRBJ5/7rmsp1tcXBwNDZXHrgnwbgFg585dDlxzMpvn5iSVzXj6ECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBtibw/PPZFwAmc+3SpcvBa+b8bgFgdXXNdmtOburznDlzInk4CBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAgfULzJ49O956a+76G2zkSqbWb8SaJo0FgKNGjSru06f23X2B11xs6vNLL73Y1KbaESBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBDi3w0kuTs55/nz59eiQ1f0mAxgLAgQMH7ldeXlaQbcQpr0zJtqt+BAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgQwlMnZJ9zV1FRUXBgAED9k7AGgsAy8rK9m+O3tSp2SfTnHH1JUCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECbU1gSjMKAJO5Zmr+PpY8NxYAdu5cMTJ5kc2xcOHCzH7Eb2XTVR8CBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQINDhBObMmRNJ7V22R+fOnXZJ+jYWAFZVdR2ebaAZr70WDQ0N2XbXjwABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIdCiBpOZuxowZWc+5qnOXxpq/xgLA6urq7tlGmvnGzGy76keAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDqkwMyZr2c9727V3XomnQtHjx5d2rVr15JsI73+evZViNmOqR8BAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEGjLAjNnZr/4Xrdu3UpHjRpVXFhRUTGyqKgoa4c3Zs7Kuq+OBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgIwrMfD37AsDi4uKoq+u/XWFpadHOzcF76605zemuLwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQ6HACza29K2go3iVTAFi+XbZyCxcujOXLl2fbXT8CBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQINAhBZLau0WLFmU997Kysu0zBYAlA7ONMG/evGy76keAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDq0wNy5c7Oef1lF6eCkALB7thGaM3i2Y+pHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgTag0BzavBKS0u7ZwoAy7plC7FwwcJsu+pHgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQ6tMCihdnX4JUUl3YrLCkpq8pWcPGSxdl21Y8AAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECHRogebU4JWUllUVVpSXVWQruGjRomy76keAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDq0wKJF2S/CV15e2qmwqLi4JFvBJUuWZNtVPwIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAg0KEFFi/OvgCwpKS0pLC4uLggW8GVK5Zn21U/AgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQoQWaU4NXVFRUWJj8X7aC9avqs+2qHwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQ6NACzanBK/7/BYBZrwC4qn51h8Y3eQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgkK1A/cpV2XaNzOp/BZlH9lsA19dbATBrfR0JECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAoEMLNGsFwOKSgsLCwqwXAIyGzP8cBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAwKYLNDRkvwtvUvtXuOlD6kGAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAi0toACwNa+A8YnQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJZCCgAzAJNFwIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAg0NoCCgBb+w4YnwABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIZCGgADALNF0IECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEBrCygAbO07YHwCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIJCFgALALNB0IUCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECrS2gALC174DxCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAFgIKALNA04UAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECLS2gALA1r4DxidAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAlkIKADMAk0XAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQ2gIKAFv7DhifAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAhkIaAAMAs0XQgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQGsLKABs7TtgfAIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgkIWAAsAs0HQhQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQKtLaAAsLXvgPEJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEAWAgoAs0DThQABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQItLaAAsDWvgPGJ0CAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECWQgoAMwCTRcCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQINDaAgoAW/sOGJ8AAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECGQhoAAwCzRdCBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAawsoAGztO2B8AgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCQhYACwCzQdCFAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAq0toACwte+A8QkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQBYCCgCzQNOFAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAi0toACwNa+A8YnQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQJZCCgAzAJNFwIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAg0NoCCgBb+w4YnwABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIZCGgADALNF0IECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEBrCygAbO07YHwCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIJCFgALALNB0IUCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECrS2gALC174DxCRAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAFgLFWfTRhQABAgQIECBAgAABAm1SoHefPlE3qC4GDx4cdXV1mcfg6FPbJyorO0fnzp2jvLy88bmysjJKSkpi2bJljY8FCxbE8szXi5csiYULF8SsN2bF1KlTYkrmMXXq1Jg6ZUrMmTOnTZpImgABAgQItFeBgoKC6Nu3X+N7/pr3/kGZ9//evXtHRUWn6NKlS+a9vyw6daqMqqqqKCoqiqVLlzY+kvf+pUuXZH4OWB7z5s2L11+f0fh+3/i+n/wMkHnvX7RoUXulMy8CBAgQIECAAAECBAgQIECAAIE2JKAAsA3dLKkSIECAAAECBAgQINB0gaSgb9ddd43dd98j9thzz9h++xGZP/B3anqATMukIDB5dOvWbaP9kiKAZ555Oh568MF4ePzD8cj48ZliwYUb7acBAQIECBAgkI5A8n692267N77v75553mbbbRvfxzclekVFRaY4sCJqamo22m32rFkx4dEJje/9Dz30YDz77LOxatWqjfbTgAABAgQIECBAgAABAgQIECBAgECaAgoA09QUiwABAgQIECBAgACBVhNIVvnZeZdd4hOf+GTsuedesW3mj/7JSj4tdSQFh0nRQfJIjqQA4Nlnn4mHH3o4/nXvP+OB+++P5cuXt1Q6LTrOpz51aAwcOLBFx2wLgyWrRN155x1NSrW8vCI+//nPN6mtRhsWuO6638T8+fM33KgNXR0yZEgcfPAnUsk4W5sBAwbEoYcelkoOHTnIihUr4qqrftaRCVKfe2FhYeN7fvJvZM+99owtttgyknMtdSQrCydjr/k3mqwaOP7hh+P++8fFH//4x5g1642WSqXVxjnyqKOitk9tquP/4Q+/b1crK++4446xzz77pmL04x//KBoaGlKJJQgBAgQIECBAgAABAgQIECDQfgQKrrnm6tWlpaUF2UzpyiuvaNz6Ipu++hAgQIAAAQIECBAgQCANga222joOP/zwOOzw0ZEUqeTrkawG+I97/h5jx46Nf/7zH1FfX5+vqW5yXrfe+sf48Ec+ssn92nuHv999dxx11BFNmmb37t3j5VemNqmtRhsWGLnjiMatOTfcqu1cPfDAg+IPN9yYSsI7jdwhXnnllU2ONWrUh+L2O+7c5H46vF8gWSl2s/5933/Sq6wEtt9++zh89BFx2GGHRW1tfpquXr06/v3vB2LsLbfEn//8p0iKA9vjcc89/2z8AEaac7vl5pvjlFM+l2bIVo31pS+dGt/57iWp5NC9plsk31sOAgQIECBAgAABAgQIECBAoH0JDKobFGeffW5Wk8p88LjBCoBZ0elEgAABAgQIECBAgEBrClRWVsaYMSfE8WPGxJZbbtWaqTR57Kqqqjj0sMMbH2+++WbccsvNcd1vfp1VMU6TB9WQAAECBAi0E4HkffTEEz8Txx13fAwbPjzvZ5WsRLjvvqMaH5f/8Iq4++674je//nU88MD9eZ97ayd4xJFHxo033hDjxt3X2qkYnwABAgQIECBAgAABAgQIECDQJgRabk+MNsEhSQIECBAgQIAAAQIE8lkgWSXta1/7ejz9zHNxyfcubTPFf2ub9urVK0499bSY8OjjmULAW2O//fZbu4nXBAgQIECAQEagR48e8Y1vfLPxvf/Ciy5uE8V/a9+48vLyOOSQT8Wdf/pzPPDv/0RS4FZUVLR2M6/fI5AUTZZl3BwECBAgQIAAAQIECBAgQIAAAQIbF1AAuHEjLQgQIECAAAECBAgQaGWB/v37x6WXXhZPPf1sfOWr50V1dXUrZ5TO8MnqQB/9n/+J2/54R9x73/2x//4HREFBQTrBRSFAgAABAm1YoF+//773n/vlr0TXrl3b8Gz+m/q2224Xv/zl1fHww4/EoYceFsnPAo4PCgwZMiTOPSe7bW8+GM0ZAgQIECBAgAABAgQIECBAgED7FrAFcPu+v2bXzgQKSgqjpGd5lPYoi+LOJVGYeV3YqTiS8wWlmUdmvquX1EdDQ8SqzHP9OysaHyvfXhGrFqyMhtWZCw4CBAgQIECAQBsSSFZ+OevMs+KMzCNZPac9HzvssEPceNPN8fjjj8c3v/H1GD/+4fY8XXMjQIAAAQLrFCgrK4vTzzgzzj777Mx7f8U627SHk8k2xtf++jdx6mmnx3nnfSUmPPJIe5hWqnNIvg/G3jo2Xpw8OdW4ghEgQIAAAQIECBAgQIAAAQIE2puAAsD2dkfNp90IlPWuiPLBnaNTXZcoH1gZpZnCv+JupVnPb/XK1bF85tJY/vrizGNJLHllYSydujAaMucdBAgQIECAAIF8FEhWxvv+938QdXV1+ZheznIaOXJk3HX33+OOO27PFAJ+I15/fUbOxhKYAAECBAjkk8CoUR+KH1z+wxg6dGg+pZXTXJIPANx99z0x9pZbMlsdfy3eeuutnI7XloKXlpbGlVf+KD5+0IGZD7v6UGtbundyJUCAAAECBAgQIECAAAECBFpWQAFgy3objcB6BYo6F0fVdjVRNaImKrfoFsnrNI9ktcCKTCFh8lhzJEWBS6csjMUvvBMLn5gby6YvXnPJMwECBAgQIECg1QQ222yz+N6l34+DDvp4q+WQDwMfcsin4iMf+WhccMH58ZtfXxurV/vgRj7cFzkQIECAQPoCvfv0iUu+e0kcetjh6QdvAxELCgriiCOPjP0+/OH46le/En+87dY2kHXLpLjHHnvGcccdH7/73fUtM6BRCBAgQIAAAQIECBAgQIAAAQJtUCDdCqM2CCBlAq0pUFRZHN127xVdduoeFUO7REFhsolvyx1JUWDl5l0bH70+OSBWvLU8Fk58K94ZPyeWTlvUcokYiQABAgQIECDw/wUOO/zw+NGPfhKdO3dmkhFIHC7PrIR0yCGHxCknnxwzZ77OhQABAgQItCuB/fc/IK76+S+iurq6Xc0rm8n06NEjrr3213FAxuTMM0+PxYt9UDNxvPCii+Ouu/5mdcRsvqn0IUCAAAECBAgQIECAAAECBDqEQGGHmKVJEsgngUyNX1J01//kzWP4FbtEn2MGR6fhXVu8+G9dJKU9yqL7//SLwd8eEYPP3yGqP1QbhRVF62rqHAECBAgQIEAgVYGy8vK48kc/jmuu+bXiv3XI7rXX3vHv/zwYSZGEgwABAgQItAeB4uLiuODCi+KGG29S/LfWDT189Oj417/ui+Gbb77WlY75MikO/c53LumYkzdrAgQIECBAgAABAgQIECBAgEATBBQANgFJEwJpCCSr+3XdvWcMu3jHGPTVbaPrbj0jWYEvX49kq+C+xw+JzS/fJXofURfF3UrzNVV5ESBAgAABAm1cYOjQofGPf/wzPv3pE9v4THKbfk1NTWORxPkXXBiFhfn7c2RuFUQnQIAAgfYgUFvbN/78l7/GGWecGcn2t44PCmy+xRZx773jOuy2yGuLHHnUUTFq1IfWPu01AQIECBAgQIAAAQIECBAgQIBARsBfjXwbEMixQEFRQXTbo1cM+c6O0f9zm0dp3045HjHd8MkKgD327xfDvr9TY0GgQsB0fUUjQIAAAQIdXeCQQz4V9417ILbddruOTtGk+SdFEmeeeVZcfc21UVZW1qQ+GhEgQIAAgXwS2HvvfeL+B/4du+22ez6llZe5VFZWNm4JfNlll0eyYmJHPy7/4RWRrBrtIECAAAECBAgQIECAAAECBAgQeL+AAsD3e3hFIFWBzlt3i6EX7Rj9ThoeZX0qUo3d0sGS1QqTLYGHXbpT9PzkgCgs9Z+Plr4HxiNAgAABAu1N4ORTTolrf/0bW/5mcWMPPfSwuPmWsdGpU9v6cEkWU9WFAAECBNqRwMEHfyLG3npb9OzZsx3NKvdT+dzJJ8dvr/9dhy9+GzJkSJxz9jm5BzcCAQIECBAgQIAAAQIECBAgQKCNCajgaWM3TLptQ6Ckpiz6f2GLGHjONlFa27YL/9YWTwr/emUKAJNCwGRlw7BTz9pEXhMgQIAAAQJNEPj6178R3//+D2xl2wSr9TXZd99Rcccdf4qqqqr1NXGeAAECBAjkjcBxxx0fv7nut1awzfKOHHjgQXFLpvg/WRWwIx+nZ7aNHjZ8eEcmMHcCBAgQIECAAAECBAgQIECAwAcEFAB+gMQJAs0QyBTDdf9I3xh6ycjounOPZgTK/67JVsDJyoZ139g+KgZ3zv+EZUiAAAECBAjkhUBRUVFcccWV8eWvfDUv8mnrSey8yy7xhxtu7PArArX1+yh/AgQItHeB0047PX7y0/+N5OcAR/YC++yzb9xx55+juro6+yBtvGdZWVlceeWPoqDAJ1Lb+K2UPgECBAgQIECAAAECBAgQIJCigALAFDGF6tgCxV1KYuDpW0efYwZ3qO1xOw2uisHfGNG44mGy8qGDAAECBAgQILA+gdLS0rjm2l/HiZ/57PqatPr5JUuWxLx582LatGkxderUxuf58+fHsmXLWj239SWw9977xNVXX6OoYn1AzhMgQIBAqwp8+9vnx0UXfydvC7YWLFgQb775ZuN7/ssvvxyvvvpq5PN7/0477RR/+evfolfv3q16X1tz8D333CuOOebY1kzB2AQIECBAgAABAgQIECBAgACBvBIozqtsJEOgjQp03q46+p04LIq7lrbRGTQz7cyHrpMVD6u2rY63/vJazP3HzFi9cnUzg+pOgAABAgQItCeBwsLCuOqqX8Qhh3yq1aeV/JH/kUfGx/PPPddY5Dd12tTG5zdnz95obrW1faOuru7dx/DNN4/ddts9evbsudG+uWxw8MGfiB9mVlY868wzoqGhIZdDiU2AAAECBJoscO6XvxJnnX1Ok9vnquHrr8+Ihx96OCa/ODnznj8lpmWK/JNC/6Tof0NHcXFx9OvXL/O+P7jxvX9Q5meAHXbYIXbaaeeoqKjYUNecXttqq63jzjv/FAfs/7HGYsWcDpanwZOi0r///e5466238jRDaREgQIAAAQIECBAgQIAAAQIEWk5AAWDLWRupnQokW/72ObouMh9lb6czbPq0CsuLotfhg6LbPn3izdumxTuP+iVs0/W0JECAAAEC7VvgkksujcMOP7xVJrls2dK46667Ytx998XDDz8UL730UtZ5vPHGzEgeDz304PtibL7FFrHHHnvG3nvvHR/72P7RqVOn911viRfJCovJdngKAFtC2xgECBAgsDGBE074dHzjG9/cWLOcXF+0aFH89S9/iXHj7mt8z54+fXpW49TX1zeuCJisCpjEWnMk77kjMoWAyXv/QQd9PFMQuNOaSy32vMUWW8ZNN92S+XDFJzMrFS9tsXHzZaCampq4+DvfjS98/pR8SUkeBAgQIECAAAECBAgQIECAAIFWE1AA2Gr0Bm7rAoUlhVF7wtDotkevtj6V1PMv7VXeuCVw9aj58caNU2P5jMWpjyEgAQIECBAg0HYEzj7n3Djl859v0YRXrVoV9917b9x629jGAoCkECCXx+QXXojk8ZtfXxuVlZXxiU98Mo486qhMQeA+kax+mOvjxhtviFO/9MVYvbptr8L84uTJ8fOfX5VrrhaL/9qM15o81qLFixtXcGxyh5Qb9u/fP84598upRL3qqp/FSy++mEqsbILMmTMnm276bEBgcubfZrLCaGsdu+62Wxx11NGpDP/1r50XS5e2TrHUypUrU5lDWwjy8Y8f3LgybUvmmvj+85//iFvHjo2//e1vOS2KW7FiRUx45JHGx4+uvCIGDx4ch48+IkZnHkOHDm2xaSf/Nn5z3XVx/HHHRlKs2NGOI488Km684YZ44IH7O9rUzZcAAQIECBAgQIAAAQIECBAg8D4BBYDv4/CCQNMEiqtKYrNTt4xOw7o0rUMHbVW5ZbcYcv6IePveWfHmn16NVYs73i+jO+itN20CBAgQIPCuwJgxJ8Q3v/mtd1/n+otly5bFDX/4ffz0pz+JadOm5Xq4dcZfnCnkSgrykkdSVHXaaWfEmBNOiPLy8nW2b+7J9lL8lzjMzKyueN11v2kuSZvsvzzzvduac99+++1TKwC85+9/j/vvH9cm74Ok1y2QrHzamt+fSVF3WgWAyX8z58+fv+6JOpuKwJ577hVXX3NtFBUVpRJvY0GSgs7fXX995r3/xzFjxoyNNc/J9SlTpsRl3780fnDZ92P//Q+I5MMPLbUqYDLej378kzjt1C91uFWAk5WPf3jFlbHXXntE8j7qIECAAAECBAgQIECAAAECBAh0VIHcL0XRUWXNu90KJMV/g768jeK/Jt7hgqKCqPlobQy7dKdItksuKLRVchPpNCNAgAABAm1eYL/99osrrvxR47a0uZ5MsvVdsgLP9tttE+ecc3arFf+tPc+kEOGrX/1y7LjDiPjVL3+ZWY0o3T9Ot6fiv7XtvCZAgACBtieQrIR3w4035azo/b0iyXv/lVf8sPG9P3mvba3iv/fm1NDQEHfd9bf46Ef2i0M++Yl4dMKE917O2dfHHntcnHfe13IWP58DJysunn3W2fmcotwIECBAgAABAgQIECBAgAABAjkXUACYc2IDtCeB4i7/V/xX1r+yPU2rReZSVFkcfY4ZHEMv2iE6b9OtRcY0CAECBAgQINB6An361MYvfnl1i6z+c/fdd8Vuu+4SF154Qbz55putN+kNjJysnpUUJ+y6y05xb2Zr4jQOxX9pKIpBgAABAmkJlJWVxbW/vi66dMn9bgn//Mc/Yo/dd4uLLrow8nXb72Ql1I997KNxxumnxbx589JiXm+cc7/8lfjQhz603uvt+cIZZ54Vw4YPb89TNDcCBAgQIECAAAECBAgQIECAwAYFFABukMdFAv8VaCz++8q2ofjvvybZfFXat1MMPHub6P+FLaKke1k2IfQhQIAAAQIE8lwg2fLvmmuvjZ49e+Y009deey2OPurIxserr76a07HSCj59+vQ4/LBPxZe++IVmbUGp+C+tOyIOAQIECKQlcOGFF8eIESPSCrfOOLNnzYoTxhwfo0cfFlOnTl1nm3w6mawIeP31v41ddh4ZyXt3Lo/CwsLGD1/06t07l8PkZeyk+PSKzFbAyZbADgIECBAgQIAAAQIECBAgQICkBwhFAABAAElEQVRARxRQANgR77o5b7JAQUlRDDhtqyjLFK850hHounOPGHbJjtHr8EFRWF6UTlBRCBAgQIAAgbwQ+OpXz4s999wrp7n89a9/iX323jOS1f/a2pEUA9xwwx9it912yWprQMV/be2Oy5cAAQLtX+DAAw+Kk085JacTHTfuvtg7897/pz/dmdNxchF87ty58cUvfD4+//mTY+nSpbkYojFmr1694le/ujqSYsCOduy1195x9NHHdLRpmy8BAgQIECBAgAABAgQIECBAoFGg4/02yI0nsKkCmU8P9z9leFQMqdrUntpvRCAprOx5YP9MIeDI6LZHrwgf1N6ImMsECBAgQCD/Bfbdd1Scc+6Xc5boihUr4utfOy+OP+7YZq2gl7MENyFwsorRwZ/4eNx2661N7nXTTTfGqV/6YqxevbrJfTQkQIAAAQK5FOjXr3/878+uytnqa8l73mXfvzSzgu6hebvdb1N9b77ppvjIh/eLl19+ualdNrld8rPY2eecu8n92kOHiy7+TnTv3r09TMUcCBAgQIAAAQIECBAgQIAAAQKbJKAAcJO4NO6IAr2PGBRddvTLw1ze++JupdHvpOEx+JsjFFrmElpsAgQIECCQY4HOnTtntp77Zc5WnZk3b158/OMHxs9/flUkq+i1h2P5smXxuc99Ni699HsbnU5S/JdsHaz4b6NUGhAgQIBACwr8+Cc/jerq6pyMmKyWd8wxR8X3vndJrFq1KidjtHTQ5557Nvb70L7xwAP352zoZDXmXG/HnLPkmxE4Kf67+DvfbUYEXQkQIECAAAECBAgQIECAAAECbVNAAWDbvG+ybiGBZFW6Hh/r10KjGaairnMM/vp20ffTQ6O4SwkQAgQIECBAoI0JnPe1r0efPrU5yXrGjBlxwAEfy2rL3JwklGLQpJjx+5kCwCt+ePl6oyr+Wy+NCwQIECDQigIHHfTx+PCHP5yTDN5555049FOHxN/vvjsn8Vsz6MKFC+OII0bHXXf9LSdpFBcXx2WXXZ6zVRlzknRKQY866ujMVtH7pBRNGAIECBAgQIAAAQIECBAgQIBA2xBQANg27pMsW0GgtFd51B47pBVG7uBDZrZcrt6nTwy7bOfo9ckBUVjiP1Md/DvC9AkQIECgjQhsueVWcfLJp+Qk28kvvBD7f+x/4sXJk3MSP1+Cfuc7F0eyNeDah+K/tUW8JkCAAIF8ECgvr4jvXrLxFWyzyfXNN9+Mgz9+UIwf/3A23dtEn2QV4DHHHxdjb7klJ/nuvMsucfTRx+Qkdj4HLcj8XumHV1wZZWVl+Zym3AgQIECAAAECBAgQIECAAAECqQqorEmVU7D2IlBQVBD9Tt48CiuK2suU2tw8CksLo2emAHDwRTtE1517tLn8JUyAAAECBDqSQPKH1h9cfnmUlKS/gu/LL78cBx10QLz++ox2T5qsBHjaaV+KcePue3euiv/epfAFAQIECOSZwBlnnhkDBw5MPav58+fHJz7x8Xj66adSj51vAevr6+Pznz85Z0WA519wYXTp0iXfpp3zfIYNGxZnnXV2zscxAAECBAgQIECAAAECBAgQIEAgXwQUAObLnZBHXgn0OmxQdBpclVc5ddRkynpXRP8vbBEDz9w6yvpUdFQG8yZAgAABAnktcPjo0bHnnnulnmOy+s/oww+NuXPnph47XwOuXLmycTWgZ555OhT/5etdkhcBAgQIDBgwIM7MFACmfSxfvjyOO/aYSFb/7SjH6tWr49RTvxj33fffDwCkNfdevXrFeV/7elrhchpnxox0P+xxZqYAMCkEdBAgQIAAAQIECBAgQIAAAQIEOoKAAsCOcJfNcZMEKgZWRvf/6btJfTTOvUDn7apjyMU7Ru3RQ6zMmHtuIxAgQIAAgSYLJNurXXjhRU1u39SGS5YsiaOPOiKmTZvW1C7tpt3ChQvjk584OL70xS9EUhTgIECAAAEC+Sbwta9/I5ItgNM8kpVwk0K4Bx/8T5ph20SsFStWZD4AcGxMmjQp9Xw/97mTY/DgwanHTTvg9y75bixevDi1sMnPqMlWwMlK1Q4CBAgQIECAAAECBAgQIECAQHsXUADY3u+w+W2aQOaXgrXHDY2CQr8c3DS4lmmdbM1c89HaGP79naP7R/q6Ty3DbhQCBAgQILBBgSOPPCpqa9P98ERSAHDy506KiRMnbnDs9nxx3rx5iv/a8w02NwIECLRhgb59+8Vhhx2e+gwu/8FlcevYsanHbSsBFy1aFEcecXjMnjUr1ZSLi4vjS186NdWYuQj25pw3IykCTPPYe+994qijjk4zpFgECBAgQIAAAQIECBAgQIAAgbwUUACYl7dFUq0lUD2qT1QMsfVva/k3ddyizsXR55jBMfjb20enYV2a2k07AgQIECBAIGWBwsLCOO30M1KOGnHtNVfHX//6l9TjCkiAAAECBAg0X+ALX/xilJSUND/QeyI8OmFCXHbZ999zpmN++eabb8Ypp5yc+ocAjjn22OjRo0deo5aVlsUvf/mLePrpp1LN8+LvfDe6d++eakzBCBAgQIAAAQIECBAgQIAAAQL5JqAAMN/uiHxaTSApKut96MBWG9/Amy5QPqBz1J23XfQ/ZYsori7b9AB6ECBAgAABAs0SOPjgT8TQoUObFWPtzi+88Hx861vfWvu01wQIECBAgEAeCFRVVcWYMSekmkmy7esXvnBK1NfXpxq3rQa7//5x8ZMf/yjV9JPtmpOtgPP5SLbsTb4Hzjzj9Fi1alVqqSbFfxdedHFq8QQiQIAAAQIECBAgQIAAAQIECOSjgALAfLwrcmoVgR4f6xdFlcWtMrZBmyGQ2a256649Yvj3RkavwwdFYZn/rDVDU1cCBAgQILBJAmmv/rds2bL4zIknxrJlSzcpD40JECBAgACBlhH4zGc+G126pLsS/1e+fG688sorLTOBNjLKJZmtcCdOnJhqtidlCgArKipSjZlmsKQAMDmSef/m19emGTqOOebY2GuvvVONKRgBAgQIECBAgAABAgQIECBAIJ8EVMrk092QS6sJJKv/1Xy4b6uNb+DmCxSUFkbPA/vHsEtGRrc9ekVkCgMdBAgQIECAQO4E9txzrxg5cmSqA/zvT38Szz//XKoxBSNAgAABAgTSESgqKopTPv/5dIL9/ygTHnkkbrzxhlRjtodgK1eujC+fe3aqWwHX1NTEMccel7c8awoAkwQvvviimDXrjdRyLSgoiCuuuDLeO0ZqwQUiQIAAAQIECBAgQIAAAQIECOSBgALAPLgJUmh9gR7794/C8qLWT0QGzRZItgLud9LwGPSVbaN8s8pmxxOAAAECBAgQWLfA0cccs+4LWZ6dOfP1uPLKK7LsrRsBAgQIECCQa4Gk+L+2Nr0PTzY0NMTXv35eJM+ODwokK+HddNONH7zQjDNHHXV0M3rntmtpWem7AyxYsCC+dt55775O44thw4fHGWeelUYoMQgQIECAAAECBAgQIECAAAECeSegADDvbomEWlog2fbX6n8trZ778So37xqDzx8RfY8fEsVVJbkf0AgECBAgQKADCSSrp3z84wenOuMLLjg/lixZkmpMwQgQIECAAIH0BD516KHpBctEGnvLLfH444+nGrO9Bbvoogtj0aJFqU0rWb15wIABqcVLM1BZ6f9tAbwm5h133B7/uOeeNS9TeT7rrLNj6NChqcQShAABAgQIECBAgAABAgQIECCQTwIKAPPpbsilVQSS7WILy/xTaBX8HA9aUFgQ1R+qjaHfG9m4PXBBsfucY3LhCRAgQKCDCHzkIx+Nrl27pjbbZIWbW8eOTS2eQAQIECBAgEC6AsXFxXHwwZ9ILWiyxe3FF1+YWrz2Gmj2rFnx86t+ltr0kq1wP/WpdAs500quNPMBk7WPL3/5nFi6dOnap7N+XV5eHj/MbAWcODgIECBAgAABAgQIECBAgAABAu1JQDVMe7qb5pKVQPW+fbLqp1PbESjqVBy9Dh8UQy7aITpvV912EpcpAQIECBDIU4HDR49ONbOf/PhHtv9LVVQwAgQIECCQrsC+++4b3bt3Ty3on+68M2bMmJFavPYc6OqrfxXLli1LbYqH5GkBYFnpf7cAXjPZV199NS77/qVrXqbyvM8++8aRRx6VSixBCBAgQIAAAQIECBAgQIAAAQL5IqAAMF/uhDxaRSDZJrasb6dWGdugLS9Q1qciBp65dQw8d5sodd9b/gYYkQABAgTahUBlZWV87GP7pzaX5A+7f/nLn1OLJxABAgQIECCQvkDaRWO/+MVV6SfZTiPOmTMnbr01vZWSR4wYEYMHD847rbLM6nzrOn72s/+N5557dl2Xsj538Xe+GzU1NVn315EAAQIECBAgQIAAAQIECBAgkG8CCgDz7Y7Ip0UFqvex+l+LgufJYJ236hZDzh8RvTOrAhaWF+VJVtIgQIAAAQJtQ+DDH/5IVFRUpJbsL35+VaxatSq1eAIRIECAAAEC6Qok26WmWfz/6IQJ8dhjj6WbZDuP9vOrrkp1teQDDzwo78TKSj+4BXCSZLJd9FlnnRmrV69OLecePXrEhRddnFo8gQgQIECAAAECBAgQIECAAAECrS2gALC174DxW02gsKQwqkb4tG+r3YBWHji5/z0O7B/DLhkZNck20Jk/aDgIECBAgACBjQvsvsceG2/UxBbLli2NP/zh901srRkBAgQIECDQGgLJanE9e/ZMbejrr/9tarE6SqBkBbzHUyya3G333fOOrrTsg1sAr0lywiOPxG9/e92al6k8H3vscbHnnnulEksQAgQIECBAgAABAgQIECBAgEBrCygAbO07YPxWE+i0RdcorLD6W6vdgDwZuLhbadSeMDQGf2v76DSsS55kJQ0CBAgQIJC/Arvvnl4B4D333BMLFy7M38nKjAABAgQIEIjddkuvWKy+vj7uuutvVLMQ+NOf7syi17q7JPc0Wdkxn46ysnWvALgmxwvO/3bMmvXGmpfNfk7m/6Mf/yQ2Nm6zBxKAAAECBAgQIECAAAECBAgQINACAgoAWwDZEPkp0MXqf/l5Y1opq4pBnaPuvO2i/xe2iJKaDf/SuZVSNCwBAgQIEGh1gcrKyth6661Ty+POO+5ILZZABAgQIECAQG4Edt1tt9QCP/DAAzF37tzU4nWkQHfeeUdq2wB37949hgwZkld869sCeE2SCxYsiG9965trXqbyPHTo0Dj9jDNTiSUIAQIECBAgQIAAAQIECBAgQKA1BRQAtqa+sVtPIPMh56odbP/bejcgT0fOfF903blHDP3uyMbtgZNtgh0ECBAgQIDAfwV23XXXKC4u/u+JZny1dOnS+Pvf725GBF0JECBAgACBlhDYZeddUhvmL3/+U2qxOlqg6dOnx1NPPZXatNNc2TGNpDa0BfCa+LeOHRv33nvvmpepPJ999jl5VwyZysQEIUCAAAECBAgQIECAAAECBDqUgOqWDnW7TXaNQOfquiiYUrvmpWcC7xMoLCuM3ocPiqHfGxnd9uj1vmteECBAgACBjiyQ5va/D9x/fyxevLgjc5o7AQIECBDIe4Hq6uoYvvnmqeX5j3/ck1qsjhjo3n/9M7Vpp7myY2pJNSHQueecFcuWLW1Cy6Y1KS8vjx9ecWXebYnctOy1IkCAAAECBAgQIECAAAECBAj8n4ACQN8JHVKguu82MXDVF6NhkuKuDvkN0MRJJ1sB9ztpeAz68jZR1r+yib00I0CAAAEC7Vdg++1HpDa58Y+MTy2WQAQIECBAgEBuBLbaauvUCqNmzXojZsyYkZtEO0jUCRMmpDbT7bbbLrVYLRlo6tSpcfnll6c65L77joojjjwy1ZiCESBAgAABAgQIECBAgAABAgRaUkABYEtqGytvBGpqt27MZbOVJ0c8aSXAvLkxeZpI5ZbdYsj5I6L2hKFRXFWSp1lKiwABAgQI5F6gbvDg1AaZ8MgjqcUSiAABAgQIEMiNQF1dXWqB0yxeSy2pNhbo0UcnRENDQypZDxqU3r1NJaFNCPLTn/w4Jr/wwib02HjTSy65NLp3777xhloQIECAAAECBAgQIECAAAECBPJQQAFgHt4UKeVeoGvvLd8dpP+Kz0bBM5u9+9oXBNYlUFBUEDX79omhl4yM7h/pG8lrBwECBAgQ6EgChYWFsdlm6fzMtHLlynjiiYkdic9cCRAgQIBAmxQYOHBganlPfPzx1GJ11EBz586NZAW8NI4uXbpETU1NGqFaPMaKFSvirLPOTK0YMplAYnH+BRe2+FwMSIAAAQIECBAgQIAAAQIECBBIQ6A4jSBiEGhLAkUl5VFR9f6tf/stPSHeeO6GWLXVlLY0Fbm2gkBRZXH0OWZw1HyoNt648ZVY9Mz8VsjCkAQIECBAoOUF+vXrF2VlZakM/Nxzz8XSpUtTiSVI+xKoquoSI0akt9V0S+okRRmvvfZaSw5pLAIECORcYODAQamNMWnSpNRideRAkyY9EYNTWpV50KBBMW/evDbJ+fDDD8Xvf/+7OP74Manlf9xxx8dNN94YDz30YGoxBSJAgAABAgQIECBAgAABAgQItISAAsCWUDZGXglU1SSfXv/g6m21i4+J2ZNviZWbv5hX+UomPwVKayti4NnbxMJJ82LWDa/EireW52eisiJAgAABAikJ1NWlt/3vlCmvpJSVMO1NYOTIkXHfuAfa5LSuv/63ccbpp7XJ3CVNgACB9QkkBWJpHdOmpbNyXVr5tNU40199NbXUkwLPiRPb7qrM53/7W7H//gdEz549UzEpKCiIH/34J7H3XnvE8uV+z5MKqiAECBAgQIAAAQIECBAgQIBAiwjYArhFmA2STwKV1evfvqb3giOi9MUt8ildueS5QNWImsZtgWuPHhKF5UV5nq30CBAgQIBA9gJ1dXXZd16r56sp/uF6rdBeEiBAgAABAikKpLUF8KpVq2LmzJkpZtZxQ02fPj21yQ9MscAztaQ2IdDbb78d3/rWNzahx8abDhs2LE47/YyNN9SCAAECBAgQIECAAAECBAgQIJBHAlYAzKObIZWWEaio6r3BgXq9c3jMefn2WD702Q22c5HAGoGC4sKo+WhtdNm5e8y+dVrMf/jNiIY1Vz0TIECAAIH2IdCntja1iaS5ck1qSb0n0LDhw2PrrbZ+z5mO8eU99/w9lixZ0jEma5YECBAgsFGBwsLC6Nmr10bbNaVBUvy3cuXKpjTVZiMC06entwJgbZ/0fr7bSNo5u3zLzTfHMcccG/vss29qY5xzzrlx+x9vi1desWp1aqgCESBAgAABAgQIECBAgAABAjkVUACYU17B81GgrFPNRtPq+fan4q1Xiv4fe/cBHlWVv3H8nfQKIUAglITQRGoEUUCxgotdBBexoX9xratIUSxIUVARBdva2+7a1oKKUkSRKmDZtTdcQEBQQKpAQsn8546LBkjPuTO3fO/zjJnMvfd3zvmceZw85M05Kmj2WbnXcgECewXiMhLUcGBLZR7fQGue/692fL917ym+IoAAAggg4HqB1NRUY2Nw+haAJ598ikaOHGVsvG4oNHrUSMJ/bpgo+ogAAghEUCA5OVnWlqgmjpUrza1aZ6I/bq5hcgXA1DRzP99FyzQYDGrI4Gs1f8FCJSYmGulGUlKSJtx9j3qfcbqRehRBAAEEEEAAAQQQQAABBBBAAAEE7BZgC2C7hanvOIHE1NoV6lOdDacpedkhFbqWixAoLpCcl6amN3QIhwHjaiYUP8VzBBBAAAEEXCuQEgoBmDo2bNhgqhR1DAhY4b9JkyYaqEQJBBBAAAEvCZgM/1tbtXKYEdi0aZOZQqEqKSkpxmpFs9D333+viRPvMdqFY445Vn/u189oTYohgAACCCCAAAIIIIAAAggggAACdgkQALRLlrqOFUhIrlnhvtVef7JSlneq8PVciMDvAqFFEjK6ZanFnYcq6/QcxcTzv9vfbXiCAAIIIOBKgRSDKwCyzaxz3gKfffYp4T/nTAc9QQABBBwlYK0AaOrYsX2HqVK+r7Nt2zZjBinJ3ggAWiCTQgHAJUuWGLOxCt122zjVqlXLaE2KIYAAAggggAACCCCAAAIIIIAAAnYIkEixQ5WajhaIjavcimyZ605U6orDHD0mOudcgZiEGNUNBQCbjjlENTvXcW5H6RkCCCCAAALlCJhcIWY7IYBytCN3un797Mg1RksIIIAAAq4SSEkxtz3s9h3bXTV2J3e2oKBA1ra3Jo6UVO8EAAsLC8NbAZuysXzr1q2rUaPHmKCmBgIIIIAAAggggAACCCCAAAIIIGCrAAFAW3kp7kSBQGzlAoDWGGr9fIJSVxICdOJ8uqVPifWS1ejyVsod2laJDbzzD+xu8aefCCCAAALVF0g1GALYtu3X6neICkYEsrKyZHKLRyOdoggCCCCAgCMEUg2Gw1j919yUFhUVqbCwwEhBkyFPIx2qZpF58+bqxRdfqGaVfW8///wL1L37Ufu+yHcIIIAAAggggAACCCCAAAIIIICAwwQIADpsQuiO/QKxVQgAWr2q9dMJSlvVxf4O0oKnBdJaZ6jZ6EOU3b+ZYpJjPT1WBocAAggg4C2BxKREYwOyVmjhcI5A48Y5zukMPUEAAQQQcIxAQgKf/Y6ZjP06smOHmQBgcnLSfpXd/+3NN92oDRs2GBtIIBDQXXdNUEJC5f+g2FgnKIQAAggggAACCCCAAAIIIIAAAgiUI0AAsBwgTntPIBCoeugqY00Ppf3Y1XsojCiiAoHYgDJ7ZqvlnZ1Vu0cDBWICEW2fxhBAAAEEEKiKQGGBudBeUpL3ftlcFVOn3JOZmemUrtAPBBBAAAEHCZhaZc4aUlIin/0mp9bUz1KmgoQmx1bdWr/88otuGXFzdcvsc/9BrVrpr1dfs89rfIMAAggggAACCCCAAAIIIIAAAgg4SYAAoJNmg764QiBj9fFKX32EK/pKJ50tEJsWp/rnNFXTWzoopUUNZ3eW3iGAAAII+F5g+47txgySk1OM1aJQ9QXSa6RXvwgVEEAAAQQ8J7B9+w5jY0ry4EpzxnAqWchakc5UAHD79m2VbN0dlz/33LOaO3eO0c4OG3adWrRoYbQmxRBAAAEEEEAAAQQQQAABBBBAAAFTAgQATUlSx1cCNX88lhCgr2bc3sEm5aQp74b2yrm6teLrmNtiyd5eUx0BBBBAwG8C27ebCwCmpCT7jc/R401LS3N0/+gcAggggEB0BHYYDP+nEP43NonJycmyQoAmjh0GQ54m+mOqRjAY1JDB16qw0NwK1omJibpn4iRj9qbGSh0EEEAAAQQQQAABBBBAAAEEEEDAEiAAyPsAgSoKEAKsIhy3lSqQnp+pFrd1UlbfJopJ5H/PpUJxAgEEEEAgKgLbt5lbISYlhRUAozKJpTRaI52ViEuh4WUEEEDA1wImw//JhP+NvZdSU1ON1drm0RUALaDvv/9e9993rzErq9CRR3ZXn759jdakGAIIIIAAAggggAACCCCAAAIIIGBCgISJCUVq+FbgtxDgkb4dPwM3LxBIiFHdkxqpxbhOyuiWJZn5o37zHaUiAggggIDvBLYZXAGwdu3avvNz8oDj4uOc3D36hgACCCAQJYFtBsP/tWrVitIovNdsRkaGsUGZDHka65TBQhPunqClS5carCiNHXu7TM6B0c5RDAEEEEAAAQQQQAABBBBAAAEEfCtAANC3U8/ATQnU/PGY0HbAhABNeVLnN4G4WolqOLClmlzXTkmNzf11P74IIIAAAghUVcDkCoC5uU2q2g3us0HAq9v/2UBFSQQQQMBXAgUFBbK2UjVx5OTkmihDjZBA48aNjTls37bdWC0nFioMvYeHDrnWaNeysrI0avQYozUphgACCCCAAAIIIIAAAggggAACCFRXgABgdQW5H4GQACFA3gZ2CaQeVFPNRuWHw4BxNeLtaoa6CCCAAAIIlCuwZs2acq+p6AW5uYQAKmoVieu279gRiWZoAwEEEEDAZQJ79uzRunXrjPQ6OztbcXGsOGsC02SY8ue1P5vokqNrvPfee3rpX/8y2scLLhigLl26Gq1JMQQQQAABBBBAAAEEEEAAAQQQQKA6AgQAq6PHvQgUEyAEWAyDp2YFAoHwdsDNQ9sCW9sDB+L4X7dZYKohgAACCFREYNmyZRW5rELX5DZpUqHruCgyAjsMbu8cmR7TCgIIIIBApARW/PCDkaas8F+DBg2M1PJ7kZycHGMEy5eb+/nOWKdsKHTzzTdq06ZNxioHQv9OM3HSJCUkJBirSSEEEEAAAQQQQAABBBBAAAEEEECgOgL86W119LgXgf0ErBCgdWxtMD/8lf8gYFIgNiVOWX2bqOaR9fTTC0v162cbTZanFgIIIIAAAmUKmPwFcV5e0zLb4mRkBXY4aAXATz/9VKNG3hJZAEOtrV6z2lAlyiCAAALOEVi+fLkO7dzZSIdyc5toxYoVRmr5uYjJlZR/CM2vH461a9dq9KiRodDevcaG26rVwbrqr1frnrsnGKtJIQQQQAABBBBAAAEEEEAAAQQQQKCqAgQAqyrHfQiUIkAIsBQYXjYmkFg/WbmD2ujXrzZpzXNLtXP1dmO1KYQAAggggEBpAj/++KN27txpZKWT1q1bKykpWQUFbD1bmnckX9++wzk/S2zcuEGzZ78XyeHTFgIIIIBAGQIm/wAgPz9f8+bNLaM1TlVEoEP+IRW5rELX/GBohccKNRbli/7+92d09tn9dXiXLsZ6MmzYME1+9RWVt1J2UVGRsTYphAACCCCAAAIIIIAAAggggAACCJQkwD6SJanwGgLVFGA74GoCcnuFBNJaZ6j56EOU3b+ZYpJiK3QPFyGAAAIIIFBVgT179sjUL4mt7dI6duxY1a5wn2GBjRtZVdgwKeUQQAABzwhYKwCaOkytJGiqP26sU7t2bTVtamYl5W3btmndunVuZKhSn60Q3rXXDtKuXbuqdH9JN1l/0DLh7oklndrntcLQH9FwIIAAAggggAACCCCAAAIIIIAAAnYKsAKgnbrU9rUAKwH6evojNvhAbECZPbNVo3NtrXt9hTbM/VkKBiPWPg0hgAACCPhLwNomrkWLFkYGfdjhh+v99xcYqWW6yFNPPqHXJr9quqzReqeccqpuvW1stWsGQz83rFq5stp1KIAAAggg4E0BU+F/S6ezoa2EvSldsVFZIcpAIFCxi8u5yuTqjuU05ZjTX3/9lR584H4NunawsT4dd9xx6tO3r155+eVSa+4sLCz1HCcQQAABBBBAAAEEEEAAAQQQQAABEwIEAE0oUgOBUgQIAZYCw8vGBeIyEpQ9oLkyjq6vn55fqu1Lthhvg4IIIIAAAgh8+ukn6tGzpxGIw0MBQKcemzdvlvVw8pGWlmake+vXr9eOHWzFbASTIggggIAHBb766svQ35gFjYTOsrMbqGHDRvrxx1UelIrMkDof2tlYQ19+8aWxWm4qNH78nTqj95lq0qSJsW6PG3eH3n3nHW3atKnEmgWFBSW+zosIIIAAAggggAACCCCAAAIIIICAKQG2ADYlSR0EShFgO+BSYHjZFoHkJmnKG95ejS5vpfjMRFvaoCgCCCCAgH8FFi5aaGzwRx99jFJSUozV81uhdu3bGxnySlb/M+JIEQQQQMCrAhs2bNCS774zNrwePXoYq+XHQscdb85v0eJFfiQM/+HD0KHmVgC0ELOysjRy1OhSPXcWsgVwqTicQAABBBBAAAEEEEAAAQQQQAABIwIEAI0wUgSBsgUIAZbtw1nDAqHdgGp2rqMW4zop6/QcBeL5X71hYcohgAACvhX4YPFi7dmzx8j4k5OT9ac/9TJSy29FrK3/DjvMzAqKK1eu8Bsf40UAAQQQqKTA4g8WV/KO0i8/9bTTSz/JmTIFcnJylJ+fX+Y1lTm5aKG5P+yoTLtOuNZarW/y5FeNduWCCwbo8C5dSqxZuJMtgEuE4UUEEEAAAQQQQAABBBBAAAEEEDAmQCrEGCWFEChbgBBg2T6cNS8QSIhR3VAAsMXtnZTRLct8A1REAAEEEPCdwNatW/Xll18YG/cZvXsbq+WnQs2bN1edOnWMDJkVAI0wUgQBBBDwtMDiReZWijvqqKOUkZHhaS+7BnfqqacZ2YrZ6t/mzZv17bff2NVVV9S94Ybh2rJli7G+xsTEaOLESYqPjz+g5s5CAoAHoPACAggggAACCCCAAAIIIIAAAggYFSAAaJSTYgiULUAIsGwfztojYG0F3HBgSzW5rq2SGqXa0whVEUAAAQR8I7DwfXOrxfTseYJSU/lsquybp0uXrpW9pdTrv/ji81LPcQIBBBBAAAFLYLHBrWKtcFSvXicCWwWB0wyunvjhBx+oqKioCr3wzi0///STxowpfdveqoz04INb66q/Xn3ArYVsAXyACS8ggAACCCCAAAIIIIAAAggggIBZAQKAZj2phkC5AoQAyyXiApsEUltlqOnIfGUPaK649AP/It2mZimLAAIIIOAxgYUL3zc2Imsb4HPPO89YPb8UOunkk40N9d8ff2ysFoUQQAABBLwp8N///lfr1683NrgLBgwwVssvhQ5q1UqdDzvM2HAXGQx1GutUFAo99eQT+uijj4y2fN1116lJkyb71NzJFsD7ePANAggggAACCCCAAAIIIIAAAgiYFyAAaN6UigiUK0AIsFwiLrBJIBAbUObR9dV8XCfV7tFA1vccCCCAAAIIVEbg3XffUUHBjsrcUua1l112hWJjY8u8hpN/CKSnp+vYY4/744VqPNu0aZO+//77alTgVgQQQAABPwgEg0G9/fYMY0Pt2rWbDjnkEGP1/FDo8suvMLb9r+X19gxz8+lmf2sVxGsHXaPdu3cbG0ZSUrIm3D1xn3oFBWwBvA8I3yCAAAIIIIAAAggggAACCCCAgHEBAoDGSSmIQMUECAFWzImr7BGITY1T/XOaqvmYjkprV8ueRqiKAAIIIOBJgV9//VUzDP7SOC8vTyeffIonrewY1IknnaTExEQjpT8OrXhjhTo4EEAAAQQQKE9g8uRXy7ukUucvv/zKSl3v54vr1Kmjfv36GSNYsmSJPv/8M2P13F7oiy8+10MP/c3oMI4//nid2afv7zULWQHwdwueIIAAAggggAACCCCAAAIIIICAPQIEAO1xpSoCFRIgBFghJi6yUSAhO1m517ZRztWtlVA3ycaWKI0AAggg4CWBV15+2ehw/nr1NUZXtTHaOYcV69evv7Eeffyx2S3vjHWMQggggAACjhOYM3u2NmzYYKxfZ/TurQYNGhqr5+VCFw+8RNaqcqaO1wyHOU31K5p17rh9nFauXGm0C7ePu101a9YM19xZyAqARnEphgACCCCAAAIIIIAAAggggAACBwgQADyAhBcQiKwAIcDIetNayQLp+ZlqPrajsvs3U0wS2zCWrMSrCCCAAAJ7Bd6e+ba2bt2699tqfz300EPVu/eZ1a7j9QIHtWoV2v73WGPDXLBggbFaFEIAAQQQ8LbArl279OabU4wNMj4+XjfdfLOxel4tlJWVpSuvvMro8CZPnmy0nheKbd++XcOGDTE6lKx69TRy1OhwzcLCnUZrUwwBBBBAAAEEEEAAAQQQQAABBBDYX4AA4P4ifI9AFAQIAUYBnSYPEAjExSizZ7ZajOukjG5ZUuCAS3gBAQQQQACBsEBhQYHREIBVdPSYW5WcbG51Gy9O1aWXXmZspcSNGzfq/fcJAHrxfcKYEEAAAbsEJr9qdhvgs8/ur/z8fLu664m6N4+4Renp6cbG8u033+jrr78yVs9LhWZMn64pU94wOqQBAy7UYYcfrp1sAWzUlWIIIIAAAggggAACCCCAAAIIIHCgAAHAA014BYGoCBACjAo7jZYgEJeRoIYDW6rpzflKbm7uFw0lNMVLCCCAAAIuFnjh+eeN9r5Ro0a65ppBRmt6qVj9+tmyghKmjunTp2n37t2mylEHAQQQQMAHAvPnz9Pan382NtKYmBiNDW2TylGyQIcOHXTuueeVfLKKr7708ktVvNMft11/3XVGV7m23uMTJ07Snj17/AHIKBFAAAEEEEAAAQQQQAABBBBAIGoCBACjRk/DCBwoQAjwQBNeiZ5Acl6amt7QIRwGjKuZEL2O0DICCCCAgCMF5s6do08++cRo364ZNEjWNrccBwrcPGKE0RUS33rzzQMb4RUEEEAAAQTKELCC40899WQZV1T+VLduR+jP/fpV/kaP3xEXF6cJE+6RFSAzdezYsUNPG54/U31zSp01a1Zr7NhbjXandes2uuQvlxqtSTEEEEAAAQQQQAABBBBAAAEEEEBgfwFz/4q0f2W+RwCBKgkQAqwSGzfZJRDaBtjaDrjFnYcq6/QcxcTzsWEXNXURQAABNwrcd+8ko91OSkrW448/ocSkJKN13V7MWgGof/9zjA3DCgDMmvWusXoUQgABBBDwj8BTTz8V2s50p9EB33XX3crJyTFa0+3Frr9+uA7t3NnoMJ795z/0yy+/GK3pxWKPP/aY/vOf/xgd2uDBQ4zWoxgCCCCAAAIIIIAAAggggAACCCCwvwBJjv1F+B4BBwgQAnTAJNCFfQRiEmJUNxQAbHZrR9XsXGefc3yDAAIIIOBfgTfeeF1Lly41CtC2bTuNGjXaaE03F4uNjdX48ROMrgA09a23ZIUAORBAAAEEEKiswM8//aRXX32lsreVeX2NGjX0yKOPyfrM45C6dz9Kg4cMNUphbUH74IMPGK3p1WKW1bWDrja6bW9ycrJXuRgXAggggAACCCCAAAIIIIAAAgg4RIAAoEMmgm4gsL8AIcD9RfjeCQIJWUlqdHkr5Q5rq8SGqU7oEn1AAAEEEIiigPUL0gfuv894Dy699DL16nWi8bpuLHjNoGt12OGHG+36I48+bLQexRBAAAEE/CVwz90TjIajLL0uXbpqyNBh/oIsYbR169YNhSEfNRr8t5qx/mhj+fLlJbTISyUJfPrpp3r00UdKOsVrCCCAAAIIIIAAAggggAACCCCAgCMFCAA6clroFAK/CRAC5J3gVIG0gzPUbFS+svs3U2xKnFO7Sb8QQAABBCIg8Nzzz8laDcjkEQgE9FhoK+D27dubLOu6Wvn5+Ro+/Aaj/f7oo4/04QcfGK1JMQQQQAABfwksWbJEk1991figrW1ve/c+03hdtxRMSUnR8y/8S9nZDYx32Y4/2DDeSYcVHDf2Nq1e/aPDekV3EEAAAQQQQAABBBBAAAEEEEAAgZIFCACW7MKrCDhGgBCgY6aCjuwnEIgNKLNntlrceahq92igQExgvyv4FgEEEEDADwKFBQUaPXqU8aGmpaXpX/96WY0bNzZe2w0F69Spoyefekbx8fFGu/vww38zWo9iCCCAAAL+FLj99rHauXOn0cHHxMTobw89rMO7dDFa1w3FrM/7Z575hzp16mS8u5Mnv6p///vfxut6veCvv/6q64axKqXX55nxIYAAAggggAACCCCAAAIIIOAVAQKAXplJxuFpAUKAnp5e1w8uNjVO9c9pqqa3dFBKy5quHw8DQAABBBCovMALLzyvxYsWVf7Gcu6oV7++XnrpFWVkZJRzpbdOJyUl6/nnX1ReXp7Rga1Zs1pvvP660ZoUQwABBBDwp8DSpUv15JNPGB98UlKSnnvuBTVv3tx4bacWtFY+nnTvferRs6fxLm7fvl0jbr7ZeF2/FHzrrTc1bdpUvwyXcSKAAAIIIIAAAggggAACCCCAgIsFCAC6ePLour8ECAH6a77dONqknDTlDW+nnKtbK75OohuHQJ8RQAABBKooEAwGNXToEO3Zs6eKFUq/7aBWrTTlzbdkhQH9cMTFxYW2P35ch3bubHy4kyZN1K5du4zXpSACCCCAgD8F7hp/pzZs2GB88JmZmeHP/oMPbm28ttMKxsbG6v4HHtQ555xrS9fuuedu/fjjKltq+6XodcOGatu2bX4ZLuNEAAEEEEAAAQQQQAABBBBAAAGXChAAdOnE0W1/ChAC9Oe8u23U6fmZajG2o7L6NlFMIh8zbps/+osAAghUVeCLLz7XE6Hgmh1H27btNGPGTDVr1syO8o6pmZiYqKeefkannHKq8T4t+e47PfXkk8brUhABBBBAwL8CVvhvxM032QJQv3623po6zZZAvC0drkLRhIQEPfHkUzr33POqcHf5tyxbtkwPPHB/+RdyRZkCq1at0u3jxpZ5DScRQAABBBBAAAEEEEAAAQQQQACBaAuQzIj2DNA+ApUUIARYSTAuj4pAID5WdU9qpBa3d1JGtywpEJVu0CgCCCCAQIQFxo27TWvXrrWl1dzcXE2b/rY6duxoS/1oF01JSdFzoW1/7Qj/WWMbccvNrP4X7UmmfQQQQMCDAs8//5zmzZtry8hq1aql11+fouOPP96W+tEsmpqaGv7cP/30M2zrxo03DFdhQYFt9f1U+JFHHtZnn33qpyEzVgQQQAABBBBAAAEEEEAAAQQQcJkAAUCXTRjdRcASIATI+8AtAnEZiWo4sKWaXNdO1hbBHAgggAAC3hbYvHmzrrzycllbAttx1K1bV1OnzdDFAy+xo3zUaubk5IRWOZqu4447zpY+zJ79nmZMn25LbYoigAACCPhbwPrMv+rKK7Rp0yZbIKyA/Iv/ellDhg5TTIw3/hmz5UEH6d1337M12PjCC89r+vRptsyJH4vu3r1bg68dpKKiIj8OnzEjgAACCCCAAAIIIIAAAggggIALBLzxL2cugKaLCJgWIARoWpR6dgqkHlRTzUZ2CIcB42rE29kUtRFAAAEEoizwzsyZuu++e23rhbVN7oQJd+vJp55Wenq6be1EqvCfevXSnLnzlZ+fb0uTO3fu1E033mhLbYoigAACCCBgCaxYsUJX//Uq2zBiY2N1880j9OKLLykzM9O2diJR+Mwz+2jWrNk6qFUr25pb8t13GjL4Wtvq+7Xwxx9/rCcef9yvw2fcCCCAAAIIIIAAAggggAACCCDgcAECgA6fILqHQFkChADL0uGc4wQCgfB2wM3HdQpvDxyI4yPIcXNEhxBAAAFDAmNvu1UfLF5sqFrJZXr3PjMcnLNr1bySWzX3alpamu688y49H9r2NyMjw1zh/SqNG3ubvvrqy/1e5VsEEEAAAQTMCkyZ8oYef+xRs0X3q9ajZ0/NnTdfVnjebYf1WT/p3vv0xJNPydr+166jILTl70UXXajt27fb1YSv695662j99NMaXxsweAQQQAABBBBAAAEEEEAAAQQQcKYA6Qtnzgu9QqDCAoQAK0zFhQ4RiE2JU1bfJmo25hCldajlkF7RDQQQQAABkwK7du3SxRdfpI0bN5ose0CtvLw8vfLqa3r6mb+rYcNGB5x36gsnnXSyFn/wof5y6aUKhALydh1z5szW/fffZ1d56iKAAAIIILCPwM0jbtbnn3+2z2umv7E+71944V/657PPqVEj53/2W5/z/c4+Wx98+LEGDLjQNMcB9W688QZ9+eUXB7zOC2YEtm7dqhuGDzdTjCoIIIAAAggggAACCCCAAAIIIICAQQECgAYxKYVAtAQIAUZLnnarI5BYP1m517RR7tC2SmyQUp1S3IsAAggg4ECBVatW6YrLL1NRUZHtvTv99DNCv1j/SNcPv0G1ajk3XN6lS1dNfu11Pfvc82rQoKGtLr/88osuCwUMI+Fv60AojgACCCDgGoHC0Opz/xdafc4KSdl9nHzyKaEw/Ue67vrhtq6kW51xWJ/7U958Sw8//Kjq1q1bnVIVunfy5Ff11JNPVOhaLqq6wGuvTdbMt9+uegHuRAABBBBAAAEEEEAAAQQQQAABBGwQIABoAyolEYiGACHAaKjTpgmBtNYZajb6EGX3b6aYpFgTJamBAAIIIOAQgenTp+n666+LSG9SUlI0PBQA/PyLr3TrbWOVnd0gIu2W14i18s8xxxyr115/Q9Omzwg/L++e6p4PBoP661VXskVddSG5HwEEEECg0gLff/+9zjv3HBUWFlb63sreYH3233DDjeHP/lGjxygrK6uyJWy5/thjj9Wbb00Nf+4fccSRtrSxf9FFixaG/vDi8v1f5nubBIYOHawdO3bYVJ2yCCCAAAIIIIAAAggggAACCCCAQOUF4ip/C3cggIBTBawQoHVsbTA//JX/IOAWgUBsQJk9s1WjSx2tn7JSG2atUbAo6Jbu008EEEAAgTIEHn/sUWWFVr0Zdt31ZVxl7lRqaqquuuqvuuSSv2jGjOl6+aWX9PbMt2WtShTJwwognnPuuTrvvPPVpEmTSDatkbeM0LRpUyPapqnGrPDGGWf0NlUu6nV++uknWaEMDgQQQMBPAnPnzgmtQvsXPfHkU4qJsf9vj9PS0nTNNYN06aWXaepbb+ql0Gf/rFnvaufOnRFjtz73+/TpE97ut23bdhFr12ro66+/Uv+z+6mggEBapOBXrFihO++4XVbwlAMBBBBAAAEEEEAAAQQQQAABBBBwggABQCfMAn1AwKAAIUCDmJSKuEBcerzqn9NUNbtl6afnl2r7ki0R7wMNIoAAAgiYFxg3bqzq1Kmji/7vYvPFS6mYmJio0047PfzYsmWL3goFAqwwwPsL3tfq1T+WclfVX46Li1PHTp3Us0dP9eh5gjp06CBr9b9IHw8//JDuv/++SDdrrL3WrdvoqaefMVYv2oVmTJ+us88mABjteaB9BBCIvIC1TWrt0Gf/hAl3R6zxpKQkndmnb/ixYcMGvfHG65r93ntauPB9rV271mg/rGBjmzZt1e2IbjrllFPVrdsREQk77j+IVatWqW8oeLhp06b9T/G9zQJ/+9uD+nO/frJ+duFAAAEEEEAAAQQQQAABBBBAAAEEoi1AADDaM0D7CNggQAjQBlRKRlQguUma8oa31+aP1uvnF5dp1wb7t4+K6ABpDAEEEPChwLBhQ8NBACuUF+mjRo0a6t//nPDDavuHH37Q++8v0Ddff61ly5b977FU27ZtK7drSUnJaty4kRo0aBhe2c8K+rXvkB8KAbSRFTyI5jF58qu66cYbotkF2kYAAQQQQOB3gScef0z1Qiu7RmoV4N8bDj3JzMzUhRdeFH5Yry/57jstDK3I+u0334Q/95cuW6rly5dXaIXguqGVjJvk5Skv9Gia11T5+YeoS9euqlmzZvEmI/7cCjn26dPblj9siPhgXNjgrl27NGjQNZo+/e2ohD9dSEaXEUAAAQQQQAABBBBAAAEEEEDARgECgDbiUhqBaAoQAoymPm0bEQgtmlSzcx3V6JCp9dNWad3UVQruKjJSmiIIIIAAApEX2LNnj/5yyUDFx8frxBNPinwHirWYm5sr67H/sXXrVu3YsUPbt2/Xli2bVfS/7eitAGFsbKxq1aol67kTD2u7xcsvuzTUZz4rnTg/9AkBBBDwq4C1CnBKaqquvPKqqBK0aNlS1mP/Y/PmzSoIffbvKCj4fRW9hIR4paSkhgN+yclJoYB/8v63Rf17K/zXNxT+++7bb6PeFz934MMPPtAzTz8V0VWu/ezN2BFAAAEEEEAAAQQQQAABBBBAoHQBAoCl23AGAdcLEAJ0/RQygJBAICFGdU/PUUb3elr76g/a9L7ZrZtARgABBBCInEBhYaEuOP88Tbr3Pp177nmRa7iCLaWnp8t6uO2YP3+ezu73Z1m+HAgggAACCDhN4OabbpQVWBsx4handS0c8ov2Sn6VRVm9+kf17n0G4b/Kwtl0/ejRo3Tyyacoq149m1qgLAIIIIAAAggggAACCCCAAAIIIFC+QEz5l3AFAgi4WcAKAaavPtLNQ6DvCIQF4jMT1XBgSzW5rq2SGqWiggACCCDgUoHdu3frr1ddqUmTJrp0BM7q9rx5c9Xvz2eFVy50Vs/oDQIIIIAAAn8I3HP3BA0efC0r1f5BUqVnS5Ys0Z9O6En4r0p69txkrSJ540032FOcqggggAACCCCAAAIIIIAAAggggEAFBQgAVhCKyxBwswAhQDfPHn3fXyC1VYaajc4PhwHj0uP3P833CCCAAAIuEAgGgxo9aqSsFYGs5xxVE5gy5Q2ddVbf8JbFVavAXQgggAACCERO4Kknn9AlAy/Wzp07I9eoh1r65JNPdNKJf9KqVas8NCpvDOWVl1/WrFmzvDEYRoEAAggggAACCCCAAAIIIIAAAq4UIADoymmj0whUXoAQYOXNuMPBAoGAMrplqfm4Tqrdo4ECsQEHd5auIYAAAgiUJvDggw/okksuJsBWGlAZr1shiosuHKDCgoIyruIUAggggAACzhJ49dVXQtvWnxXeEthZPXN2b2ZMn67TTj1Z69evd3ZHfdy7oUOuVUHBDh8LMHQEEEAAAQQQQAABBBBAAAEEEIimAAHAaOrTNgIRFiAEGGFwmrNdIDY1TvXPaarmYzoqrV0t29ujAQQQQAAB8wLWiinHHXeMvvnma/PFPVhx165dGjZsaHgbxT179nhwhAwJAQQQQMDrAu+9956OPupIffThh14farXHt3v37vCqyf3799PWrVurXY8C9gksW7ZMd911l30NUBkBBBBAAAEEEEAAAQQQQAABBBAoQ4AAYBk4nELAiwJWCLDGmiO9ODTG5GOBhOxk5V7bRjlXt1ZC3SQfSzB0BBBAwJ0C337zjY479hg999yz7hxAhHq99uefdWbvM/T4Y49GqEWaQQABBBBAwB4Baxvbk07qpYce+puCwaA9jbi86po1q0Or/p2iSZMmYuSSuXzg/vtk/VzLgQACCCCAAAIIIIAAAggggAACCERagABgpMVpDwEHCNRYRQjQAdNAF2wQSM/PVPOxHZXdv5likmJtaIGSCCCAAAJ2CezYsUNXXnG5rrj8MrYELgH53XffVffuR2j+/HklnOUlBBBAAAEE3CdgrWp74w3DNeCC87Vlyxb3DcDGHs+aNUtHdT9SCxe+b2MrlDYtsHPnTl177SACm6ZhqYcAAggggAACCCCAAAIIIIAAAuUKEAAsl4gLEPCmACFAb84ro5ICcTHK7JmtFuM6KfPo+qEXArAggAACCLhI4Pnnn9ORR3TV2zNmuKjX9nV127ZtGj78Op3V90ytXbvWvoaojAACCCCAQJQEpkx5Q926dpH11e/Hhg0bNOiaq8Of++vXr/c7hyvHb4U2//nPf7iy73QaAQQQQAABBBBAAAEEEEAAAQTcK0AA0L1zR88RqLYAIcBqE1LAwQJxGQnKHtBcTW/uoOTm6Q7uKV1DAAEEENhfYNmyZerX7yyde05/rVixYv/TvvneWvWvW9fD9cjDD7OSjG9mnYEigAAC/hT48cdVuuD883TWWX1k/Rzgt8PaBvkf//i7DuvcSc8887SKior8RuCp8Y68ZYTWrVvnqTExGAQQQAABBBBAAAEEEEAAAQQQcLYAAUBnzw+9Q8B2AUKAthPTQJQFkvPS1PSGDmo4sKXiaiZEuTc0jwACCCBQGYGpU99Sl8M76+4Jd6mwsLAyt7r62qVLl4bDj3379PZ1ANLVk0jnEUAAAQSqJPDOzJnh1QDH33mHbz77v/jic/XqdYKu/utV+uWXX6rkxk3OEti4caNGjLjJWZ2iNwgggAACCCCAAAIIIIAAAggg4GkBAoCenl4Gh0DFBAgBVsyJq1wsENoFOKNbllrceaiyTs9RTDwffy6eTbqOAAI+E9ixY4duu+3W8Io4Tzz+mAoKdnhW4Kef1oS3++3a5TBZ4UcOBBBAAAEE/Chgfdbffvu4Yp/9BZ5k+Prrr3TppZfo2GOO1geLF3tyjH4e1L9efFFz5sz2MwFjRwABBBBAAAEEEEAAAQQQQACBCAqQgIggNk0h4GQBQoBOnh36ZkogJiFGdUMBwGa3dlTNznVMlaUOAggggEAEBKytgIcOHaIO7dtp4j13a8uWLRFoNTJNLF++XNdfP0z5+R3C2/3uHHqbpQAAQABJREFU3LkzMg3TCgIIIIAAAg4W+P2zv0M73XvvJP36668O7m3Fu/bRRx+FV/o9oltXWSGx3bt3V/xmrnSNgLWt89Ahg0N/vOLNAKtrJoKOIoAAAggggAACCCCAAAIIIOATAQKAPploholARQQIAVZEiWu8IJCQlaRGl7dS7rC2SmyY6oUhMQYEEEDANwJr167VmDGj1a5ta40eNVLff/+9K8deVFSkuXPn6PzzztWhnQ7Ro488okJ+QezKuaTTCCCAAAL2Cqz9+WeNGnlL+LPfWhXYCs677bDC/dOnT9Ppp52qnj2OC6/0awXEOLwtYP2cOnHiPd4eJKNDAAEEEEAAAQQQQAABBBBAAAFHCBAAdMQ00AkEnCNACNA5c0FP7BdIOzhDzUblK3tAc8Wlx9vfIC0ggAACCBgTsFYAnDRpojof2lHHHXu0HnzwAa1Zs9pYfbsKffPN1xo79jblh1YzskIAb745RXv27LGrOeoigAACCCDgGYFNmzbp7gl3qeMhHXTCCT3C4fl169Y5dnxW2P/99xdo8LWD1OqgFup/dr9w+N+xHaZjtgjcG/p5dcmSJbbUpigCCCCAAAIIIIAAAggggAACCCCwVyBu7xO+IoAAAnsFrBCgdWzJnh/+yn8Q8LJAIDagzKPrq+ahdbTu9RXaMGuNgkWsxODlOWdsCCDgPYH//Oc/sh63jLhZ3bododNOO11HHHmEWrU6WDEx0f2bJ2u7wg8//FBzZr8XDvv997//9d4EhEb07LP/1Pz58zw5tuoMatmyZdW5PaL3rlmzJryqpolGly715vvchE1Vanz77TfG5uaXX36pSheifs+///1vYwY7WG016vNZ3Q5YK+d9+MEH4cdNN92go485RqeccqqOCP0M0KJly+qWr9b927Zt0+LFizX7vVl69dVX9eOPq6pVzw03P/Hk4+EVDavbV7eu6lzeuAsLCzXw4ot03HHHl3dphc6zcmSFmLgIAQQQQAABBBBAAAEEEEAAAd8JBB5//LGihISEQFVGbm1hsGzp0qrcyj0IRE3gmAueU2JqZtTad1PDWxrNJgTopgmjr0YEClb8qjXPLdP27zYbqUcRBBBAAIHoCWRkZKhLl67q2q2bunXtpnbt2ysxMdHWDlm/6F+0cJEWf7Ao/PWrr75khT9bxSmOAAIIIIDAHwJ169ZV19BnfvizP/T5f/DBrRUfb99q7+vXrw8F/T/QgvnztXDh+/rss8+0e/fuPzrEMwQQQAABBBBAAAEEEEAAAQQQQAABBCog0CSviQYPHlqBKw+8ZOfOnUFWADzQhVcQQOB/AqwEyFvBjwJJOWnKG95OWz/ZEAoC/le71hf6kYExI4AAAp4QsLYKnD59WvhhDchaDbBhw4bKy2saeuQpr+lvXxs2bKTk5CSlpKQqPT099Dw59Dzld4Pt27fLWr1l8+bNKgytHGWtHvXzTz9p+fLl+uEH6/HD78+tlX84EEAAAQQQQCA6AtaWwG+88Xr4YfUgLi5OjRs3Dn/uNwl9/jf932d/dnYDJSUlhj7zU1SzZs3Q86Tw5//eXls/Q+z9zLeeFxTskLWq69LQH0IvWxZ6hL8u08aNG/fewlcEEEAAAQQQQAABBBBAAAEEEEAAAQSiJkAAMGr0NIyAOwQIAbpjnuileYH0/Eyltamp9TPXaP2UFSoqLDLfCBURQAABBCIqUFRUpJUrV4Yfc+fOKbdtKwRohf84EEAAAQQQQMCdAtZqfFZw77ct2WeVOwhrpWAr9M+BAAIIIIAAAggggAACCCCAAAIIIICAmwRi3NRZ+ooAAtERsEKANdYcGZ3GaRWBKAoE4mNV96RGanF7J2V0y5ICUewMTSOAAAIIRFyA8F/EyWkQAQQQQACBqAoQ/osqP40jgAACCCCAAAIIIIAAAggggAACCFRRgABgFeG4DQG/CRAC9NuMM97iAnEZiWo4sKXybuqglKbpxU/xHAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQiJoAAcCo0dMwAu4TIATovjmjx2YFrPBf3k3tw2HAuJoJZotTDQEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQqKRAXCWv53IEEPC5gBUCtI4t2fPDX/kPAr4TCATC2wGn52fql6mr9MvM1SraVeQ7BgaMAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAtEXYAXA6M8BPUDAdQKsBOi6KaPDNgjEpsQpq28TNR19iNI61LKhBUoigAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAJlCxAALNuHswggUIoAIcBSYHjZdwKJ9ZOVe00b5Q5tq8QGKb4bPwNGAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAgegJEACMnj0tI+B6AUKArp9CBmBQIK11hpqFVgPM7t9MMcmxBitTCgEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQKFmAAGDJLryKAAIVFCAEWEEoLvOFQCA2oMye2Wp5Z2fV7tFAgZiAL8bNIBFAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAgOgIEAKPjTqsIeEqAEKCnppPBGBCITYtT/XOaKm9EvlJa1DBQkRIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggMCBAgQADzThFQQQqIIAIcAqoHGL5wWSc1OVN7y9Gl3eSvG1Ez0/XgaIAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAApEViItsc7SGAAJeFrBCgNaxJXt++Cv/QQCBkEBoF+CaneuoRodMrZ+2SuumrlJwVxE0CCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIBAtQVYAbDahBRAAIHiAqwEWFyD5wj8IRBIiFHd03PU4vZOyuiW9ccJniGAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAlUUIABYRThuQwCB0gUIAZZuwxkE4jMT1XBgSzW5rq2SGqUCggACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIVFmAAGCV6bgRAQTKEiAEWJYO5xCQUltlqNno/HAYMC49HhIEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQKDSAnGVvoMbEEAAgQoKWCFA69iSPT/8lf8ggMB+AoFAeDvg9A6ZWvf6Cm14b42Ce4L7XcS3CCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIBAyQKsAFiyC68igIAhAVYCNARJGU8LxKbGqf45TdV8TEelta/l6bEyOAQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBAwJ0AA0JwllRBAoBQBQoClwPAyAvsJJGQnK3dQG+Vc3VoJdZP2O8u3CCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIDAvgJsAbyvB98hgIBNAmwHbBMsZT0pkJ6fqbS2Gdr43s/6efJyFRXs8eQ4GRQCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIVE+AFQCr58fdCCBQCQFWAqwEFpf6XiAQF6PMntlqMa6TMo+uLwUCvjcBAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQT2FSAAuK8H3yGAgM0ChABtBqa85wTiMhKUPaC5mo7ooOTm6Z4bHwNCAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAgaoLEACsuh13IoBAFQUIAVYRjtt8LZDcJE1Nb+ighgNbKq5mgq8tGDwCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAII/CYQBwQCCCAQDQErBGgdW7Lnh7/yHwQQqIBAaBfgjG5ZqnFoHf0ybZXWT12lol1FFbiRSxBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEDAiwKsAOjFWWVMCLhEwAoBpv/U1SW9pZsIOEcgJiFGdU/PUdMxh6hG+1rO6Rg9QQABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAIGIChAAjCg3jSGAwP4CNVcerxprjtz/Zb5HAIEKCCRkJmjkOXv092FBNa4brMAdXIIAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACXhJgC2AvzSZjQcClAmwH7NKJo9vRFdi1R4MKvtQpuZukXOnIdtLj06R7Jwe0rSC6XaN1BBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEIiMACsARsaZVhBAoBwBKwTISoDlIHEagb0Cu/fo+qJQ+C8rFP7735EUL111WlBz7y7SWd2DCgT2nuErAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCHhVgACgV2eWcSHgQgFCgC6cNLoccYFAKPw3Ku5L9cj4I/xXvBPZmaFVAK8I6uURRWoTWhmQAwEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQS8K0AA0Ltzy8gQcKUAIUBXThudjpBAYM8e3Zb0pY5ILjn8V7wbXQ+WZtxepPtCYcA6NYuf4TkCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIeEWAAKBXZpJxIOAhAUKAHppMhmJMICYU/rs9+UsdFl9++G9vozGhbYD7hrYDnn9PUXh74IS4vWf4igACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAJeECAA6IVZZAwIeFCAEKAHJ5UhVVkgtui38F+n2IqH/4o3ViNFurF/UO+OL9JxhwSLn+I5AggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCLhYgACgiyePriPgdQFCgF6fYcZXEYG4UPhvXGjb345VDP8Vb6NZtvTP64J64cYitWxU/AzPEUAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQMCNAgQA3Thr9BkBHwkQAvTRZDPUAwTig3s01lD4r3jxo9pJM28v0q0XBJWeXPwMzxFAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEDATQIEAN00W/QVAZ8KEAL06cT7fNhW+O+2RDMr/5VEGR8nXXxiUAvvLdLAXkHF8hNBSUy8hgACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAgKMF+HW/o6eHziGAwF4BQoB7JfjqB4EE2Rv+K26YmS6NGRDUW7cF1fmg4md4jgACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAJOFyAA6PQZon8IIPC7ACHA3yl44mEBK/x3a4J9K/+VRtc+L6jXRhbpkWuK1LB2sLTLeB0BBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEHCRAANBBk0FXEECgfAFCgOUbcYV7BaIV/tsrFghIp3aR5t4jDekTVGLC3jN8RQABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEnChAAdOKs0CcEEChTgBBgmTycdKlAYpRW/iuJKzkhqCF9g1pwT5HO6s5qgCUZ8RoCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAJOECAA6IRZoA8IIFBpAUKAlSbjBgcLWOG/MVHY9rc8kga1pXuvCOqlEUU6OKe8qzmPAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAApEWIAAYaXHaQwABYwLhEODqI4zVoxAC0RBwavivuMURraWZdxTpvlAYsHaN4md4jgACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAALRFCAAGE192kYAgWoL1PjxWNUgBFhtRwpER8AN4b+9MjEBqW9oO+D5oW2BB/YKKi527xm+IoAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggEC0BAgARkuedhFAwJgAIUBjlBSKoICbwn/FWWqmSmMGBDXrziId0yFY/BTPEUAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQCDCAgQAIwxOcwggYI8AIUB7XKlqj4Bbw3/FNZo3lJ4bHtTfhwWVm0UQsLgNzxFAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEIiUAAHASEnTDgII2C5ACNB2YhowIOCF8F9xhh4dg5pzd1C3XhBUWlLxMzxHAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAbsFCADaLUx9BBCIqAAhwIhy01glBbwW/ts7/IQ46eITg5p3T5HOOz6omMDeM3xFAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAATsFCADaqUttBBCIigAhwKiw02g5Al4N/xUfdr1a0viBQb15a1CdWrItcHEbniOAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIGCHAAFAO1SpiQACURcgBBj1KaADxQT8EP4rNlzlNwvqjVFB3XdFUHUzip/hOQIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAgiYFCAAaFKTWggg4CgBQoCOmg7fdsZv4b+9Ex0IbQPct3tQCycFNaRPUInxe8/wFQEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQRMCRAANCVJHQQQcKQAIUBHTotvOuXX8F/xCU5JDAUA+wY1a3yRTu1S/AzPEUAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQKC6AgQAqyvI/Qgg4HgBQoCOnyJPdpDw377TmldfeuSaIr14U5EOarTvOb5DAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAgaoJEACsmht3IYCAywQIAbpswlzeXcJ/pU9g97bSzDuKNH5gUJnppV/HGQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBAoX4AAYPlGXIEAAh4RIATokYl0+DAI/5U/QXGx0nnHBzX/niIN7BVULD+NlI/GFQgggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCJQgwK/cS0DhJQQQ8K4AIUDvzq0TRkb4r3KzkJEmjRkQ1PRxRerSqnL3cjUCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIISAQAeRcggIDvBAgB+m7KIzJgwn9VZ26TK706skh/HxZU47rBqhfiTgQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBHwmQADQZxPOcBFA4DcBQoC8E0wKEP4zo9mjY1Bz7g7qxv5BpSaZqUkVBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEvCxAANDLs8vYEECgTAFCgGXycLKCAoT/KghVwcuS4qWrTgtq3j1FOqt7UIFABW/kMgQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBHwoQADQh5POkBFA4A8BQoB/WPCs8gKE/ypvVtE76teS7r0iqDfHBNWxOdsCV9SN6xBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEE/CVAANBf881oEUCgBAFCgCWg8FK5AoT/yiUycsEhofDfG6EQ4H2hMGDdmkZKUgQBBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAHPCBAA9MxUMhAEEKiOACHA6uj5717Cf5Gd85jQNsB9Q9sBW9sCW9sDJ4a2CeZAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAYkAIO8CBBBA4H8ChAB5K1REgPBfRZTsuaZGinRj/6DeubNIx3dkW2B7lKmKAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIOAmAQKAbpot+ooAArYLEAK0ndjVDRD+c8b0NcuW/jEsqBduLFLLRs7oE71AAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAgGgIEAKOhTpsIIOBoAUKAjp6eqHWO8F/U6Ett+Kh20szbi3TrBUGlh1YH5EAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQMBvAgQA/TbjjBcBBCokQAiwQky+uYjwn3OnOj5OuvjEoBZNKtLAXkHF8pONcyeLniGAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIGBfg1+TGSSmIAAJeESAE6JWZrN44CP9Vzy9Sd9dKl8YMCGrqbUEddlCkWqUdBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEoitAADC6/rSOAAIOFyAE6PAJsrl7hP9sBrahfLu8oCaPLNIj1xSpUZ2gDS1QEgEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAecIEAB0zlzQEwQQcKgAIUCHTozN3SL8ZzOwjeUDAenULtKcu6UhfYJKTLCxMUojgAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCAQRQECgFHEp2kEEHCPACFA98yViZ4S/jOhGP0ayQlBDekb1IJ7inRWd1YDjP6M0AMEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAdMCBABNi1IPAQQ8K0AI0LNTu8/ACP/tw+GJbxrUlu69IqiXRxTp4BxPDIlBIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAgggEBYgAMgbAQEEEKiEACHASmC58FLCfy6ctEp0uVtraeYdRbovFAasXaMSN3IpAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACDhUgAOjQiaFbCCDgXAFCgM6dm+r0jPBfdfTcc29MQOob2g54fmhb4IG9goqLdU/f6SkCCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAL7CxAA3F+E7xFAAIEKCBACrACSiy4h/OeiyTLU1Zqp0pgBQc0aX6Rj84OGqlIGAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQACByAoQAIysN60hgICHBAgBemMyCf95Yx6rOormDaRnrw/q78OCys0iCFhVR+5DAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEIiOQFx0mqVVBBBAwBsCVgjQOrY0WOCNAflsFIT/fDbhZQy3R8egjmov/WOmNP6lgLbuKONiTiGAAAIuE6hRo4bq1KmjzMxMZdaurcxaoa+h54lJSbLOWUdiYqKSk5PDz+Pj47Vr167w823btv3+fMuWLdqze7c2bNjw+2Pjpo3a+L/vd4fOcSCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCERWgABgZL1pDQEEPChACNCdk0r4z53zZmevE0I/FV18YlCndAnq7lcCem5WQEUsCmgnObURQMCQgBXia3nQQcrNzQ09mignJyf0yA1/bdy4sRISEgy1VHaZ9evXa+XKlVqx4gf98MMPoa8rws+XL1+u5cuW/R4kLLsKZxFAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBCojQACwMlpciwACCJQiQAiwFBiHvkz4z6ET45Bu1asVWgVwYFDnHieNeEb66LuAQ3pGNxBAwO8CsbGxata8udq2aas2bdqotfVo3SYc9HOCjbXKoPU45JBDDujOzp079e233+jLL7/UV6HHF198Hn6+du3aA67lBQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAgYoLEACsuBVXIoAAAmUKEAIsk8cxJwn/OWYqHN+RDk2Den2U9Mp86dbnAlq3yfFdpoMIIOAxgZSUFLVv30FdunQJPbrqsMMPV61aoZSyCw9rFcJ27dqHH8W7//NPP2nhooVavGiRFoW+fvbZZyoqKip+Cc8RQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQTKECAAWAYOpxBAAIHKChACrKxYZK8n/BdZby+0Fggt/te3e1AnHSY9NEV6YEpAhTu9MDLGgAACThRITExUt27ddHyPnurevXtolb+2slb98/JRr359nXFG7/DDGueWLVvCYcB58+Zqxtsz9N2333p5+IwNAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEKi2AAHAahNSAAEEENhXgBDgvh5O+Y7wn1Nmwp39SEkMakhf6cwjg7rjxRhNWeTOcdBrBBBwnkCTJk10zDHH6uhjjtHxx/dQenq68zoZwR7VqFFDPU84IfwYc+ttWrFihWbNeldzZs/WzJlva9u2bRHsDU0hgAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAs4XIADo/Dmihwgg4EIBQoDOmjTCf86aDzf3Jq++9Mg1RTq/hzTi6Rh9u8rNo6HvCCAQLYGWBx2k3r3PDK16d4ZatTo4Wt1wRbs5OTm68MKLwo8dO3bo7dCqgK+8/LLeDoUBCwsKXDEGOokAAggggAACCCCAAAIIIIAAAggggAACCCCAAAII2ClAANBOXWojgICvBQgBOmP6Cf85Yx681osj20gz7yjSC7MDoRUBA9qw1WsjZDwIIGBaIDc3VyeeeFJ4q9vDu3QxXd4X9ZKTk3X66WeEH9ZWwdOmTtVrr03Wu+++o127dvnCgEEigAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAvsLEADcX4TvEUAAAYMChAANYlahFOG/KqBxS4UF4mKl844P6sTOQY1/KaBn3w2oKFjh27kQAQR8IJCamqozz+yjCwZcqEMPPdQHI47cEK2tgvudfXb4sfbnn/XPf/5DzzzzdHjL4Mj1gpYQQAABBBBAAAEEShOIiYmR9TObU45t27bxRyNOmQz6gUA1BOLi4pSWllaNCtxamsDmzZsVDPKPm6X52Pl6bGys0tPT7WyiUrW3bt2qPXv2VOoeLkYAAQQQQACB6AsQAIz+HNADBBDwuAAhwOhMMOG/6Lj7sdXaod9n3HlxUOcdJ930tPTRdwE/MjBmBBAoJtCpUyedf8EA9enTl19MFHOx62lWvXoaPGSoBl07WO/MnKknn3oi/JV/rLZLnLoIIIAAAggggED5AvXq1ddXX39T/oURuuL8887Vm29OiVBrNIMAAnYJdO3aTW9MedOu8tQNCRQUFGjzpk3aFHps3LRRP4f+6G716tVatXKlfvzxR33//fehxxIVFhbiZUigbdu2mj1nnqFq1S9zVPcj9fnnn1W/EBUQQAABBBBAIKICBAAjyk1jCCDgVwFCgJGdecJ/kfWmtd8E2uUF9doo6cU50rjnA/plCzIIIOAngcTERPXte5Yuu/xytW3bzk9Dd8xYrVVmTvjTn8KPlaFfTDz6yMN6+umn9Ouvvzqmj3QEAQQQQAABBBBAAAEEEEAAAScLJCUlKal+fdULPUo7rD+4W7Fihb766kt98skn+s9//q1PQ1/Xr19f2i28jgACCCCAAAIIIGCzAAFAm4EpjwACCOwVIAS4V8Ler4T/7PWletkCMaHF//ofE9QJHYO67vGApn3IaoBli3EWAfcL1K5dWxf938W6ZOAlslai43CGQOPGjXXrbWM1ZOgwPf7Yo3okFAbkFxHOmBt6gQACCCCAAAIIIIAAAggg4G4Ba8vavLy88OPkk0/5fTDfffutFiyYr/kLFmje3Dlat27d7+d4ggACCCCAAAIIIGCvQIy95amOAAIIIFBcwAoB1lh9RPGXeG5QgPCfQUxKVUvA2hb4icFB3XtFUOkp1SrFzQgg4FCBZs2a6Z6Jk/TFl1/ppptuJvzn0HnKyMjQ0GHX6bPPv9T48RPUqFEjh/aUbiGAAAIIIIAAAggggAACCCDgboGWBx0U/iPJJ554Ut98u0TvvPuehl13vTp06ODugdF7BBBAAAEEEEDABQIEAF0wSXQRAQS8JUAI0J75JPxnjytVqydwVvegpo8tUqvG1avD3Qgg4BwBa2W5iZPu1aLFH+qii/5PSUnJzukcPSlVIDk5WZf85S/6+N+fhOcvKyur1Gs5gQACCCCAAAIIIIAAAggggAAC1ROIiYlRp06ddOONN2n2nHn6/IuvdMcd49WlS9fqFeZuBBBAAAEEEEAAgRIFCACWyMKLCCCAgL0ChADN+hL+M+tJNbMCefWlqbcVqd/RQbOFqYYAAhEVyMnJ0X33PxAOkF144UWKi4uLaPs0ZkYgISFB1vxZQcDrh9+gtLQ0M4WpggACCCCAAAIIIIAAAggggAACpQpYK/JfetllmjZ9hubNXxD+I72aNWuWej0nEEAAAQQQQAABBConQACwcl5cjQACCBgTIARohpLwnxlHqtgrkJQgTbwsqCF9CAHaK011BMwLZNWrF97q96OP/6Pzz79A8fHx5huhYsQFrODf8FAA8D+ffKaLB16i2NjYiPeBBhFAAAEEEEAAAQQQQAABBBDwo0Dbtu00fvyE0DbB3+mhhx9hi2A/vgkYMwIIIIAAAggYFyAAaJyUgggggEDFBQgBVtyqpCsJ/5WkwmtOFhjSNxgOAsaRM3HyNNE3BMICiUlJGjxkqD4OBf+srX4J/nnzjVGnTh1NmHC33ps9h22IvDnFjAoBBBBAAAEEEEAAAQQQQMChAklJyTr77P7hLYKnvPmWevU6UYFAwKG9pVsIIIAAAggggICzBQgAOnt+6B0CCPhAgBBg1SaZ8F/V3Lgr+gLWVsCPDgoqgd1Doz8Z9ACBUgSsf3BevPhDjRhxC1vElmLktZfbtWuvqdOm66mnn1HDho28NjzGgwACCCCAAAIIIIAAAggggICjBY48sruef+FFLXh/YTgUGBPDr7AdPWF0DgEEEEAAAQQcJ8BPT46bEjqEAAJ+FLBCgOlruvlx6FUaM+G/KrFxk4MEeh0a1ENXBxVPCNBBs0JXEJDat2+vGTNmhv/BOTc3FxKfCVirDJxxRm8tXLQ4vC0wqw747A3AcBFAAAEEEEAAAQQQQAABBKIucPDBrcPbAs+ZOy+8ImDUO0QHEEAAAQQQQAABlwgQAHTJRNFNBBDwvkDNVccRAqzANBP+qwASl7hC4MTOQf3tr0ViO2BXTBed9LiAteXM8OE3aOY7s3TY4Yd7fLQMrzyB9PT08LbA06bNUIsWLcq7nPMIIIAAAggggAACCCCAAAIIIGBYoG3bduE/0Hz9jSnhP9g0XJ5yCCCAAAIIIICA5wQIAHpuShkQAgi4WYAQYNmzR/ivbB/Ouk/g5MOkOy4Ouq/j9BgBDwkcf/zxWrT4A10fCgAmJCR4aGQMpboCh3fpojlz5+vKK69SbGxsdctxPwIIIIAAAggggAACCCCAAAIIVFLgqKOO1nuz5+q++x9QZmZmJe/mcgQQQAABBBBAwD8CBAD9M9eMFAEEXCJACLDkiSL8V7ILr7pf4Jxjg7r8FEKA7p9JRuA2gTp16ujRRx/Xy69MFtv9um32Itff5ORk3TZ2nKZOnc77JHLstIQAAggggAACCCCAAAIIIIDA7wIxMTE6//wL9MGHH6t//3MUCAR+P8cTBBBAAAEEEEAAgd8ECADyTkAAAQQcKEAIcN9JIfy3rwffeU/gpnOCsrYE5kAAgcgInPCnP2nBgoU6689/jkyDtOJ6AWtr6LnzFqhP376uHwsDQAABBBBAAAEEEEAAAQQQQMCNArVr19bfHnpYr73+hho3buzGIdBnBBBAAAEEEEDANgECgLbRUhgBBBCongAhwN/8CP9V733E3e4QiAn90ep9VwTVvIE7+ksvEXCrQFJSsu64Y7xeeOFfyqpXz63DoN9REqhRo4Yef/xJPfzwo0pNTY1SL2gWAQQQQAABBBBAAAEEEEAAAX8LWNsCL3h/kS688CJ/QzB6BBBAAAEEEECgmAABwGIYPEUAAQScJuD3ECDhP6e9I+mPnQKpSdIj1xQpKd7OVqiNgH8FOnXqpHnzF+jSyy5jqxj/vg2MjLzf2Wdrztz5atu2nZF6FEEAAQQQQAABBBBAAAEEEEAAgcoJpKena+Kke/X3f/xTNWvWrNzNXI0AAggggAACCHhQgACgByeVISGAgLcE/BoCJPznrfcxo6mYwME50i3nFVXsYq5CAIEKCQQCAQ26drCmz5ip5s2bV+geLkKgPIFmzZrp7Znv6M/9+pV3KecRQAABBBBAAAEEEEAAAQQQQMAmgVNPPU2z58xTfn6+TS1QFgEEEEAAAQQQcIcAAUB3zBO9RAABnwv4LQRI+M/nb3ifD39AT+koFpXy+buA4ZsSsP4C/NnnntfIkaMUFxdnqix1EAgLJCcn65FHHtOdd96l+HiWb+VtgQACCCCAAAIIIIAAAggggEA0BJo0aRL+w88BAy6MRvO0iQACCCCAAAIIOEKAAKAjpoFOIIAAAuUL+CUESPiv/PcCV3hbILRYmcYPDMraEpgDAQSqLmBtz/re7Lk68cSTql6EOxGogMBfLr1Ub0x5U1n16lXgai5BAAEEEEAAAQQQQAABBBBAAAHTAomJiZp07326/Y47FRsba7o89RBAAAEEEEAAAccLEAB0/BTRQQQQQOAPAa+HAAn//THXPPO3QE5WUIP7BP2NwOgRqIbAOeecq5nvvKO8vLxqVOFWBCou0KVLV7377ntq3bpNxW/iSgQQQAABBBBAAAEEEEAAAQQQMCpw2WWX64UX/qX09HSjdSmGAAIIIIAAAgg4XYAAoNNniP4hgAAC+wl4NQRI+G+/ieZb3wsM7BVUs2zfMwCAQKUErL/wHjlqtB7820NKSkqu1L1cjEB1BRo1aqS3Z76jP/XqVd1S3I8AAggggAACCCCAAAIIIIAAAlUU6NGzp6a8OVV169atYgVuQwABBBBAAAEE3CdAANB9c0aPEUAAAXktBEj4jzc1AgcKxMdJN53DKoAHyvAKAiULpKam6h//fFaDBl1b8gW8ikAEBKz34bPPPq9L/vKXCLRGEwgggAACCCCAAAIIIIAAAgggUJJAhw4dQn+k9y67Q5SEw2sIIIAAAggg4EkBAoCenFYGhQACfhDwSgiQ8J8f3q2MsaoCvQ4NquvBVb2b+xDwj0CDBg01fcbbOvHEk/wzaEbqWAFrJcrx4ydo9JhbFQgEHNtPOoYAAggggAACCCCAAAIIIICAlwWaNGmiN9+aqqZNm3p5mIwNAQQQQAABBBAICxAA5I2AAAIIuFjA7SFAwn8ufvPR9YgJDO5bFLG2aAgBNwrk5+fr3Vmz1LZtOzd2nz57WODqq6/R/Q88qLi40JKuHAgggAACCCCAAAIIIIAAAgggEHEB649G35jypnJzcyPeNg0igAACCCCAAAKRFCAAGElt2kIAAQRsEPh/9u4CzIrq/QP49y6xlLSE0kiHonQ3SEp3t6RioIKBEiIWtXR3d3d3qiASCqgoIQqyRfznHX/Lf4Gte+/MnTNzv+d57rO7986c857PzO7eeOc9dk0CZPKfCScDu3SkQJn8QLE8jpwaJ0UBrwUqVKioXcm9DhkyZPS6L3ZAATMEWrVqjekzZiIwUSIzumefFKAABShAAQpQgAIUoAAFKEABCsQi8PzzmbBq9Vpkzpw5li35MAUoQAEKUIACFLCvAEsR2PfYMXIKUIACjwQkCVDa7Yx7H92n8jdM/lP56DA2FQV61XuIdl9wGUkVjw1jsk6gdu06mDJ1GgIDA60LwqYj3759G9evX8fNmzdx88YN/Hv3X30mwcHBCA0NfTSrJImTIGFgQv3nZ5I9gxQpUyJ16tRIkyYNUqRI8Wg7fhOzgJyrixcvQbOmTXD37t2YN+ajFKAABShAAQpQgAIUoAAFKEABChguIMl/S5YuR80a1fT3QwwfgB1SgAIUoAAFKEABiwWYAGjxAeDwFKAABYwSsEsSIJP/jDri7MefBKoWeYgcGVy4cNWfZs25UiB6gWbNm2PMmHFcWjUaIkniO3PmDM6cPo2ff76IX375BZcuXdJuv+Dq1asIDw+PZs+43y3L2qZN+yyyZM2CLFnkllX/mjt3bhQoUBDJkyePe2d+sOXPP/+MkJAQP5gpp0gBClCAAhSgAAUoQAEKUIACFFBTIFeuXJg3bwHq16+nvUYPVjNIRkUBClCAAhSgAAU8FGACoIdw3I0CFKCAigKqJwEy+U/Fs4Yx2UHApRX/a1H5IYbMZRVAOxwvxmiuQJeuXTF8+AgEBASYO5BNepdkvhPHj+PAwQM4evQovv/+O5w/dw737t0zdQbS/9Wrv+u3gwcOPDWWJAXmz18AhQoXRvFixVG8RAm/TQqcPXsW+vbpjQcPHjzlxDsoQAEKUIACFKAABShAAQpQgAIU8J2AvD8xecoUtG3Tmq/TfcfOkShAAQpQgAIU8IEAEwB9gMwhKEABCvhSQNUkQCb/+fIs4FhOFGha/iFGLHQh3NycHifScU4OEujZsxc+GzLUQTNyfyr379/HoUMHsXnzZuzdswfHjh1T8qr1/yoOXsL69ev0SUrCZr58+VGyVClUqlQJFStWQtKkSd0HsNkeTP6z2QFjuBSgAAUoQAEKUIACFKAABSjgeIHatevg3XcHYNgw/36PyfEHmhOkAAUoQAEK+JkAEwD97IBzuhSggH8IqJYEyOQ//zjvOEtzBZ5NAchSwOsOsQqgudLsXVUBqfz36WdDVA3P1Lhu3bqFdevWYtPGjdi2bSvkZ7s1qX4n1QnlNmXyJCRMmBClSpVG1WrVUKdOXWTLls1uU4o1Xib/xUrEDShAAQpQgAIUoAAFKEABClCAApYIvP3Ouzh58iTWrFltyfgclAIUoAAFKEABChgtwARAo0XZHwUoQAFFBFRJAmTynyInBMNwhEDt4tASAB0xFU6CAm4JtG/fAZ9//gVcsh62n7Tbt29j3dq1WLpsCbZt3YqwsDBHzVzms2PHdv02aOAHeOWVV9CwUWM0aNAAGTM+Z/u5MvnP9oeQE6AABShAAQpQgAIUoAAFKEABBwvIe0zjJ0xEpYrlce7cOQfPlFOjAAUoQAEKUMBfBAL8ZaKcJwUoQAF/FJAkwGd+L23Z1Jn8Zxk9B3aoQLWXHyIhL99w6NHltKITaNWqNb786mu/Sf7bu3cPunXrgly5cupfN6xf77jkv6iO9ZEjR/DB+++hYIH8aNigPlauXIHw8PCoNlX+Pib/KX+IGCAFKEABClCAAhSgAAUoQAEKUADJkiXDpMlT9VUKyEEBClCAAhSgAAXsLsCPkO1+BBk/BShAgVgErKoEyOS/WA4MH6aABwLPJAHKFHyIbcf9pwqaB0zcxUECUhHu21GjERDg7OuW/v77b8yZMxvTp0/DT2fPOugIuj8VWSp427Zt+i1d+vRo3boNOnXqhOeee979zizYg8l/FqBzSApQgAIUoAAFKEABClCAAhYJ/PPPP5DXsU5oKVKk8JuLLyMfr5deegkfDByEjz4cFPlufk8BClCAAhSgAAVsJ8AEQNsdMgZMAQpQwH0BXycBMvnP/WPEPSgQV4FKL0JLAIzr1tyOAvYVKFeuPMaNC0K8ePHsO4lYIr9y5QqCxo3FzJkzcOfOnVi29r+H//zjD3z15UiMGT0KjbRk0N59+iBfvvzKQjD5T9lDw8AoQAEKUIACFKAABShAAQqYIlC6VEn8+usVU/q2otPEiRPrVfGSJk0KuSgv1wu5kCt3buTJkwe5c+dB9uzZHZkk2KtXb2zauBG7d++ygp1jUoACFKAABShAAUMEmABoCCM7oQAFKKC+gK+SAJn8p/65wAjtLVAq30NtAqwAaO+jyOhjE5Akr1mz5yAwMDC2TW35+I9nzmDkl19g+bJluHfvni3n4Mugw8LCMG/eXMyfPw/Va9TAgAHvQ67QV6kx+U+lo8FYKEABClCAAhSgAAUoQAEKUMATgeDgYMjt2rVr+Pnnn3HwwIHHupGkwEqVKqFypSqoqH1Nly7dY4/b9QdZeUJWoChTuhRCQoLtOg3GTQEKUIACFKCAnws4ey0tPz+4nD4FKECBJwUkCfCZ30s/ebdhPzP5zzBKdkSBaAXyZQFSJI32YT5AAdsLyFKvi5csgSw947R28eJFdO/eFaVLl8TiRYuY/OfmAX748CE2rF+vfdBQAW3btMaZM6fd7MGczZn8Z44re6UABShAAQpQgAIUoAAFKEABtQSkUv+C+fPRrVsX5M2TC6/WrKFfrOeEpLkcOXJgwHvvqQXOaChAAQpQgAIUoIAbAkwAdAOLm1KAAhRwgoBZSYBM/nPC2cE52EEgQCv+VzSPVAFko4DzBJInT45FixdDkgCd1OQN8jf69UWJ4kX1N8ofPHjgpOn5fC6SCLhq1Ur9yvyer/eA+FrVmPxnlTzHpQAFKEABClCAAhSgAAUoQAErBeS1+f79+9CjezctGTA33n77LZw7d87KkLweu2fPXihUqLDX/bADClCAAhSgAAUoYIUAEwCtUOeYFKAABSwWMDoJkMl/Fh9QDu93AgWz+t2UOWE/EJDlViZPnor8+Qs4Zrbh4eGYMH48ihZ9GdOnT4P8zGacgCRSzp07B0WKvIjPhw9DaGiocZ3Hoac5c2ajb5/eYEJnHLC4CQUoQAEKUIACFKAABShAAQo4VuDvv//G5EkT9QsfO7Rvpy8fbMfJxo8fH0OHDbNj6IyZAhSgAAUoQAEKgAmAPAkoQAEK+KmAUUmATP7z0xOI07ZUIG9mVgC09ABwcFMEBn34EapVr25K31Z0unHDBpQqWRwDBryD27dvWxGC34x59+5dDNcSAMtoSyvv2rXTJ/OWyn99evdi8p9PtDkIBShAAQpQgAIUoAAFKEABCthBQC6QW758GUqWKIb33xtgy/dDypYth7p169mBmzFSgAIUoAAFKECBxwSYAPgYB3+gAAUo4F8C3iYBMvnPv84XzlYdgXyZ1YmFkVDACIEGDRqib99+RnRleR/Xr19H584d0axZE5w/f97yePwpAPGuX6+uXpVPqg+Y1bjsr1my7JcCFKAABShAAQpQgAIUoAAFnCAgFfqDgsahdKkS2LJli+2m9MngT5EwYULbxc2AKUABClCAAhTwbwEmAPr38efsKUABCsDTJEAm//HkoYB1AtkzAAEu68bnyBQwUqBgwUIYM3YcXC77n9RLFi/Wq/7JVzZrBB4+fIiZM2eghFZtYMP69YYHweQ/w0nZIQUoQAEKUIACFKAABShAAQo4VODKlSto0li76LNPb1tVA8yePTtatWrt0KPCaVGAAhSgAAUo4FQBJgA69chyXhSgAAXcEHA3CTCB1vfghN/j5Xi33BiFm1KAAkYJJIgPpElhVG/shwLWCaRKlQqz58xFkiRJrAvCgJH/+usvtGvbRq/8JxUA2awX+OPqVbRo0Qz9+7+J4OBgQwJi8p8hjOyEAhSgAAUoQAEKUIACFKAABfxIIOJCvWrVquDChQu2mfmb/d9CYGCgbeJloBSgAAUoQAEKUIAJgDwHKEABClBAF4hrEqDrQXx0CQtm8h/PGwpYLJAh1UOLI+DwFPBOQCr+SeW/rFmzeteRxXvv2bMb5cqWwcqVKyyOhMM/KSAfMkydMhkVK5bHqVMnn3zYrZ+Z/OcWFzemAAUoQAEKUIACFKAABShAAQo8JvDjmTOoWqUSduzY/tj9qv6QKVMmtGrdRtXwGBcFKEABClCAAhR4SoAJgE+R8A4KUIAC/isQWxKgJP/1uHcbDVIc8l8kzpwCighkSKVIIAyDAh4KdOrcBbVq1fZwb+t3u3//PoYM+Qz169XFr79esT4gRhCtwNkff0T1atUgSXyeNCb/eaLGfShAAQpQgAIUoAAFKEABClCAAo8LyAoKjRs1xJw5sx9/QNGf+vTpi3jx4ikaHcOiAAUoQAEKUIACjwswAfBxD/5EAQpQwO8FoksCZPKf358aBFBMIGVSxQJiOBRwQyBv3nz49NNP3dhDrU3lDeumTRph5BcjIImAbOoLhIQEo3evnujRvZtbSwLLhxJ9+/TGgwcP1J8kI6QABShAAQpQgAIUoAAFKEABCigucO/ePf31+bSpUxSPFPqqFTVrvqp8nAyQAhSgAAUoQAEKiAATAHkeUIACFKDAUwJPJgEy+e8pIt5BAcsFEgVaHgIDoIBHAokTJ8b06TOQKFFij/a3eqcffvgeVSpXxNatW60OheN7IDB//jzUrVML165di3VvqfzXp3cvJv/FKsUNKEABClCAAhSgAAUoQAEKUIACcRd4+PAh3nqrv8eV+uM+kvdbdu/Rw/tO2AMFKEABClCAAhTwgQATAH2AzCEoQAEK2FEgIgmQyX92PHqM2R8EEiXwh1lyjk4UGDJ0GPLkzWvLqa1duwbVqlbBxYsXbRk/g/5P4MiRI9qSwFXw09mz0ZJw2d9oafgABShAAQpQgAIUoAAFKEABClDAawGptC8V91euXOF1X2Z2ULZsOeTPX8DMIdg3BShAAQpQgAIUMESACYCGMLITClCAAs4USHupHN45fR8NUhxy5gQ5KwrYWCBRQhsHz9D9VqB8+Qpo376DLec/c+YMtGvbBnfv3rVl/Az6cYGff/4Z1atXxe7dux5/QPuJy/4+RcI7KEABClCAAhSgAAUoQAEKUIAChgtIEmC3rl1x/Phxw/s2ssMWLVsa2R37ogAFKEABClCAAqYIMAHQFFZ2SgEKUMD+AgkehKPb0Qkotex3hO9Ibf8JcQYUcJiA9v4YGwVsJZAkSRJ8O2o0XC6XreKWZWk+Hz5Mvyr93r17toqdwcYscOvWLTRq2AALFyx4tKEk/3HZ30cc/IYCFKAABShAAQpQgAIUoAAFKGCqQEhIMNq2aYVr166ZOo43nTdt2gzx48f3pgvuSwEKUIACFKAABUwX4LMV04k5AAUoQAH7CUQk/+W9cUYPPmxjWv1rggo37TcZRkwBhwoEhzt0YpyWYwUGD/4U2bJls9X87t+/j149X8f8+fNsFTeDjbtAWFgYunfviitXLiNd+vR6oqdUIGCjAAUoQAEKUIACFKAABShAAQpQwDcCly9fRpfOnbBs+QolLxxNly4dKlepgo0bNvgGhKNQgAIUoAAFKEABDwRYAdADNO5CAQpQwMkCTyb/RcxVkgBZCTBCg18pYL1ASKj1MTACCsRVoEyZsujYqXNcN1diO6n217VrFyb/KXE0zA1Cqjx++ulg9O7VE0z+M9eavVOAAhSgAAUoQAEKUIACFKAABaIS2LFjOyZNnBjVQ0rc17BBIyXiYBAUoAAFKEABClAgOgEmAEYnw/spQAEK+KFAdMl/ERRhm7QkwL2pIn7kVwpQwEKBEFYAtFCfQ7sjkDhxYowaPUbJK7ijm0d4eDg6deyApUsWR7cJ76cABShAAQpQgAIUoAAFKEABClCAAhQwUODjjz/E+fPnDezRuK6q16jBZYCN42RPFKAABShAAQqYIMAEQBNQ2apMKlAAAEAASURBVCUFKEABOwrElvynz+khELbmWVYCtOMBZsyOE7h2y+W4OXFCzhTo1+8N5MiRwzaTk8p/kvy3cuUK28TMQClAAQpQgAIUoAAFKEABClCAAhSggN0FgoOD9er8UqlftZYqVSqUKlVatbAYDwUoQAEKUIACFHgkwATARxT8hgIUoID/CsQp+S8SD5cDjoTBbylgkcDvf1k0MIelgBsCWbNmRZ++fd3Yw9pN5Q1mWQZ21aqV1gbC0SlAAQpQgAIUoAAFKEABClCAAhSggB8K7Nu3V9n3ZV6tVcsPjwinTAEKUIACFKCAXQSYAGiXI8U4KUABCpgk4G7yX0QYTAKMkOBXClgjcPWGNeNyVAq4IzBk6DAkSpTYnV0s3XbQwA8wf/48S2Pg4BSgAAUoQAEKUIACFKAABShAAQpQwJ8FPvpwEMLCwpQjqFChgnIxMSAKUIACFKAABSgQIcAEwAgJfqUABSjghwKeJv9FUIVtSovwvakifuRXClDARwK3g4E7IT4ajMNQwEOBypUro3btOh7u7fvdRnw+HGPHjvH9wByRAhSgAAUoQAEKUIACFKAABShAAQpQ4JHAzz//jOnTpj36WZVv8uXLj7Rp06oSDuOgAAUoQAEKUIACjwkwAfAxDv5AAQpQwH8EvE3+06UeAmFrnkX4ztT+A8eZUkABgR8vKxAEQ6BADAIJEiTA8OEjYthCrYeWL1+mxTtMraAYDQUoQAEKUIACFKAABShAAQpQgAIU8FOBb775GuHh4UrN3uVyoXTpMkrFxGAoQAEKUIACFKBAhAATACMk+JUCFKCAHwkYkvwXyStsg1YJkEmAkUT4LQXMFTh9yWXuAOydAl4KtGvfAbly5/ayF9/sfujgQXTv3g0PH2pZ7WwUoAAFKEABClCAAhSgAAUoQAEKUIAClgv8/vtvWLliheVxPBkAEwCfFOHPFKAABShAAQqoIsAEQFWOBOOgAAUo4CMBo5P/IsJmEmCEBL9SwHyBHy4zAdB8ZY7gqUCSJEnwVv+3PN3dp/tdvnwZrVq1QGgI19T2KTwHowAFKEABClCAAhSgAAUoQAEKUIACsQgEBY2NZQvfP/ziSy/6flCOSAEKUIACFKAABeIgwATAOCBxEwpQgAJOETAr+S/CJ2yjVglwb8qIH/mVAhQwSeC7n1mpzCRadmuAQLfuPZA+QwYDejK3i9DQULRr2xrXrl0zdyD2TgEKUIACFKAABShAAQpQgAIUoAAFKOC2wJEjR3D06FG39zNzh4IFCyEggB+vm2nMvilAAQpQgAIU8EyAz1A8c+NeFKAABWwnYHbynw6i5SSFrUnH5YBtd3YwYDsJBIe5cOoCKwDa6Zj5U6wpUqRA7959bDHlAe++g2PHjtkiVgZJAQpQgAIUoAAFKEABClCAAhSgAAX8UWDZ0iVKTTtZsmTIkSOHUjExGApQgAIUoAAFKCACTADkeUABClDADwR8kvwXyZHLAUfC4LcUMFjg4I9aou09gztldxQwSKBv335IlSqVQb2Z1838+fMwffo08wZgzxSgAAUoQAEKUIACFKAABShAAQpQgAJeCyxfvgwPH6q1GkqBAgW9nhc7oAAFKEABClCAAkYLMAHQaFH2RwEKUEAxAV8n/0VMn8sBR0jwKwWMFdh/2tj+2BsFjBJImzYtZPlf1du5c+fw5hv9VA+T8VGAAhSgAAUoQAEKUIACFKAABShAAb8XuHLlCg4fOqSUQ3ZWAFTqeDAYClCAAhSgAAX+E2ACIM8EClCAAg4WsCr5TyflcsAOPrM4NSsFNh7h8r9W+nPs6AW6deuOJEmSRL+BAo/cu3cPPbp3RXBwsALRMAQKUIACFKAABShAAQpQgAIUoAAFKECB2AS2bt0S2yY+fTxbtmw+HY+DUYACFKAABShAgbgIMAEwLkrchgIUoIANBSxN/ovkxeWAI2HwWwp4KXDxKnD6kpedcHcKmCAgiX8dO3U2oWdju/zqy5E4fPiwsZ2yNwpQgAIUoAAFKEABClCAAhSgAAUoQAHTBPbt22da3550nD17dk924z4UoAAFKEABClDAVAEmAJrKy84pQAEKWCOgSvJfxOyZBBghwa8U8E5gzUFW//NOkHubJdC2bTukTp3arO4N6ff48eMYOfILQ/piJxSgAAUoQAEKUIACFKAABShAAQpQgAK+ETh48ADCw8N9M1gcRsmSJWsctuImFKAABShAAQpQwLcCTAD0rTdHowAFKGC6gGrJfxETDtuYFuF7U0b8yK8UoIAHAqv3e7ATd6GAyQIJEiRAz169TR7Fu+5l6d++fXop9WaxdzPi3hSgAAUoQAEKUIACFKAABShAAQpQwD8EgoODcerUKWUmmzZtWmViYSAUoAAFKEABClAgQoAJgBES/EoBClDAAQKqJv/ptA+BsDXpEL5T7QpRDjgNOAWHCvzwC3DyIisAOvTw2npaDRs1QqZMmZSew/jxQTh58qTSMTI4ClCAAhSgAAUoQAEKUIACFKAABShAgagFzv30U9QPWHBvsmTJEBgYaMHIHJICFKAABShAAQpEL8AEwOht+AgFKEABWwkonfwXSZLLAUfC4LcUcENgxmYm/7nBxU19KNCtWw8fjub+UFeuXMHwYUPd35F7UIACFKAABShAAQpQgAIUoAAFKEABCighcP7CeSXiiAgiTRpWAYyw4FcKUIACFKAABdQQYAKgGseBUVCAAhTwSsAuyX8Rk+RywBES/EqBuAncCQGW7WYCYNy0uJUvBYoUKQK5qdzefedt/PvvvyqHyNgoQAEKUIACFKAABShAAQpQgAIUoAAFYhA4d+5cDI/6/qFUqVL5flCOSAEKUIACFKAABWIQYAJgDDh8iAIUoIAdBOyW/KebcjlgO5xajFEhgZmbXJAkQDYKqCbQvkNH1UJ6LJ7du3dh7do1j93HHyhAAQpQgAIUoAAFKEABClCAAhSgAAXsJfDH1atKBRwYmFCpeBgMBShAAQpQgAIUYAIgzwEKUIACNhawZfJfJG8uBxwJg99SIBqBkDBg0jpW/4uGh3dbKJA8eXI0btzEwghiHvrBgwcYNPCDmDfioxSgAAUoQAEKUIACFKAABShAAQpQgALKC9y5c1upGBMmDFQqHgZDAQpQgAIUoAAFmADIc4ACFKCATQXsnvwXwc4kwAgJfqVA1ALztwN//BX1Y7yXAlYKNG/RAkmSJLEyhBjHnjdvLo4fPx7jNnyQAhSgAAUoQAEKUIACFKAABShAAQpQQH2BO3fuKBVkYCATAJU6IAyGAhSgAAUoQAEwAZAnAQUoQAEbCjgl+S+CPmxjWoTvTRnxI79SgAL/EwgOc2HUcj5d4wmhpkD79h3UDEyLKjQ0FMOGDlU2PgZGAQpQgAIUoAAFKEABClCAAhSgAAUoEHeBf/+9G/eNfbBlQi4B7ANlDkEBClCAAhSggDsC/ETZHS1uSwEKUEABAacl/+mkD4GwNekQvjO1AsIMgQLqCIxbCVxl9T91DggjeSRQqFBh5MuX/9HPqn0za+YM/PrrFdXCYjwUoAAFKEABClCAAhSgAAUoQAEKUIACHggkTpzIg73M2+VeeLh5nbNnClCAAhSgAAUo4IEAEwA9QOMuFKAABawScGTyXyRMLgccCYPf+r2ALPsbtNrvGQigqECjxo0VjUxLKA8Lw6hR3yobHwOjAAUoQAEKUIACFKAABShAAQpQgAIUcE/gmWeecW8Hk7cOCQk1eQR2TwEKUIACFKAABdwTYAKge17cmgIUoIBlAk5P/ouA5XLAERL86u8Cg+e4cDfU5e8MnL+CAi6XCw0aNFQwsv9CmjljOi5fvqxsfAyMAhSgAAUoQAEKUIACFKAABShAAQpQwD2BZMnUSgAMC2MCoHtHkFtTgAIUoAAFKGC2ABMAzRZm/xSgAAUMEPCX5D+dissBG3DGsAu7C2w+6sKyPUz+s/txdGr8xUuUQJYsWZSc3v379zF69CglY2NQFKAABShAAQpQgAIUoAAFKEABClCAAp4JpE+f3rMdTdorNDTMpJ7ZLQUoQAEKUIACFPBMgAmAnrlxLwpQgAI+E/Cr5L9IqlwOOBIGv/Urgdt3gXenMPnPrw66zSbbpHETZSNetWolLl26pGx8DIwCFKAABShAAQpQgAIUoAAFKEABClDAfYGcL7zg/k4m7nHr1l8m9s6uKUABClCAAhSggPsCTAB034x7UIACFPCZgL8m/0UAczngCAl+9SeBd6e68PtNf5ox52ongYCAANStV1/ZkCeMH69sbAyMAhSgAAUoQAEKUIACFKAABShAAQpQwDOBnDlzerajSXvduHHDpJ7ZLQUoQAEKUIACFPBMIL5nu3EvClCAAhQwW8Dfk/903/8tB4x7AUhQnhlRZp9z7N96gVmbXVjOpX+tPxCMIFqBl195BenSpYv2cSsfOHbsGPbv32dlCBybAhTwI4HEiRMjVarU2i2VfkudOjUkSTp+gvhIljTZI4nbd27j/r37kCXKb968ib/++uvRLSQk+NF2/IYCvhaIOHf1r9r5G3HeJk2aFAkSJNDDkfP29u3b+vd3g+/+d+5GOo8fPHjg67A5np8LyN/aNGnTIk3qNEiTJo1+riZImABJkyTVZcLCwnD37l3IuXn9+nXcuHkDN+Sr9gH9w4faGwxsFKCAoQLx4sWD/F6m1J4PyddUKVMhUaJE+nOi5MmTPxrrn3/+0X8vQ0JCcPMv7fmQ9r9EnhfJjb+bj5j4DQUoEItArly5Y9nCdw8HBwdDbmwUCNT+72XPlh3Zs2dHWu15ajptqWp5npo2TVqk1r7GixeAJImTIGFgoPb/0aX9HA/h4fe011n/6O8T3Lp1S/8fKf8rw8PC8dvvv+G3337F5UuX9a+///475DkuGwUoQAEKUCAuAkwAjIsSt6EABSjgYwEm/z0OLssBS2MS4OMu/MlZAqe1VUs/msmlf511VJ03m+rVqis7qcmTJiobGwOjAAXsKfDss88iX778yJsvL17ImQuZs2RG5syZkSlTZqRIkcLrScmH3r/+egVXrlzBpV8u4exPZ/HjmTM4ffoH/QNxrwdgB34tED9+fP1DKDmH8+TNixw5cmjnbiY8/7zcnkfChAm98rl37x6uXr2qnb+X9fP30qVfcFo7f+Uc/kk7l/khlVe8fr2zJKEWKFgQhQu/iNzaB/3yYWrWbNmQJUsWBGofnHrSQkNDtfP0F1y8eBHnzp/Dd6dO4cSJEzh79kfIucxGAQrELCC/f/ny50f+/AWQK5f2nEh7PpQlS1ZkzJjxUdJ4zD1E/aj8bl6+rP0fuXRJu/2CM2dO4/vvvsd3352CJESwUYACFIgQkAuwChUqFPGj5V/lQgM2/xKQi6Ty5cuHIkVexosvvaT/P5TXWBkzPgeXy7z39CVR/s8//sCvv/2GH388g5Pac1h5Hnvq1EncuXPHvw4CZ0sBClCAArEKMAEwViJuQAEKUMC3Akz+i9pblgNG/AdIUJpvAEYtxHvtLHD9b6DDly6EhNt5FozdHwSq16ip5DTlDa/ly5cpGRuDogAF7CGQMmVKvFK0KIoWLYairxTFS0WK6Ffvmxm9VMqRW6FChZ8aRt7gl8qmh48cxuFDh3BE+xpRie2pjXmH3wvIB06yJJp+/mrn8SvaeSwfTnmaLBUXUEkwlIRCuZUsWeqxXSShSpIAjxw5op+/h7RzWD6skoqCbBR4UiBr1qwoVao0ypQtixLFSyDnCy/o1cOe3M6bn+V3IVfu3PqtOmo86koqsR4+fBi7d+/G7l27cOjQQSavPtLhN/4qIJX7ihUvjuLFimtfS+AVrQp85Gp+RrrI7+YL2u+83J5sv2hJuwf278f+A/uxb+9ePTnwyW34MwUo4D8CxbS/Sd5ewGKkllzIxeZsgWTJkunPTytUqIgSJUqiQIECpr6+ik5TXuulz5BBv7388sto0aKlvqlUvL5w4QJOntQSAo8f157P7sJx7SurtEcnyfspQAEK+IcAEwD94zhzlhSggE0EmPwXw4HicsAx4PAhOwtI0l+Hr1y49Kd5Vwra2YexqyOQIUNGrRLL00kqKkS4dOkSfbk3FWJhDBSggD0EZJmeUlrSUoWKFVGpUmW9moQs4atKk2WDatSsqd8kJkmckjfzt2/bim3btjFJRZUDZWEc8n+5UqVK+vkr53G6dOksjObxoSU5UCoPyq116zb6g1LJadeunfr5K+exVGJj808BSfgpqyX71az5KuTiEqksZlVLlCixFks5/YYB70GWXtu8aSPWrFmDDRvW499//7UqNI5LAZ8JyPOfl7RKRpWrVEVV7SYXRMjfcaubJAfLrWmzZnookmyzadMm7Xd0E7Zs2QJJ4GWjAAX8R6B06dJKTZbPZZU6HIYFIxfn1alTBxUrVsLLWgK8Cv8Po5uc/P+OSKJv2LCRvplUpty2dSs2bd6of2Wlyuj0eD8FKEAB5wpY/0rOubacGQUoQAG3BJj8FzcuVgKMmxO3sofAAy2xtdeYABw5a494GaV/C1SvXt3UJS280Z09e5Y3u3NfClDATwSkeo0k1dWtWw9Vq1aDLCNllxYvXjy9Ao9U4en/1tv6Uj8bteSUVatWYePGDUyCtsuB9DLO3Hny6OevnMMvvviil735dnepsilxy03aTz/9hNWrVmrn8Eq92qVvo+FovhaQJdMqVa6MJo2b4tVatSDL/KrY5P9Ew0aN9dvdu3exauVKzJ8/Dzt37mA1FRUPGGPyWECqCUmVv9dea4D69evjueee97gvX+0oS9i3b99Bv0ly7lotUVcuBNuyZTPCw7mcgq+OA8ehgFUCVbTXbyo1JgCqdDS8i0VeV9Wv/xrqa/8TZUlfO7e0adOiSdOm+k0qAcpFhPJ+wdIli/XXX3aeG2OnAAUoQIG4CTABMG5O3IoCFKCAqQJM/nODVyoBrv2vugWXA3bDjZsqJ/BQO5cHTHFh7UHlQmNAFIhSoErVqlHeb/Wd586dw6GD/EWy+jhwfAqoKiDLRNXQKky1bNUKlStXUWrZKG/MZDmiiCQVqYCzceNGzJ07B1s2b4Ysv8rmHIGMGZ9D8xYt0LxZc0gCoFNarly58Mab/fXb5cuXsXjRQv0clv/rbM4RkCqQHTp01P5eNUKaNGlsNbEkSZKgWfPm+u38+fOYNGkC5s6ZY8hy7M8++yxe79nLco+NGzZg3769lsfBAHwnIMu2t9Iqs0p1Vvnerk2SiCMSHP784w/MmTMbM2ZMhywbzEYBCjhPQKoFy4VQKrWLFy+oFA5jcVNALk6SpXQlsdxJr7EiM0iFQFkyWG4DtErXx44dw6KFC7BgwXzcvHkz8qZKfl+0WDH0VOD58pM457QL2YYM+ezJu/mzhwIdOnZC+fLlPdzb3N2+++47fDnyC3MHYe8UMEGACYAmoLJLClCAAu4IMPnPHa3/bcskQA/QuItKApL89960AMzeolJUjIUC0QtIhYhSpdRabiUi2pUrlkd8y68UoAAFHgnkyZsXHdp3ROMmTWyXdPJoEnH8RpawrFevvn6TD8EXaG/qT582FRcu8EOpOBIqt5ksNVW7dh20adMWFbVlfqUCpJNb5syZHyUDHti/X0/kWLRoEZd3tOlBl2p/derURafOnVGmTFmbzuLxsHPmzInhw0fg/fcHYuKE8QgKGufVB6eptWTIfv3eeHwQC366oS0TxwRAC+B9PKS8lqtarRq6dummLfNbBZIQ4KSWLn16/X9IX+13av36dRg16lvI/xI2ClDAOQJSrVT+lqnUTv9wWqVwGEscBSSprKOWcNSgQQPI62h/akWKFIHcPvzoY6xYvhxTpk5W+oLq77Xkq/LlKyB16tRKHab79+9j5swZkIvY2LwTkAt233//A0jlShXbunVrVQyLMVEgVgFnvdqLdbrcgAIUoIBaAkz+8+J4/C8JMHxvSi864a4U8L3A/QfAO5NdmLnJ92NzRAp4KvDCCy9AKpWo2FYwAVDFw8KYKGCJgHygXbPmq1i2fIWW0HAA3bp3d3zy35PQ8iF47959cOjwUW3ZyoWopCWPqfZh2ZMx8+f/F5APN/q98SaOnziJ6TNmQqrvOj357/9n/993JUqWxKjRY/C99qHqR9qHU7LkI5s9BGRZ9S5du+LI0eOYOm26Y5L/IuvLEsFvvf0OTp76HgMHDoJUY2WjgKoCgYkSoW3bdti//yAWLlysJwE6Lfkvsr3MrVat2loS4Eb9VllbdpyNAhRwhoBUPlephYSE4OzZH1UKibHEIiCJZKtWr8GmTVv0yn/+lvwXmSeR9vxAqlxv3LhZv8mFOyo+PwgODsaM6dMih67E9/L6XCpHsnkvIBc9qpr898fVq1i+bJn3k2QPFLBAgAmAFqBzSApQgAIiwOQ/A84DJgEagMgufCkQEgb0GBWAOVvVumrVlwYcy54CJUuWUjLwixcv4uTJk0rGxqAoQAHfCUi1KVnK7uChI5g3fwEqVmTSm7yBX6NmTSxdtgJ79u5Do8aN/S6RzHdnoPcjSZLbF1+MZNJbJMrIyZATJ06GVPVkU1NAlsqV5ZwlKW7EiJGQio5Ob7L8aP+33saRI8f0BCsmWjv9iNtrfoGBgejcpSuOHz+Bb0eNduzShjEdFUkmX7J0OdasXQf5no0CFLCvQLHixfHiiy8qNYHTp08jPDxcqZgYTNQCUgF3w4ZNWLFyFcqWLRf1Rn58r/x+zZo9B/sPHNLfM1AtEXDSpElK/q611ir1S/U6Nu8E2rZr510HJu49ZeoUhIVpH+axUcCGAkwAtOFBY8gUoID9BZj8Z+AxZBKggZjsykyBG/8AjT9zYfUBM0dh3xQwR6BUaTWX/121aqU5E2avFKCALQTkDdcOHTrisJaAMXrMWMgSjWxPC+TLlx+TJ0/FPq0CUPPmLSDLy7KpIZAlSxZ8/c23OHrsuJ6s4c+VKKI7InK+NmnaFHv37teryuXPXyC6TXm/jwUk+bpT5y44duwEPvzwI2WrN5jJIlVXJcFq5arVyJYtm5lDsW8KxCogFWmk4p88L5Kk8gwZMsa6j9M3KF26DNat24AJEyZBfl/ZKEAB+wm8/npP5YI+ceK4cjExoMcFChQoqD8/W7RoCYqXKPH4g/zpKYFcuXLp7xns3LVbX1XhqQ0suuP333/Tlyu2aPhoh02XLh2kciKb5wLy2kkqc6rYpMrr9GlTVQyNMVEgTgJMAIwTEzeiAAUoYJwAk/+Ms3zUE5MAH1HwGzUFTl10odZAF47+xMp/ah4hRhWbgKoVALds3hxb6HycAhRwoIBUWmrQoKF+lfpXX38DSaJii11A3tQPGj8Bu3fv1asDxr4HtzBLIFWqVBgydJi+VLMsH8TqAbFLSzUK+b3ftXsPxgWN59LAsZOZuoUsty6VQkaO/JJJNZq0VJTZoyWpStU1VgM09dRj59EIlCtXHtt37NQTUjNl4tLpkZnkd7Jps2Y4ePCw/jsqiZJsFKCAPQSkqrCKSTb79++zB6AfRinLicp7BDt27oL8b2RzT0ASJ2VVBVlJIHeePO7tbNLWQUFjTerZu247dOzoXQd+vncbrYqiahUnIw7JkiWLce3atYgf+ZUCthNgAqDtDhkDpgAF7CzA5D8Tjx6TAE3EZdfeCCze5UL9j1y4fI3Jf944cl/rBKRSQvbs2a0LIJqR7969iwMH9kfzKO+mAAWcKiBX72/cuFmvBKbi3yY7uMtSqvPnL9QrIhQuXNgOITsmRkn069Wrt1bx7wSkmgkT/9w/tPIhQYsWLbUKV0f0qnPJkiVzvxPu4bFAjhw5sGDBIv2DQfme7f8FZClkqbomS8wxMf3/XfiduQIZMz6HGTNn6f/TCxYsZO5gNu89RYoU+u/o5i3b8PLLL9t8NgyfAv4h8MYbbypZvXy3ViWNTT2Bdu3a61VwZZUAJnt7d3wqVaqkXzj46WdDkDhxYu8683Lvo0eP4sB+9d7/LVOmrDJJkl4S+3x3qfLfslUrn48b1wHHBwXFdVNuRwElBZgAqORhYVAUoIATBZj854OjyiRAHyBziLgKyJK/Xb8JQJ9xLoSEx3UvbkcB9QQKFVLzg6Q9u3cjNDRUPTBGRAEKmCIgFdNGjR6D9es3omixYqaM4W+dSkWErdt2YPjwEXjmmWf8bfo+n68sQ7hz527IhygpU6b0+fhOG1CWS37jzf44cPAQ6tat57TpKTcf+ZDmzf5vYe++A6heo4Zy8akUUMTfVvmdZ6OAWQJS1U4qyO4/cBD16tU3axhH9vvSSy9h0+atGDhwkJKJRY5E56Qo4IFArty50UZb1ly1dvHiRfz66xXVwvLreNJnyICFCxfjm29HQZK92YwRSJAggX7xmlS5lmrXVragoHFWDh/l2PJcrGOHTlE+xjtjFqhevQYyZMgY80YWPbp79y58990pi0bnsBQwRoAJgMY4shcKUIACMQow+S9GHmMfZBKgsZ7szSOBrcdcqDogAKsPeLQ7d6KAUgKFFK0ksXXrFqWcGAwFKGCeQPPmLXDw0BHIEiFcWtFYZ6mM0K17dz2JigkExtpG9CbJq6PHjMXqNWsh1RfZjBV47rnnMXPWbL2qpSwTx2a8QL58+bFx0xYMGvQhAgMDjR/AgT2mSZMGy5avQKtWrR04O07JagH5W7dy1Wp8/c23SJ48udXh2HJ8qSbb/623sWr1Gi4pb8sjyKD9QeDjjz9RMkl3584d/sBvmzk2bNgIe7UEtWrVq9smZrsFKisvyPMOuXDQqtcCq1evwqVLl5Sja96iBaQKOJt7AlKtU9XG6n+qHhnG5Y4AEwDd0eK2FKAABTwQYPKfB2je7sIkQG8Fub+HArLMb+evA9B6hAt//OVhJ9yNAooJqLqU1N69exSTYjgUoIDRArIE+bz5CxA0fgLSpk1rdPfsL5JAxBKCU6ZMhSSssRkjIB9E7dMqprVu3YbJq8aQRttLjZo1IdUpxJrNGAFJuO7duw+279iJIkWKGNOpH/UiS3yPGTsOnwz+FJJsxEYBIwQaNmqMXbv3Wl6Jx4i5qNBHyZKlsFNbyvPVV2upEA5joAAF/icg1XRr1aqtpMf6deuUjMvfgpLnWV99/Q2mTJ2G1KlT+9v0fT5feV0gFw5u3LQZuXLl8vn49+/fx6SJE3w+bmwDSsXJRtpzM7a4C8gFfFWqVo37Dj7c8ueff9ZWHeHfeB+ScyiTBPjug0mw7JYCFKCACDD5z8LzgEmAFuL739DBYS6MXOxChf4urD3of/PnjJ0tULBgQeUmePfuXfzwww/KxcWAKEAB4wTq139Nv5K/Zs1XjeuUPcUqIIkFe/ftV/YN2VgnoMgGSZMm1SszLViwCLIkFZtvBGQpa6m2OHfefKRLl843gzp0lGeffRaLFi3B4E8/g3zAyua5QJ8+fTF+/EQmAXpOyD01AakuMy5oPCRRn8sbGntKSOLInLnzMGz450pWGzN2tuyNAuoLyPPoUaPHKBmovBe1fft2JWPzp6DkQsGVK1ejQ4eO/jRtJeZauPCL2LZ9J+rWrefzeGbOnIE7d+74fNzYBuzQkcsAx2YU+fHWbdpAVqJQsUmSqSSbslHA7gJMALT7EWT8FKCAsgJM/lPg0DAJUIGD4PwQNh91oeJbwFdLXAgJd/58OUP/EkiUKDFyvvCCcpM+evQI7t27p1xcDIgCFPBeIDBRIj1xavqMmZAlFNl8L5AhQ8ZHiT/x48f3fQA2HzF//gL6hyLt23dg1T+LjqVUctq1aw+kegyb+wJlypTFbq3CmKqVGdyfkfV7NGnaFF9+9TX/Jlh/KGwZQdasWbFh4ya0aNHSlvHbIWipbNS9ew/Mm7cAknzERgEKWCfwqXbxQbZs2awLIIaRt27dgpCQ4Bi24ENmCxQtWlRLwtyBEiVLmj0U+49GQP5Pzpg5C+8OeM+nz23/+ecfzJ0zJ5qorLtbKqW//PLL1gVgo5GlKrqqFfsluXT27Fk20mSoFIhegAmA0dvwEQpQgAIeCzD5z2M643dkEqDxpuxRFzh10YUGnwSg7RcuyNK/bBRwokDevHmUrIJw+NAhJ3JzThTwe4Hs2bNjo/YBtyROsVkrELH056rVayDLA7PFTaBly1bYvGWrJcsixS1C/9lKKoMsW74C/d96m5XX3DjsXbp21d3Ej81YAfnfJhUV2SjgjkClSpX0pPKCBQu5sxu39VCgarVqWLtuPav3eujH3SjgrUDlypXRXuGqbitWLPd2itzfCwG5OIWvT70ANHBXeb9ggJYAOHnyFJ9WC58wIQgPHjwwcCbGdMUqgHFzrKT9jc+cOXPcNvbxVpJcKkmmbBRwggATAJ1wFDkHClBAKQEm/yl1OP4LhkmACh4U+4b0123gwxku1BrowoEz9p0HI6dAXARy5MgZl818vs2RI0d8PiYHpAAFzBWQD1y379gFWVKGTR2BkiVLYcfOXShVqrQ6QSkYSYIECfTKlWPHBSFx4sQKRuifIcnSQgMHDtIrOsnywGzRCwQGBurLJ48YMRJyPrOZI9CrV2+MHPklXnutgTkDsFdHCbRr1x4LtaW4U6VK5ah5qT4ZeS66adMW5M2bT/VQGR8FHCWQJUsWTJw0xacVxdwBlMSQ1atWu7MLtzVQQJacnTt3PmSlEjZ1BBo2aoz5Cxb5rHruhQsXsGHDenUA/hdJI80hZcqUysWlWkDy3FbFJkmlEyeOVzE0xkQBjwSYAOgRG3eiAAUoELUAk/+idlHiXiYBKnEY7BxEuLba6JR1LpTsF4DJ6124r97FZnbmZeyKCmTRlptSsZ0+/YOKYTEmClDAQ4Fu3btj/vyFSJ48uYc9cDczBZ599lm9IhiXHoxaWRIzFi9ZysqVUfMocW/1GjX05TPlg2W2pwVSpEiBRYuXKLsc09MR2/ueTp276BVT7D0LRm+mgFTVef/9D/DNt6OUrMZu5txV6Vuq06zfsBFyIQQbBShgvkCSJEkwd958pEmTxvzBPBxh+fJlXP7XQztvd2vWvDmmTpvu00pz3sbsT/tLteIVK1dDXlP4oo0bO9YXw7g1hlwEyPdLYiZLly4datZ8NeaNLHp008aNOH/+vEWjc1gKGC/ABEDjTdkjBSjgpwJM/rPBgWcSoA0Okpoh7jwFVHsvAINmunD7rpoxMioKmCGQLVs2M7r1qs/g4GBcvHjRqz64MwUooIZA/Pjx8dVXX2P48BGQSl1s6gpIdbBxQePx0UcfK1uVwwq9nDlzYqNWJah8+QpWDM8x3RDIly+/tjzzNhQrXtyNvZy/6XPPPY916zegXLnyzp8sZ0gBGwgEBATg21Gj8fY779ogWmeHGJEcXbxECWdPlLOjgMUC8ncvaPwEFChQ0OJIYh5+7tw5MW/AR00RaNqsGcaNG8+EeFN0jev0lVdewZKly31yUefu3btw6tRJ44I3qKf27TvwvZIYLFu2bKVspfnx44NiiJwPUcB+AkwAtN8xY8QUoICCAkz+U/CgRBcSkwCjk+H9UQic+w1oPcKF5kMDcPZKFBvwLgo4XCCrghUAz5w5AynNz0YBCthbQBLKpk2fgQ4dO9l7In4Wfb833oQscyvJm/7eChUqrCVObcQLL7zg7xS2mb9Us1yxYhVkyXE2IFeuXNi0eTMkOZKNAhSwXkAuhggKmoA2bdpaHwwj0AWSJUuGxYuXomjRohShAAVMEJDkP6l2Wq9efRN6N67L7747hQP79xvXIXuKk0DFipUwevRYyHnCpr6AngS4ZJlPlgMOGjdOOZDcefKgbNlyysWlQkBS3bpN23YqhPJUDGfOnMaOHdufup93UMDOAvyvaeejx9gpQAElBJj8p8RhcC8IJgG65+WHW//9LzB0ngtV3w3A1mMuPxTglCnwn0C2bNmVo+Dyv8odEgZEAbcFkiZNivkLFqJOnbpu78sdrBeQpW2mz5gJSeL01yZLAq5avQaSUMZmLwFZnmnOnHlo2LCRvQI3ONq8efNh9eq1kAqAbBSggPUCklg/cdJkSKUjNrUEnnnmGSzWEhqKFCmiVmCMhgI2F5CEkK++/sYWSc/jg1gdytenm1xsNXPWbC7762t4L8crWqwYpk2bYfoFg0uXLsGff/zhZbTG796hY0fjO3VAj5IYmSNHDiVnIn/fHz7UPjBmo4CDBJgA6KCDyalQgAK+F2Dyn+/NDRuRSYCGUTqpowfaebF4lwtl3wzAmJUuhN1z0uw4Fwq4JyAfQj3/vHofCnP5X/eOI7emgGoC8iHqsmUrIFfzs9lXoHbtOnoSZ6JEie07CQ8jl3N36bLlkKUB2ewpkDBhQkyaPAWtW7ex5wS8jFqW2JME1nTp03vZE3enAAWMEJDKRmPHBvl9YrIRlmb1If/zl2rPX1VfotSs+bNfChgtIBVPv/7mW7Rr197org3v7/r161oS8GLD+2WH0QtkzpwZixYthrx3wGY/gWrVq+PLr742NfDQ0FBMmTrF1DE86VwucuVrrKflVP1bf/PmTSxYsODpgHkPBWwuwARAmx9Ahk8BClgnwOQ/6+wNG5lJgIZROqGjPT8A1QYEoM84F27844QZcQ4U8E4gdZo0SJAggXedmLD35cuXTOiVXVKAAr4QiFhGrVjx4r4YjmOYLCCJcHPmzkNgokQmj6RO93Ll+tx58yFV5NjsLSAJN9+OGo3mzVvYeyJuRi9LUy1fsRJp06Z1c09uTgEKmCUwfPgIVv4zC9fAflOmTIkFCxciQ4aMBvbKrijgfwKSULtg4WJbJP/J0Zk4cQJCQ0L870BZNGO5UGfa9JlInyGDRRFwWCME2mrLvb7+ek8juoq2j2laAmCIYr+b8j66zJ3t/wVSp06N2nXq/P8dCn03c8Z07RwKVigihkIBYwTiG9MNe6EABSjgXwJM/nPQ8f5fEqDMKEHpWw6aGKcSV4HfbgCfL3BhkVb5j40CFPh/gTSp0/z/Dwp9d+kXJgCafTg6duqMcuXKmT0M+/eBwI7t2zF9+jQfjBT7EEmSJMFC7Sr+4iVKxL4xt7CNQOXKlTFzxixt6a5WCAsLs03cngQqy/4uWLiIyX+e4Cm6jyQBjhk7DuH3wrFksfMru2TJkgXLl69g8p+i5yPD8k+B9957H126dvXPydtw1s8/nwnz5i9A7Vo1cffuXRvOgCFTwFoBWQJy/vyFyJU7t7WBxHH0v/76CxPGc/nfOHIZstmHH32MV155xZC+2Im1Ap8M/hQnTpzAnj27TQnk2rVrWLx4kXJV3aXa3ddffYn79++bMm+7ddqsWXMkUvCi0fDwcEyaNMlunIyXAnESYAJgnJi4EQUoQIH/F2Dy3/9bOOY7JgE65lC6M5G7oS4ErQLGrHIh1NmfV7vDwm0p8EggjVYBUMXGCoDmH5UiRYrgtdcamD8QRzBdIFWqVEokAMpV0LNmz0WpUqVNnzMH8L1A9Ro1MH7CRHTu1BEPHjzwfQA+GLFQocJ6AqsksrI5S0CWoBs/fiJu376NjRs2OGtykWYjVVSWr1iFjBmfi3Qvv6UABawUaNa8Od55d4CVIXBsDwReeuklTJw0GW3btHbs8x4PWLgLBWIVaNS4MUaO/ApSTdMubezYMfjnHy4T46vjVaNmTdOrxvlqLhwHiB8/PqZOm47y5cvij6tXTSEZHxSkXAJgpkyZUK1adaxfv86UOdut07bt1KyIuGrVSvz2269242S8FIiTAJcAjhMTN6IABSjwnwCT/xx8JvwvCTB8r33ehHDw0TB1ag+1Y71Yq/ZXqp8LXy5h8p+p2Ozc1gIqLg0niSVXTXrTyNYHi8FTIBqBfHnzRfOI7+52uVz45ttRkEpxbM4VaNCgIQZ/+pkjJ5g5c2Yt+W8RnnnmGUfOj5P678OpadNmQBLgndhkyep58xYge/bsTpwe50QBWwqUKFkS33472paxM2igdu06+PiTwaSgAAXiIPDss89i5qzZmDx5qq2S/65fv87qf3E4vkZtIhepjBs3HvL+AZtzBNKlS4exY8aZdly///477NixXTmwjh07KReTFQHJCiB5FXhfMqq5j2d116hYeJ9DBJgA6JADyWlQgALmCzD5z3xjy0dgEqDlh8DsAI6fd6Hexy70GefCNa74bDY3+7e5QGoFKwDKldf37t2zuSzDp4DvBNKlT4/UqVP7bsAoRhow4D20bNkqikd4l9MEevbshe7dezhqWlKhZNGiJciQIaOj5sXJPC0g1R3nL1iEbNmyPf2gje+RZY6lUpVTkxttfGgYuh8LyDKys2bNQWBgoB8r2H/qvXv3Qf36r9l/IpwBBUwSkCrL8jpw774DqFu3nkmjmNft0KFDcOfOHfMGYM+PCXw+YoTl7108FhB/MEygStWq6NS5i2H9PdlRUNC4J++y/GeZc9asWS2Pw+oAZDlkFduRI0dw6OBBFUNjTBQwRIAJgIYwshMKUMDpAkz+c/oRjjQ/JgFGwnDOt3/8BfTVkv5qD3LhyFleSeicI8uZmCmg4hLAN2/eNHPK7JsCjhTIkyevZfNq3KQJl7azTN+agYcMHYaq1apZM7jBo8qHllO1qnB58lr3O2TwlNhdLAJSoWL+/IVIlixZLFva5+GPPv4EderUtU/AjJQCDhdIkCABpk+fAamIxWZ/gVGjx7C6qv0PI2dggkCtWrWxe89ejB0XBBVXl4htyj/88D1mzpge22Z83CCBatWr2zJJ1KDp+0U3gwd/alpC3KaNG3Hu3DmlHOUirPbtOygVk6+DSZ48OWSlCBXb+PHqJY2q6MSY7CvABED7HjtGTgEK+EiAyX8+glZpGCYBqnQ0vIolJBwYs9KFcm8GYJG27K8s/8tGAQrETSBFihRx29CHWzEB0IfYHMoxAjlz5rRkLoUKFcaoUWMsGZuDWicgb3RPmjQFOXLksC4Ig0Ye9OFHqFSpkkG9sRu7CEjC57ggZyw/1rBhI/Tp09cu9IyTAn4hIMvGFi1WzC/m6g+TlA+35WIBVnP0h6PNOcYmIAnO9erVx6ZNWzBn7jxll32MbR7y+PvvvYf79+/HZVNu46VAokSJMWLESC974e6qCyROnBgjR35lSpgPHjzAhAnjTenbm05btW7j188PGjdpCjnuqrWrV3/HiuXLVQuL8VDAUAEmABrKyc4oQAGnCTD5z2lH1I35MAnQDSw1N9181IWKb7kwdJ4Ld0LUjJFRUUBlgcCECZUL79ZfWjlPNgpQwC2B5zNlcmt7IzaWZYdnzZ6j5Jt9RsyPfcQsIMvmzp4zF0mTJo15Q4UflSvVmTil8AEyOTRZpu6NN/ubPIq53Usio1SmYqMABdQRkIpYPXq8rk5AJkbyzz//4JdffoFU0Tp8+DCOHz+u3y5evIi7d++aOLLvu37ppZfw2WdDfD8wR6SAIgJy4Y9UHP7u+9OYMXOW7ZOcF8yfjx07tiui6/ww+vfvj2zZsjl/opyhvlLAa681MEVi7pzZuHXrlil9e9qpVHuuU9d/K7G3a9fOUzpT95s8eTLCw7WqIWwUcLBAfAfPjVOjAAUo4JUAk/+84nPGzv9LApTJJCit1gsIZwCbM4vvfgY+nBGA/WfM6Z+9UsBfBBIomAB45987/sLPeVLAMIHnnnvOsL7i0pHL5UJQ0ATTlneJSwy+2iY0NBTnz5/DTz/9hGt//ok7//6Lv//+W/tg+1+EhYYhYWBCLQkuGaQ6zDPakqLp0qdH7ly5kV37kCyhgn9jjXTLly8/vvzya3Tv3tXIbn3Sl1TNHD1mLORcdnq7fv26dv6ehSRk/KUl2d/VzmFJzIj48OSZZ57REzmTaMmcqVKlQpYsWZArVy5kzOjbvytWHIcPPhiIA/v3Y8+e3VYM79WYknw7a+ZsWyfhxgVAztWzZ8/iJ+0m5++/2vNESTr65/ZtPNCq9shSzkm1m3yVxGT5cDlv3ny2XIowLh7cRm0B+RD4m29HOe5/i1TdOXXqFHbv3oUfvv9e+538UX9eJM+HYmpJkiTRqgXn1P+n5MuXT0sYKo6iRYtC/u/YsXXu0hUbN22ELEPIRgGnC8jrmOLFS6BKlSqorN2k8rtTnjdfu3YN778/wOmHUJn5yevjXr17KxOPEYFI5cgrV67gwoUL+PnihUevs+7cuYN///c+wd9/30J8rWJmMu29AnnPQJ6nPvfc83hee+8mS5asyJc/PzJnzmxEOMr1MfjTz7Bu/TqEhhhbrUFeF8ycOUO5i/g6duyEJYsXK3cczA5ILo4oXPhFs4dxu/+QkGDMmD7N7f24AwXsJsAEQLsdMcZLAQr4RIDJfz5htscgTAK0x3HSovzrNvD1UhembXTh/gPbhM1AKaCsgIrLGIWH8Qo9ZU8YBqaswPPaG8m+bJ27dEH1GjV8OaRPxpI38uUD7p07d2Dv3j348cwZXLp0CfLBt7stXrx4eoKkJKKULVcO5bRbgQIFHfPBWYRHs+bNsXnLJixetCjiLuW/ytJlkyZPdWTilCRGybm7c8cOHD5yGOe0xFVJmvKkSUKVJAK+9FIRlCtfHmXLloMktzipyXLWEydNQtkypT12sspj2PDPkSt3bquGN2Vc+Vt78uRJbN+2FXu08/jsjz/i8uXLePhQe8HuZkuTJo2eCFiseHFUrlwZJUqUdHxStptE3NwEgS+/+toxfydva0m2q1evwprVq/Uk6YikcXfY5IP67747pd+WLftvT3l+JMsj16heQ6uYU0//P+NOn1Zv+80336JUyRJ6IrLVsXB8ChglIM/vcufOo91yI0+evMidJ4+W/Ffckc+VxWzAu+/g5s2bRvGxn1gEevfuA1kC2M5N/p/t27cPu3ft1JPhT5w4YUh1MUkKlOTaEiVLolKlSlqSfDFHPF+VxMYunbtgzJjRhh/2SRMn4PXXeyJ+fHVSX0qXLqO/7jhz5rTh81W5w7bt2isZ3iLtvSm5CJKNAk4XUOevoNOlOT8KUMA2Akz+s82h8l2gTAL0nbUHI4XfA2ZucmHEYhduO2slGQ80uAsFjBNIqCVBqNbCwsNUC4nxUEB5geee912lrvz5C2Dw4M+UN4lrgHJ18JrVa7B8+TL9zXxPPuCOaixJJpSKAHJbu3aNvokkpJQrVx4NGjZEjRo1oWISdlRzie2+r776BocOHtSXAYxtWxUef1+r+lakSBEVQjEkBll+ccH8edi4cYO+9KKce0Y0qWBx7Ngx/TZt2lQ9eVWqPlatWhWS+Cl/C5zQpBLHt6NGo22b1raZTu3addCmTVvbxBtToFJldd26tVi1cqW+FN+NGzdi2jzOj0k/UtlRbt98/ZWexCB/f+vVrw9ZlixxYnt/EB1nCG7oM4EmTZtClha3c5MkXKlut2DBfO33ch3kOZLRTf5HSeVVuQ0e/IleEbBV6zZorv1fsUOCiPzP+FRbCrhvH2dVszL6ODuxv4VaQkGYQy5WTKpV50z2jFTPfca2FTk9PcfkoqWlS5d4ujv3c1Mgbdq0kOpodmxyEdUy7VxZunQpDh48YEjC35MO8t7DLi2pUG4jvxgBqZxbuXIVNGrcGDVr1rTF/8Un5xTx85v938KsWTP11RMi7jPiq1ReXLVqJRo0aGhEd4b1Ief5O++8ZVh/qnck52rjxk2UDHN8UJCScTEoChgtwARAo0XZHwUoYGsBJv/Z+vCZGzyTAM319bD3nae05X5nBuDsFQ874G4UoEC0AgkDA6N9zKoHwsKYAGiVPce1r0CGDBl9ErxUTpNqWYkSJfLJeGYOsn//PsybO1dP/JOqab5okpAiiYZyk6VWGzZqrH3g3UL/8NsX45s1hizlN37CRNSu9apH1RLNiiuqfkuWLKXckkFRxRnbfZKcJ+eRnMP79u31qEJabGM8+bhUYfvhh+/126hR32rL/RRGi5at9Df+5cM9OzdJ2mmpzWXu3DnKT0OWUZOERbu306d/0JYwnomFCxfAqKS/mEz+1Za+Xq8tRSa39wa8i6bNmqF9+w6OSWSNae58zHwB+Z8+ZMgw8wcyaYQQbYm++Voi+VitUs+5c+dMGiXqbg8fPgy5ffbpYMgSuz179lI+IUkSsFdo/4O3bt0a9aR4ryMFnHLhgyMPThwnJRfN9O//Rhy35mZGCPTs1VtPajOiL1/1IZVrx40dqyeKyoUqvmxSaVCq78pNXmPLRSvde/Sw5fNVeW7UtVt3fDHic8MJg4LGKZcAKBfIffLJR5DXHP7QGjZspOTzNVnNQ96zYKOAPwgE+MMkOUcKUIACcRFg8l9clPx8m/8lAYbvTennENZP//zvQJsvXGg+lMl/1h8NRuBUgQTx1asAeE9KfrJRgAJuCSRPntwnS8v27feGvoytW8EptLEkMMmb6RUrlMOrNWtg5swZli3hJhUFpkyehGpVK2vVAKth86ZNCkm5H4ok1nXs1Nn9HX24R6CWuDpq9BjIsq92bbJc2dChQ1CwQD707tVTX+7Xk+VRjZi/LNUqiVQFC+bH22+/BanGYOf22ZChkOQ61dvIkV9CqonatUnydf16dVG6VEnIh3e+SP570urvv//GpIkTUaZ0KTRsUF+vcvnkNvyZAu4IfPjRx7Zc+lcuvJLl+V4sXBBv9Ovr8+S/yMbyt+Dz4cNQ5KXCGD8+CPfuqfua0OVy4etvRtm6MlNke35PAX8QkL8pXbt2tuy1nz8YRzXH9Npza5X/nkeOWS5OadWyBcqXK4t58+bC18l/kWOR72/fvq1X0CtbprT+fHX79m1PbqL8z920BECpFGd0k9UHDh86ZHS3XvUn78k1adLUqz7stHO7du2VDJfV/5Q8LAzKJAH7vrNpEgi7pQAF/FOAyX/+edw9mjWTAD1iM2qnf7QlfofOc6HKOwHYctRlVLfshwIUiELg/gNjlgmMomuP74oXjy9fPMbjjn4rEC9ePG0Jp2Smzj9P3rx46623TR3DrM5lSbulSxbryR5tWrfCiRMnzBrKo34PHjigvVncCJUrVXi0XLBHHVm800daAkSmTJksjiL64Qe8OwC5cuWKfgOFH7l27Ro++nAQChcqoFdRkAQmVVqoVjlq8qSJeOXll9Cvbx/bLAX9pJ9UqRgx4osn71bq5zp16tp2iVH5kK5Rw9f05GupzKBK27ZtG6pUroj27drip7NnVQmLcdhIoGixYmjbtp2NIv4v1LVr16BUyeIYNPAD/Pnnn8rEL4mAklwuv5fHjx9XJq4nA8mSJQv69ev35N38mQIUUFRg4MD3Ia+52Hwr8HqP7lqSeSF9eds///jDt4PHcTSprP7uu29DEu3kf6NVF1dFF67EI89XG7xWX08EPHXqZHSbKne/XLRkVqKYXEikWuvQsaNqIZkSj1TElee/qrWLFy9iw4b1qoXFeChgmgA/QTONlh1TgAJ2EWDyn12OlEJxMgnQ5wfjgWa+eJcLZd8MwJiVLoSpe8G3z204IAXMErD6itao5pUgYcKo7uZ9FKBALAIpUqSIZQvPH5ZKJ99qlU4CFVw2PLZZff/9d6hZszo6deoIuapf5Xbs2DG96sBr9etZWoXHUyNJQh058itPdzd1vwIFCqJX7z6mjmFG55K8Om3qFBQr+jJk2V2VlxSSSlIzZkxHiRLFMOLz4ZZXzfDkeNSvryWovVrLk11N30eqSoz4Qu0ExagQrl+/ji5dOqFatSrKLpcpH6yuWLEcpUuXxODBn9jy3I3KnveZLyDPj4YNHW6ryrKXLl3SkwikytGFCxfMR/JwBKkyW6N6VYwdO0a5ZIyIKfXVEgAzZ84c8SO/UoACigrMnTsHE8aPVzQ654f122+/YsiQz1BIu5Cpc+eOkGrQqrQ9e3ajZInimDhhAuR1l+pNEgErViivX3QlFQLt0Lp07WbK86SVK1fg11/VqkBfuPCLKFq0qB0Oi1cxqnrhy8QJ423xe+wVPnemQCQBJgBGwuC3FKCA/wkw+c//jrn47CGhAABAAElEQVRhM2YSoGGUsXW0R/s8vvp7AegzzoXr6hQ0iS1sPk4B2wuEh4UrN4eECZgAqNxBYUC2EEiRIqVpcTZp2hQlSpY0rX8zOr57965eMU3eIJclYuzUduzYrlUgKKUvhadionZMljVq1kTVatVi2sSSx4Z//jnix49vydieDvrdd6f05aHffPMNqFTxL7b5SEXAYcOGolzZ0ti1a2dsmyv3+JChw5RMdn7//YHImPE55bxiCmjhggXah6rFsHjRopg2U+YxWaLu66++RKWKFZSuPKYMGAOBJA2rWAElukMjSxrK8wu7LCMoieUDP3gfnTp2QIj2v0W1lihRYnz62RDVwmI8FKBAJIHDhw9DnkuzWS8gf9OXLF6sV4MuV7YMpk+fBnnNbkWTiz++HPkF6terq1wSWWwekqgoF12VLlXCFv/Ps2fPjooVK8Y2Lbcfl+ftkyZOdHs/s3fo0LGT2UNY2n9gokRo2qyZpTFENbgkxM6ZMzuqh3gfBRwrwARAxx5aTowCFIhNgMl/sQnx8VgFmAQYK5E3G/x2A+irJf01+TQAP/ziTU/clwIU8EQgNCzUk91M3SdBwgSm9s/OKeBUAbMqACZJkgQff/yJrdiOHj2qvyEuFdPkjWE7Nkn8Gz58GMqXL6t85cInfYcOGYYECdT5W16vXn2ULVvuyTCV/Vk+1Bn5xQg9CUmWTbVr++mnn/QP1fr3f9NWFdXkQ6oePV5Xij1X7tzo2Mk+HybJEp5NmzZGt25dIN/brUm12GpVK+sfDKu2DJzdLJ0cr/yfGzjoQ1tM8a+//kK7tm0gSzHapWJQZNhly5ZqyZZ18c8//0S+W4nvJQnUTs8xlEBjEBTwkYBUOW3RvCnk4hQ2tQTkQqc3+vVF/nx59GXfz50757MAw8PD0fP1Hvjss09x//59n41r9EBXrlzRlgR+Ta9erXr1QrOS4iQR0qok0uiOZ8OGDZEqVaroHrb9/fXq1VNyfpL8Z8fnuLY/ITgBSwWYAGgpPwenAAWsEmDyn1XyDhyXSYCGH9S7oS58udiFMtpyv4u0ZX/ZKEABawTCtStwVWuJEydWLSTGQwFbCCROYs7vzhtvvGmrqlOTJ01ErVdr4JdfnHFlwdkff0SVypWwYP58W5yHEqQkK3Xu3EWJeOUK9cGffqZELHEJ4ubNm2jWrIm+TJZdk1cjz1OSp6ZOmYyaNarZ6ney/1tvI1369JGnYun3Qz4bqlRSbUwYJ06c0JJXy2PTxo0xbab8Y/L7Jx8M/1d5LFj5eBmg7wVat2mLnDlz+n5gN0eUpApJaJWl8uzcDh44gEYNX1MyCXCQTRJB7Xz8GTsF3BW4du0aGjdqgOvXr7u7K7f3oYBUOR8/PgjFi72iJbPVx9q1a0xNypMqhG3atIJUxHVCk9daUr26VcsWuHPnjrJTql69hilJY7du3cI8bYlvlZpUB27ZspVKIRkaS7t27Q3tz4jOJAF20sQJRnTFPihgKwEmANrqcDFYClDACAEm/xmhyD4eE2AS4GMcnv6gvS7Fqv1Ahf7Al0tcCFUv98jTqXE/CthSIFTBBEAnXylpy5OEQdtGIEF84yuupUuXDq/37GULg3///RedOnXE22+/ZatqY3HBDQ4ORvfuXdGvbx8ll8CLag6SQJUsWbKoHvLpfR07dETWrFl9Oqang8kSZRW0io+bN23ytAtl9zt+/DgqViiH9evXKRtj5MDk3H1bO4dVaJUrV0a16tVVCCXWGCRRuWaN6rh8+XKs29plA6k8VrvWq7h69Xe7hMw4fSAg1f/69VN/Sck9e3ajerUqOH/+vA9UzB9C/k9KJUPVEuSLlyiB6jVqmA/AEShAgTgJSLXQZlol4osXL8Zpe25kvYAksm3btk1PZHvpxUJ6UpskcRrZ5H9Hl86dsGH9eiO7VaIveY31as0aylbeTpgwIerWrWeK1YQJ46FaBcT22nsQLpfzCl688MILKF26jCnH0ZtON2xYD6n4ykYBfxNgAqC/HXHOlwJ+LsDkPz8/AcycPpMAvdI9ccGF+h+70O3bAPx6w3kvgrzC4c4UsEjgXwWvEE2dKrVFGhyWAvYWMGPJ1X5a9T9ZAlj1JlXT6terg6VLFqseqlfxyRI3zZo2Ufrq/ogJpkmTBt0tXkZVzl05h+3QpFpa3Tq1IUs5ObVJhQapTjFt2lRbTLFN23bIlCmTpbHKB0cfDLTHEqNDhnymJyqHhDivWp4sK1+1ShUmElj626DW4E2aNEWWLFnUCuqJaBYtXKgvDSjL/zqpbd++DR988J5yU/rgg4GO/LBfOWgGRIFYBGQJyEZa5b9jx47FsiUfVlVAXg8NHvwJChXMj27duuDwoUOGhDpgwLu2r4YbE4Qsq/xa/XqQ90ZUbI0aNzYlrJ9++km5C+gkUa58+QqmzNfKTuX1sYqJjeODgqxk4dgUsEyACYCW0XNgClDA1wJM/vO1uB+OxyRAtw/6H9r7ze9MdqH2QBcOn2Xin9uA3IECJgrcuHHDxN496zplqlSe7ci9KODnAkYnAGbM+Bw6aFcuq97+uHoVdWrXwpEjR1QP1ZD4du7cob2xX1fZN/YjT7JXr95IkSJF5Lt8+n3Xrt0gVSxVb0uXLkGrVi206o7OS5x60l6qM/R/8w18883XTz6k3M+BgYF4+513LY2rRo2aePnlly2NIS6DfzhoIEZ+MSIum9p2m19/vYJ6dWvj0qVLtp0DAzdGIF68eHjjTW1JA4XbksWL0aNHN8hSh05skyZOVK6CU+HCL5pW3ciJx5BzooAZArIEauPGDQ1LGDMjRvYZd4HQ0FAsXLAA1bRKtlJJfNasmR6/XpozZzamTJ4U98FtuqUkATZ4rR5kdQTVWpkyZU1ZBljmGRQ0TrXpokNH9d9LcwdNqji2aNHSnV18su0PP3wPeY+MjQL+KMAEQH886pwzBfxQgMl/fnjQrZoykwDjJB92D5iyzoVybwZg9hYXHmhubBSggFoCN26qlwAoSwCreEWhWkeO0VDgaYH4CeI/facX98jSdokSJfKiB/N3/eWXX/DqqzVw+vQP5g+m0AiS7GiHJSkl+c+qKoCJEydGr959FDpqUYciVR27dumM8PDwqDdw4L2yxNcnH3+ETz75WPnZyYccmTNntiROeS703vvvWzJ2XAeVY/nuu29j9OhRcd3F1ttJRRpJAnRypU5bHyAfBV+tWnVIZRdV26pVK/VqnPfv31c1RK/jkr89ffr2hlT6Uqn1tcGy0Cp5MRYKGCkgVc/kIqmDBw4Y2S37UkTgxIkT6NO7F/LlzYNBAz9wa7nPsz/+iP797VEV3gjukydPoufrPSD/K1VqcgFFpUqVTQlpx47tkEQwlVqtWrWRIUNGlULyKpZXX62FZ5991qs+zNiZ1f/MUGWfdhFgAqBdjhTjpAAFPBZg8p/HdNzRUwEmAcYot/moC+X7uzBopgt3QmLclA9SgAIWCty4ft3C0aMeWqqYydKRbBSggHsCCeIncG+HGLaWRNzWbdrEsIX1D127dk3/kOfixYvWB2NBBGfOnNaW9muAv//+24LR4z5k585dtETSxHHfwaAtW7Zqrfz/EqnQ9Ea/vnBykkZMh/Obr7/CiM+Hx7SJ5Y/Jc5Ier/e0JI7qNWpAKkqp3D54/z1MnDBB5RANj00SzyXBwGnLqhoO5eAOu2jVZVVtGzdsQOdOHXHvnnY1psPbn3/8ga++HKnULKVia9my5ZSKicFQwB8Efv/9N9SqVdNvKsL7wzGNbo63bt3CmDGjUazoy3q1xw3r10MqjEfX5P/h6693R2iIf304sWLFcshrLdVa1WrVTAlJkh1VSwST15Ft27UzZb5WdNq2XXsrho1xTFnVaNGiRTFuwwcp4GQBJgA6+ehybhSgAJj8x5PAMgEmAT5F/9OvQMvhLrT9woVLf3K536eAeAcFFBNQcQlgIbKq2o5ih4fhUMAtgZje+HarI23j9trSv0mSJHF3N59tf/fuXTRv1gQ///yzz8ZUcSCpfNimdSull/hLmzattlRMC5/yBQQEaEsfvu7TMd0dbPfuXejZU73KDO7Ow9vthw8fhnnz5nrbjan7t2nT1pKlrHv27GXqvLztfPKkiUout+XtvOKy//nz57Ukqw5+m7wbFyOnbpMrVy6tek0lJacnFY46aeelU5f9jQp9/PjxuK7YBW19+vSNKlTeRwEKmCQgF0XVqF4NP545Y9II7FZFAXnvY8vmzWjevCleLvIivv32G0T1/uYk7fmqVM/3xzZkyGeQyokqtcomVQCUOS5ctFC55wTttATA+PGNXanDiuOZJUsWVKxY0YqhYxxzxvRpHi8LHmPHfJACNhFgAqBNDhTDpAAF3Bdg8p/7ZtzDYAEmAeqgt+4AH85wofI7Adh+gol/Bp9l7I4CpglE9QaZaYO50XGWLFnd2JqbUoACIhB+z5glRBMmTIiuXbsqiyrV0jp17ICjR48qG6MvA9u1ayd69+6p3BI/kQ1e1xKZJCnPV61mzVeRM2dOXw3n9jjyAaUkboaGhrq9r9N2kGoNffv0xvbt25SdWrJkydC+fQefxvfiiy+iXLnyPh3TncHkA9f33hvgzi6O23br1q0YbINlrB0Hb/GEOnTsBFmeW7UmS+G2btMKd+5ob8z4UQsJCcasmTOUmrFUN8qdJ49SMTEYCjhVQKqeVq9WFZcvX3bqFDmvOAhIdeaPP/oQBQrkw+s9uj96n0CqNX8x4vM49ODMTeR9k359eyt1wUr6DBmQLVs2U8ClyuO0qVNM6dvTTp977nnUqFHT092V2U8uiPPl+zlxmXh4eDgmT54cl025DQUcK+C7d1kdS8iJUYACKgow+U/Fo+KnMflxEmC4trLMlHUulOwbgMnrXbgffdV9Pz05OG0KqC1wTauYIB++q9ZYAVC1I8J47CBw/959Q8KsXbsOMmTIaEhfZnTy0YeDsH79OjO6tm2fCxcsUG4ZvMiYL7zwgk+vGO/cRd0EVlm2qkmTRpCvbP8JyJv3bdu0xoULF5QlkaQfX37o8frr6lb/k0o7HTq084slRmM7IUePHoWlS5fEthkfd4iALOXWuHET5WYjr+Uk4eGns2eVi83MgIqXKIGJEydDLjJQqUmCqK+TxlWaP2OhgC8E5O+e/A9u2bI5JAGajQIiIAlgUlm8SuWK+q1bty6QJEB/bsePH8fkSZOUIpD/32a1yVMmK3eRnbyOtHOTCoatWrdWbgorV6yALP/ORgF/FmACoD8ffc6dAg4VYPKfQw+snaflh0mAO08B1d4LwKCZLvxz184Hj7FTwH8F5A2yP//4QzkAVgBU7pAwIBsISBKNEa1N23ZGdGNKH1J1aty4sab0bfdOZSnVQwcPKjuN1tpV475oWbNmRYUKFXwxlEdj9Ovbh1VKopCTD2+7dO4Io/6ORTGEV3fJeVW+vG/Oq9SpU6P+a695Fa9ZO0vVyk7/x95ZgEd1PW18gru7F4q7B3d3l6KBFlpaWrSCVJDSQgUoJMHdIbgFCBR3CO7EcLdAsO/Otnx/oJHdvbJz777zPJBk9545M79zs9m99z0zXl642f4vYBYg9Ovbh65fu6YXcvgVRKBmzVqUNm1aQRH9E8rkSZNo9epV4uLSI6BEiRJR585d6O/tO2jDBn9q1bo1xY8fX4+pVPls27YdJUiQUJUPDAYBEIicwIMHD6hzp440dMhgUZXNIo8Wj7qKAHcL8N+40VXTi5r39z9+U9qkPhUTk2dZT91i4evbfn7LdPPvjONq1arRBx984MxQEWP4/W/GjJlExPJ2ED4+E9/+Ed+DgFsSgADQLZcdSYOAdQlA/GfdtTV9Zm4iArxwlajTaA9qOzIWnQ01/aohARBwewLcLkOa5cufT1pIiAcExBPQogWwZPHUzZs36bPPeoqsWirh5Hjx4gV9/HE3scKc+vUbUOrUqXVH1aFDR0MrtTmS0OzZs2jFiuWODHGrY/lG3ciRI8Tm3LGTMSLWNm3aihS08MKMHDGcTp48IXaNXBEYV/Psq4gAYdYn0LZdO3FJhoaG0rBhP4qLS+uAcufJQ6NG/UqnTp+lP8eOo8KFi2g9hab+UqZMqQi5m2jqE85AAASIuJpZ1SqVaNWqlcABAiBgJwEWxc2bO8fOo/U/rHCRorpO4i1swyhXke/cpauuOevpvHOXLnq6d8r3gf376cCBA06NxSAQsBIBCACttJrIBQTcnADEf25+ApghfQuLALnK38j5HlTz61i06ZCHGVYDMYIACNhB4PLly3YcZewh+fMXMHZCzAYCFiDw+NFj1VlIFU9xlaVevT6lGzduqM7Ryg5Y0N2vn0whClfoad26ja74Y8eOLbI9DSd9/vx5+ubrgbrmbwXn48b+Sdu3/y0yFW6PzqIOvY2rW0m0Xbt20l9/jZcYmstjWrt2DVoBu3wV9A0gSZIkVKdOXX0nccJ7//596dGjR06MlD+EW841atSYlq9YSXv37qcePXtSsmTJ5Af+b4RoA2yapUKgJiDw8uVL+v23MVSndk26dOmSCSJGiCAgiwC3zH716pWIoPLnz08eHvrdVwoMDKSdO3eIyPVNEHydTWLF4jfxRfWVK/9xBUBp5u3jLS0kxAMCLiEAAaBLsGNSEAABrQlA/Kc1UfjTjYDFRICvlHyWbPegSn1j0V8rPeiZNh0GdcMPxyAAAo4RCAq67NgAA45OkyYNpUuf3oCZMAUIWIfAw4cPVCfTvEVL1T70cLBo4UK08LET7OJFi2jjhg12Hm3sYXqfX+XKlRfZnoYpf9n7C3ryRNlNA4uWAN+Y6v3F56LaVL0JmG/asBhFTytVujTlzSevCnJ4eDh92rOHmBuHeq6Bs76/HjiA7t+/7+xwjBNOoFat2uJu3C5f7kcb1q8XTs7x8NJnyEADBn5NRwOP0azZc6hKlaq6CgUcj9C+EZ6e5US+ntsXPY4CATkEeBNN3bq1lWqnP1FERIScwBAJCJiIAG/83rdvr4iIEydOTNmyZdM1lokTJujq31Hn3AmhSdOmjg5z+fEfdehAvCFDkl25EkarVq6QFBJiAQGXEYAA0GXoMTEIgIBWBCD+04ok/BhGwCIiwN2niGp/G4t6T/Sgm7ifYdjpg4lAwEgCElsAc/4FUAXQyNMAc1mAgNoKMEWLFqWcOXOKI/H48WP64YfvxcUlOaBBg74VeYOsZMmSul7sbyr0ojqLNLh6Gsw+AnyDSlrrpjeRN2na7M23unxt3ryFLn7VOh0/biwFBwerdWPp8bdu3aJxCieYNQlwBVBJxiKYwYMGSQpJdSwVKlSkqdOm07FjJ+i77wZRpkyZVft0tQNUAXT1CmB+MxPg17nfxoymShUrELd7hIEACKgjsGL5cnUONByt94an9evXiasW6tW1m4YE9XfFrYs7duyk/0QOzjBlyhR6/hzVSRzEhsMtSgACQIsuLNICAXchEOfVC+p+ZCrlu33aXVJGnlYhYGIR4NU7SqUSRfTXclgsOhlklQVBHiAAApERkNpChcVIMBAAAfsJPFTZAq6pzsIW+zN598jff/+Nrl27+u6D+ClaAlwpY9Ik32iPccWT3OqnSRN9dr5z+1+9q7M5w+zp03AaOmSwM0PdesxvSps3ib/3lStXJq7goIfxTZYmTZro4VqVz+vXrkHYZidBH++JdOP6dTuPxmFmIRAvXjyqVbu2qHDnzZtLYWGhomJyJhhurezVrTvt2r2HVq9ZSyyCjhs3rjOuRI5p06YtxU+QQGRsCAoEJBPgjTOVK1ek4cOHKVWhwyWHithAwDQEVqxYQa9fKzerBFi2bNl1jYKryvv6ymoTW9bTkwoUKKhr3lo6r1q1qq6bN52Jlf8ezJwx3ZmhGAMCliQgqz6nJREjKRAAAb0IsPjv4yNTqODN43pNAb8goC+Bf0WAPEnc8vf0nUsD7+ERHjRxJdFfq5RWv+isoAFRuAAB+QROn1ZKfQq00mXKCIwKIYGAXAIPH6hrAdyosTzhCVcCmzDhL7nQBUc2+tdfiG88p02bVlSUjZXzbPz4cZrHVLasp8jW8ePHjaOQkBDN87W6Q678+dOPP9JEbx9RqXILpPr1G9Ds2bM0j6tMmbIiK17xzXdeD1jMBLjN92ilWtHo0WNiPhhHmIYA/24mS5ZMTLxc9eTPP34XE48zgeTLl5+6d+9Obdq2IxYBWtVSpkxJXJ144YIFVk0ReYGApgR4c+qPSuX3lUp7RylCJU0ThDPTEmBxeo4cOShjxkyUMVNGypghI2VQ/vH3GdJnoAQJEyjvFZITb0pLmjTp/3/lhB8o12n4b/fDhw/p2dOnFK78u3v3rk3IHxoaSqHKZ8WwsDDbz3z9Q6/qZlevXiHuAMN5uNqyZs2qewhz58xRKgoPFvUezsvLi/r376d77lpM0KlzFy3caOpj4cKFdOeOUrUEBgIgYCMAASBOBBAAAVMSgPjPlMuGoCMjYAIRIG8AW72XaNhcotBbHpFlgcdAAAQsSoA/PF+5EibupnPpUqUtShxpgYD2BFh0EB7ufHUEbv2bK1cu7QNT6ZFFbHyRHOY4Ab7RMG7snzRs+AjHB+s4ooTSBjhVqlSaX7itVauWjlE75/r+/fuonOYcOtuohQsXUJ8+fSl3njwqvGg/tEbNmroIABs1bqx9sCo9njp1krjSGMx+ArNmzqDevb8kI25s2h8VjlRDoEqVKmqGaz520aKFthv4mjvW2SGLJxo2bETdFOEft/t1F+us3ECHANBdVht5Okvg1q1b9IdS9X3KlMnErX9hIOBKAiyQy5+/AOXLn58KKhXb8uXPR7lz5yGuCOyMvdlEYE8VcT7/eZP2sWPH6Ljyj78GBh61iQedmfv9MUeOHBYhAMyWLdv7oWn+8yOlQwZv2urV63PNfTvrsLWyQfMHReTMsUk23kRar159USGyKNzXR9bmQFGAEIxbEoAA0C2XHUmDgLkJQPxn7vVD9JEQECwCPHrRg4bO8qD9ZyKJGw+BAAi4BYHjx46LEwCmS5+esmfPbsobXG5x0iBJUQRu3LihKp7qNWqqGq/HYG7/uWTJYj1cu43PmYoQZcDAr0Xteuc2p1WrVadlS5doug7Va9TQ1J8WzqZPnyb+4r4Weerlg1s3cQXQP8dqXzFSTcxVq1YjrgT44sULNW7+M7amwNfhv8aPJ14HmP0E+MbttGlT6fvvf7B/EI4UTaBKlaqi4hs3bqyoeGIKhqsldenShVgIlz5DhpgOt9zz5cqVp7z58tGZ06ctlxsSAgG1BG7fvk3jldc0Fv6h2rBamhjvDAEPDw/KmzcfVahYURGnV7AJ1NOlS+eMK03GsMiwSJGitn9vHL58+VIRAQbS9u1/2/7t3rXL6d+Xo0ePKpVpm71x7bKvGQx6PzDJ14d69vzUVpHRZcm+NTFXh2zVug1NVz4rSLZ27do7LXjVK69t27YSb06DgQAI/I8ABID/Y4HvQAAETEAA4j8TLBJCdI6AMBHgjbtEY5Z60LwtHvRKiQ0GAiDgvgSOHz9GtevUEQegrKcnBIA6rcrOHTs0Fy/oFKpotw0aNBTRYvWmSgGgROGJr68vKkCoPPu5zdCMGdNt1ahUutJ0eA1FrKelAJBv0hQuXETTGNU6YxEQdqirpUi0QKkC+N2gweTKG3HvZ5E8eXLiSpb79irl0zUyroKRJ29ejbxp4+bG9eu0VGOhrjaRyfcyR6k28s0331L8+PHlB4sIoyXAN2qLlygR7TFGPnno0CE6e0b+zk0WVFSuXIW8unWztU1n0bQ7G4sfv/v2G3dGgNxB4B0CwcHByvtkb+LNShD+vYMGPxhAgNuz16/fgGrVrk3ly1cQcT0nurS5rXDx4sVt/7jKNG9C2rdvL61ZvZpWr15F/Ptkr50/d87eQ3U9LlXKVLr6f+Oc2axZs5oaN27y5iGXf+U2wJIFgPwermOnzi7n9H4APsrfDBgIgMC7BNz7E9a7LPATCICAcAIQ/wlfIISnnoAAEWCEUqxitr8H/brYgx463y1QPQt4AAEQEEPg+PHjYmJ5O5BqSpWoRQsXvv0QvteIwIIF84n/wdQRqCNEOHvz1k2nE+GbshUrVXJ6vB4D+UbQDKV6Gkw9AR9vb9uud2dbFqmP4L8eqlat+t8HVTxSRfHHF6olGQunuIolTB0BbgE+efIkGqSIACUZvz/RUgBYs1ZtSenZYpmqVKZ49uyZuLjMEBC3MlyxfDm1btPGDOEixmgIlCpVylbxM5pDDH1q4ULZ7925zWG79u2pm1d3ce3bDV2o9yZr27Yd/fjjD8R/02Ag4M4E9u7ZQyziWLVqJXFVMxgIGEWAW5ry5s3GTZpSRaXaH7elN6vx9RsWLvK/ESN/Jq7qx79TixctjFEMyFU3JVgKRYRplHlPnChKAFioUGEqU7aspp8ltWRZoUJF+vDDD7V0qdrXhQsXyH/jRtV+4AAErEYgltUSQj4gAALWJADxnzXXFVlFQuBfEeDzXSkieVLfhzYd8qAq/TxoiNLyF+I/fVnDOwiYicCxY4Eiw62mtNmTJuoQCQpBuYQAV4XJkCGjS+Z+f1I1LYALFixIiRMnft+lS39eMH8e3bt3z6UxWGXyq1ev0KqVK0WlkylTZsqaNatmMZUtU1YzX1o54qomMG0IcIUErqgoycqW9dQ0nMqVK2vqT62zp4pIRXJlCrX5GTF+6rQpRkyDOXQmUKJkKZ1nsN/98+fPleq5S+0fYOCRfDP7jz/H0qnTZ2nUqF8h/nuL/ZEjR+j7oUOIXqPtxltY8K0bEeDPdFwVu3w5T6pbtzYtX+4H8Z8brb8rU+VKzG3atqVVq9fY/j7x36lq1aqZWvwXGc+iRYvS4MFD6PCRQPJbvoJatGxJ8RMkiOxQun1HhgCQqzAada13z57ddPjw4Uh5uOpBr67dXDV1jPN2Elj9b9IkH3r16lWMseMAEHA3AhAAutuKI18QMCEBiP9MuGgIWR2Bf0WAzwwSAZ4LI2o/yoM6jfagoBuyKqSoA4nRIAACWhDg3XR37yp9wYVZ+gwZqECBgsKiQjgg8A+BPHnyGHbRMibmoaGhMR0S5fO8+1iaLVmyRFpIpo5nyZLF4uLX8rwrXaaMqPzOnT1rq8QgKigTB8OVKrYGBIjKgKuCcTsurayssNfhjRs30M2bzleW1YqLmf1whcigoCAzp4DYFQIllXbfUmzL5s3E1SWlGFcWbtmqFa1fv5G279hJXbp0pUSJEkkJz6VxsIh6vrKZpVbN6lStamWarbQFR0VVly4JJjeYQHh4OPn5LaNOHTtQvnx56JtvBtKpUycNjgLTuSuB7Nmz0/c//EjHT5xSKk5OUir+VdL0fbtUrrFixaKqyibqKVOmKb9vZ+j7738gvqb6tt0Tct2XKzAaWYXR23vC2xhc/n2Tpk0pVSpj2iA7kiwLMxs1buzIEN2PffDgAc2bO1f3eTABCJiRAASAZlw1xAwCbkQA4j83Wmyk+i4BRQT4Ym06eqqjCPDeI6KhMz2o+sBYtPUohH/vLgB+AgEQeEPgtVKRgHdFSrQaNWpIDAsxgQDlzp1HDIXgYOdFBmVKyxIAhoWF0r59e8WwtUIgAQFb6P79+6JS8dSoghpXryxYsJCo3JYtk1mhSRQkB4NZ5ieLKVeAzZ+/gINZRH4436SUUk32TYTcvhamnsDatWvUO4EHlxIoUbyES+d/e/KN/jJan2XJkoWGDBlqE1ZMnjyVynpqWxH17ZzN9v2lS5do6JDBVLBAPvrs05504MABs6WAeEHAaQK8YWPBgvnk1bUL5f4wp+0rtyVF62unkWKggwSqV6+unIOL6NDho/TVV30oTZo0DnqwzuEs5PqqT18KDDxOf02Y+P+VebmasBQzUgC43M+PuDOCFEugVGj86KMOUsL5/zhat2lDHJskmzNnNj16pNzghIEACPyHAASA/0GCB0AABKQQgPhPykogDpcRUESALxUR4OOdyTUN4cVLojmbPahi31g0Zb0HvUSVbE35whkIWJHAnt0yBYD16zewIm7kZAECefPmFZNFcHCw07GUVCpZSTI/5eIs2ntouyJcdWb16lXaOlXprWSp0io9/DO8uCLO0LISmxZBLYUAUAuM7/hYu2YNcUUlSVa6tDbnsJbVMLXgw1V7NmxYr4Urt/exZvVqt2dgZgDp0qX7T+UcV+aza+dOl03PbfpYWDF33nw6cvQY9e3Xn9KmTeuyeCRN/PLlS6UK4jpq2bI5lSpZnMaPH0d37tyRFCJiAQFdCPD7ha1bA2jEiOFUu3ZNypvnQ/q0Zw9b5b/Hjx/rMiecgkBkBCpVqmyrRrt02XKqU7cucSU82D8EuFovC812795L4/+aQFmyZBWDhmMzylj4OGXKFKOms2ueLl29xHQUeRNw585d3nwr4iu/x5o8yVdELAgCBCQSiCMxKMQEAiAAAhD/4RwAgX8JKCJAWpee7tNrSl7hgWos249z1b9YdMb5boCqY4ADEAAB8xHYtXuXyKC5tWPGjJlE7dYUCQpBGU4gt9ICWIoFBzknAOTqaTly5JCShi0OP4indFkP5ippl3m+fPlswj2+qKvGChTUpgqbmhjeHnv8+DHiFsAwbQk8fPiQNm3yp4YNG2nrWIU3rSoAsohVkvkrVcZw416bFeHq2lwRKXXq1No4hBdDCeTNm8/Q+aKbjAVlZ86cju4QXZ5LkSKF7b1DV69ulCtXLl3mMKtTbpM+R2ntO336NAoJCTFrGogbBOwi8OLFC7pw/jwdPnKYDh8+pPw7TEePHKGIiAi7xuMgENCDAG+iGTRoMFWuXEUP95byyRvmOnToSG3atBWTV1wDBYCc9Azl73X//gMoYcKEIhjkzJmTqlWrRlu2bBERD1971+rzrVYJ8QaLy5cva+UOfkDAcgQgALTckiIhEDA/AYj/zL+GyEBjAooIMM66DHRH+ZqqonMiwIvXiH5ZGItW7dE4NrgDARBwCwKBR48S7+KWcjHkDXTevduocSOa5Itdf2+Y4KsMAlJuDHN1t+vXlTcBTlj+/PlF7Tq+deuW7YaSE6lgSAwEduzYYaugJqWlC/+t+eCDD+i8cjNRjUm7SL3J319NOhgbDQFmK0kAqJX4tGDBgtFkbfxT3K4Ppg0BFjjzedumrZybrdpk5h5e8giq9Lxb2aj1+jXvHDXGihUrRt26f6xUtWuptIKTcaPcmMxjnoWFvVOnTqGVK1ZA/BQzLhxhEgJcHevevXt08+YNCgkOoStXwigkNNQm+jtz9gxdungR57tJ1tIdwmRB+s8//0K1atd2h3Q1zdHItrsxBR7Lw9hKjbyZYuHCBdSlS9eYQjPsed5gIUUA2KlTZ8PytnciH29vew/FcSDglgQgAHTLZUfSICCXAMR/ctcGkbmYgHI9N/76DHRDqQSYruJDu4N5/JTIZ7UH/bXSg549t3sYDgQBEACBdwjw7u0DB/YTt8+QZk2aNIUAUNqiuHk8KVOmFFMJ5dKli063zC1QQJbwhG+qGnmD251OYxaKHjp0kMqXryAmbRbvqRUAFhR2Du9WzmGYPgSkVSrWSnxasGAhfYA56XXXTpkVoZ1Mx+XD9u7bCwGgy1fBuQDySRIA7tL/9zJ+ggTUrGkzm/CvVKlSzkGz6CiuirpIEQ1MnTqVTpxQWm7A3JJA69Yt6eaNG5bInT9v3b9/n7iyHwv/Hj16ZIm8kIS1CbB47YveX9KAAQMVcXoCayeL7HQh4OPjTdzm1sPDQxf/jjqtW7eeiI43SZMmpebNWzgavq7Hc2eFHTu26zoHnIOA2QlAAGj2FUT8IGAhAhD/WWgxkYo+BBQRYOL1GSlEuRiTtVL0F2BeKccu2+FBw+Z60M37+oQDryAAAu5FICAgQKQA0NOzHGXNmhXtldzrdBSdLbfHkHLR8PRp51vC5VXasEqyPbshntJzPXYrAgJJAkA+/9RWG8unVLGUYq9evaJ9e/dKCcdycZw/d464SmiaNGlE5JYqVSpKlz493bh+3el4MmTIKKo9bHBwsK3qj9MJYeB/CBxUNtfAzEkgZ64PxQR++vQp3WLJkSMHdenqZWsNiHbV72I+o7zHnqJU+1u4YD5xK3qYexM4eeIkhYWFujcEZA8CLiJQqnRpGjt2HEnbwOgiHJjWSQL8d50r7tWoUcNJD9oOixMnjiJI7EyjRv2srWMHvbVs2YoSJUrk4Ch9D/f18dF3AngHAQsQMLaOqgWAIQUQAAF9CED8pw9XeLUgAUXYl2pDJrr4d+Iokzt03oMaD/Wg3hMh/osSEp4AARBwmMDGDRscHmPEAG4D3K79R0ZMhTlAwC4CZUqXses4Iw5SIwDMnj27ESHaPQdXAITpR4BbCEoytecfC7B4t7oUO3XqpK2KipR4rBYHV6uR9hqh9hzOkyePqGXau2ePqHisEMzJkyfpyZMnVkjF7XLImiWLmJyDgoI0jYU/W3HrxEWLltDBQ0foyy+/EiVG1jRZB51xK1Q/v2XUqGED8vQsQ1MmT4L4z0GGOBwEQAAEtCLAbeh/+WU0bdjgD/GfVlDd3I/3xL9EEeikCABZCOhK66RURZRkvOlv8ZLFkkJCLCAgkgAEgCKXBUGBgHsRgPjPvdYb2WpAQBEBpt+YmU5ve1cEePUO0ZeK6K+RIv5jESAMBEAABLQkwC2NpO5q/+ijDsQ3q2AgIIEAVwCUYryL2VnLli2bs0M1H8cCicDAQM39wuH/COzbt49evnz5vwdc/J3a848rw0oyiKf0Xw1pVUKzZlX3Gqr2d0Br4nv2QgCoNVNur3jkyGGt3cKfAQQyCxEAcnXZkJAQTTLmCn8s9mPRH4v/WASIz1f/oL1yJYxGjhxBhQsXJK+uXdB2TpMzDk5AAARAwHkCH3zwAW3096dPevTA3yrnMWLkewS4AqCaa2jvuVP9Y8aMmahevfqq/TjroGjRolSsWDFnh+sybsb0afTs6VNdfMMpCFiJAO6SWWk1kQsImJAAxH8mXDSELIOAIgLM6p+ZDgUkoPAID/ptiQdV+CoWLd7uQUoBDBgIgAAI6EJAahVAvkleqVJlXXKGUxBwhADvzi1ZspQjQ3Q99pSKtnBqxStaJnZOae/JVVdg+hHg9nWhoXJal2XLpq4CpaTzl1ft5Cn9WjTqd1aYyzNXWZRkagV8aisIas3i8KGDWruEP4XA0aNHwcFkBFKmTCmmFdr169fo2bNnqgiWKlWKvH186fiJU/TDjz8Rt/2FkXJd7TUFBARQxw4fUdEihWn0r7/Q9WvXgAYEQAAEQMDFBOrWrUcBW/9WRNlFXBwJprcaAf7b7+PjLSqtrl7dXBZPp06dXTZ3ZBNHRETQ1KlTI3sKj4EACLxHAALA94DgRxAAAeMIQPxnHGvMZFECitAvaGUqqvxlLPptqQc9xX1xiy400gIBOQQ2btwoJ5j3IunStet7j+BHEDCeQIECBShx4ncr9BofxT8zPn0aThcvXHBq+iRJklCKFCmcGqvHoEuXLurhFj7fI3DxohzOmTNnVlXNQVoFwEsXnftdfG+J8GM0BCSdvxxmNpVVKNWKYKNB5dRT0vg6lYTAQUFBlwVGhZCiI5ApU+bonjb0OWfb/yZMmJA6dOhoE1D4b9pCbdu2owQJEhgau9TJ7t27RxMnTqAypUtS82ZNaPXqVcTVOmEgAAIgAAKuJRA7dmwaOvR7mjd/ASVPnty1wWB2yxJYuHAB3bmjtNkSYlWrVqVcuXIZHk2iRImoZavWhs8b3YQrli+na9euRncIngMBEPiXAASAOBVAAARcQgDiP5dgx6QWInBR2fHide0K9VJ2IIfdQ8k/Cy0tUgEB0QS2bdtKLCqSaA0bNqIsQtpxSeSDmIwhUKVKVWMmsmOWwKOBTlfNS5s2rR0zGHfIJUHCNOOyNn6my4KElnHjxlV1YydNmjTGA4xmRoinooGj0VNcwVJSpdDUKs/BTJkzaURGvRu+CXb//n31juDhPwSCLgf95zE8IJsAVwCUYlevOnYTlG8gDx8xUqlKe4bG/zVBXFs3V3I9cuQIffF5LyqQPy8N+u5bOn/+vCvDwdwgAAIgAAJvEeBNlgsXLqY+ffuRh4fHW8/gWxDQlkB4eDhxm1kpxud75y7Gb3hv2rQZJUuWTAoGWxw+PhNFxYNgQEAyAQgAJa8OYgMBixKA+M+iC4u0DCFw79UrGn7rJjUIC6HtT54YMicmAQEQAIE3BPhCiL+//5sfRX3l1qsff9JDVEwIxv0I1KtfX0zSB1W0a0yVKpWYPDgQiKeMWY5Lly4ZM5Gds6gRWaRKndrOWfQ/jCsHSWqvrH/GrpmBOYeEhLhm8khmVfs6mlrQOYzX4EgWWKOHgoODNfIEN0YRUPO3SesYHz16FKPLWLFiUdWq1Wj6jJm0d98B6tXrc1FVnmNMQMcDuH3y8uV+1KxpE6pWtTLNmTOb+PMuDARAAARAQA4B/rvr57eCatSsKScoRGJpApMnTyZuNyvFPvqoA8U3uFJzFxeIDqPjvXfPHjp06FB0h+A5EACBtwhAAPgWDHwLAiCgPwGI//RnjBmsSeDF69e04MF9qh0SRDOVr/wzDARAAARcQWDpkiWumNauOTt37iKm/apdAeMgSxFgsUfp0mXE5HT4sPMXx1IIqm7DQKUJ08QsssaBSBP5qBFQSRJocItGtA/U+GSNwp2kaqFqzl9OL1VKOULsoMuXoyCOh9USQAtgtQSNH58iRQrjJ41ixsePH0fxDBFXc+7brz8dDTxOfstXEFdy4faJsH/eVw4dMthW7a9rl860dWsAsIAACIAACAgkkC59etqwwZ9Kl5FznUUgJoSkMQFuM8vtZqUYf65spryPM8ry5csv7nfO19fHqPQxDwhYggAEgJZYRiQBAuYgAPGfOdYJUcojsCv8CTUJC6UhSuW/uy9fygsQEYEACLgVgQ0bNtDDhw9F5pw8eXJiESAMBFxBoGatWsSVKKXYYRW7Y9UKV7RmcFN5DwTTn4A0zilVVKKUJAC8feuW/ouHGWwEJJ3Das9BNee/1qdDSKicyopa5+ZqfyzgevDggavDwPwOEJAkAIys7XlZT0+aPHkqHT9xioYMGUpZsmRxIDvrHvpSuZa2bt1aatmyOZUqWZzGjx9H3N4cBgIgAAIgIJMAC9lXrlhFufPkkRkgorI0AW/vCaLy8/LqZlg8nTp3NmwueyYKU+6Lrlq10p5DcQwIgMC/BCAAxKkAAiBgCAGI/wzBjEksRiDo+XPqff0adb56hc5GPLNYdkgHBEDArASePg2nNWtWiw3/yy+/ogQJEoqND4FZl0C9enLa//INzQsXLjgNO3GixE6P1WPgk2gq3Ogxn7v6fPwo6kpCrmCi5jxMnDiJK0KOdM5HOH8j5aLHg4/taIepx7yR+VRzDiZMmJDixYsXmVuXPGZPm1GXBGaRSR89krmxxiJ4NU8jgfL7KcW4vS9b4sSJiVu1bd+xk9av30gtW7US9RriSl43b96kP37/jYoXK0Lt27WlzZs20atXr1wZEuYGARAAARCIgUCyZMls1Wvz5ssXw5F4GgT0IXD48GHas2e3Ps6d8MpVMAsXLuLESMeGcKvhNm3aOjZI56OnKC2Z0VFBZ8hwbzkCEABabkmREAjIIwDxn7w1QUSyCYQr7X3H371D9UODad3jR7KDRXQgAAJuSWDpUrltgLlFSNeuXd1yXZC06wiwUKNGjZquC+C9mXfu3EGvlfcTzlrceHGdHarLuCdPnujiF07fJfBY2PvOePGdF0DFE3QOP3kiS1j57qpb6ydJYks152D8+PFFLQxE2Poux5Mn4fpOAO+aEogXV857pKxZs9Ivv4ymk6fO0B9/jqVChQprmquZnfFN++7dvahQwfz0008/UkgIKpmaeT0ROwiAgPsQ4Gsrc+bOo4IFC7lP0shUJAHviRNFxdXVy0v3eBo1akSSOoKEh4fTzJkzdM8bE4CA1QhAAGi1FUU+ICCMAMR/whYE4YgmwHuQlyttNasHX6ZxigAwQsWNe9GJIjgQAAHTE9gaEEBcTUGqoQqg1JWxblws/kuaNKmYBHfs2K4qlnhxnRdeqZo4isHcIhGmPwFpQks156GasVqTfvIYAlatmUblT9JrRbx4zov4JFX/Y9bSXhuiWn+zPg6RsLlWLq6g6pyNGzehT3r0IK6UBCPivwHTp02lihXKU726dWjpkiUUEREBNCAAAiAAAiYiMG7cX1SpUmUTRYxQrUqAu98EBweLSa9Vq9a6X3fs1ElW+98FC+bT3bt3xawBAgEBsxCAANAsK4U4QcCEBCD+M+GiIWSXETj67Bm1uRJKA25ep1svX7osDkwMAiAAAvYQ4NL78+fPs+dQlxyTPkMG6qHcDIOBgFEEOnWWdZFs+9/qBICSbm7z680z5X0STH8C0tp8xlNRBU3SOSytsqL+Z5LrZpBUqY5bc8aJE8cpGHGlibBRxdKpdbR3EASW9pKScVxcQRUAZRBxfRSnT5+iAQP6U/58eahv3z504sRx1weFCEAABEAABBwmwKL2Nm1ltR91OAkMsAyBl8o9ukm+PmLySZIkCbXWsT1vrly5qGLFSmLy5a4mvoL4iwGDQEDADgIQANoBCYeAAAg4TgDiP8eZYYR7Erj+8gUNvHGdWoWF0JGnT90TArIGARAwJYEZ06fRq1dcu1Sm9e3Xn9KkSSMzOERlKQIZMmSkmjVricmJq3PyjVA1Fjt2bDXDNR374sVzTf3BWdQEWGwpyWLHdv6SFYuvpNjz57K4SuGiRxwRz2VVenL2tTRuXOeEg3owZZ9Pw/E5VS+27DccfPXEq7nv2LHkvEfSPDkTOXz+/Dn5+S2jhg3qUznPsjRl8iR6qHTUgIEACIAACJiTQJmyZWn48JHmDB5RW5bA7NmzSNJGSS8d2wB36NiJPDw8xKxlgNJ96Mzp02LiQSAgYCYCcq6ImokaYgUBEIiWAMR/0eLBkyBgI/CUd7Dcu0u1g4PI79FDeg0uIAACIGAyApcuXaKtW7eKjZpbYX3zzbdi40Ng1iHQrn17p6s86UFh+/a/iXfKqrHngtqlxY+fgCSJudRwlT42UaJEokJ8HuG8+JOFAVIsUWJZXKVw0SOOxIkS6+HWaZ/Otp6UJsZVU43TaXhuNDB+/HhulK35U5UmNDY/UccyuHIljEaMGE6FChUgr65daOfOHY45wNEgAAIgAALiCHBlM1/fyYQqu+KWxu0DevDgAc2dM0cMhwIFCpKnZznN4+HfvfbtP9LcrxqHPj4T1QzHWBBwawIQALr18iN5ENCeAMR/2jOFR+sRCHj8mOqGBNGYO7fpicob9Najg4xAAATMRICrAEq2zl26Up68eSWHiNhMToB3x3bo0FFUFv4bN6qOx1nRiuqJI3HAjKUJ0yIJ0xIPJRImnlLT+vm5oEpwOH+N+/VInFiOAJBfR50VY0cIErDy6iUWJg427owyZiZpr73GZG3eWSRtkjAvRcci59dSrgLTscNHVLRIYRoz+le6cf26Y05wNAiAAAiAgFgCP4/6hXLkyCE2PgTm3gR8fb1FdcDx8uqm+YLUq1ef0qVLp7lfZx2eP3+eNm/a5OxwjAMBtycgq6eE2y8HAICAuQlA/Gfu9UP0+hM48ewZDb99iw48Ddd/MswAAiAAAgYQWLduLV27dpW4BapEixMnDo0ePYaaNmns9E14iXkhJjkEKlWqTDlz5hQT0MuXL8nfXwMBoDDxSSJF1COp7YqYBdc4kMRJ5IinODU1VZYiVFQP1BgrJUmcRGuX8BcFgcRK9RAppqYKpTSBkSRhpZT11TIOCCy1pKm/L2kCXf0zdt0M9+7do3nz5tL0aVOJbwTDQAAEQAAErEegcuUq4jZV6kk5PDyc7ihFIe7cuWP7xyJ3bmHP13J482Py5Mlt03Nl87jx4hG/D8+YMSNxlUSYawhwB5z169dR/foNXBPAe7M2btKEvvvuG7p169Z7zzj/Y6dOnZ0frMNIX18fUaJLHVKESxDQlQAEgLrihXMQcB8CEP+5z1ojU8cJ3FU+wE24e4fmPHxAL1Hxz3GAGAECICCWALeomzFjhuhWu3wxsU2btrRgwXyxHBGYeQl8+VUfUcEf2L+fbt++rTqmCGXTgiRLolz0viEpIIvGwpwl2bOnzp+Hz54+FZMKWgAbtxSShGpqKliqGasHbRZhw/QjgNcI/djq4Vna76ceObra55EjR2jqlMm0dOkSYqEEDARAAARAwJoE4ikCN960azVjMd/5c+fo+PHjdOxYIF28eJGCgi4r/4Lo/v37TqWbIEFCpUJbWkqfIQNlz56dCuQvQLnz5KH8yleunhg7dmyn/GKQfQQmTpggRgAYP358+uijDjR27J/2BR/DUVmzZqVq1avHcJRxT/PvyHxlAwgMBEDAeQIQADrPDiNBAAT+JQDxH04FEIicwHNF7Df/wQP64+5tevTqVeQH4VEQAAEQMDmBKZMnUe/eX4pu0Tl8xEjauHGDbXetyXEjfEEESpUuTdUFXSRjNLwrWQvjiiuSLGnSpJLCsWwsyZL9U21ASoJqzkNnb6zokXvSpMn0cAufkRCQ9Fqh5vxlwQtXEIwbN24kWRr/kDRxsPEE9J0xMaqE6gtYY+/3hb1H0jg9l7l7qgj3ly1bStOmTqGDBw+6LA5MDAIgAAIgYByBHj16Up68eY2bUKeZWPDHmzF37NhOO3fuoL1799KTJ080ne2p0lEqODjY9m//vn3v+ObPQGU9PalC+QpUXvlXomRJ4o4oMO0I8LoGBh6lIkWKaudUhafOXbrS+PHjNKmS16FDR4oVK5aKaLQdOnv2LHr8+LG2TuENBNyMAP4CuNmCI10Q0JoAxH9aE4U/qxDYGf6Ehintfi9ERFglJeQBAiAAApES4Gpjs2fNoh49e0b6vIQHU6dOTSwC/OxTuTFK4IQYHCMwcMDXjg0w4Oh1GgkAuR2NJMuWLTsdPXpUUkiWjCVbtmyi8rp7967T8dxRqm9LMWlcpXDRI47s2XPo4dYpn2peR7kVGJ//6dKlc2purQdlzpxFa5fw9y+BhAkT/n+rN0AxBwE1f5vMkaGxUXJbPW7xO3fuHGzWMhY9ZgMBEAABlxJIliwZ9enbz6UxqJmcN+tsDQigVatW0tq1azTpxOBsPNxCeJO/v+0f+0iZMiXVrVuPGjVuTNWqVacECRI46xrj3iLgPXEiefv4vvWI67794IMPbFX7Nm/apCoIrhzZoWNHVT60HMxi2smTZDDWMi/4AgGjCciR9BqdOeYDARBQTQDiP9UI4cCCBC4qH/66X7tCXa5egfjPguuLlEAABCInMGHCeOJ2wJKtXbv2Yto1SOaE2OwjULx4capVu7Z9Bxt01OnTp+jM6dOazCbt5nbOnDk1yQtOoicgjbMaAZWasdFTcvxZvgHD/2D6E+AbIVLsrkoh9Z076tu5a8VCEletcpLiJ5vSws3Dw0NKOIjDDgLS3iPZEbK4Q/jm7rp1a6lly+ZUqmRxWwUbSX+3xQFDQCAAAiBgQQLcScSMn5FCQkJoxIjhVLhwQWrduiVxtTLeGC3J+L3K/PnzqH27tpQndy7q89WXdOjQIUkhmjIWP79ldOP6dTGxe3l1Ux1LzVq1KFOmzKr9aOWAxbRc6RIGAiCgjgAEgOr4YTQIuC0BiP/cdumReBQE7istfoffukkNQoNpm8Yl3qOYEg+DAAiAgBgCfAHMb9kyMfFEFcifY8dR2rRpo3oaj4OA3QQGfv2N3ccadeCiRYs0m0pS9TRO6gMIADVb2+gcSeOs5jyUJiSQJq6M7jww63PShJZqz0G147VcR2mvDVrm5mpf2RUBIMxcBCT9bpqLHNGNGzfo99/GUPFiRWyiBK5a80q5lgYDARAAARBwLwLc+2gUaQAAQABJREFUsvbjT3qYKunz58/TJ590t/0NGzP6V7p+7Zop4ufqgDNmTKca1atS5UoVadasmfTs2TNTxC4tSOY2ZeoUMWHVqVOX1FZq79Sps5h8OBBfHx9R8SAYEDArAQgAzbpyiBsEXEgA4j8XwsfU4gi8UNozLXhwn2qHBNFM5Sv/DAMBEAABdyQwduyfxC3rJBuL/8aOGy85RMRmAgJVq1aztVORFCr/7i1dslizkG7dvEnc0kaKofqUMSshiTNXUXj29KnTiV+9csXpsXoMhIBKD6rv+pQmsryqVIRXY1evXFUzXNOxadKkIb5RC9OeAASA2jPV2+OVK2F6T2E5/3v27Kbu3b2ocKECNGzYT8Sbx2AgAAIgAALuS6BDh47ELYDNYFzxrddnn5Jn2dK0WNl0yVVszWrHjgXSl72/oKJFCxNfw33w4IFZU3FZ3NOnTaWnKq5TaBk4t+/t3Nl5AV+GDBmpdu06Woakyldg4FHauXOHKh8YDAIg8A8BCABxJoAACDhEAOI/h3DhYIsT2B3+hJqEhdIQpfLfHRN/+LP4MiE9EAABgwicOHGcVq1aadBszk9Tr1598urW3XkHGOnWBOLHj0+/jh4jjsHevXs0bZPBF7XDwuTc4P7www/FMbdaQLFixaKcOXOJSUutOEBa25gPc+Ec1vvkyiXsdULtORgUdFlvZA75z5VLzuuDQ4ELPzhHDjltq4WjEhMeC9TDw8PFxCM1kEePHhHfJK9QvhzVq1tH2aiyhCIiIqSGi7hAAARAAAQMIsCfO3v0/NSg2ZyfhivUTp8+jcqUKUXz5s01tfDvfQpcvfCH74dSoYL5bV+vXZOz8ej9WKX9fOvWLVq8WLvuG2rz69ipE8WNG9cpNx916EBx4sRxaqweg1D9Tw+q8OmuBCAAdNeVR94g4AQBiP+cgIYhliQQpFTE6X39GnVSqjqcjUDJdEsuMpICARBwisCIEcNNcVFs5MifqUSJEk7liEHuTeDzL3pT7ty5xUHQsv3vm+SCg4PefOvyr5kyZSb+B9OPQL58+SlJkiT6TeCgZ7XnX0hIsIMz6nt4qVKl9Z0A3qm0MMZqz2G1AkKtT4kSJUtp7RL+FAJFixYFBxMSCEUFuyhX7fTpUzRgQH8qkD8v9e3bh06ePBHlsXgCBEAABEDA/QhUrFiJpFdAZrF/i+bNqG+fr+j+/fuWXSRuD8yVAIsVLULffDPQsnlqnZj3xIliOuBwFb/69Rs4nCILcbkSpxS7ceMGLV26REo4iAMETE8AAkDTLyESAAFjCED8ZwxnzCKbQLjSXm/83TtUPyyE1j1+JDtYRAcCIAACLiBw9swZWrhwgQtmdmxKruI2Y+ZsSpUqlWMDcbRbE8iWLRv169dfHAOuQuO3bKnmcamtwKZ1QOWUCjIw/QiUK19eP+dOeFYrfrqitACW1J6pTNmyxC16YPoRsNo5HBQkR4TNq+ZZ1lO/xXNTz1xxo3hxbEgx4/IHQwD4zrI9VzbJLlPeizZsUJ/KeZalKZMnEYsKYCAAAiAAAiDwPoF27du//5Conw8fPkxVq1SirVsDRMWlZzDPnj0jzhtmH4FTp07Stm1b7TvYgKO6enk5PEuVKlUoR44cDo/Ta8AMpdomn4cwEAABbQhAAKgNR3gBAUsTgPjP0suL5Owg8Fo5Zrly8bJ6SBCNUwSAEUoJeBgIgAAIgEDkBH4Z9bMpPrRnzZqVJk2aAkFG5MuIR98j4OHhQWPG/E4JEyZ87xnX/8i7ZO/du6d5IOfPn9fcpxqH5TwhAFTDL6ax5YUJAC+oPP9YjHD58uWY0jbs+aRJk1KhQoUMm8/dJkqRIgXlz19ATNp8/qkV8J07d05MPhyIZzm8Bmu9IAUKFKBEiRJp7Rb+DCBw7txZA2aRP8WVK2HEFeALFSpA3by60s6dO+QHjQhBAARAAARcRoA34zZq1Nhl88c08Y4d2xUxez0KDQ2N6VDLPV+wQEHL5aRnQhMnTtDTvUO+K1eu4nCnko6dOjs0h54HR0RE0NRpU/WcAr5BwO0IQADodkuOhEHAMQIQ/znGC0dbj0CgsvOkzZVQGnDzOt168cJ6CSIjEAABENCYAFdtmjljhsZe9XFXo2ZNGjZ8hD7O4dVSBD799DOqVbu2yJymTZ2iS1zSWrZJq+6lC3QXOpUmADx+4rhqGrwzX5JBQKXfangqAmFuYyTFzp8/R3wjQ42FhYXSnTt31LjQdCxvnMicOYumPt3dWRlUVTTtKXD61CnTxq5F4Hv37KGuXTpT0SKFaczoX+nG9etauIUPEAABEAABixOoWKkSJU6cWGSWu3btpLZtWtOTJ09Exqd3UJI2U+mdqxb+N/n7E3fBkWC8YblLV/urAKZOndqptsF65cpVpPFeUi+68OuuBORcHXPXFUDeICCYAMR/ghcHoelO4PrLFzTwxnVqqbT7Pfz0qe7zYQIQAAEQsBKBMWN+pQcPHpgiJRZ2dfXqZopYEaRrCJQoUYK+/+FH10wew6yHDh3SrVXLyRMnYpjd2Kfz5ctPadOmNXZSN5ktd+7clCFDRjHZvn79ms6cPq06nhPH1YsIVQfxloNKlSq/9RO+1ZIA30yUZKdOaiM+lSbErlipoiTMpo+lbJmyps/BXRM4KUxgbsQ6cLVprnZTulQJqlu3Ni1f7kcvsEnWCPSYAwRAAAQsQ6BO7boiczl39iy1ad2KHj9+LDI+I4IqWAgVAB3hzNcsfCf5OjJE12PbtWtPCRLY17GkffuPiKtxSjFfH28poSAOELAMAQgALbOUSAQEtCUA8Z+2POHNPASevX5FvvfuUu3gIPJ79JC4/S8MBEAABEDAMQI3b94kbgVsFvv119FUvXp1s4SLOA0kkDx5cqUVxQyKFy+egbPaP5Ve1f84grCwMLp//779weh8JFf3atS4ic6zuKf7xk2aiko8JCSEHj58qDqmU8IqNNWoUZO4FTBMWwJc8aCJsHP4pEbn3onjsoTYjfEarNnJGzduXKpZq5Zm/uDIWAIsUucbv+5gR44coS8+70X58+WlQd99S+fPn3eHtJEjCIAACICADgSqVq2qg1d1LrniX6dOHenRo0fqHJl4dMKECalkyVImzsA1oS+YP4/u3r3rmsnfmzVlypTUvHnz9x7974/82VlS+989e3YTv9eEgQAIaEsAAkBtecIbCFiCAMR/llhGJOEEgQBll1edkGAac+c2PXGTi7lOYMIQEAABELCLwOTJkzSp4GTXZCoPihMnDs2cNYeKFy+u0hOGW4kAXxgbN/4vypEjh8i0WGi7dOlS3WLjG9uBgUd18++M4xYtWjgzDGNiICCN69Gj2lwAPnLkcAyZG/t0ggQJqH6DBsZO6gazlS5ThrJkkdWaVqtz7/CRQ6JWsHr1GpQsWTJRMZk1mAoVKlKKFCnMGr7bx82Vzq0shHuqdMGYN28u1axRjapVrUxz5symp0/D3X7dAQAEQAAEQMB5Atx29EOl8rw0GzzoOzp9+pS0sAyNp3yFCqIqwhmavIrJWDw6c+YMFR60HWpPd5ty5coTd4CQYj7eqP4nZS0Qh7UIQABorfVENiCgmgDEf6oRwoEJCZyMeEbtroTRJ9evUhhamJhwBREyCICARALPnz+ngQMHSAwt0piSJElCS5b6Ud58+SJ9Hg+6HwFu+yu52pGP0iZD75ux+/buFbXwnp7lKGPGTKJiMnswefLmpfz5C4hKY8/u3ZrEExQURNevXdPEl1ZOmjeDiFUrlm/8tGje8s23Ir6+evWK9u/bp0ksWv0uaBKM4oRFrPXq19fKnVv7adSokVvnb4XkDx48YIU03snh0qVL9OMP31Ohgvmp12ef0sGDB995Hj+AAAiAAAiAgLMEypQpS7zJUpIdP36MZs2aKSkkl8TCm3xgzhGY5OtLfP1bgpUqVYqKFSsWbSidO3eJ9nkjn+TOD2vWrDZySswFAm5DAAJAt1lqJAoCMROA+C9mRjjCWgTuvnxJw2/dpOZhoXQAu5mttbjIBgRAQASBv//eRitWLBcRiz1BpEqVivz8llP27NntORzHWJhAz56f0pdffiU2Q648M0Wpsqm37d0nSwDIbYCbNWumd9pu5b9lC1niKYa/b7824imtfWlxYlRT2s3z3xqYNgRix46ttP+V1RqcK4jwa7QWJlHE2qxpzK2ltMjdyj745jeElOZf4f3795s/CSWDl8p1sXXr1lLLFs2oVMni9Oeff9Dt27ctkRuSAAEQAAEQkEOgSNGicoL5N5JB331n+zsoLjCDA6pVs5bBM1pnuqtXr9CqlSvEJNSlq1eUsXD18cZNGkf5vNFP8DXNFyjGYjR2zOcmBCAAdJOFRpogEBMBiP9iIoTnrUTgudLSbtb9+1QjJIhmPrhPL9Hu10rLi1xAAASEERgyeBBxWwSzGFcXW7FyNWXLls0sISNOjQk0VwRRI0b+rLFXbd3xhTKtBCbRRXZAubnNrYAlWadOncVVDpDEx5FY4saNS+0/+siRIbofy1UtA49q13paWhVLZt6uXXvdObrLBHXq1KX0GTKISnevxpVT9+zdIyq/6jVqUObMslouiwJkRzCVK1dBNVs7OEk/5ICGYnVX5Hrjxg36/bcxVKxoYWrfri1t3ryZuIIpDARAAARAAAT0IJAnTx493DrtMzDwKPGmZXe3EiVKUG5ha2O2NfH2nigm5FatWlOyZMkijad1mzZKRfeEkT5n9IN8nwDVN42mjvnciQAEgO602sgVBKIgAPFfFGDwsCUJ7Ax/Qo3DQmjY7Zv0EBc3LbnGSAoEQEAWAS7p/+OP38sKKoZouALgmrXrKWfOnDEciaetRqC6Up3L29uHuNKcVAsPDydu/2uE3b17l06cOG7EVHbPwW26a9WubffxODBqAs2aNxcn5GHxVERERNRBO/jMjh3bHRyh/+GffvYZsRAQpp7AF717q3eisYcd27U957Ztk3Vjks/dT3r00Jiae7n7+JNP3Cthi2Z7/PhxunPnjumy2717F3Xv7kWFCxWgYcN+otDQUNPlgIBBAARAAATMR0CaAHDOnNnmg6hDxO3by9oQqEOKurs8cOAA7d+nXRcDNQEnSpSI2rRtG6kL3kwrxRbMn0f37t2TEg7iAAHLEZB7V8NyqJEQCMgkAPGfzHVBVNoTuPj8OXW/doW6KGW5z2t4U1H7SOERBEAABKxHYMrkybRnz25TJZYlSxZFBLgOO2FNtWrqgm3QoCHNm7+Q4sWLp86RzqOnT59GN2/e1HmW/7nftGnT/34Q8t0XX8gT/QhBY3cY3IJSIsctSgUiLS0wMNDQ3xd7YufqaU3RytoeVNEeU6p0afL0LBftMUY/ya00t24N0HTaTf4bNfWnhbPOnbtQkiRJtHDldj74/WXduvXcLm8rJszV8rZt22qK1B49ekTTp02lCuXLUf16dWnpkiWaiu1NAQFBggAIgAAIuJRA9uw5XDr/25M/V+4TLVm8+O2H3PL7+AkSUIuWrdwyd62TllQF0Mur23/SK1WqFBUsWOg/j7viAe4y4uPr44qpMScIuA0BCADdZqmRKAj8lwDEf/9lgkesR+C+clF2zJ3b1Cg0mLaZqAWl9VYCGYEACLgzAb5B9sXnvYhbO5rJMmTISGuVSoB8oQRmbQJt27ajGTNnUfz48UUnym1/fxsz2tAYtRZkaRF8xYqVqHjx4lq4clsf1apVo0KFCovLX2vBKf/9CdiyRVyen3/+hbiYzBaQRAHr4cOHNa8IxpWUz5w+LWp5kidPTh06dBQVk1mC4RtysWPHNku4iDMGAlsDtBX8xjCdw0+fPn2K+vfvRwXy56W+ffvQyZMnHPaBASAAAiAAAiCglkDChAkpadKkat1oNv7EiRPE3Q7c3Vo0b0EpUqRwdwya5L9q1UoxVZXz5ctP5ctXeCevjoKq//E1xnNnz74TH34AARDQlgAEgNryhDcQMA0BiP9Ms1QI1EkCr5Rxyx8+pDohQeR77y5FKDtLYCAAAiAAAq4jcP78eRo5YoTrAnBy5jRp0tDKVWuoXr36TnrAMOkEevTsSROVtr9x4sSRHir98cfvmotLYkp67949xJVjpFnffv2lhWSqePr1HyAu3mvXrtKpUyc1j2vzFnlVLIsUKUq169TRPFd3ccg3NbhqqzTbslmfc81/k7+0VOmzXp8TVw2B2U+AqyZ2UqonwqxDYMuWzcRVTKQZt/lt2KA+lfMsS1OnTKaHyrUxGAiAAAiAAAi4ikD69OldNXWk8x7YL6Nda6TBGfQgb0j5qk9fg2az/jQvXrygyZN8xST6dhVA/gzSokVLMbF5+0wUEwsCAQGrEoAA0Kori7xAIBoCEP9FAwdPWYLAHqXCVOPQEBpw8zrdVtowwUAABEAABGQQmDhxAh3Yv19GMA5EwbuVZ8+ZS17dujswCoeagcDAr7+hUaN+JW6HKt2uXAkjH29vw8OMiIggf4EtKBs2bESVKlU2nIcVJmzSpOl/doRLyGvtmjW6CCn8N24kbvMkzYYPG0Fx48aVFpYp4hkx8meRVdTWrFmtC7+VK1fo4leN06xZs9Jnn/VS48LtxnLVytSpU7td3lZOODQ0lI4cOSIuxQQJEtKuXTvFxYWAQAAEQAAE3JNAypQpRSV+8OBBUfG4Ihi+JpA7d25XTG3ZOWfOnEGPHz8WkV+jxo0pbdq0tlhaKm2eEydOLCIurvwnscuICDgIAgQ0JAABoIYw4QoEzEAA4j8zrBJidJbA1RfPaeCN69RRuUF+JuKZs24wDgRAAARAQCcCLxVR9scfdzNlFQreHfvbb7/Tr7+OgWBDp/PDSLdc7e/33/+gb7/9zshpVc3FFTRd1UZ7uZ+fqtj1GvzzqFEiRUB65auFX67Y9eNPw7RwpbkPP53OM27vtG3rVs3jVeswd5481L37x2rduN34unXrUfXq1cXlfeHCBQoMDNQlLt48wa2ApVnfvv0onbCKLtIYvYmHb8D1QuvvNzgs9ZVbvkmz4sWLUzOlrR/McQLx4sVzfBBGgAAIgAAIREsgfnxZVaOvXr0abbxWfzJWrFjUrz86Kmi9zvfv36f58+Zq7dYpf/x+pkPHTraxktr/+vj66LLp0ylIGAQCFiYAAaCFFxepgcD7BCD+e58IfrYKgXCl5cr4u3eoplL1z+8RWptYZV2RBwiAgDUJXL58mfr2/cq0yX38ySe0fMVKSpcunWlzcPfAkydPTouXLKWuXt1MgyIw8CgtWDDfZfFuVCqoSdnJ/DaEggULoZ3i20Ds+L6X0rYze/bsdhxp7CE3rl8nblmoly1fLlPE+vU33xK3mofZR4BvZAwfMdK+gw0+aoWO5xi3GPXzW2ZwRjFPx+2kBg8eEvOBOIL69x8opvIGlkNbAqsFCgA5Q/7djB8/vrbJWtwbC8wPHjoiUmRucfRIDwRAwOIEEiib0CTZvXt3JYVjeCydu3SlAgUKGj6vO0zo4+NNr169EpHqgAED6cjRY1SiRAkR8dy7d48WzJ8nIhYEAQJWJwABoNVXGPmBwL8EIP7DqWBFAq+VpNY9fkR1QoJpnCIAjBDy5tqKrJETCIAACGhJYMnixTRPyK5IZ/IqX74CBWzdRqVKl3ZmOMa4kECevHnJf9MWqlq1mgujcGxqrpzZ56svib+6yrjy4Pp161w1fbTzDho0GBWooiX0vydz5MihCLD7/e8BQd+tWLFC13OcW7NyO2tpxoJkqRUZpbHieL7o/SXlypVLYmiKQE9fkemypUtE5v3RRx2odJkyImOTEhS/9+jStauUcBCHxgTOnTtHx48f09irencffPABfflVH/WO3MRDlixZaKK3D/HXJUv9aOy48ZQ0aVI3yR5pggAIgIC+BOLEjaPvBA565wrx7mq8+WzIkKHumr7ueXNVeH9lA60ES5gwoajNn7NmzaQnT55IQIMYQMDyBCAAtPwSI0EQIIL4D2eBFQkEPntGba6EUu/r14hb/8JAAARAAATMRWBA/3507uxZcwX9VrSZMmWmdes20DdK9SZuDwyTT6B+/Qbk77+ZcufOLT/YtyKcPHkSHTp06K1HXPPt/PkyWpm8n33q1KnJ29uXPDw83n8KP79FgNteT5o0RWwFKr3PL95tvnbtmreIyPm2ffuPqHmLlnICEhpJsWLFaODAr0VGd+LEcd0FQEePHlVaDB8Vlz+3EOPXFq4GCPsvAeYzbux4QlvR/7Kx0iPz58msZsKif7O973XFecHvkaZMmUYpU6a0Tc/vKTt16kz79x8krgoIAwEQAAEQUEfgxfMX6hxoPNqdrx3w5rM3f+80xgp3/xLw9p4IFu8R4A3N06ZOee9R/AgCIKAXAQgA9SILvyAghADEf0IWAmFoRuDGyxc08MZ1ahkWQoefPtXMLxyBAAiAAAgYS4B3/XXv7kVPTfxazjeLuH2j3/IVlDFjJmMBYja7CXD7s59H/UJz582nZMmS2T1OwoFXroTRiOHDJIRCAQEBFBwcLCKW94OoXr069ejR8/2H8fNbBLj9i9QqXVw56fDhw29Fq8+3s5Ud51Ltt99+p8yZs0gNz+VxJU6cmKZOmyFWRDVjxgxDGM2cKfMc5uqiI38eZQgDs03y+edfUFlPT7OFjXgdJLBo0UJ6/lzexlR+DzxG+fvCQlRY1ASGfv9DpL+n6TNkoHnzF9CfY8ehGmDU+PAMCIAACMRI4JlSyEGSuasArnadOtSuXXtJS2HJWLZt20q8QQz2PwLckSEoKOh/D+A7EAABXQng05+ueOEcBFxLAOI/1/LH7NoSePb6Ffneu0u1g4PI79FD4va/MBAAARAAAXMTCAwMtLU2NXcWRJUqVaYdO3dR6zZtzJ6K5eLPn78Abd4SQD17fmrK3AYOGECPHj0SEfurV69ozpzZImKJLIgffvyJChYsFNlTbv+Yp2c56td/gFgO3ArGCNu6datYEWuKFCnId9IkiDSiOBF+HT2GcubMGcWzrn2YW6QvWbzIkCB4nvDwcEPmcnSSjh07UcOGjRwdZunjufLat98NsnSOSO4fArdu3aKNGzeIxFG5chX69NPPRMYmIah69eoTC3WjMq4S1blzF9q1ey/xhhMYCIAACICA4wTCw2W1/UyttMF1N+NNyxMmeKNzgkEL7z0RVQDfRu3j7f32j/geBEBAZwIQAOoMGO5BwFUEIP5zFXnMqweBgMePqW5IMI25c5sev4b0Tw/G8AkCIAACriKwYMF88vEx/4WAVKlSka/vZFq0aAllyYIqTq46n97My5VOPvusF20J2GpaUZif3zLiXbKSbO6cOSIr3DAjrnIzc9Zs4pbAsP8R4Hbl06ZPF9uqnMVMixcZI55iEevMmTP+B0fYdxUqVCQWssLeJdC1qxdxm2Sptnz5cuIW00bYgwcPlPcZC42Yyqk5/powkfLkzevUWKsNSpQokfLaO4MSJEhgtdSQTxQEpk+bGsUzrn94yNDvqVChwq4PRFgEhQsXoUmTp9glhuDPd0uW+qEaoLA1RDggAALmIMBCeUlWrFhxSeHoHkvs2LGVv3eTKY0bCh91hxvFBEuWLqGbN29G8ax7PXz06FHavXuXeyWNbEHAxQQgAHTxAmB6ENCDAMR/elCFT1cQOBnxjNorre8+uX6VQl+8cEUImBMEQAAEQMAAAkMGD6Lt2/82YCb9p6hVuzbt3rOPPunRg7hFMMx4AgUKFKQNG/xpxMifTXvjPTQ0lPr2+cp4eDHMyC2JVyhiF6mWK1cumjdvgbLuCaWGaGhcSZMmpUWLF4tuUT5XqSpplHiK4c+YPk1sBTWO74svelP3jz/hb2EKAf6bytX/JNvECRMMDW/ixAn0WuimuOTJk9PChYspbdq0hjKRNhlXDGMxJARX0lZG33i2bNlCZ8+c0XcSJ73zJonpM2YS/47C/iHAGyQWKhsQkiRJYjcSVAO0GxUOBAEQAIF3CNy6dfudn139Q5nSZVwdgqHz//jTMKpYsZKhc7r7ZM+ePqVpU6e4OwZb/j7eqIaIEwEEjCYAAaDRxDEfCOhMAOI/nQHDvSEE7r58ScNv3aTmYaG0X2mpBAMBEAABELA2gReKyLtrl84UEhJiiUT5RtIvv4ymbX9vt7UHtkRSJkiCRV+DBw+hrdv+plKlS5sg4shDfKm8D+rxyceGiqIijyTyR//6a1zkTwh5tEzZsmilqqxF3LhxlYqIc0RXwORzncVMRtqdO3do/ry5Rk7p8FyjRv1CdevWc3ic1QYUKVKEpk+fKVpMv3VrAB07FmgoehYYbdwgs9Uog8iRIwfNnTuf4rtx5bs+fftRs2bNDT0vMJnrCbAw13eSr+sDiSKCDz/8kKZMmSa2InAUYevyMFdA8vNb7vQGCVQD1GVZ4BQEQMDCBJ4q93fu3r0rJsNKlStTsmTJxMSjZyA9e35KvXp9rucU8B0FgWlKdehnz55F8ax7PHzj+nXlPdcy90gWWYKAIAIQAApaDIQCAmoJQPynliDGu5rAc+WC6az796lGSBDNfHCfXgqtbOBqTpgfBEAABKxI4Pbt29S+XVt6+PChZdLjSnQrV62mGTNnUfbs2S2Tl7REuBpH8xYtaf+Bg9Sv/wCb8ElajI7E8+cfv9OuXTsdGWLosdy+Y8eO7YbO6ehkjRs3oVGjfrWrpZujvs1wPLf4GT9+AlWrVk10uNzi+tKlS4bHyKJDbgcs1Xj9pk6bTmU9PaWGqHtcXM1z4aLFlDhxYt3nUjPBX+NdI4ge76J57WVVukwZmqy01WQhsrtZkyZNadCgwe6WNvL9l8CC+fNECRzeX5iatWrRT8OGv/+wW/3MVRCXLvNT3a787WqA0t9vudUCI1kQAAGxBFzxuS8qGAkTJqQWyjUkqxtfF+HOGDDXELhx4wYtVVoBu7NNUzowuLsI0p3XH7m7jgAEgK5jj5lBQFMCEP9pihPOXEBgZ/gTahIaQsNu36SHgm/IuQANpgQBEAABtyFw/Pgx6typAz1//txSOfPN4H37D9Lvv/9B3G4Kph0BFhlwu9+pU6cRV+Mwux04cECpHjlKfBq//ya7JScD/PiTT2jsuPFuV+kmXrx4NEX5fWjTtq3o84grJf3x+28uifHChQu0fLmfS+a2d9JEiRLRsmXLqXr16vYOscxxBQsWorVr11OGDBlF53T48GHilp+usJ07dxD/k2yNGjWmWbPnELcedRdr2LARTZ4ylWLFwuV2d1nz9/N88uSJ4ZVt348hpp8/+6wXcZVKdzSu/Ld8xSoqUqSoZunz54+lyt/rP8eOo6RJk2rmF45AAARAwGoELl+6KCqlHj16iq40rhZWgwYNaZKyIQfvS9WSVDfee6L7tr9l4d90pQoiDARAwHgCuCJhPHPMCAKaE4D4T3OkcGgggUuKyOPja1eoy9UrdO55hIEzYyoQAAEQAAGJBAICAqj3F58Ti0OsZCzK6erVjQ4eOkwjfx5F6dKnt1J6hudSsmRJWrRoCW3cuIlYBGgFu3nzptIKu5MpBLD8eyq5SuGb86Fjx042MRz//rmDcSWDefMWUNOmzcSny9X/jhw54rI4R436mbgFsWRjEeC8+QuJhVTuYvx6vnrNWlP8jRw5crhL36uMGC6/ihe3sp6/YBHxa5PVjW+yTps+wy2rHlp9bR3Nb5KvD927d8/RYYYeP2TIUOr+8SeGzunqyTJnzmITlxcrVkzzUFANUHOkcAgCIGBBAidPnRKVVd58+ahzl66iYtIqmJatWtk6kbjTRhyt2Gnthze6b9/+t9ZuTeFv2bKlxFUQYSAAAsYTgADQeOaYEQQ0JQDxn6Y44cxAAg+UKn9j7tymhqHBtFXZJQ0DARAAARAAgTcEFiyYT8OHD3vzo6W+JkiQgD799DMKDDxuq06WO08eS+WndzLcEpOFf5s2B1Ct2rX1ns4w/xEREdSpYwcKDQ01bE61E5lBfMI5shiORVTJkiVTm7Lo8VzVxs9vBdWoWVN0nBwct9/9eeRIl8Z57uxZWrJ4sUtjsGdyvmkzfcZM6mLRm1NvM6hdp45SmXElpUiR4u2HRX6/b+9e2uTv79LYdu/e5bIKhI4kzq0xl/ktJ36Nsqo1b94C4j+rLq4TeT148IB8fLydGGncEBas/frraPqqT1/jJnXhTEWLFiX/TZtI789db6oB/vHnWFQDdOF6Y2oQAAGZBI4edd3mr6iIDBo0mLJmzRrV06Z83Ktbd/L1nWzp6oZmWxh3rQLo4+2+1Q/Ndo4iXusRgADQemuKjNyIAMR/brTYFkr1lZLL8ocPqXZIEPneu0sRFqvwZKGlQiogAAIg4FIC3GLUyq0CWNTRqVNn2rNnnyJOWkCVK1chvhkH+y8Brt7G7Uy3BGyj9es3Wkr49ybbgQP6K+fC7jc/muIrVwDcvHmzKWKtUaMGBWz9mwoVKmyKeB0Nkqumbft7O7FA1gy2bOlSOnnyhMtD/eWXn4nFt9ItduzYxGKC8X9NoPiKiNxqxm2pvv32O5qvCHW56qEZTMomheHDfrQJaqUz8/QsR1u3/U0lSpSQHqpD8fH7Nj53ue26u1SadQiQGx/sPXEC3bp1SzQBPn+///4H+mnYcEu3B2zcuAmtUz4/ZMyYyZD1YK4s2t+5aw+xABoGAiAAAiDwD4GjLqz+HtUapEyZUtnEMdMS7+P4GiN/Zvztt98t/Xc9qrWU/PiGDevp4kVZLbD15sXXCwMDA/WeBv5BAASiIAABYBRg8DAISCcA8Z/0FUJ8kRHY+zScmoSG0ICb1+m28JZbkcWPx0AABEAABIwl0L9/P1q8aJGxkxo8Gwsf6tWrTytWrqIDBw/TV1/1MUXrQyMw5c6dm7hF2bFjJ5RKKpOoePHiRkxr+ByTJ02imTNnGD6vFhMOHvQdvXjxQgtXuvvImTOnrfpL+/Yf6T6XkRN80qMHrV69ljJlymzktE7PFR4eTj/++L3T47UceOnSJaU6go+WLnX11aFDR6XtuT/lyJFD13mMdJ46dWpavGQZDfz6G9PcqOL21VLaOB0+fJi4arIZzNZ+c90G2+YHM8QbU4wsVp05a7bt3MUGjphoud/zXAXwl19GmSLxL77orbyOLKLkyZObIl57g2QhxKhRv9paILqiDTlXlFq6bLlNjJE0aVJ7w8ZxIAACIGBZAjdv3iSuwi7NSpUqRb6TzF0xj0XufE3AHarGSzt/7ImHOyD4+squDm1PHo4c4+PtXvk6wgbHgoARBCAANIIy5gABjQlA/KcxULjTncDVF89p4I3r1OFKGJ2OeKb7fJgABEAABEDAGgT4Ismnn/ZQWgL6WSOhGLJggdL3P/xIx4+ftFUFbNmqFSVOnDiGUdZ6mndgd+v+Mfn7b6Z9+w9S3379LS2I3LJlC3333TemXcTTp08plTqnmSb+BAkS0oSJ3raWOGZvR8kX+efMnacIDEabqmLBuLF/imp1PfrXX+jGjRumOYeLFCmqVFLbTiwGNLvoqE7duvT39h1UvXp10/B/9uwZDRk8SFS8P/30Iz169EhUTFEFw4KcsePG05Qp0yht2rRRHSb+cd6QsHlLADVq1Fh8rAjQdQRmzphO586dc10ADsxcq3Zt5Zzeapkqnfny5acNGzdRj549Xfq3EtUAHTgJcSgIgIBbEJCyieZ92E2bNrOJAPm9qtmMrxvu2LmLSpUubbbQ3SreuXPm0P37990i5+DgYFq7do1b5IokQUAqAQgApa4M4gKBKAhA/BcFGDwsksBTpb3v+Lt3qKZS9c/v0UORMSIoEAABEAAB2QReKhVjP/m4O3HFHXexuHHj2qoCTp48lc5fuGirMNO8eQtKkSKFJRFkz55dEXp+ZquCePbcBRoz5je3uHi5f98+6tihvWkq6EV18v388wi6c+dOVE+LfLx1mzY2gakZRVTcDpar/u3dt58aNGgokm9UQYWFhdJYRQAoyR4+fEjDh/0kKaQYY+EqTdwOePWatZQnb94Yj5d2AItXZ82eY6s4ZZbKlW8YcltPrhwpya5fu6a0+hojKaQYY2nRsiXt2bufuCKrmYSsfFN46NDvaaOySYEFRjAQiI7A8+fPlUrWsgTD0cWbK1cum2jum2++Jf4sYkbjVtwc/7a/t1PRokXFpPB2NcAkSZKIiQuBgAAIgIDRBAICAoye0u75+JrbypWrKX2GDHaPceWBHOfcefOJrxumSpXKlaFgbjsIPH78mGbPnmXHkeY/ZPIkX+Jr+TAQAAHXEYAA0HXsMTMIOEwA4j+HkWGAiwi8VuZd9/gR1QkJonGKADBCqeAEAwEQAAEQAAFnCfANNK+uXch/40ZnXZh2HFcsa9y4CU2dNl0RA16i9es3Ur/+A6hYsWLEQiAzGgsZue3x8BEjaeeu3XTk6DEa+fMoqly5CsWJE8eMKTkc88mTJ6h165b05MkTh8dKG3D37l0aOmSwtLBijIerTb4RUUm6SRxd4GXKllXaGG+xVf0zYzu5gQMGELcAlmZz586hPXt2SwsrxnjKl6+gtKLdaWuVnixZshiPd/UB8RMkoM8+62UTr5qxclpQUBCNHv2rqzFGOv+Ev8YT/10xk/GNSq7I6rd8BRUqVFh86JUqVaZtSvXNPn37uc17FfGLYoIAN6xfr7TkW2WCSP8Jkd+Hf60I6Lg6a7Vq1UwTNwfKf1d27tpji5+FgNLsTTXAXbv3UtWq5mIrjSXiAQEQMC+BzZs3ifw8+IYof97+W3m/J3mjHV8j/KpPX9q37wDVr9/gTej4agICk3x9TL8BOCbM7iR0jIkFngcBVxKAANCV9DE3CDhAAOI/B2DhUJcSOKa0RWpzJZR6X79GV168cGksmBwEQAAEQMA6BCIiIqhjpw6KAG6ddZJyMBMW/JX19KTBg4dQwNa/6XJQCC1dtpwGfv2NTTwnURDEFUQKFixEbdu2o59H/WK7oXjh4mVbi+NevT6nAgUKOkjB/Idz9ajmzZvRvXv3zJ/MvxnMmzeXtm6Vu5s/OtAsouLfp/kLFoptfVeuXHmbSGbDBn/i1pNmND+/ZWLbwHC7+d69v6CnT5+aDi2LHLhVeuCxE7aqRxIrxfJNqp49P6UjR47SiJE/k8S/VTEt/Gulsn2fr3qLFW3zRoneX3xuykoLVapUtb03mDlrtsj3BCVKlKBlfito5arVlDdfvphOFTwPAv8h8PXAgaZp0/0meK5wyec9vzcqUqTIm4dFfq1Rowbx+yOuLPvhhx+KjPHtoLga4DK/5fT7H38SqgG+TQbfgwAIuAMB3gzGIkDJli59epozdx5NnzGTcuTIISZUFulzB4ODhw7R99//QGbYACYGnpBAQkJCLN/dZr5ybdBdWh0LOa0QBghESgACwEix4EEQkEUA4j9Z64FoIidw4+ULGnLrJrUMC6HDJrx5FnlWeBQEQAAEQEASgWfK35dOHTvQksWLJYXlslj4plH16tXp22+/s7XPDQ4Js1XTmzd/gU0kyC1MSpYsSWnTptU9xtSpU9vmat6ipU2M8teEibRV2TkdGnaVduzcRd4+vjYBSOHCRShWLPf9GHr16hVq1rQxcctGK9k/4pgvxYpjYmLNVVnq1q1Hm7dspUWLlth+r1x9nvIF/jp169pEJ2vXrTd1tRiuEvnN1wNjWgaXPn/u7Fmx1d3sAcNtgblqEwsBhwwZStxa3dWWLl06RVj5JR09GmgTgGfIkNHVITk9//z580hyyzJO7ODBgzRJabdkRuPXYK52vH3HTpoxcxaxMNvVrYFZeM03fzdtDjBdJTQzngNWjvnKlTAaMXyYKVPk90b8fp7fG1WsWMnlv5dvIHJF2ZatWtla/S5Z6kdcsclMxq9vXbt6URtlgxQMBEAABNyNwOJFi0yRctOmzZTK5QeUz4hjXPrZijsXfPVVH+VaX6Ctg0GmTJlNwQ9BRk7A23ti5E9Y4FG+LmjWz6MWwI8UQOAdAu7RX+mdlPEDCJiLAMR/5lovd4w2Qnljt+DBA/r9zi16rHwPAwEQAAEQAAE9CXCVmx49PqYHD+6TV7fuek5lSt8s+uB/3GL3beNWs8HBQRQWdoXu3rlDd/jfXf56m55HPKeHjx7SyxcvbdWDHinfJ0+ewjY8gXKDjf+xscCEq0ulTpOGuHUfi/5SpUxFGTNlMmVFJ1tSBv7H4r/GjRoSt5G0ol2+fFnZiT7UdoHczPnVql2b+B/fsF+0cKFSrXIesTjMKOOKme3at6dWrVoTC6isYAMH9qcbN26IT2X8uLG2dk9c8cusxtX1uCIgtyndtWsnzZs7l1auXGFY9an48ePbxLTt2rWnGjVrWqJVKr8WDB70nSlOiWE//Ug1qtegPHnzmiLe94Nk4XWTJk1t/y5evEgsvJw/b57y3iX0/UN1+Zk3THDF4o6dOlPu3Ll1mQNO3ZMA3wxt0LChTURnNgIsVnvz3ujChQs0Z85sWrpkMXEVGyONXx/473Pr1m2pVevWts8kRs6v9Vz+GzfStKlTtHYLfyAAAiAgngB39bh16xalUa4rSTeutt7940+oq1c3WzX72bNn0daAAOLrknoabwasXLkyNVM29bZQNtkmTJhQz+ng20ACe/fssW3c4s3aVrNN/v507tw5q6WFfEDAlAQ8pkyZ/Er5I+bhTPR//PE7XVIuyMBAwEwEqnaaR/ETpzJFyBD/mWKZ3DrIgMePaZgi/AvR+UOPW0NG8iAAAiAAAlESGDr0e5vIIcoD8AQICCHAApJGDRsQCxqsbHyTmCtQcsUYK9mJE8eVFsdbadu2rbRr5056rLwH1sq4dU+FChVtFf6qVq1qWuFOVDwWLJhPn/bsEdXT4h7PmTOnUlFoh6Xa8nGrrZ07dijncIByDm8jPp95d75Wxi0XKyttXPn8rVSpsulFGW9zefnyJTVp3Ih27tzx9sOivy9atCht9N9MfMPSCsYtug8prc62BmyxvQ7v37+PIiIiNEmNBUWFCxemaopokisqe3qWo7hx42ri2yxOhgweRH/9NV63cDNmzEQnT53Wzb+jjjt2+IhWr17l6DBNjufWrzt37bHMppljxwJp/bp1tr8rhw4dJP5bo7VxG0bPsp5UtVo1qq9sbkqfIYPWU7jEH28Kqlypok0A45IALDApv9/g1uxSrFDBAoaJ1aXkjDi0J8Dv4bjqqhTj1yl+rdfDhg0fQZ9//oUernX3efv2bdt7iS2bN9s+Xz1QCmNoYfw3r5zyXrS60tq+YcNGtk23Wvg1o4/8+fLStWtXzRi6XTG3aNmSpkyZZtexZjqoRfOmtGXLFjOFjFhBQCyBHB/koL59+zsVn3K95DUEgE6hwyAzEzCLABDiPzOfZdaP/YJywX2EIvzbrlQTgoEACIAACICAKwl89lkv4ouHfBMXBgISCXDlIhb/Xbp0SWJ4msfEO/l37NhlmZu07wPi3f5HDh+mU6dP0XlldzPvcD537ixdv3492iprXJktg3LjOk+evLbKUrkU0VSBAgWJb/TEjh37/Wks8TMLXqtUrhgtF4mJcvW6id4+EkPTJCauuHFIaRd75uyZ/z+HL1y8QPfv3aNnz55FOgdXoeAKsDly5FDO3zzKeZyH+BzmakyZM2eJdIwVHvxtzGgabsLWnV9++RX98ONPVliC/+TAFY0PHNhvq8x6+syZ/2PvLsCsLNYAjr8sXaKAgIggWKCCtCgo3QoordJSAjZhcG1FrwkIu4TSgkGpIHilpLtLETZZNtju4M4cBREX2D35xX+e57Anvpl55zdn2RPvN+P4qf8f1isbp6bmnICk/489//y9447qjkTrO9QqifXq1Re96p+dCwmA3p19q/59yczMVEkiB+TgwQOO30n99yU4KFiio6McSW46kfdyRSfdli17vdxwQwW1ivnNon8376heXb0+qi1Vq1a9XDXT3q8Ty7t07qReKxsnyceMmCQAmnHWiPlqAnZKANRJ8bv37DP9auH675v+nEf//Tt06JAcOnjQ8dlArHpfFRcXl+NJK3pLX/3+SZ94pi965e6GDe+VW2655WpPEds8bvUEQP3aR2/pbKXtnI8dPSr33XevW080tM0TnoEikIOAqwmAbAGcAyp3IeBrAZL/fD0D9H85gVj1pmay2ipwXkK8ZLlx1YjL9cf9CCCAAAIIXE1gypTP5dSpUzJ9xkwpVqzY1Q7ncQS8KhASopP/Ojieo17t2Ied6eSiIUMGy+IlSy2Z2KY/rG3QsKHjkhOz/qA/KSlRfdifoVbgKqhWkispepU/u5XU1FR5ctAA0yX/6XnS2442a9ZcevTsaclp00m6bdq2dVwuHaBeWU2vcKmfx7qUKFHCcTm/Ffylx1v59pYtm2XChPdMOcRJkyY6thpt1bq1KeO/UtD6td6DDzZ1XC49TichJSYmOp6/epVLfaxOvmbbtEuluO0rAf335cGmTR1bTfsqBk/0q5PE69Sp47hc2r5OjtCrI+kE3dTUv5PM9e+nXqlUJ+faqfz3vx+Q/GenCWesCCCQo4DeRn75sqXyqNre1sxFn4isE/f0pXPnLv8ail4dNy4uVn0uUkCKFy/OZ5b/ErLnHfqk0unTp8trr71uGYCAAH+S/ywzmwzECgIsk2GFWWQMlhIg+c9S02mZwWSoD88XxsdJm+BAma1+kvxnmallIAgggIAlBFas+FFtC9VW9HZKFASMIqDPgG3fro2tkv/O22/YsF7eeP218zdt9bNUqVKOM7n1Smn6jG47Jv/pCR/94guyR62UaNbyzDNPy/79+8wavtNx62QMvSqFfv7qi04WtGPyn3490b9/P9EJZWYsOuFmyJAnJTAw0IzhOx3z+ZUqq1Sp4nj+litXjuQ/pzWp6CmB5597Vg4fPuSp5g3Xrk6O0El+FSrc4Pi91H9b9EX/ftot+W/durXyoUoApCCAAAIIiLz/wfumfa2d2/nTJ6Hov396xWlOWM6tmj2Omz3rS9EJolYoMTExsnDhV1YYCmNAwDICJABaZioZiBUESP6zwixabwybUpKlc0iwjI+KlBi1VQUFAQQQQAABIwrs27dPWrZoYcuEDSPOh91j2r5tm7RXSal6BUC7lsmTJ8nixd/Zdfi2HvcXM2fIvHlzTW2gVyrq88Tjjm1FTT0Qgs+zgN4GuW/fPhKhtvU2c9FfxPTt8/hlt8U189iIHQEzC+gve/up/2MSEhLMPAxiz6OA3qp8gEos11sAUxBAAAEERI4fOyZzZs+CAgFbCjiS5tTK0FYoc+bMtkwyoxXmgzEgoAVIAOR5gIBBBEj+M8hEEMYFgVNqKeqnz4RLf7X6wW8Z6Rfu5woCCCCAAAJGFdAr9nRo306WLFls1BCJywYCP/20Um3/0kn0B3p2Lnr7xVEjR4hOzqXYR2DTpo3y0kvjLDHgoKAgx5f1eltcin0EXnzhedm5Y4clBrx//34Z8dRTbMdkidlkEFYS+P3332XQoAEkg1lpUq8wFv2eoHevHhIbG3uFo3gIAQQQsJ/AhAnvSWJiov0GzogRUAJT/aea/n2aXjF/xvRpzCcCCBhMgARAg00I4dhTgOQ/e867UUcdr7YL+vBstHQMCZKVSbwBM+o8ERcCCCCAQM4CSUlJMnBAf3lp3FjJUMnsFAS8KaDPfNWrhunVwygiycnJ0rNnd9GJVBTrC+htr594/DGxUsKc3s766adHmv6Dees/+9wzwg/en2D61SsvldArsb799luX3s1tBBDwscDPq1fLyy9bI2Hex5SG7j41NdXx3uDEiROGjpPgEEAAAV8IREZGyqeffuKLrukTAZ8L/Hb8uPzyv//5PA5XAvjhh+9tvfOJK3bURcCTAiQAelKXthHIhQDJf7lA4hCvCGSrXpaqLUjaBgdKQGyMpKtVWygIIIAAAgiYVcBfnUn58MMdRa8KSEHA0wJ6O6/xr74izzw9SvQZsJS/Bc6Eh0v37l1Z9eRvEkteCw8/bdl5XrRwobz77juWnDcG9bfAggXzRa9CYsXy8UcfWi6x0YrzxJjsJzAtIECmT2PVFKvOvH5/8OSggaJXR6YggAACCOQsMOXzyRIYGJjzg9yLgMUFpk793NQj1J+9UxBAwHgCJAAab06IyEYCJP/ZaLINPtTtapWaLiHBMjryjESpD6goCCCAAAIIWEFg29at0vTBB+TXXzdYYTiMwaACejuvnj26yeTJkwwaoe/DOn7smPRSW5/pFQEp1hPQW9t179ZNgoODrTe4v0b04X8/IEnDsrMrsuqnn+TZZ5629EqPzz/3rKxcucLCs8jQEDCnwEsvjRW9UifFWgLn1EnVzz37jPz44w/WGhijQQABBNwskJKSIsOGDhGdNE1BwG4Ca9eulaNHj5hy2Hv27BH9uTsFAQSMJ0ACoPHmhIhsIkDyn00m2uDDDM/KlDERZ+SJsFA5kp5m8GgJDwEEEEAAgbwL6C1FHunSWd566022BM47HzWuIqAT21q1bC6//PLLVY7kYf3BYK+ePdge2WJPhfj4eOnW9RE5ePCAxUb27+GMHTtaZs+e9e8HuMfUAmvWrJF+/fpY/jVCRkaGDBjQX9avX2fq+SJ4BKwmoBMedOKD3hKYYh2BV195WebOnWOdATESBBBAwIMCW7dukU8+/siDPdA0AsYU0CcM+E815yp6/v5TjIlKVAggICQA8iRAwAcCJP/5AJ0u/yGQql5YToo5K62CgmRJYoKw2e8/eLiBAAIIIGAxAf3Fmt7+rk3rlvLb8eMWGx3D8ZWAXtGjVasWcuLECV+FYLp+9Wqcjz/WWyUBppoudgL+t0BSUpJj29/du3f/+0EL3qM/nNerqH311QILjs6eQ9q48Vd54vHekpZmj5Ph0tT/vfr/4O3bttlzwhk1AgYV0Am6OhFZ/59EMbeAfq0wbtwYmTLF3Fv6mXsWiB4BBMwo8MEH78uuXbvMGLrpY/72m29k5IinTD8Osw5g0aJFEh0dbarwz4SHy9IlS0wVM8EiYCcBEgDtNNuM1RACJP8ZYhpsG4RO9FuZlCjtggNlokoATDuXbVsLBo4AAgggYD+BvXv3StOmD8iM6dMsvc2f/WbWuyPWyWtjxrwofZ54XBISErzbuQV606tt9e7VU3TyGMW8Anrr60ce6Wy7RKLs7GwZNXIEKwGa96l7IXK9cmvPHt1Fbztmp6L/7+2qVu3cvHmTnYbNWBEwvID+v6hH926it4KjmFNAJ/+NHv2iBPj7m3MARI0AAgj4UEAnww8d8iSfE3h5DvT2s6NGjZQVK370cs90d14gNTVFZn35xfmbpvg584uZkp6ebopYCRIBOwqQAGjHWWfMPhMg+c9n9HSsBA6qVQ16hYXI02fCJTQzExMEEEAAAQRsKaC/XNNfzPTo0U1CQ0NsacCgnRfQK0i2ad1Kpk8jidR5RZF169ZKly6dRCeRUcwnoM/2fqhjB9mxfbv5gndDxHpV2eeefUYmTvzMDa3RhC8ElixZLI/17inJycm+6N7nfSYmJqqtux91/F/s82AIAAEELgjo9ym91f9Nq1etunAfV8whkKk+Z31aJVDMnDHdHAETJQIIIGBAAb27woAB/UT/n0rxvIBOPBs4YIDaocFeJ0R5XjbvPcyYMcM0CXX6pGizJSzmfUaogYC5BUgANPf8Eb2JBEj+M9FkWSzUSPWGaXxUpHQNDZbdbLdmsdllOAgggAACzgr87+efpdG9DR0rNOhkDgoCVxNYsGC+NGv2oBw4sP9qh/J4LgR27tghHTu0l/Dw07k4mkOMInDy5Elp376tHDp00Cgh+SQOvcrPa/8ZL2+8/horyvpkBpzv9Eu1usLgJweZ5gsW50d65Zo60aiXWo1Vb2dPQQAB4wjorbr79Hlcvvn6a+MERSRXFNDJ5I+r7eTnzZt7xeN4EAEEEEDg6gI/r14tLzz/3NUP5AiXBV599VU5cuSwy+3QgOsC+pWhXMcAAEAASURBVHMxs2yp+91330pkZKTrg6YFBBDwmAAJgB6jpWEE/hYg+e9vC655TyBdfSk1Jy5O2oQEycL4OGGzX+/Z0xMCCCCAgDkE9Ao448aNUSu6tZSDBw+YI2ii9LqA/iDu8cd6y4inhtt2tShPoR8+fEhaNG8u+/bt81QXtOtGgS1bNkvrVi1EJwFS/hT49NNPZNBAVk0ww/NBb9/8n/GvyvPPPSsk/v85YzrRqF/fPjItIMAMU0iMCNhGQG+pNnToYPnk449sM2azDlR/Af7wQx1YtdGsE0jcCCBgSIE5c2bLfz9435CxWSUofRIQq9YaazanTv3cWAFdJhr/qVMv8wh3I4CAUQRIADTKTBCHZQVI/rPs1Bp6YGuTkqSdSvx7KzpSEtUXHRQEEEAAAQQQuLzA7t27pXmzpvL6a/8hwevyTLZ7RK/wpVfy0CtFrljxo+3G760Bnz4dJh3UinKsQuUtcef6WbjwK3mkS2eJjo52rgEL19LbyT78UEeJOHPGwqM099CS1PvjPk88LpMmTTT3QDwQvU6GHDt2tIx/9RXRSZIUzwvo7dOXLl3i+Y7owdQC+nXom2++4dhyPiMjw9RjsWrwetWktm1aiX4vSUEAAQQQcK/Ae++9K/Pnz3Nvo7TmEDh29Kg8NXwYGgYT2Lt3r+iTLo1cNm78lRPojTxBxIbAXwIkAPJUQMCDAiT/eRCXpnMU+EOdJTwwPEyGnDktwXxAmKMRdyKAAAIIIJCTQGZmpnz22adSv15d+eqrBXwJnhOSje4LCgqSro92kVEjR0icWlGZ4lkBvXVa3z5PyIQJ7/G751nqPLeukw5eefklGT5sqKSlpeW5vl0q7Ny5U1q0aC46sYdiLIHff/9dJWi0JpH7KtMyefIk6d27J3/zruLk6sObNm2UTp0edvy9c7Ut6ttDYNasL6VL504SERFhjwGbZJQ6+b91q5asimyS+SJMBBAwn4BOhH961Ej58ouZ5gvewBFHRUVJr149JD4+3sBR2je0KZ8bexVAVv+z73OTkZtLgARAc80X0ZpIgOQ/E02WBUKNVWfqvx0VKR1Dg+VX9QUqBQEEEEAAAQScE9CrkekzYVu1bG74My+dGyG1riSQqrZD/OjD/8p9jRrK2rVrr3Qoj7lZQK889b5KAOzW9RHRH0pTfC8QFhYqD6lt7aZMMfaH0L6X+jOC0NAQ6dixvfj7syWOUeZEr7LWonlTOXTooFFCMnQcq1etkpYtmoleFYTifgG93f1jvXtJamqK+xunRUsLbN68SZo1fVB27thh6XGaYXB61dTX/jNeBg0cIHp1WQoCCCCAgOcE9GcEzz//nHz80Yee68RGLeu/W71V8t+pU6dsNGpzDXXlyhUSGBhoyKD18+ann1YaMjaCQgCBfwqQAPhPD24h4BYBkv/cwkgjuRDIVGdCLYyPkzbBgTJb/dS3KQgggAACCCDgusCePXvUtqTtZED/fnw45jqnKVr4/vvlarvfBvL222+xFbQPZ0wnXjZ98AHRW4tQfCegE4H0PGzfts13QZiwZ71i4kvjxkq/vn0kJibGhCOwRsg6wWrMmBcdf8MTEhKsMSgvjeLEiRPSqlUL+XrRIi/1aI9u9EqU3bs9ymor9phuj4xSn6Skk8z1ap16VSSK9wV0or9ejXHixM+YA+/z0yMCCNhY4K233pTxr77C/70uPAf0ya76RBS9cj3FuAL6RIMAg55QOH1agOj4KAggYHwBEgCNP0dEaDIBkv9MNmEmDndzSrJ0DgmW8WrlvxheeJl4JgkdAQQQQMDIAnr1oIYN6skzT4+S4OBgI4dKbE4KHDly2PFlnt6C1qhn2jo5NNNW0yvPdVZbJL76ystqpaRU047DjIHrVQGee/YZ6dmzOysxujCBy5cvk/vvayS//O9/LrRCVWcE9u7dK03VSlnTp01zpjp1lEBiYqIMHTpYhg0b4rgOimsCegVK/TctMjLStYaobXuB9PR0RwJE10e7yJnwcNt7eBNg8eLvpEnj+zlBxZvo9IUAAghcJKAT4PXr05QUVlK+iCVXV/XJUX37PiEbNqzP1fEc5FuBefPmitFOYtPvD3VcFAQQMIcACYDmmCeiNIkAyX8mmSiTh3lKrSrx9Jlw6afO/j2ekW7y0RA+AggggAACxhfQKzrNmTNb6ter49h+RK/+QDG/wB9//CHDhw2VB5o0lvXr15l/QBYbgd7u5/PPJ0vzZk1Fr8hJ8bzAli2b1e/D/TJr1pee78wGPYSHn5bu3bvKCy88TxKVF+Zb/63+4P0J0qZ1Szl+7JgXerR+F4sWLlQrgTZhJVAXplonAbdr20Z0YjsFAXcJ6NWSGze+TxZ/9627mqSdywjEx8c7Ek70lr+xsbGXOYq7EUAAAQS8IfDN119LyxbN5bfjx73RnSX60Ilk3bp2lZ9Xr7bEeOwwCD1nRku2WzB/PiuZ2+HJxxgtI0ACoGWmkoH4WoDkP1/PgPX7T1ZbfEyKOSsdQ4JkZVKi9QfMCBFAAAEEEDCYgF5148svZkq9unVk9OgXWS3OYPOT23CCgoJk1MgRcm/D+rJw4VdsYZFbOB8dd/ToEWmttqMcN26M4c6C9hGJ27vVW9U+PWqkdOzQXk6ePOn29u3coN6m8YuZM9T/Nw1EbzNO8YyAI3n1gcby3nvvik4EpLhPQCfLt2/fVl5+aRwrruSRVf/u9+rVgwTgPLpxeO4EoqOjZdCggY7nGCcn5c4sr0ctW7ZUGt3bkC3R8wrH8QgggIAHBfQODs2bN5Vvv/nGg71Yo+nTagGRhx/qIJs2bbTGgGw0Cv35s1GKPjl32jR/o4RDHAggkAsBEgBzgcQhCFxNIH92pjy5d4bcFXnwaofyOAJ5FshWNZaqsz5aBp2SiSoBMF19iURBAAEEEEAAAd8JpKWlyYzp01QiYG3p36+v7Nyxw3fB0HOuBXRi0/PPPetYyVGfTZuZmZnruhzoW4GsrCwJ8Pd3JFHpbbkp7hHQH+QuWDDfsc353LlzRCerUTwjoFf/0tuM62SgU6dOeaYTG7aqt1QdOeIpR/LqsaNHbSjgnSHr/yumTp0ije9vJGvWrPFOpybuRb9OfGncWMfqn0Z/raHnlmJugVU//eRIUtO/oyRAu2cu9XuGbt0edbzP08kTFAQQQAABYwkkJSXJ4MGD5Llnn+FEi8tMze7du6VF8+ayb9++yxzB3UYVKFGihPTvP8Aw4enVI0+cOGGYeAgEAQSuLkAC4NWNOAKBKwro5L/BKvnvbpL/rujEg84J7E1NlZ5hITI68oxEqS8+KQgggAACCCBgHAGdlKRXhmitthts27a1LF++jNXkjDM9FyLRK0P1eeJxR+Lfl19+wZejF2TMd0V/CTugfz9p166N7Ny503wDMFDEGzf+qrZPaiYjnhouUVFRBorM2qH8majRQMa/+gpbCbow1ampKfLJxx85EvHnz59H8qoLlnmpqpNiuj7aRZ54/DFWQb4M3IED+9WXrc3E33/qZY4w1t2ZWZwMYawZcS6axMRExyqdOkmXLf6cM9S1kpOT5f0J78l9990revtuCgIIIICAsQVmzfpSncxW3/FZnLEj9W502kWv7h8eftq7HdObWwT69OkrpUqVcktb7mjELO9r3DFW2kDAKgIkAFplJhmHTwRI/vMJuy06DVcfwo6JOCM9VPKfTgKkIIAAAggggICxBbZv2yb9+vaROrVryQfvTxC24vLtfOkVUPSWMC3U1jAd2reTH374Xljlxrdz4s7et23dKm1U4u2ggQPk999/d2fTlm/r8OFD8ljvXmoroI6yd+9ey4/XiAPUq4NNnjzJkbw2ZcrnopPZKLkT0KupffXVAmlQv568+eYbbAueOza3H/Xjjz84Vhx7++23JD4+3u3tm7FB/dz87wfvq8Tq5qL/nzVLycggAdAsc5WbOH/77Tfp0aObI1FXr/xDyZ2A3mZv+rRpUqfOPTJBJQCm8Tls7uA4CgEEEDCAgD5JUH8W17NndwkKCjJARL4LITY21mGhV0bkPabv5sGVngsUKCDDhj/lShNurXv06BFZv36dW9ukMQQQ8LwACYCeN6YHiwqQ/GfRifXxsFLVtlsBsTHSNihQliQmCJtw+XhC6B4BBBBAAIE8CgQHB8t7770r99Sq6fgC7vvvl7PiXB4NXTn8yJHD8uorL8vdd9VwbAmzZ88eV5qjroEF9Ha1ixd/p5JQGsiQIU/K8WPHDByt70PTq1LpLWibNL5fVq5c4fuAiEDOnj0rr7z8ktxzTy35/PPJkpJCIuDlnhY6qVuv9Hdvw/ry1PBhEhIScrlDud9LAvpLxY8+/K/UvqemfPbZp7Z+/uqEP52U/u6775juNV+m+t2iWE9Ab9XdqmVz6d2rp+zfz9Z/l5thvZr7woVfqdWj6smYMS9KxJkzlzuU+xFAAAEEDC6wetUqx2cDeiVXO56goncnadSoIashGvx5erXwOnXqLJUrV77aYV57PMDfn9X2vaZNRwi4T4AEQPdZ0pKNBPzY9tdGs+29oa5NSpJ2wYHy4dloSVZfaFIQQAABBBBAwLwC+gslvQWXTrjRyWgvvzROdmzfzgcnHphSfZbzzBnTHduZ3n9fI0ciTUREhAd6okkjCujftW++/tqxXZveHlivxkn5W+DXXzc4EgCaPviA6IRknThJMZaATjjQicv31LpbPvzvB2zJfNH06G0t9ZcODerXlZEjnpI//vjjoke5agSBmJgYef21/zhWzpo48TNbrcoYGRkpzz//nDz4QBMx6wkHOrmWYk0B/ff+p59WSrOmDzpOSmL1lr/nWW/1+8XMGY5EkeHDhrKl+d80XEMAAQRMLaBPqNIruer3VXplZjskAp46dcrxfr9/v75yJjzc1PNH8CIjRo4yDIM+YXHRooWGiYdAEEAg9wIkAObeiiMRcAjo5L8he2fI3ZEHEUHALQKH1BZQvcJCZciZ0xKqto2hIIAAAggggIC1BHQy2tSpU6RNm1ZSq+ZdMv7VV2TXrl0k4rgwzdHR0TJ37hzHNi/V77hNXnzxBWGrMxdALVBVb/G8dOkSadu2tSMZVG8Brbd0s2NJVVvXzZs317HaX6eHH3IkAJD4Z/xngk4meuedt+Xuu++UUSNHyMGDB4wftIci1F9k6dUR77qzuowbN4bkDA85u7NZ/YXja/8ZLzXV8/ett9609BeQ+sQDvdpfvbq15csvZopORM9rye+XP69VPHJ8RiYJgB6BNVCj+u+/PimpS+dOjmRVveKdfp1gxxKmPnt94/XXHCdnvfDC8/L777/bkYExI4AAApYXOP9a7XwioL5ttaJPIhs9+kXHCuk64Z9ifoH7728sdevWNcxA5syeZetV3g0zEQSCgBMCBZyoQxUEbCuQLytDhu+ZJjWij9jWgIG7TyBSJftNVNv9fpMQL1msxOE+WFpCAAEEEEDAwAJ628LJkyc5Lnpbh/YdOqgtulpLE7V6TJEiRQ0cue9D09srr1yxwrGK2ZYtm536wt33oyACbwjoZNDBgwfJ2LGjpXuPHvLYY49LrVr3eKNrn/axc8cOWbBgvmNr5Li4OJ/GQufOC6T9lcCpkzjr1KnjeP527dZdrrvuOucbNUFNvSLT8uXLZMH8+bJx468kyZtgznIKUf/f8/FHH8oktRpg+/YdZOCgQfLgg00lX758OR1uqvvCw0/L9OnTZcb0aS6vKFOkSGFDjD05KdkQcRCEdwQOHNgvesW7cWPHqNdHPaVPnz6Wf32kTwZZs+YXWbRwofz44w+m26bbO88MekEAAQSsKXA+EfDjjz+Wzl06S79+/dXOAfeberCBgYHqBOPPZe6cOaLfP7mr6L+X+oRKI5TU1BQjhOH1GEaOMs7qf3qVcP2+h4IAAuYUyDdjxvTsQoUKOfUpzCeffCwn2X7DnDNv46ib9pkrRUpcn2cBVv7LMxkVLiOQoZL9voqPl09ioiVRrVRCQQABBBBAAAEEdPJf48b3S4uWraR1q9Zy2+232x5Fbzehty9dv369/LphPat02P4Z4RrA3XfXlEceeUQe7tRZbrvtNtcaM1Dtw4cPqaSp5Y6kv9+OHzdQZITiToHChQurVWTbSufOXaRN27ZSsmRJdzbvs7b0KlQ6MUMn/v34ww+it/ylWE+gWrVqjmSjrl27me7/X716mj7pYObMmfK9ep66a8tcvcLHjyt8v1rLQx07yKZNGz32pPPz85NrrrnGY+3nteGkpCS3zWFe+zbq8Xfddbfj9VHnLo/IrbfeatQw8xSX/r3dvm2bfPPtN7Jk8Xei31NQrCVQoEABKVGihGEGpbcZ1auRUxBwRSB//vyGeo2fkJBgyZMu9WdtOhGwe/ceUq5cOVemzGt19WrTGzZsEL0i2/ffL7fkvHgN06Ad6ddg27bvFP3a2QhlsXr9NGjgACOEQgwI2FLg5qo3y/PPv+jU2FVC9zkSAJ2io5KZBZr0ninFr70xT0PIp7b9Hcq2v3ky4+CcBdaqDxvfPhslQeoMCgoCCCCAAAIIIHA5gfIVKqitPO6VRvfdJw3Vz1q1aknBggUvd7gl7j958qTs2b3LsT2y/jL6wIEDfJFiiZk13iCqV68hDz38sLRo0UIaNGgo+ktEs5S0tDTZvn2brPnlF/nhh+9JjDXLxLkxTp0M2Kx5c2nXrr00b95CqlSp4sbWPd+U3q5q7dq1snr1KseFpD/PmxupB72qZSeViK0TWe+88y4jhfaPWHRC9Xfqi69FarvUU2pLaneXli1byrff+X6VlQfVCtR6VTgKAlpAnyyhVydv2aKl1Ktf31Svj3Ry5wZ1wtCaNWvUlser2DqepzQCCCCAwBUFdKJV3Xr1pL16T6Vfl+q/gUYqOpl93759snTJYvn666/l9OkwI4VHLG4W+PjjT2TAwEFubtX55tq0aSU7tm93vgFqIoCASwIkALrER2U7CtzfY4qULFMt10PXyX9DVPJfzciDua7DgQhcKvCHWkL7HZX4t8GNy3Jf2ge3EUAAAQQQQMC6AkWLFpW6detJffVlnP7CvMadNeSOO6qLWs3ddIPOzMx0fJl+7NhR2b9/v0r426kS/3azOofpZtIaAevVQ5o0eUAebNpUGtRvILXuucdQv1d6hbR9e/fK9h3bHV9sb960ya1b/VhjFu09Cr26WjOVCHi/2s6qQcOGoreXN1I5Ex4uO3bukC2bN8u6devkyJHDbO9rpAnyYSw33XST+sK1nfo/uInoFfF8uQqLTq7eqZ6nP69eLStW/Ci//fabR2U6dnxI5s1f4NE+ctN47XtqkiiVGygbHlOqVClp2rSZ43ez4b33Ss2aNQ2VEKi3Bzx44OCFpD99coS7Vui04XQzZAQQQMD2ApUqVZLWasX1hur9VN06deVWtWuAt1dj00l+W7dudZzst/rn1aJPnKJYX6Bs2bJy4OAh0TvDGKHs2rVLWrVsboRQiAEB2wqQAGjbqWfgzgrc+8jHcm2FO3NXPStDhu2ZJndHH8nd8RyFwCUCcWr5/0lno2V+QrxkqrN2KAgggAACCCCAgLsE9IqAt956m9x5151SXSUDVqlysyPxo8rNVaR8+QqSL18+d3WV53Z00tLp06cdZykHBQU5vkjXq+kc/+24nPzjD1HL0ee5TSog4A2BwkWKyD0qCVCvUqVXCqyhLtVr1BD9RbinS0xMjCM56tjRo3L4yBHZu2e3I0mW3xdPy1ur/XLlyzuSWXWyhn7u6udwtVtu8Xjiht76LjAw8MJz+ODBg7JDJa4GBwdbC5jReExAb8nWUK3KWrNmLalZq6ZjJRZPbR8bFhbqWFVFr6yydcsW2aa2C9UJRd4qXbt1kxkzvvBWd5ft55ZqN3MCxmV1eOBiAX0yUh2VEKFfI+m/LfqEpOrVq3tlG1a9DeWhQwfVCRH71O/tXsfv7vHjx0SfVERBAAEEEEDAEwIlS5Z0/N3TqwTeWeNOt37Wpk88OXHid8dq/r+rk07069GdO3eKfn1KsZ/AmLHj5KWXXjbMwAcPHiTffvONYeIhEATsKEACoB1nnTG7JFC77XgpX63x1dtQK/89qVb+q83Kf1e34oh/Cehkv29V0t8nMWflbFbWvx7nDgQQQAABBBBAwJMCeotIvQqUvpRRZ5OWvq60lC7916VMGdFnmJYseY0jBL0Cmt4CVV/09fMlKSlRraTx5xdrKSnJkpaWLhkqcS8uLu6vS6zExsZeuH1GnZ2sP7DUiX+RkZHnm+EnApYQ0CtT6d+nSpVuEr1qVcUbb5Trrr1Orrvuz8u16qdOys2fP7/63Sp5Yczx8fGOraz1745O8HNcYv/8GRoS4kiOCgkJFp0oGxUVdaEeVxBwp4BeLVavanHTTZUdz199XT+n9fNW/23Qz+NrrvkzybWYSvIopP6G6KJXU9LbKuqSmJjw93NYPZf1ihRhYWHqORwkQSrJTz+H01TyNwUBdwpUqHCDVK1aVW6++WbH5Xr1vL3++uuljHotU6Z0Gcdz9eL/d3USX2pqmiMxKFr9nxqtTsjUr0n0a5OTJ/+QP9RJCH+cOOHzpLehw4bJhAkfuJMqz21lqc+qypcrK/onBQFnBcpXqOD4u1L5r78vFW64wfH6yPG35a+/L/p39OL3GfpvRYq66L8r+r1GXFysZKqfZ8+edbyXCAkNFf3aKCQ4REJDQxzvN5yNj3oIIIAAAgi4U0C/r9KfB+j3Vddee60UK1ZM9Odv+oRBfTJhEXXRRX9uppY9l6TkJNGfCej3+uGnwyUqOkoiIyIcnxG4My7aMqeAfs4cOHDI8f7GCCMIDz8ttWrezarKRpgMYrC1gKsJgAVsrcfgbSmQlnT26uNWyX+D9kyX2lGHrn4sRyBwicAW9QX529HRcjw97ZJHuIkAAggggAACCHhHQJ9RrLev8/QWdt4ZDb0g4HuBCPUhvb7oM/MpCJhNQK8i6Uh8UslPFATMJKC/hNKXLVs2mynsq8ZaseKNVz3G0wdERkaQ/OdpZBu0r7d515edO3bYYLQMEQEEEEDA7gL6fdUJdTKJvlAQcFWgd6/ehkn+02OZPn06yX+uTir1ETCAAAmABpgEQvCuQFpy9BU7PKe2/X1yd4DUOXv0isfxIAKXCgSq1RE+UmeXr1Sr5VAQQAABBBBAAAEEEEAAAQQQQAABBBC4VOBGAyQAnlar0FAQQAABBBBAAAEEEEDA+wL58uWT4cOf8n7Hl+lRn0g+d87syzzK3QggYCYBEgDNNFvE6haB5PjLf8B1Tq3810et/Efyn1uobdNIilrKe4baxstfXdLVdQoCCCCAAAIIIIAAAggggAACCCCAAAI5CdxQ8Yac7vbqfWfOXP7zUa8GQmcIIIAAAggggAACCNhMoG3bdnL7HXcYZtSLFi2UyMhIw8RDIAgg4LwACYDO21HTpAKJZwNzjPxcdoY8tnu6NIo+nOPj3InApQI61W9ZQoK8HxMtUZmZlz7MbQQQQAABBBBAAAEEEEAAAQQQQAABBP4hYIQtgMPVtq0UBBBAAAEEEEAAAQQQ8L7AyFGjvN/pFXqcFhBwhUd5CAEEzCRAAqCZZotY3SKQHBci57KzJJ9f/gvt6W1/u6uV/xqT/HfBhCtXFtinlkN+OzpS9qamXvlAHkUAAQQQQAABBBBAAAEEEEAAAQQQQEAJFCpUSCpWrOhzi7CwMJ/HQAAIIIAAAggggAACCNhNoHbt2tK4cRPDDHvDhvVy6NBBw8RDIAgg4JoACYCu+VHbhALZKtkvKTZYSpS+2RF9dla6dN0xVZrF/WbC0RCytwXOZGXKR9HRsjQxQdjs19v69IcAAggggAACCCCAAAIIIIAAAgiYV6BGjRqOJEBfj+CPP074OgT6RwABBBBAAAEEEEDAdgIjRz5tqDFPnTLFUPEQDAIIuCZAAqBrftQ2qUBM+CFHAqBe+a/jzgBpSfKfSWfSe2GnncuWWXFxMiXmrCSfI/XPe/L0hAACCCCAAAIIIIAAAggggAACCFhDoFatewwxkJN//GGIOAgCAQQQQAABBBBAAAG7CFSseKN06tzZMMMNDAyUn39ebZh4CAQBBFwX8HO9CVpAwHwCMacPik7+a7VzqnSMPWa+ARCxVwXWJiVJ2+Ag+fBsNMl/XpWnMwQQQAABBBBAAAEEEEAAAQQQQMA6AjVr1jLEYE6ePGmIOAgCAQQQQAABBBBAAAG7CDw1YoQULFjQMMOdOvVzycrKMkw8BIIAAq4LsAKg64a0YEKBs6EHpNm2yfJIAttdmHD6vBbywbQ0eTs6SnalpnitTzpCAAEEEEAAAQQQQAABBBBAAAEEELCmQK1avk8AjI2NlZiYGGsCMyoEEEAAAQQQQAABBAwoUKJECenTp69hIktMTJSvFiwwTDwEggAC7hEgAdA9jrRiMoG0pCi5K/qwSKHCJouccL0hEKPOdvhcbfU7LyFestju1xvk9IEAAggggAACCCCAAAIIIIAAAghYWqBIkaJyT23fbwF87OhRSzszOAQQQAABBBBAAAEEjCbQv/8AueaaawwT1rx5cyU+Pt4w8RAIAgi4R4AEQPc40ooJBf6ntnW9kwRAE86c50LOUMl+X6kXO5/GREtCdrbnOqJlBBBAAAEEEEAAAQQQQAABBBBAAAFbCTRu0lh0EqCvy/79+30dAv0jgAACCCCAAAIIIGAbgQIFCsjQYcMNM95s9R34tAB/w8RDIAgg4D4BP/c1RUsImEtAJwBSEDgvsCklWTqFBstb0ZEk/51H4ScCCCCAAAIIIIAAAggggAACCNhewM/PTwoWLGh7B1cBWrZs5WoTbql/8OABt7RDIwgggAACCCCAAAIIIHB1gc5dukilSpWufqCXjli16ic5efKkl3qjGwQQ8KYACYDe1KYvQwkcSU+TkMxMQ8VEMN4X+CMjQ54MD5P+p8Pk9/R07wdAjwgggAACCCCAAAIIIIAAAggggIABBUqVKiXD1EoVu3bvlX5qyyqKawKtDJIAuH//PtcGQm0EEEAAAQQQQAABBBDItcDw4SNyfaw3Dpw6ZYo3uqEPBBDwgQAJgD5Ap0vjCPyYmGCcYIjEqwKxannjN9Vqfx1DgmR9crJX+6YzBBBAAAEEEEAAAQQQQAABBBBAwKgC9erVk6n+AXL02G/y3oT35eabb5bhw5+S/PnzGzVkw8dVpUoVue32230eZ6Y6GfrI0aM+j4MAEEAAAQQQQAABBBCwg0CTJg+Ifn9llHL48CH59dcNRgmHOBBAwM0CJAC6GZTmzCWwKCFess0VMtG6KKDne2lCgrQNDpS5cXGSee6ciy1SHQEEEEAAAQQQQAABBBBAAAEEEDC3QJEiReXxx5+QNWvXy/9+WSu9evWWIkWKXBhUtWrVpFOnzhducyVvAr16P5a3Ch46ev/+/ZKWmuqh1mkWAQQQQAABBBBAAAEELhYYOXLUxTd9fj3A39/nMRAAAgh4TqCA55qmZQSMLxCstn/dnJIiTYoWNX6wROiywNbUFHk7KkqOqe2fKQgggAACCCCAAAIIIIAAAggggIDdBapWrSp9+/WXPn36SpkyZa7I8fIrr8r33y8XvYocJfcCfn5+juTK3Nfw3JFbtmz2XOO0jAACCCCAAAIIIIAAAhcEbrvtNmndps2F276+Eh0dLV9//bWvw6B/BBDwoAAJgB7EpWlzCCyMjyMB0BxT5XSUYeqD6U/PRssStnx22pCKCCCAAAIIIIAAAggggAACCCBgDQGdkNamTVt58snB0rxFC9G3c1NuvfVW6dGjpyxYMD83h3PMXwLNmjWTm266yRAe27dtM0QcBIEAAggggAACCCCAgNUFRqjV/3L7XssbFrNnfSmparEcCgIIWFeABEDrzi0jy6XAmuQkCVUJYjcW4Nchl2SmOSwpO1umxsbIl3Gxks5Wv6aZNwJFAAEEEEAAAQQQQAABBBBAAAH3C5QtW1aeUCv9DRgwUCpXruxUB6+OHy/Lli2VpKQkp+rbsVKfvv0MM+ytW7cYJhYCQQABBBBAAAEEEEDAqgLXX3+99OzZyzDDy1C7Is6YMcMw8RAIAgh4RiB3p3d6pm9aRcAQAhkqMSxAJYlRrCNwTg1laUKCtAoJcswtyX/WmVtGggACCCCAAAIIIIAAAggggAACeROo36CBBARMl4OHjshrr73udPKf7vWGGyrKmLHj8haAjY++5ZZb5KGHHjaEwPFjxyQiIsIQsRAEAggggAACCCCAAAJWFhg06EkpUqSIYYa4fNkyOX06zDDxEAgCCHhGgARAz7jSqskEvk2IlxC1CiDF/AL709KkZ1iIjI48I1HMqfknlBEggAACCCCAAAIIIIAAAggggECeBYoWLSp91Gp/69b/Kj///Iv06NlTChcunOd2cqowbNhwqVHjzpwe4r5LBMaMGScFDLLryM//+/mS6LiJAAIIIIAAAggggAAC7hYoUqSoDHpysLubdak9f/8pLtWnMgIImEOAPU/NMU9E6WEBvQqgf8xZefv6ch7uieY9JXAmK1M+io6WpYkJolcApCCAAAIIIIAAAggggAACCCCAAAJ2E6hWrZroLWf7qkvp0qU9MvxChQqJf0CAtGrZQvRWUpScBW699Vbp2q1bzg/64N6fV6/2Qa90iQACCCCAAAIIIICAvQR6P/aYlC1b1jCD3rF9u+zcudMw8RAIAgh4ToAVAD1nS8smE1isEsf+SE83WdSEm3YuWz5XyZutgwJlCcl/PCEQQAABBBBAAAEEEEAAAQQQQMBmAvnz55cOHTrKd4uXys5de+TZZ5/zWPLfedpate6RZ597/vxNfuYg8Mqr40XPjRFKUlKSbN26xQihEAMCCCCAAAIIIIAAApYV8PPzk+HDnzLU+PwD/A0VD8EggIDnBFgB0HO2tGwyAb0K4KtRkTK/4o2Sz2Sx2zXcterDyzejI9m+2a5PAMaNAAIIIIAAAggggAACCCCAgI0Frr/+esdqfwMGDJRKlSp5XWLMmLGy8ddfZcuWzV7v2+gdtmzVSrp0ecQwYa5bt1bS0tIMEw+BIIAAAggggAACCCBgRYG2bdvJbbfdZpihhYWFyvfLlxkmHgJBAAHPCpAA6FlfWjeZwI7UFPk+MVE6lShhssjtFe7h9DR5OypK9HxREEAAAQQQQAABBBBAAAEEEEAAATsJ1K5dW/r1HyC9evWSIkWK+mzoBQoUkFmz50jTBx+Q8PDTPovDaB2XLFlSPv10oqHCWrJksaHiIRgEEEAAAQQQQAABBKwoMOrppw01rOnTp0tGRoahYiIYBBDwnABbAHvOlpZNKvCeWlEuPjvbpNFbO+yYrCyV+Bcpj4aGkPxn7almdAgggAACCCCAAAIIIIAAAgggcIlA+/YdZMOvG2Xtug3SXyUA+jL573xo5cqVkxkzZ0qhQoXO32X7n2+88aZPVmS8HHyqOoF21U8/Xe5h7kcAAQQQQAABBBBAAAE3CNStW1fuu+9+N7Tknib0+4A5s2e5pzFaQQABUwiQAGiKaSJIbwpE/ZVk5s0+6evKAulqe+aZcbHSMjhQZsfHSZa6TUEAAQQQQAABBBBAAAEEEEAAAQTsJFC8RHGpWbOW4YbcuHETmThxsuTLl89wsXk7oDZt20p/tSWzkcrq1aslUe14QkEAAQQQQAABBBBAAAHPCYwYOcpzjTvR8qJFi+Ts2bNO1KQKAgiYVYAEQLPOHHF7VGBJYoIsS0jwaB80njuBTSnJ0iUkWCZER0kCKzPmDo2jEEAAAQQQQAABBBBAAAEEEEDAcgJLlyyRkJAQQ46rp9qO+KWXXjZkbN4K6o7q1WXGjC8Mlwi5+LvvvEVAPwgggAACCCCAAAII2FLgpptukk6dOhtm7OfUYjoB/v6GiYdAEEDAOwIkAHrHmV5MKPCfqAg5mZFhwsitEbK2HxweJv1Ph8lvGenWGBSjQAABBBBAAAEEEEAAAQQQQAABBJwUyMzMVF/iTHWytuerjR4zVl54cbTnOzJgD9ddd50sWLBQSpYsaajooqOj5aefVhoqJoJBAAEEEEAAAQQQQMBqAsOfGiEFChQwzLDWrVsnR44cNkw8BIIAAt4RIAHQO870YkKBZJUZ/2JEuKSx6pxXZy9Oeb8dFSkdQ4JkXXKyV/umMwQQQAABBBBAAAEEEEAAAQQQQMDIArNnz5L4+HjDhvjqq+Pl6aefMWx8ngisWLFiMnfefKlWrZonmnepzfnz50laWppLbVAZAQQQQAABBBBAAAEELi9wzTXXSJ8+fS9/gA8eCQgw7oljPuCgSwRsI0ACoG2mmoE6I7BffUA2OjJCzjlTmTp5EshWRy9V2y63DQ6U2fFxkqESMCkIIIAAAggggAACCCCAAAIIIIAAAn8LJKjPTj7/fPLfdxjw2htvviUTJnxguK1wPUFVvHhxWbjoa2ncuIknmnepTb3t1xyVMEpBAAEEEEAAAQQQQAABzwkMGDBQSpQo4bkO8tjyiRMn5OfVq/NYi8MRQMAKAiQAWmEWGYNHBVYmJcqnMWc92ofdG9+amiKdQ4JVsuUZic7KsjsH40cAAQQQQAABBBBAAAEEEEAAAQQuKzBFJQBGRkZe9nEjPDB02DCZMtVfChYsaIRwPBJD6dKl5YcfV8oDDzzokfZdbVRv+6W//KMggAACCCCAAAIIIICAZwT0+50hQ4d6pnEnW502zV+y2eHQST2qIWBuARIAzT1/RO8lgSkqAXBxYoKXerNPN8EZGTLyTLj0CQuVo+lsR2KfmWekCCCAAAIIIIAAAggggAACCCDgrEBiYqJ88vFHzlb3Wr1evXrL0mXLpXyFCl7r01sd3Xb77bJy5SqpXbu2t7rMcz+TJ32W5zpUQAABBBBAAAEEEEAAgdwLPPLoo1Kx4o25r+DhI+Pj42XB/Pke7oXmEUDAqAIkABp1ZojLcAIvq62Al6sPWCmuC6SoLUgmqaTKdqHBskqtsEhBAAEEEEAAAQQQQAABBBBAAAEEEMi9wBdfzJSQkJDcV/DRkfff31g2bNgoDz7Y1EcRuL/b7j16yNq16+X2O+5wf+NuavHAgf0qxrVuao1mEEAAAQQQQAABBBBAICeBESNG5nS3z+6bN2+u6BPGKAggYE8BEgDtOe+M2gmBLJW0NkZtUbssgZUAneBzVDmn/tVbKrcLDpSJKgEwneWHnaWkHgIIIIAAAggggAACCCCAAAII2FggLS1Nxr/6iikEypUrJ4uXLJW33n5HihYtaoqYcwqyePHi8ulnE2XatBmirxu5TJz4mZxTn2VSEEAAAQQQQAABBBBAwDMCTZs2k1q17vFM4060mpWVJdOnBThRkyoIIGAVARIArTKTjMMrAjoJcGxUBEmATmgfUB9M9wwLkafVlr9hmZlOtEAVBBBAAAEEEEAAAQQQQAABBBBAAIHzAkuXLpE1a9acv2non/nz55eRI0fJps1bRX9RZqaSL18+0av+7di5S/r162/40E+cOCFLlywxfJwEiAACCCCAAAIIIICAmQWMtvrfqlU/yalTp8xMSuwIIOCiAAmALgJS3X4C55MAA2Jj7Dd4J0YckZUp46MipZva7ndPaqoTLVAFAQQQQAABBBBAAAEEEEAAAQQQQCAngTGjXxC9GqBZStWqVWXpsuUyf8FXUr16DcOHXadOHVm5cpVj1b8bbqho+Hh1gO++87ZkcvKtKeaKIBFAAAEEEEAAAQTMKXBH9erSqnVrQwXvP3WqoeIhGAQQ8L4ACYDeN6dHCwjoJMAPz0bLK5ERksF2GjnOaLpymRMXJ22CAmVhfJxk53gUdyKAAAIIIIAAAggggAACCCCAAAIIOCugV3ub+Nmnzlb3Wb0OHTrKxk2bZcpUf7n9jjt8FkdOHesV/1q3aeNIVFyzdr3c26hRTocZ8r59+/bJkiWLDRkbQSGAAAIIIIAAAgggYBUBvfqfft9glHLw4AH59dcNRgmHOBBAwEcCJAD6CJ5urSHwdUK8DAkPk7hs0tsuntGfkhKlTXCgvBUdKUkkSF5Mw3UEEEAAAQQQQAABBBBAAAEEEEDArQIfffyRHD16xK1teqMxvS1w796Pydat22XxkmXStl078fPz3cfVFSrcIIOHDHHE8/XX35puq2I9Z2+9+bqc47M4bzx96QMBBBBAAAEEEEDApgLlypWTHj16Gmr0Af7+hoqHYBBAwDcCBXzTLb0iYB2BjSkp0ikkSD4sV14aFClqnYE5MZIT6enyztko+TU52YnaVEEAAQQQQAABBBBAAAEEEEAAAQQQyKtAWmqqDBk8WP73yxopVKhQXqv7/Hi9ckbz5s0dl4gzZ+SHH76XZcuWyaZNGyUrK8uj8VWrVk3at+8gDz/cSRo0bOjTBERXB/rTTyvll19+cbUZ6iOAAAIIIIAAAggggMAVBAYPHiKFCxe+whHefSgqKkq++fYb73ZKbwggYEgBEgANOS0EZTaBsMxMeSIsVPpcU0rGlikrBQ205K83LGPVCoiT1ZbI89SKiHp7ZAoCCCCAAAIIIIAAAggggAACCCCAgPcEDhzYL++996689trr3uvUAz2VK19eBg560nGJjY2V7du2ydZtW2Xrli2it7VKSEhwqledZKjbvv2226Ve/frSoEEDqV+/gejVO6xQUlNTZNzYMVYYCmNAAAEEEEAAAQQQQMCwAkWLFnW8VzFSgLO+/EL0SWEUBBBAgARAngMIuElAbwI8Oz5O9qWnyTtlr5fbCxkn899NQ/xXMxkq2W+eGvPkmLMSzzbI//LhDgQQQAABBBBAAAEEEEAAAQQQQMBbApMmfiZt27aVRo3u81aXHu3n2muvlTZqPPpyvujVLU6dPCmnTp2SmJgYSUpOkri4OElVO3ToVTgKqhUQixcvLsWLFZeixYpKxYo3SuXKleWmm24y1Cod58fjrp+ffPKJBAYGuqs52kEAAQQQQAABBBBAAIEcBB57/AkpXbp0Do/45q50tTvfzJkzfdM5vSKAgOEESAA03JQQkNkF9qoM+86hIfKEWg3wmetKSwk/P7MPKcf416ttft+NjpQ/MjJyfJw7EUAAAQQQQAABBBBAAAEEEEAAAQS8J6C3yx0y+ElZu26DlClTxnsde7GnsmXLir7UVyv4Uf4UOHLksHz26SdwIIAAAggggAACCCCAgAcF/NR3/sOHP+XBHvLe9LKlSyU8/HTeK1IDAQQsKWDNzCRLThWDMpNAploZb1ZcrLQJCZLFiQmW2hb3YFqa9DsdJk+Gh5H8Z6YnJbEigAACCCCAAAIIIIAAAggggIDlBYKDg2XggP6SmZlp+bEyQHHM84inhkua+ryOggACCCCAAAIIIIAAAp4T6NCho9xyyy2e68CJlgMCpjpRiyoIIGBVARIArTqzjMsQApHqw9axEWekg0oEXJqQIDox0Kzlt4x0eS4iXB4NDZbNKclmHQZxI4AAAggggAACCCCAAAIIIIAAApYW2LBhvbz15huWHiOD+1Pg/fcnyJ49e+BAAAEEEEAAAQQQQAABDwuMHDnKwz3krfltW7fKrl278laJoxFAwNICJABaenoZnFEE9Da5oyPPSHuVCPhNQrykmigRcLfa0nioWjq4Y3CQ/JCYKOZNYTTKs4E4EEAAAQQQQAABBBBAAAEEEEAAAc8KTJo0UZYuXeLZTmjdpwJbt26RTz/52Kcx0DkCCCCAAAIIIIAAAnYQqF+/vtzbqJGhhhoQ4G+oeAgGAQR8L1DA9yEQAQL2ETilEgFfjoyQd6Oj5KESJaX3NdfInYUKGw4gITtbflRbFy9VCX+7UlMMFx8BIYAAAggggAACCCCAAAIIIIAAAghcXuCcOvl05IinpEqVm6VOnTqXP5BHTCkQEREhA/qz1bMpJ4+gEUAAAQQQQAABBEwnMMJgq/+FhobI998vN50jASOAgGcFSAD0rC+tI5CjQKJKsFsYH+e41CxcWNoWLyEtixWXWwsVyvF4b9ypk/7WJyfL6qRE+UVt8ZuublMQQAABBBBAAAEEEEAAAQQQQAABBMwpkJSUJN27PSorf1ott912mzkHQdT/EshWn9kNGzpYwtWOHRQEEEAAAQQQQAABBBDwrECVKlXkoYce9mwneWx9+rRpkpmZmcdaHI4AAlYXIAHQ6jPM+AwvcCAtTfTlw7PRUrlgQUciYKOiRaVW4SJSNn9+j8Wfrs4EP6T63aFW+NuqEv62qa1+9X0UBBBAAAEEEEAAAQQQQAABBBBAAAFrCERHRzuSAFet+lnKV6hgjUHZfBSv/We8rF271uYKDB8BBBBAAAEEEEAAAe8IDB8+QgoUME5aTUpKisyZM9s7g6cXBBAwlYBx/qcyFRvBIuAZgSC1RfCXcbGOi+7hRvVionaRonKXWiWwsrpeqUBBqaSSBEv5+eU6AJ3UF52VKUHqLIDf09PlmLocV5dDaamSSsJfrh05EAEEEEAAAQQQQAABBBBAAAEEEDCjQGBgoDz66CPy44qVcu2115pxCMT8l8Ds2bNk8uRJeCCAAAIIIIAAAggggIAXBPT7pyf69PFCT7nvYuFXCyQmJib3FTgSAQRsI0ACoG2mmoGaUSBUJe2FJibIj+pycSmpEgCvVasDXqN+FsqXT4rl85MS6nrquWzJVIv4JamfKdl/Jv5FZWVdXJXrCCCAAAIIIIAAAggggAACCCCAAAI2Ezh8+JD06tVDvvnmOylZsqTNRm+N4f68erW88Pxz1hgMo0AAAQQQQAABBBBAwAQC/QcMlOLFixsm0nNqcZ+AaQGGiYdAEEDAWAIkABprPogGgVwJJGRni75QEEAAAQQQQAABBBBAAAEEEEAAAQQQyI3Atq1b5ZEuneTb75awEmBuwAx0zNatW6R//76SxYm+BpoVQkEAAQQQQAABBBCwskChQoVk6NChhhri2rVr5djRo4aKiWAQQMA4ArnfR9Q4MRMJAggggAACCCCAAAIIIIAAAggggAACCCCAQB4Fdu3aJZ0efkiioqLyWJPDfSWwb98+6d2rpyQnJ/sqBPpFAAEEEEAAAQQQQMB2Al27dpMKFW4w1LinTv3cUPEQDAIIGEuABEBjzQfRIIAAAggggAACCCCAAAIIIIAAAggggAACHhM4cGC/PPxQRzkTHu6xPmjYPQJ79+6Vzp0ektjYWPc0SCsIIIAAAggggAACCCBwVYF8+fLJiJEjr3qcNw/4/fffZc0vv3izS/pCAAGTCZAAaLIJI1wEEEAAAQQQQAABBBBAAAEEEEAAAQQQQMAVgaNHj0iLFs1l//59rjRDXQ8KbNz4qyP5Ly4uzoO90DQCCCCAAAIIIIAAAghcKtC8eXO56667L73bp7cDAvwlOzvbpzHQOQIIGFuABEBjzw/RIYAAAggggAACCCCAAAIIIIAAAggggAACbhcICwuVDu3bycqVK9zeNg26JrBixY/SvVs3iY+Pd60haiOAAAIIIIAAAggggECeBUaMfDrPdTxZQZ8U9NWC+Z7sgrYRQMACAiQAWmASGQICCCCAAAIIIIAAAggggAACCCCAAAIIIJBXgaSkJOnzxOMyZcrnea3K8R4SmDx5kvTt84SkpqZ4qAeaRQABBBBAAAEEEEAAgcsJ1Khxp+gVAI1U5s6dI/q9GwUBBBC4kgAJgFfS4TEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQMDCAllZWfLKyy/J06NGknTmw3lOTU2V4cOGyvhXXxE9JxQEEEAAAQQQQAABBBDwvsDIUaMkX7583u/4Mj3q9wYzpk+7zKPcjQACCPwtQALg3xZcQwABBBBAAAEEEEAAAQQQQAABBBBAAAEEbCmgV5Vo3qyZHD58yJbj9+Wgg4KCpGOHdrJw4Ve+DIO+EUAAAQQQQAABBBCwtUD5ChWka9duhjJYuXKFBAYGGiomgkEAAWMKkABozHkhKgQQQAABBBBAAAEEEEAAAQQQQAABBBBAwKsCR48ekRYtmsunn34i2dnZXu3brp0tX75Mmj7YRHbv3m1XAsaNAAIIIIAAAggggIAhBIYOGSqFCxc2RCzng5g6Zcr5q/xEAAEErihAAuAVeXgQAQQQQAABBBBAAAEEEEAAAQQQQAABBBCwj0Ca2or2jddfk969e0pkZKR9Bu7lkcbHx8uIp4ZLv759JDY21su90x0CCCCAAAIIIIAAAghcLFCsWDHpP2DgxXf5/Pr+/ftk8+ZNPo+DABBAwBwCJACaY56IEgEEEEAAAQQQQAABBBBAAAEEEEAAAQQQ8JrA6lWrpEH9uhLg7y9ZWVle69cOHWnb++9rJAsWzLfDcBkjAggggAACCCCAAAKGF3iiTx+57rrrDBWn/9SphoqHYBBAwNgCJAAae36IDgEEEEAAAQQQQAABBBBAAAEEEEAAAQQQ8IlAXFycjBs3Rtq1bS169QmKawKhoSEyoH8/6dmzu+jrFAQQQAABBBBAAAEEEPC9QP78+WXYsKd8H8hFEejV2Bcv/u6ie7iKAAIIXFmABMAr+/AoAggggAACCCCAAAIIIIAAAggggAACCCBga4GdO3dKi+bNZOzY0aK3rqXkTSA5OVneffcdtaJiPVm6dEneKnM0AggggAACCCCAAAIIeFSgY8eHpGrVqh7tI6+Nf/nFTElLS8trNY5HAAEbC5AAaOPJZ+gIIIAAAggggAACCCCAAAIIIIAAAggggEBuBPQ2wNMCAqT2PTXl448+lMTExNxUs/Ux+gu7mTOmS726deS/H7wvKSkptvZg8AgggAACCCCAAAIIGFFg5MhRhgorPT1dZqoEQAoCCCCQFwESAPOixbEIIIAAAggggAACCCCAAAIIIIAAAggggICNBWJiYuStt96Ue2rdLZ9+8rEkJSXZWCPnoevEP71ih078e/HFFyQ8/HTOB3IvAggggAACCCCAAAII+FSg4b33SoOGDX0aw6WdL1m8WCLOnLn0bm4jgAACVxQgAfCKPDyIAAIIIIAAAggggAACCCCAAAIIIIAAAgggcKnA2bNn5Y03XnesCPjpp5+Ivm33EhkZKR+8P0FqqeTI559/TkJDQ+xOwvgRQAABBBBAAAEEEDC0wIgRIw0Xn7//FMPFREAIIGB8gQLGD5EIEUAAAQQQQAABBBBAAAEEEEAAAQQQQAABBIwoEBUVJW+8/ppMmPCedO7cWQYOGCT3NmpkxFA9EtO5c+dky5bNMm/uXFm8ZLGkpaZ6pB8aRQABBBBAAAEEEEAAAfcK3HhjJWncuInExsa6t2EXWtu9e7fs3bvXhRaoigACdhUgAdCuM8+4EUAAAQQQQAABBBBAAAEEEEAAAQQQQAABNwnoxLevFy1yXGrUuFMGDhwo3Xv0lFKlSrmpB2M1c/LkSVn83bfy1VcL5MSJE8YKjmgQQAABBBBAAAEEEEDgqgJ6xe5bb6l61eM4AAEEEDCDAAmAZpglYkQAAQQQQAABBBBAAAEEEEAAAQQQQAABBEwicOTIYRk9+kV55ZWXpUmTJtKx40PSrn17qVjxRpOM4N9h6pX+Dh06KCtXrJDly5fLwYMH/n0Q9yCAAAIIIIAAAggggAACCCCAAAI+ECAB0AfodIkAAggggAACCCCAAAIIIIAAAggggAACCFhdID09XdasWeO4vPjiC1K7dm3p0KGjtG7TVu666y4pUMDYH0+HhITI5k2bZO1aNQZ1iThzxupTxvgQQAABBBBAAAEEEEAAAQQQQMCEAsb+hMWEoISMAAIIIIAAAggggAACCCCAAAIIIIAAAggg8E8BvYLenj17HJd33nlbihUrJnXq1JX69etL/QYNpEH9BlK+QoV/VvLiraioKMeqfgcPHpRdO3fKtm3b5PTpMC9GQFcIIIAAAggggAACCCCAAAIIIICAcwIkADrnRi0EEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABJwWSk5NVjeEXAAAnZElEQVRl06aNjsv5JipVqiS33367VKlys1SuXFkqV6ly4fr1119//jCnfqampkpERISEnz4tp8NPy8mTJ+WUuuifx44fkzPh4U61SyUEEEAAAQQQQAABBBBAAAEEEEDA1wIkAPp6BugfAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAQPSWu/qSUylatKiULl1Grr32WilVqpQULlxI/bz2H4cmpyRLelq6JCTES2ZmpsTFxUlGRqbEx8ep+xL+cSw3EEAAAQQQQAABBBBAAAEEEEAAAasIkABolZlkHAgggAACCCCAAAIIIIAAAggggAACCCCAgEUFUlJSJDQ0xHGx6BAZFgIIIIAAAggggAACCCCAAAIIIOCUgJ9TtaiEAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAI+FSAB0Kf8dI4AAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIICAcwIkADrnRi0EEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEfCpAAqBP+ekcAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAecESAB0zo1aCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCPhUgARAn/LTOQIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAALOCZAA6JwbtRBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBDwqQAJgD7lp3MEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEnBMgAdA5N2ohgAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggg4FMBEgB9yk/nCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCDgnQAKgc27UQgABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQMCnAiQA+pSfzhFAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBwToAEQOfcqIUAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIICATwVIAPQpP50jgAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggg4JwACYDOuVELAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAZ8KkADoU346RwABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQMA5Ab/s7GznaqpafvnIH3Qaj4oIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAK2FvDLl9/p8WdlZYlfRkbGOWdbKFDA+c6d7ZN6CCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCFhBoGDBAk4PIzMz85zfuexspxMA/fKTAOi0PhURQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQRsLeBKDl5WVma2X5YLewAXyO989qGtZ43BI4AAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAII2F6gYIGCThtkqeQ/P7UMYLazLRQpWsTZqtRDAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAwNYChYsUdnr8WSoD0C89PS3d2RaKFyvubFXqIYAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIGBrgRLFnc/BU7l/aX6pqelJzgoWd6FzZ/ukHgIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAJWEHAlBy8tLT3JLyM9Ld5ZiBIlnM8+dLZP6iGAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCBgBYHiJUo4PQy1AmC8X0ZmeqyzLVxTqpSzVamHAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAgK0FSrmQg5eenh7rl56eEemsYJkyZZytSj0EEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEbC1QurTzOXgZGZmRfqmp6b87K1imTFlnq1IPAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAVsLuLIIX2pq2nG/tLS0/c4KFi5cWIoXL+5sdeohgAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAgggYEuBEiVKiM7Bc7akpqbu9cvIyNjqbAO6Xrny5V2pTl0EEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEbCdQrpxruXdq8b8tfvPnzz+cnp7uNF7Fijc6XZeKCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCNhRoOKNzufeqZy/c4sWLTrhp+FiYmJSnQW8sWJFZ6tSDwEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAFbClS84Qanx302OjpFV3YkAMbFxZ52tqUbXchCdLZP6iGAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCBgZgFXcu/i4uLC9NgdCYAJCfFHnIWodNNNkj9/fmerUw8BBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABWwnonDude+dsiU9IOKzrOhIAU5NTtjjbUMGCBcWVTERn+6UeAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAmYUqFSpkujcO2dLcnLSJl3XkQCYlpTyg7MN6XrVqlVzpTp1EUAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEELCNgKs5d+npmSs0liMBcNaCBXvj4+KynNWrdsstzlalHgIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAK2EnAl5y4uLjZz7ty5BzWYIwFQX4mIiAjVP50pt99+h/j5XWjKmSaogwACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggIDlBXSu3W233e70OMPDz4Scr3whay/mbMz283fm9WexYsWkcpXKea3G8QgggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAgjYSqDKzTeLzrlztsTFxWw9X/dCAmBCUtKS83c687NG9TudqUYdBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBGwjcGcN13LtEhMTvzmPdSEBUN2xOC0t7dz5B/L68667785rFY5HAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAwFYCd951l9PjTUlJOXfqVPDy8w1cSACcNWtWakhIyOnzD+T1Z+XKlaVs2bJ5rcbxCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCNhCoGzZMlKpUiWnxxoaEhK8bt26zPMNXEgA1HdERUX+cv4BZ37Wrl3bmWrUQQABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQMDyAnXr1Zd8+fI5Pc6o6OifL678jwTApKT4SefOOb0LsNSpW+/itrmOAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAJ/CdStW9dpC53bl5YW8/nFDfwjAXDWrPk7IiIiUy8+IC/Xb7rpJilXvnxeqnAsAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAApYXqFDhBqlY8Uanx3nmzJmUmTMX7rm4gX8kAOoHTp8O3XHxAXm9fv/99+e1CscjgAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAgggYGmB+xu7llsXFha25VKgfyUAno2MnnDpQXm5fe+9jaRAgQJ5qcKxCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCFhWQOfU1a/fwKXxJcTEfnxpA/9KAJw1d+6KyMjItEsPzO3t4sWLS617auf2cI5DAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAwNICOqeuRIkSTo/Rsf3v7Nk/XtrAvxIA9QHBwcGbLj0wL7ebN2+el8M5FgEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAHLCjRr2tSlsYWEBG/IqYEcEwBjY6MnnDt3Lqfjc3VflSpVpGq1ark6loMQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQsKqAzqW7uWpVp4enc/liY+PfzamBHBMAZ82a93NwcEhsThVye1+LFi1yeyjHIYAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIGBJgVatWrk0rqCgoLOzZ8/ekFMjOSYA6gNDg4Pn51Qht/fVrFlLypcvn9vDOQ4BBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAIH/t3fvwVlWdx7ATy5yC9cYSPLmggSCoKBcvFTrOlNbLWq9tEgVdwm6WF0Va3emu3/sznQ63dnpdGZn22lLtQo1oC2Odsfd1daZbmftTKsmXEK4VIVwSSAEwp0gEAJJ9n3YpkOZhFzeNyGBzzOTed73Oc/5nXM+b/78zjkECBAgQIAAAQKXlEB2Tk6YNm16Qmuqrd39akcFOgwAVu/c+U/Hjx9v6ahjZ89TU1PDnDl3d/aadgIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgcEkK3H33PSElJaXHaztx4kRrfAfAb3VUoMMA4Lvvvtuwffv2yo46duX5rNmzQ25urCuveocAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECFwyArFYLMycOTOh9WzbVrU2yvJ1VKTDAGDUYf/+A99oaenxJoBnk4t333NPR2N7ToAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIELkmBe+69N6Hd/5qbm8O+fQe/cSGcCwYAS0tLf79t67ZdFyrQWduMGTPCxImTOntNOwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQuCQEJhQVhenTr0toLdu3b61evnz5+xcqcsEAYNRxV23tP1+oQFfa5j40N6EkY1fG8A4BAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIELjYAikpKWHu3IcSzszt2lXXaXav0wBgfBfAV2trdx1NBCU/vyDcdNPNiZTQlwABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQI9HuBW265JRQWFiY0z507dx6OZ/d+0VmRTgOAUYEdO2q+21mhztrvu//+MGzYsM5e006AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAakQEZGRrj3S/clPPfq6m3f6UqRLgUAX3755e/t3LnrSFcKdvTOyJEjwwMPPthRs+cECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQGBAC3z5K18JI0aMSGgNNTU7Dy1dWvqDrhTpUgAwKrRjx9ZOzxPubMDPfOaWMGXKlM5e006AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAaUQHHx5HDjjTclPOeamh3f6mqRLgcAly0r/UlNTfXBrhZu772UlJTw1YcfCYMHD26v2TMCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIDDgBKJM3PxH/zpEGblErh07duxfuvRnS7pao8sBwKhgVdW2Z1taWrpau933srKywlfmzm23zUMCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIDDQBB6aNy9kZV2Z0LSjbN62bduf6U6RtO68vH79+j/Gj/CdP3bs2Kzu9Dv/3YKCglBfXx/27NlzfpPvBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEBgwAjMmDEj3Hff/QnP9+OP/7hpyZIXnutOoW7tABgV3rNn79zGxlOt3RmkvXe/+vDDYcyYMe01eUaAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBPq9QGZmZnhk/qMJz/PkyZOtdXX13T5at1s7AEazjO8CuL+oaPwNsVje5ERmfcUVV4Ti4uKwatXq0NLSnEgpfQkQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAQJ8KpMczcE8/82z86N+EDtQ9O+fKdRVvvfzy0he6u4Bu7wAYDXD06Kfz9u7de7K7g53/fn5+QXjkkUfOf+w7AQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDo1wLz5s0LhYWFCc+xvr7+ZHXNrgU9KdTtHQCjQSorK8/k5eXvHj9+/IMpKSk9GffPffLy8kJDw9Gwa9euPz/zgQABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQI9FeBz972V2HOnLsTnl5zc3N0iu7jb7zxRkVPivUoABgNFA8BVk6ePOmBceOyc3sy8Ll9pk69JtRUV4cDBw6c+9hnAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQrwSmTp0aFpSUhNTUHh3A+xdr2bRpQ/kLL7z4/F887MaXhGawZ8++OYcPHzrTjfHafTUtLS387aInQiwWa7fdQwIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgcLEF4ifnns26RZm3RK9Dhw6d3r1775cSqZPQLDZs2HC8IC//YEFhwb2JHgWcnp4epk2fFtatqwyNjY2JrElfAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECCQVIHMzMyw+LnFYfjw4QnXjY7+XV2+6ulXX3vtD4kUSygAGA1csW7d6qKiCV/IycktTGQiUd8hQ4bGQ4DTo+OFw6lTpxItpz8BAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEEhYYMSIEeG5574erszKSrhWVGD9+sr3Xnjxpz0++rdtEgkdAdxW5NChI3fW1e0+1vY9kfvYsWPDs88+GzIyMhIpoy8BAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIEEhYYOjQoeGZeKZtXHZ2wrWiArt31zbU1tbNSUaxhHcAjCYR37HvTCyWVxb/K4kf5ZuS6MSitOTVV08JG9avD01NTYmW058AAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECHRbIDru99nFz4X8/IJu922vw8mTJ1srKirvXLly5Y722rv7LCkBwGjQ9evXV+fk5KQXFhbcnpKScAYwjBo1KkyPHwe8fv2G+HHAjd1dl/cJECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgECPBUaMHBkWnw3/5fe4xrkdW1tbw+rysu8s+9krK859nsjnpAUAo0lUVFS8V1R01Z05ObmFiUyqrW9GPD0ZhQA3bdwY4snHtsfuBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECg1wQyMzPD889/I2Qn6djfaKKV6yp/9+MlP3k8mZNOagAwmtjgwUNWjBkz5unRo0dnJGOiGRkZYdasWaGqqio0NDQko6QaBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECgXYG8vPyw+LnFITPzynbbe/Jwx44d9R+Wlc2srq5u6Un/jvokPQAYTTB+3vEvR40a+fSwYcOSUn/wkCHhhhtuDHV1dWH/vn0drcVzAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECDQY4HoxNq/e/qZkJExvMc1zu+4f//+Uxs3brr+7bffPnx+W6LfkxLQO38SGzZsOBKLZf9+7NhxJYMGDUo5v70n39PT08/uBNjY2BjiIcOelNCHAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAi0K3DHHZ8P8x99NERZtWRdx44daykrK79z5cqV65NV89w6vRIAjAaorNxQEw8A7sjLy/tyWlpyhklJSQlTr7kmfq7yuPDRRx+F5ubmc9fiMwECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQ6JbA4MGDw4KSkvC5O+4IUUYtWdfppqawqvzDJ1e8+vO3klXz/DrJSeadX/VP3yvjKcDs7JyhBQX5tyUTJjcWC9PiWy1u2fJJOH78RAeje0yAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBDoWGJedHRYvXhyKiyd3/FIPWqLN7crKy/516bJX/q0H3bvcpVcDgNEsKioqfpuXlxPLy8ufncwQ4IgRI8Itt94amk6dciRwl39uLxIgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIBAJHDTTTeFrz35VBg9enRSQVpbW8Pq1auWv/jiS19PauF2ivV6ADAac/Xqte+MH184KTc397pkhgCjo4WjI4GjHQE3b/4knD59up0lekSAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBP5fICMjIyx87LFw511fDOnp6Ull+VP4b+WSJS8sSGrhDor1SQAwGru8vPyt8eMLbozFYsndKzFeOycnJ9x8883h0KFDYe/evR0s1WMCBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQuJwFZs2aHZ586qlQWDi+VxgqKta886MfLXmoV4q3U7TPAoDR2OXlq36RH8u7JpYXuzaZOwFGtQcPHhxmzpoV/2EKw7Zt20JjY2P02EWAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECl7nAyFGjwt8sWBDmzLn7bNYs2RzRzn9r1qz57x/+8Mf3J7v2her1aQAwmsiq1at/mZ+fOykWy0vqccBtixw3blz47G23heh44Oqa6tDS0tLW5E6AAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECl5FAdMTv7bffHhY98bWQn5/fKyuPwn9rV69+80c/XjK3Vwa4QNE+DwBGc1m1as1bebm52bmx3BtTU1MvML2eNUXhv+Li4jB79g3h8OHDob6+vmeF9CJAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgACBASkwY8aM8LUnnzqbI4uCgL1xNTc3h7KyD3665CcvLuyN+p3VvCgBwGhSq9es+VVWVlZTbm7OHXHclM4m2pP2YcOGhVmzZ4epU68Jx44dC/v27etJGX0IECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAYIAIFBVNDCULF4bPf/4LIcqQ9dbV1NTUuqqs/F9++tLL3+ytMTqr2yvBu84GPbf9iSeeeDietPz5yJEjej2MWFVVFd799a/D1q1V507BZwIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAY4ALFxZPDPffeEyZOnNTrK2loaGguKytf8Nprr63s9cEuMMBFDwBGc1u06JGZV1898/2cnJyhF5hr0ppqa3eF3733Xli7dm2ItmB0ESBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgMDAE0hJSQnXXjst3HXXF8NVE67qkwXET6Jt3LTpj58rLS0t65MBLzBIvwgARvN77LHHcsYXFq6eOGli/gXmm9SmAwcOhg/e/31YtWpViCcyk1pbMQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDoHYERI0eGz9x8c7j1s7eFK6+8sncGaadq1ZbNdVVbt9/4+uuv17XT3OeP+k0AMFr5t7/97dRjx4785/Tp19+XmpraZxjRLoAbN24MH374QdiyebNdAftM3kAECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDomkBaWlqYMnVKuOWWW8/u+hd976srypitW7f215mZY++L59xa+mrczsbpVwHAtskuWvT4P95ww43fzcjI6LsU4J8GP378eKisrAzrKirC1q1VoaWl3/xWbTzuBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQuCwEoo3kiosnh5mzZoUZM2aEYcOG9fm6P/3005a1a9d8c9myV77f54N3MmC/DABGc16wYMG0SZMm/u+ECRPGdrKGXms+ceJE2Lz5k7O7AsbPbA5Hjx7ptbEUJkCAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAIEQhg8ffjb0N23atHBt/O9ihP7afoeamppD1dUffWHZstfXtT3rT/d+GwCMkKIjgQ8fPvgf118/48H09PSL6tba2hr27t0Ttm/ffvZvx/Zt4cCBgxd1TgYnQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDAQBfIysoKE4qKQlHRxDBxYlHIzs4JKSkXN9p25syZEN/17519+w48+Oabbzb3V+OLq9RFlZKSkoenT5/2SnZ29tAudumT16IdAuvqdoc9dXXxe13Yv/9AOHjwQDhy5EiIznx2ESBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgEAIaWlpYcyY0SEzMyuMHZsVYrFYiOXlxe95YejQfhULC/X19Sc3btxUsmLFil/2999uQAQAI8R58+YNHT8+/82pU6+994orrujXrlH47+jRo6HhaEM4fvx4OH4i/he/R6nQxsaTIcR3Ezxzpjk0NZ3q1+swOQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECHQmMGjQ4JCenhbi2/aFIUOGxj+nh4yMjDA8/jcs/jdy5MgwatSosyHAzmpdzPbTp5tCZeX631ZX1zzw9ttvn7iYc+nq2AMmANi2oIULF9519dXFb+TnF4xqe+ZOgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgR6KrBr167DVVWfPFxa+tr/9LTGxeiXejEGTWTM5cuX/6ap6UzmH/7w/vePHDl8JpFa+hIgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIDA5SvQ0NDQXF7+wUunT5/JGmjhv+hXG3A7AJ77rzZ//vys7OysFdOmXTdn0KBBA3ot567LZwIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDoPYHTTU3ho48/Ljt6tOHBpUuX1vfeSL1b+ZIIzT3++OO35mZnlxZfPbk4LS1+lrSLAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAicJ9Dc3By2bN68Zc/e+oWlpaVl5zUPuK+XRACwTb2kpOS2WCz3pSlTpkxNTR1wpxu3LcOdAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBJIo0NraGrZt3Vpbs3PXouXLl/8miaUvaqlLKgDYJhkPAj5QUJD375MmFRfZEbBNxZ0AAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQKXl8CZM2ei4N+2vbvrnl+2fPmvLrXVX5IBwLYfqWT+/OuuzMn+YXxHwNuHDh16Sa+1bc3uBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQuNwFmpqaWrds2bxhz57ap1599fXyS9XjsgjFxXcEzBs1YsQPCq+66kvZ2eOGXKo/pnURIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIECAAAECBAgQIEDgchaor9/XuLO6+p2jx459Y8WKFbsvdYvLIgB47o+46PGSJ7JzYv9QNHHi5EGDBp3b5DMBAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIECBAgAABAgQIDDCBaLe/+DG/VXv21n+vtLT0ZwNs+glN97ILALZpLVo0LzM1dfTfjxuX9eiECUVFwoBtMu4ECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBAgQIAAAQIECBDo3wKnT58OtbW19fv27fmvU6eav7V06dL6/j3j3pnd/wH9ICl34CETogAAAABJRU5ErkJggg=="/>
-</defs>
-</svg>
diff --git a/apps/web/src/components/AccountDetails/TransactionSummary.tsx b/apps/web/src/components/AccountDetails/TransactionSummary.tsx
index 6258d8d3b0f..6107574ec2c 100644
--- a/apps/web/src/components/AccountDetails/TransactionSummary.tsx
+++ b/apps/web/src/components/AccountDetails/TransactionSummary.tsx
@@ -21,7 +21,6 @@ import {
   MigrateV2LiquidityToV3TransactionInfo,
   QueueTransactionInfo,
   RemoveLiquidityV3TransactionInfo,
-  SendTransactionInfo,
   TransactionInfo,
   TransactionType,
   VoteTransactionInfo,
@@ -272,16 +271,6 @@ function AddLiquidityV2PoolSummary({
   )
 }
 
-function SendSummary({ info }: { info: SendTransactionInfo }) {
-  return (
-    <Trans>
-      Sent
-      <FormattedCurrencyAmountManaged rawAmount={info.amount} currencyId={info.currencyId} sigFigs={6} /> to{' '}
-      {info.recipient}
-    </Trans>
-  )
-}
-
 function SwapSummary({ info }: { info: ExactInputSwapTransactionInfo | ExactOutputSwapTransactionInfo }) {
   if (info.tradeType === TradeType.EXACT_INPUT) {
     return (
@@ -372,8 +361,5 @@ export function TransactionSummary({ info }: { info: TransactionInfo }) {
 
     case TransactionType.SUBMIT_PROPOSAL:
       return <SubmitProposalTransactionSummary />
-
-    case TransactionType.SEND:
-      return <SendSummary info={info} />
   }
 }
diff --git a/apps/web/src/components/AccountDrawer/AuthenticatedHeader.tsx b/apps/web/src/components/AccountDrawer/AuthenticatedHeader.tsx
index 4a5cbe459a9..8a86e5ba8f3 100644
--- a/apps/web/src/components/AccountDrawer/AuthenticatedHeader.tsx
+++ b/apps/web/src/components/AccountDrawer/AuthenticatedHeader.tsx
@@ -3,7 +3,6 @@ import { BrowserEvent, InterfaceElementName, InterfaceEventName, SharedEventName
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
 import { sendAnalyticsEvent, TraceEvent } from 'analytics'
-import { OpenLimitOrdersButton } from 'components/AccountDrawer/MiniPortfolio/Limits/OpenLimitOrdersButton'
 import { ButtonEmphasis, ButtonSize, LoadingButtonSpinner, ThemeButton } from 'components/Button'
 import Column from 'components/Column'
 import { Power } from 'components/Icons/Power'
@@ -48,7 +47,7 @@ const AuthenticatedHeaderWrapper = styled.div`
 
 const HeaderButton = styled(ThemeButton)`
   border-color: transparent;
-  border-radius: 16px;
+  border-radius: 12px;
   border-style: solid;
   border-width: 1px;
   height: 40px;
@@ -151,15 +150,7 @@ const PortfolioDrawerContainer = styled(Column)`
   flex: 1;
 `
 
-export default function AuthenticatedHeader({
-  account,
-  openSettings,
-  openLimitsMenu,
-}: {
-  account: string
-  openSettings: () => void
-  openLimitsMenu: () => void
-}) {
+export default function AuthenticatedHeader({ account, openSettings }: { account: string; openSettings: () => void }) {
   const { connector } = useWeb3React()
   const { ENSName } = useENSName(account)
   const dispatch = useAppDispatch()
@@ -353,7 +344,6 @@ export default function AuthenticatedHeader({
             </Tooltip>
           </FiatOnrampNotAvailableText>
         )}
-        <OpenLimitOrdersButton openLimitsMenu={openLimitsMenu} account={account} />
         <MiniPortfolio account={account} />
         {isUnclaimed && (
           <UNIButton onClick={openClaimModal} size={ButtonSize.medium} emphasis={ButtonEmphasis.medium}>
diff --git a/apps/web/src/components/AccountDrawer/DefaultMenu.tsx b/apps/web/src/components/AccountDrawer/DefaultMenu.tsx
index 474d4d2d02b..f3e26053874 100644
--- a/apps/web/src/components/AccountDrawer/DefaultMenu.tsx
+++ b/apps/web/src/components/AccountDrawer/DefaultMenu.tsx
@@ -1,11 +1,9 @@
 import { useWeb3React } from '@web3-react/core'
-import { LimitsMenu } from 'components/AccountDrawer/MiniPortfolio/Limits/LimitsMenu'
 import Column from 'components/Column'
 import WalletModal from 'components/WalletModal'
-import { useCallback, useEffect, useMemo } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import styled from 'styled-components'
 
-import { atom, useAtom } from 'jotai'
 import AuthenticatedHeader from './AuthenticatedHeader'
 import LanguageMenu from './LanguageMenu'
 import LocalCurrencyMenu from './LocalCurrencyMenu'
@@ -16,27 +14,22 @@ const DefaultMenuWrap = styled(Column)`
   height: 100%;
 `
 
-export enum MenuState {
+enum MenuState {
   DEFAULT,
   SETTINGS,
   LANGUAGE_SETTINGS,
   LOCAL_CURRENCY_SETTINGS,
-  LIMITS,
 }
 
-export const miniPortfolioMenuStateAtom = atom(MenuState.DEFAULT)
-
 function DefaultMenu({ drawerOpen }: { drawerOpen: boolean }) {
   const { account } = useWeb3React()
   const isAuthenticated = !!account
 
-  const [menu, setMenu] = useAtom(miniPortfolioMenuStateAtom)
-  const openSettings = useCallback(() => setMenu(MenuState.SETTINGS), [setMenu])
-  const closeSettings = useCallback(() => setMenu(MenuState.DEFAULT), [setMenu])
-  const openLanguageSettings = useCallback(() => setMenu(MenuState.LANGUAGE_SETTINGS), [setMenu])
-  const openLocalCurrencySettings = useCallback(() => setMenu(MenuState.LOCAL_CURRENCY_SETTINGS), [setMenu])
-  const openLimitsMenu = useCallback(() => setMenu(MenuState.LIMITS), [setMenu])
-  const closeLimitsMenu = useCallback(() => setMenu(MenuState.DEFAULT), [setMenu])
+  const [menu, setMenu] = useState<MenuState>(MenuState.DEFAULT)
+  const openSettings = useCallback(() => setMenu(MenuState.SETTINGS), [])
+  const closeSettings = useCallback(() => setMenu(MenuState.DEFAULT), [])
+  const openLanguageSettings = useCallback(() => setMenu(MenuState.LANGUAGE_SETTINGS), [])
+  const openLocalCurrencySettings = useCallback(() => setMenu(MenuState.LOCAL_CURRENCY_SETTINGS), [])
 
   useEffect(() => {
     if (!drawerOpen && menu !== MenuState.DEFAULT) {
@@ -53,7 +46,7 @@ function DefaultMenu({ drawerOpen }: { drawerOpen: boolean }) {
     switch (menu) {
       case MenuState.DEFAULT:
         return isAuthenticated ? (
-          <AuthenticatedHeader account={account} openSettings={openSettings} openLimitsMenu={openLimitsMenu} />
+          <AuthenticatedHeader account={account} openSettings={openSettings} />
         ) : (
           <WalletModal openSettings={openSettings} />
         )
@@ -69,20 +62,8 @@ function DefaultMenu({ drawerOpen }: { drawerOpen: boolean }) {
         return <LanguageMenu onClose={openSettings} />
       case MenuState.LOCAL_CURRENCY_SETTINGS:
         return <LocalCurrencyMenu onClose={openSettings} />
-      case MenuState.LIMITS:
-        return isAuthenticated ? <LimitsMenu onClose={closeLimitsMenu} account={account} /> : null
     }
-  }, [
-    account,
-    closeLimitsMenu,
-    closeSettings,
-    isAuthenticated,
-    menu,
-    openLanguageSettings,
-    openLimitsMenu,
-    openLocalCurrencySettings,
-    openSettings,
-  ])
+  }, [account, closeSettings, isAuthenticated, menu, openLanguageSettings, openLocalCurrencySettings, openSettings])
 
   return <DefaultMenuWrap>{SubMenu}</DefaultMenuWrap>
 }
diff --git a/apps/web/src/components/AccountDrawer/IconButton.tsx b/apps/web/src/components/AccountDrawer/IconButton.tsx
index 5a8cb2a4cf4..a93f42e19f1 100644
--- a/apps/web/src/components/AccountDrawer/IconButton.tsx
+++ b/apps/web/src/components/AccountDrawer/IconButton.tsx
@@ -1,6 +1,6 @@
 import React, { forwardRef, useCallback, useEffect, useRef, useState } from 'react'
 import { Icon } from 'react-feather'
-import styled, { DefaultTheme, css } from 'styled-components'
+import styled, { css, DefaultTheme } from 'styled-components'
 import useResizeObserver from 'use-resize-observer'
 
 import { TRANSITION_DURATIONS } from '../../theme/styles'
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/ActivityRow.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/ActivityRow.tsx
index 942241e7876..82628d230ae 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/ActivityRow.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/ActivityRow.tsx
@@ -7,7 +7,6 @@ import Row from 'components/Row'
 import { TransactionStatus } from 'graphql/data/__generated__/types-and-hooks'
 import useENSName from 'hooks/useENSName'
 import { useCallback } from 'react'
-import { SignatureType } from 'state/signatures/types'
 import styled from 'styled-components'
 import { EllipsisStyle, ThemedText } from 'theme/components'
 import { shortenAddress } from 'utils'
@@ -30,12 +29,11 @@ const StyledTimestamp = styled(ThemedText.BodySmall)`
   font-feature-settings: 'tnum' on, 'lnum' on, 'ss02' on;
 `
 
-function StatusIndicator({ activity: { status, timestamp, offchainOrderDetails } }: { activity: Activity }) {
+function StatusIndicator({ activity: { status, timestamp } }: { activity: Activity }) {
   const timeSince = useTimeSince(timestamp)
 
   switch (status) {
     case TransactionStatus.Pending:
-      if (offchainOrderDetails?.type === SignatureType.SIGN_LIMIT) return null
       return <LoaderV2 />
     case TransactionStatus.Confirmed:
       return <StyledTimestamp>{timeSince}</StyledTimestamp>
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/CancelLimitsDialog.test.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/CancelLimitsDialog.test.tsx
deleted file mode 100644
index de61fa9d759..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/CancelLimitsDialog.test.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { ChainId, WETH9 } from '@uniswap/sdk-core'
-import { CancelLimitsDialog } from 'components/AccountDrawer/MiniPortfolio/Activity/CancelLimitsDialog'
-import { DAI } from 'constants/tokens'
-import { UniswapXOrderStatus } from 'lib/hooks/orders/types'
-import { SignatureType, UniswapXOrderDetails } from 'state/signatures/types'
-import { render, screen } from 'test-utils/render'
-
-const mockOrderDetails: UniswapXOrderDetails = {
-  type: SignatureType.SIGN_LIMIT,
-  orderHash: '0x1234',
-  status: UniswapXOrderStatus.OPEN,
-  swapInfo: {
-    isUniswapXOrder: true,
-    type: 1,
-    tradeType: 0,
-    inputCurrencyId: DAI.address,
-    outputCurrencyId: WETH9[ChainId.MAINNET].address,
-    inputCurrencyAmountRaw: '252074033564766400000',
-    expectedOutputCurrencyAmountRaw: '106841079134757921',
-    minimumOutputCurrencyAmountRaw: '106841079134757921',
-    settledOutputCurrencyAmountRaw: '106841079134757921',
-  },
-  txHash: '0x1234',
-  encodedOrder: '0xencodedOrder',
-  id: '0x1234',
-  addedTime: 3,
-  chainId: ChainId.MAINNET,
-  expiry: 4,
-  offerer: '0x1234',
-}
-
-describe('CancelLimitsDialog', () => {
-  it('should render correctly', () => {
-    const mockOnCancel = jest.fn()
-    const mockOnConfirm = jest.fn()
-    render(
-      <CancelLimitsDialog
-        onCancel={mockOnCancel}
-        onConfirm={mockOnConfirm}
-        isVisible={true}
-        orders={[mockOrderDetails]}
-        cancelling={false}
-      />
-    )
-
-    expect(document.body).toMatchSnapshot()
-    expect(
-      screen.getByText('Are you sure you want to cancel your limit before it executes or expires?')
-    ).toBeInTheDocument()
-  })
-})
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/CancelLimitsDialog.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/CancelLimitsDialog.tsx
deleted file mode 100644
index ccc74a9403b..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/CancelLimitsDialog.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { Plural, Trans } from '@lingui/macro'
-import { Dialog, DialogButtonType, DialogProps } from 'components/Dialog/Dialog'
-import { Slash } from 'react-feather'
-import { UniswapXOrderDetails } from 'state/signatures/types'
-
-export enum CancellationState {
-  NOT_STARTED = 'not_started',
-  REVIEWING_CANCELLATION = 'reviewing_cancellation',
-  CANCELLING = 'cancelling',
-}
-
-type CancelLimitsDialogProps = Partial<Omit<DialogProps, 'isVisible' | 'onCancel'>> &
-  Pick<DialogProps, 'isVisible' | 'onCancel'>
-
-export function CancelLimitsDialog(
-  props: CancelLimitsDialogProps & {
-    orders: UniswapXOrderDetails[]
-    cancelling: boolean
-    onConfirm: () => void
-  }
-) {
-  const { orders, cancelling, onConfirm, onCancel } = props
-  return (
-    <Dialog
-      {...props}
-      icon={<Slash size={28} />}
-      title={
-        <Plural id="cancelling" value={orders.length} one="Cancel limit" other={`Cancel ${orders.length} limits`} />
-      }
-      description={
-        <Plural
-          id="cancelling-confirmation"
-          value={orders.length}
-          one="Are you sure you want to cancel your limit before it executes or expires?"
-          other="Are you sure you want to cancel your limits before they execute or expire?"
-        />
-      }
-      buttonsConfig={{
-        left: {
-          title: <Trans>Nevermind</Trans>,
-          onClick: onCancel,
-        },
-        right: {
-          title: <Trans>Proceed</Trans>,
-          onClick: onConfirm,
-          type: DialogButtonType.Error,
-          disabled: cancelling,
-        },
-      }}
-    />
-  )
-}
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal.test.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal.test.tsx
index 62521e8e88f..ba04a16bac5 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal.test.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal.test.tsx
@@ -18,7 +18,7 @@ jest.mock('components/AccountDrawer/MiniPortfolio/formatTimestamp', () => ({
 }))
 
 describe('OrderContent', () => {
-  beforeEach(() => {
+  it('should render without error, filled order', () => {
     mocked(useCurrency).mockImplementation((currencyId: Maybe<string>) => {
       if (currencyId === WETH9[ChainId.MAINNET].address) {
         return WRAPPED_NATIVE_CURRENCY[ChainId.MAINNET]
@@ -29,15 +29,10 @@ describe('OrderContent', () => {
     mocked(formatTimestamp).mockImplementation(() => {
       return 'Mock Date' // This ensures consistent test behavior across local and CI
     })
-  })
-  it('should render without error, filled order', () => {
     const { container } = render(
       <OrderContent
         order={{
           txHash: '0xad7a8f73f28fd0cc16459111899dd1632164ae139fcf5281a1bced56e1ff6564',
-          orderHash: '0xad7a8f73f28fd0cc16459111899dd1632164ae139fcf5281a1bced56e1ff6564',
-          offerer: '0xSenderAddress',
-          id: 'tx123',
           chainId: 1,
           type: SignatureType.SIGN_UNISWAPX_ORDER,
           status: UniswapXOrderStatus.FILLED,
@@ -59,33 +54,4 @@ describe('OrderContent', () => {
     expect(container).toMatchSnapshot()
     expect(container).toHaveTextContent('Order executed')
   })
-  it('should render without error, open order', () => {
-    const { container } = render(
-      <OrderContent
-        order={{
-          chainId: 1,
-          type: SignatureType.SIGN_UNISWAPX_ORDER,
-          status: UniswapXOrderStatus.OPEN,
-          encodedOrder: '0xencodedOrder',
-          addedTime: 1701715079,
-          orderHash: '0xad7a8f73f28fd0cc16459111899dd1632164ae139fcf5281a1bced56e1ff6564',
-          offerer: '0xSenderAddress',
-          id: 'tx123',
-          swapInfo: {
-            isUniswapXOrder: true,
-            type: 1,
-            tradeType: 0,
-            inputCurrencyId: '0x6b175474e89094c44da98b954eedeac495271d0f',
-            outputCurrencyId: WETH9[ChainId.MAINNET].address,
-            inputCurrencyAmountRaw: '252074033564766400000',
-            expectedOutputCurrencyAmountRaw: '106841079134757921',
-            minimumOutputCurrencyAmountRaw: '106841079134757921',
-            settledOutputCurrencyAmountRaw: '106841079134757921',
-          },
-        }}
-      />
-    )
-    expect(container).toMatchSnapshot()
-    expect(container).toHaveTextContent('Order pending')
-  })
 })
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal.tsx
index 4a9e8e1a8b9..376f6fc93ef 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal.tsx
@@ -1,12 +1,6 @@
 import { Trans } from '@lingui/macro'
 import { ChainId, Currency, CurrencyAmount, TradeType } from '@uniswap/sdk-core'
-import { useWeb3React } from '@web3-react/core'
-import {
-  CancellationState,
-  CancelLimitsDialog,
-} from 'components/AccountDrawer/MiniPortfolio/Activity/CancelLimitsDialog'
 import { formatTimestamp } from 'components/AccountDrawer/MiniPortfolio/formatTimestamp'
-import { ButtonEmphasis, ButtonSize, ThemeButton } from 'components/Button'
 import Column, { AutoColumn } from 'components/Column'
 import { OpacityHoverState } from 'components/Common'
 import Modal from 'components/Modal'
@@ -18,22 +12,16 @@ import { useUSDPrice } from 'hooks/useUSDPrice'
 import { atom } from 'jotai'
 import { useAtomValue, useUpdateAtom } from 'jotai/utils'
 import { UniswapXOrderStatus } from 'lib/hooks/orders/types'
-import { ReactNode, useCallback, useMemo, useState } from 'react'
+import { ReactNode, useCallback, useMemo } from 'react'
 import { ArrowDown, X } from 'react-feather'
 import { useOrder } from 'state/signatures/hooks'
-import { UniswapXOrderDetails } from 'state/signatures/types'
 import styled, { useTheme } from 'styled-components'
 import { Divider, ThemedText } from 'theme/components'
 import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
 
-import { PERMIT2_ADDRESS } from '@uniswap/permit2-sdk'
-import { cancelUniswapXOrder } from 'components/AccountDrawer/MiniPortfolio/Activity/utils'
-import { ContractTransaction } from 'ethers/lib/ethers'
-import { useContract } from 'hooks/useContract'
-import PERMIT2_ABI from 'wallet/src/abis/permit2.json'
-import { Permit2 } from 'wallet/src/abis/types/Permit2'
 import { PortfolioLogo } from '../PortfolioLogo'
 import { OffchainOrderLineItem, OffchainOrderLineItemProps, OffchainOrderLineItemType } from './OffchainOrderLineItem'
+import { OffchainOrderDetails } from './types'
 
 type Logos = {
   inputLogo?: string
@@ -42,7 +30,7 @@ type Logos = {
 
 type SelectedOrderInfo = {
   modalOpen?: boolean
-  order?: UniswapXOrderDetails
+  order?: OffchainOrderDetails
   logos?: Logos
 }
 
@@ -52,7 +40,7 @@ export function useOpenOffchainActivityModal() {
   const setSelectedOrder = useUpdateAtom(selectedOrderAtom)
 
   return useCallback(
-    (order: UniswapXOrderDetails, logos?: Logos) => setSelectedOrder({ order, logos, modalOpen: true }),
+    (order: OffchainOrderDetails, logos?: Logos) => setSelectedOrder({ order, logos, modalOpen: true }),
     [setSelectedOrder]
   )
 }
@@ -74,11 +62,7 @@ const OffchainModalDivider = styled(Divider)`
   margin: 28px 0;
 `
 
-const OffchainModalBottomButton = styled(ThemeButton)`
-  margin-top: 16px;
-`
-
-export function useOrderAmounts(order?: UniswapXOrderDetails):
+function useOrderAmounts(order?: OffchainOrderDetails):
   | {
       inputAmount: CurrencyAmount<Currency>
       outputAmount: CurrencyAmount<Currency>
@@ -123,33 +107,11 @@ function getOrderTitle(status: UniswapXOrderStatus): ReactNode {
     case UniswapXOrderStatus.FILLED:
       return <Trans>Order executed</Trans>
     default:
-      return null
+      return <Trans>Order open</Trans>
   }
 }
 
-function useCancelOrder(order?: UniswapXOrderDetails): () => Promise<ContractTransaction | undefined> {
-  const { provider } = useWeb3React()
-  const permit2 = useContract<Permit2>(PERMIT2_ADDRESS, PERMIT2_ABI, true)
-  return useCallback(async () => {
-    if (!order) return undefined
-    return await cancelUniswapXOrder({
-      encodedOrder: order.encodedOrder as string,
-      chainId: order.chainId,
-      provider,
-      permit2,
-    })
-  }, [order, permit2, provider])
-}
-
-export function OrderContent({
-  order,
-  logos,
-  onCancel,
-}: {
-  order: UniswapXOrderDetails
-  logos?: Logos
-  onCancel?: () => void
-}) {
+export function OrderContent({ order, logos }: { order: OffchainOrderDetails; logos?: Logos }) {
   const amounts = useOrderAmounts(order)
   const amountsDefined = !!amounts?.inputAmount?.currency && !!amounts?.outputAmount?.currency
   const fiatValueInput = useUSDPrice(amounts?.inputAmount)
@@ -235,17 +197,13 @@ export function OrderContent({
           <OffchainOrderLineItem key={detail.type} {...detail} />
         ))}
       </Column>
-      {Boolean(order.status === UniswapXOrderStatus.OPEN && order.encodedOrder) && (
-        <OffchainModalBottomButton emphasis={ButtonEmphasis.failure} onClick={onCancel} size={ButtonSize.large}>
-          <Trans>Cancel</Trans>
-        </OffchainModalBottomButton>
-      )}
+      {/* todo: add cancel button */}
     </Column>
   )
 }
 
 /* Returns the order currently selected in the UI synced with updates from order status polling */
-function useSyncedSelectedOrder(): UniswapXOrderDetails | undefined {
+function useSyncedSelectedOrder(): OffchainOrderDetails | undefined {
   const selectedOrder = useAtomValue(selectedOrderAtom)
   const localPendingOrder = useOrder(selectedOrder?.order?.txHash ?? '')
 
@@ -267,13 +225,11 @@ function useSyncedSelectedOrder(): UniswapXOrderDetails | undefined {
  * - Pending/expired/cancelled orders initiated remotely and tracked locally i.e. SwapOrderDetailsParts from the Activity query
  * - Filled orders i.e. TransactionDetailsParts from the Activity query.
  *
- * Because of this, we try to converge the different cases into the one type, UniswapXOrderDetails,
- * which can be passed around within the Activity in the case of remote records. However, all the fields may not
- * be defined in the remote cases.
+ * Because of this, we try to converge the different cases into one type, OffchainOrderDetails,
+ * which can be passed around within the Activity in the case of remote records.
  */
 export function OffchainActivityModal() {
   const selectedOrderAtomValue = useAtomValue(selectedOrderAtom)
-  const [cancelState, setCancelState] = useState(CancellationState.NOT_STARTED)
 
   const syncedSelectedOrder = useSyncedSelectedOrder()
   const setSelectedOrder = useUpdateAtom(selectedOrderAtom)
@@ -282,46 +238,17 @@ export function OffchainActivityModal() {
     setSelectedOrder((order) => order && { ...order, modalOpen: false })
   }, [setSelectedOrder])
 
-  const cancelOrder = useCancelOrder(syncedSelectedOrder)
-
   return (
-    <>
-      {syncedSelectedOrder && (
-        <CancelLimitsDialog
-          isVisible={cancelState !== CancellationState.NOT_STARTED}
-          orders={[syncedSelectedOrder]}
-          onCancel={() => setCancelState(CancellationState.NOT_STARTED)}
-          onConfirm={async () => {
-            setCancelState(CancellationState.CANCELLING)
-            await cancelOrder()
-            setCancelState(CancellationState.REVIEWING_CANCELLATION)
-          }}
-          cancelling={cancelState === CancellationState.CANCELLING}
-        />
-      )}
-      <Modal
-        maxWidth={375}
-        isOpen={!!selectedOrderAtomValue?.modalOpen && cancelState === CancellationState.NOT_STARTED}
-        onDismiss={reset}
-      >
-        <Wrapper data-testid="offchain-activity-modal">
-          <Row justify="space-between">
-            <ThemedText.SubHeader fontWeight={500}>
-              <Trans>Transaction details</Trans>
-            </ThemedText.SubHeader>
-            <StyledXButton onClick={reset} />
-          </Row>
-          {syncedSelectedOrder && (
-            <OrderContent
-              order={syncedSelectedOrder}
-              logos={selectedOrderAtomValue?.logos}
-              onCancel={() => {
-                setCancelState(CancellationState.REVIEWING_CANCELLATION)
-              }}
-            />
-          )}
-        </Wrapper>
-      </Modal>
-    </>
+    <Modal maxWidth={375} isOpen={!!selectedOrderAtomValue?.modalOpen} onDismiss={reset}>
+      <Wrapper data-testid="offchain-activity-modal">
+        <Row justify="space-between">
+          <ThemedText.SubHeader fontWeight={500}>
+            <Trans>Transaction details</Trans>
+          </ThemedText.SubHeader>
+          <StyledXButton onClick={reset} />
+        </Row>
+        {syncedSelectedOrder && <OrderContent order={syncedSelectedOrder} logos={selectedOrderAtomValue?.logos} />}
+      </Wrapper>
+    </Modal>
   )
 }
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainOrderLineItem.test.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainOrderLineItem.test.tsx
index 723a237fff8..9dd4b4f5628 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainOrderLineItem.test.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainOrderLineItem.test.tsx
@@ -27,9 +27,6 @@ describe('OffchainOrderLineItem', () => {
         type={OffchainOrderLineItemType.EXPIRY}
         order={{
           txHash: '0x123',
-          orderHash: '0x123',
-          offerer: '0xSenderAddress',
-          id: 'tx123',
           chainId: 1,
           type: SignatureType.SIGN_UNISWAPX_ORDER,
           status: UniswapXOrderStatus.FILLED,
@@ -65,9 +62,6 @@ describe('OffchainOrderLineItem', () => {
         explorerLink="https://etherscan.io/tx/0x123"
         order={{
           txHash: '0x123',
-          orderHash: '0x123',
-          offerer: '0xSenderAddress',
-          id: 'tx123',
           chainId: 1,
           type: SignatureType.SIGN_UNISWAPX_ORDER,
           status: UniswapXOrderStatus.FILLED,
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainOrderLineItem.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainOrderLineItem.tsx
index 1f9b85ec193..ddfb420c53f 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainOrderLineItem.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/OffchainOrderLineItem.tsx
@@ -2,12 +2,12 @@ import { Trans } from '@lingui/macro'
 import { Currency, CurrencyAmount, Price } from '@uniswap/sdk-core'
 import { DetailLineItem, LineItemData } from 'components/swap/DetailLineItem'
 import TradePrice from 'components/swap/TradePrice'
-import { UniswapXOrderDetails } from 'state/signatures/types'
 import { ExternalLink } from 'theme/components'
 import { ellipseMiddle } from 'utils/addresses'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
 import { formatTimestamp } from '../formatTimestamp'
+import { OffchainOrderDetails } from './types'
 
 export enum OffchainOrderLineItemType {
   EXCHANGE_RATE = 'EXCHANGE_RATE',
@@ -26,12 +26,12 @@ export type OffchainOrderLineItemProps =
     }
   | {
       type: OffchainOrderLineItemType.EXPIRY
-      order: UniswapXOrderDetails
+      order: OffchainOrderDetails
     }
   | {
       type: OffchainOrderLineItemType.TRANSACTION_ID
       explorerLink: string
-      order: UniswapXOrderDetails
+      order: OffchainOrderDetails
     }
   | {
       type: OffchainOrderLineItemType.NETWORK_COST
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/CancelLimitsDialog.test.tsx.snap b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/CancelLimitsDialog.test.tsx.snap
deleted file mode 100644
index 953b6d0fce9..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/CancelLimitsDialog.test.tsx.snap
+++ /dev/null
@@ -1,604 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`CancelLimitsDialog should render correctly 1`] = `
-.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;
-  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;
-}
-
-.c19 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 12px;
-}
-
-.c15 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c17 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c11 {
-  color: #222222;
-  cursor: pointer;
-}
-
-.c7 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c7:hover {
-  opacity: 0.6;
-}
-
-.c7:active {
-  opacity: 0.4;
-}
-
-.c23 {
-  background-color: transparent;
-  bottom: 0;
-  border-radius: inherit;
-  height: 100%;
-  left: 0;
-  position: absolute;
-  right: 0;
-  top: 0;
-  -webkit-transition: 150ms ease background-color;
-  transition: 150ms ease background-color;
-  width: 100%;
-}
-
-.c20 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #22222212;
-  border-radius: 16px;
-  border: 0;
-  color: #222222;
-  cursor: pointer;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  font-size: 14px;
-  font-weight: 535;
-  gap: 12px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  line-height: 16px;
-  padding: 8px;
-  position: relative;
-  -webkit-transition: 150ms ease opacity;
-  transition: 150ms ease opacity;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c20:active .c22 {
-  background-color: #B8C0DC3d;
-}
-
-.c20:focus .c22 {
-  background-color: #B8C0DC3d;
-}
-
-.c20:hover .c22 {
-  background-color: #98A1C014;
-}
-
-.c20:disabled {
-  cursor: default;
-  opacity: 0.6;
-}
-
-.c20:disabled:active .c22,
-.c20:disabled:focus .c22,
-.c20:disabled:hover .c22 {
-  background-color: transparent;
-}
-
-.c24 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #FF5F52;
-  border-radius: 16px;
-  border: 0;
-  color: #222222;
-  cursor: pointer;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  font-size: 14px;
-  font-weight: 535;
-  gap: 12px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  line-height: 16px;
-  padding: 8px;
-  position: relative;
-  -webkit-transition: 150ms ease opacity;
-  transition: 150ms ease opacity;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c24:active .c22 {
-  background-color: #B8C0DC3d;
-}
-
-.c24:focus .c22 {
-  background-color: #B8C0DC3d;
-}
-
-.c24:hover .c22 {
-  background-color: #98A1C014;
-}
-
-.c24:disabled {
-  cursor: default;
-  opacity: 0.6;
-}
-
-.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 6px;
-  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;
-}
-
-.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;
-}
-
-.c3 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c0 {
-  will-change: transform,opacity;
-}
-
-.c0[data-reach-dialog-overlay] {
-  z-index: 1040;
-  background-color: transparent;
-  overflow: hidden;
-  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;
-  overflow-y: scroll;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  background-color: rgba(0,0,0,0.60);
-}
-
-.c1 {
-  overflow-y: auto;
-}
-
-.c1[data-reach-dialog-content] {
-  margin: auto;
-  background-color: #F9F9F9;
-  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);
-  padding: 0px;
-  width: 50vw;
-  overflow-y: auto;
-  overflow-x: hidden;
-  max-width: 420px;
-  max-height: 90vh;
-  display: inline-table;
-  border-radius: 20px;
-}
-
-.c4 {
-  background-color: #FFFFFF;
-  outline: 1px solid #22222212;
-  border-radius: 20px;
-  padding: 16px 24px 24px 24px;
-  width: 100%;
-}
-
-.c14 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  background-color: #22222212;
-  width: 48px;
-  height: 48px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  border-radius: 12px;
-}
-
-.c16 {
-  font-size: 24px;
-  line-height: 32px;
-  text-align: center;
-  font-weight: 500;
-}
-
-.c18 {
-  font-size: 16px;
-  font-weight: 500;
-  line-height: 24px;
-  -webkit-letter-spacing: 0em;
-  -moz-letter-spacing: 0em;
-  -ms-letter-spacing: 0em;
-  letter-spacing: 0em;
-  text-align: center;
-}
-
-.c21 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-  height: 40px;
-}
-
-.c12 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c12:hover {
-  opacity: 0.6;
-}
-
-.c12:active {
-  opacity: 0.4;
-}
-
-@media screen and (max-width:640px) {
-  .c0[data-reach-dialog-overlay] {
-    -webkit-align-items: flex-end;
-    -webkit-box-align: flex-end;
-    -ms-flex-align: flex-end;
-    align-items: flex-end;
-  }
-}
-
-@media screen and (max-width:768px) {
-  .c1[data-reach-dialog-content] {
-    width: 65vw;
-  }
-}
-
-@media screen and (max-width:640px) {
-  .c1[data-reach-dialog-content] {
-    margin: 0;
-    width: 100vw;
-    border-radius: 20px;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-}
-
-<body>
-  <div
-    aria-hidden="true"
-  />
-  <reach-portal>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="0"
-    />
-    <div
-      data-focus-lock-disabled="false"
-    >
-      <div>
-        <div
-          class="c0"
-          data-reach-dialog-overlay=""
-          style="opacity: 0;"
-        >
-          <div
-            aria-label="dialog"
-            aria-modal="true"
-            class="c1"
-            data-reach-dialog-content=""
-            role="dialog"
-            tabindex="-1"
-          >
-            <div
-              class="c2 c3 c4"
-            >
-              <div
-                class="c5 c6"
-                width="100%"
-              >
-                <a
-                  class="c7 c8"
-                  href="https://support.uniswap.org/hc/en-us"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  <div
-                    class="c9 c10"
-                  >
-                    <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="c11 c12"
-                  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="c13 c3"
-              >
-                <div
-                  class="c14"
-                >
-                  <svg
-                    fill="none"
-                    height="28"
-                    stroke="currentColor"
-                    stroke-linecap="round"
-                    stroke-linejoin="round"
-                    stroke-width="2"
-                    viewBox="0 0 24 24"
-                    width="28"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <circle
-                      cx="12"
-                      cy="12"
-                      r="10"
-                    />
-                    <line
-                      x1="4.93"
-                      x2="19.07"
-                      y1="4.93"
-                      y2="19.07"
-                    />
-                  </svg>
-                </div>
-                <div
-                  class="c15 c16 css-4kpdx7"
-                >
-                  Cancel limit
-                </div>
-                <div
-                  class="c17 c18 css-1urox24"
-                >
-                  Are you sure you want to cancel your limit before it executes or expires?
-                </div>
-              </div>
-              <div
-                class="c9 c19"
-              >
-                <button
-                  class="c20 c21"
-                >
-                  <div
-                    class="c22 c23"
-                  />
-                  Nevermind
-                </button>
-                <button
-                  class="c24 c21"
-                >
-                  <div
-                    class="c22 c23"
-                  />
-                  Proceed
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="0"
-    />
-  </reach-portal>
-</body>
-`;
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 b17b2eb05cf..6031b12c4f1 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
@@ -69,25 +69,10 @@ exports[`OrderContent should render without error, filled order 1`] = `
 
 .c6 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c13 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c22 {
@@ -176,6 +161,33 @@ exports[`OrderContent should render without error, filled order 1`] = `
   gap: 8px;
 }
 
+.c15 {
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 36px;
+  height: 36px;
+  border-radius: 50%;
+}
+
+.c14 {
+  width: 36px;
+  height: 36px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
+  border-radius: 50%;
+}
+
+.c13 {
+  position: relative;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+}
+
 .c4 {
   display: -webkit-box;
   display: -webkit-flex;
@@ -226,20 +238,6 @@ exports[`OrderContent should render without error, filled order 1`] = `
   border-radius: 50%;
 }
 
-.c15 {
-  width: 36px;
-  height: 36px;
-  border-radius: 50%;
-}
-
-.c14 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
 .c19 {
   cursor: auto;
   color: #7D7D7D;
@@ -340,7 +338,7 @@ exports[`OrderContent should render without error, filled order 1`] = `
             class="c12"
           >
             <div
-              class="c13 css-15popx1"
+              class="css-1geukv8"
               data-testid="INPUT-amount"
             >
               252.074
@@ -355,14 +353,16 @@ exports[`OrderContent should render without error, filled order 1`] = `
           </div>
         </div>
         <div
-          class="c14"
+          class="c13"
           style="height: 36px; width: 36px;"
         >
           <div
-            class="c3"
+            class="c14"
           >
             <img
+              alt="DAI logo"
               class="c15"
+              loading="lazy"
               src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
             />
           </div>
@@ -399,7 +399,7 @@ exports[`OrderContent should render without error, filled order 1`] = `
             class="c12"
           >
             <div
-              class="c13 css-15popx1"
+              class="css-1geukv8"
               data-testid="OUTPUT-amount"
             >
               0.10684
@@ -414,14 +414,16 @@ exports[`OrderContent should render without error, filled order 1`] = `
           </div>
         </div>
         <div
-          class="c14"
+          class="c13"
           style="height: 36px; width: 36px;"
         >
           <div
-            class="c3"
+            class="c14"
           >
             <img
+              alt="WETH logo"
               class="c15"
+              loading="lazy"
               src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png"
             />
           </div>
@@ -502,567 +504,3 @@ exports[`OrderContent should render without error, filled order 1`] = `
   </div>
 </div>
 `;
-
-exports[`OrderContent should render without error, open order 1`] = `
-.c1 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c2 {
-  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;
-}
-
-.c11 {
-  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;
-  gap: 12px;
-}
-
-.c17 {
-  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;
-}
-
-.c18 {
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.c6 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c7 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c13 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c8 {
-  width: 100%;
-  height: 1px;
-  border-width: 0;
-  margin: 0;
-  background-color: #22222212;
-}
-
-.c25 {
-  background-color: transparent;
-  bottom: 0;
-  border-radius: inherit;
-  height: 100%;
-  left: 0;
-  position: absolute;
-  right: 0;
-  top: 0;
-  -webkit-transition: 150ms ease background-color;
-  transition: 150ms ease background-color;
-  width: 100%;
-}
-
-.c22 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #FF5F521f;
-  border-radius: 16px;
-  border: 0;
-  color: #FF5F52;
-  cursor: pointer;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  font-size: 20px;
-  font-weight: 535;
-  gap: 12px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  line-height: 24px;
-  padding: 16px;
-  position: relative;
-  -webkit-transition: 150ms ease opacity;
-  transition: 150ms ease opacity;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c22:active .c24 {
-  background-color: #B8C0DC3d;
-}
-
-.c22:focus .c24 {
-  background-color: #B8C0DC3d;
-}
-
-.c22:hover .c24 {
-  background-color: #98A1C014;
-}
-
-.c22:disabled {
-  cursor: default;
-  opacity: 0.6;
-}
-
-.c22:disabled:active .c24,
-.c22:disabled:focus .c24,
-.c22:disabled:hover .c24 {
-  background-color: transparent;
-}
-
-.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;
-}
-
-.c16 {
-  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;
-}
-
-.c4 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  gap: 2px;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c4 img:nth-child(n) {
-  width: 19px;
-  height: 40px;
-  object-fit: cover;
-}
-
-.c4 img:nth-child(1) {
-  border-radius: 20px 0 0 20px;
-  object-position: 0 0;
-}
-
-.c4 img:nth-child(2) {
-  border-radius: 0 20px 20px 0;
-  object-position: 100% 0;
-}
-
-.c3 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c5 {
-  width: 40px;
-  height: 40px;
-  border-radius: 50%;
-}
-
-.c15 {
-  width: 36px;
-  height: 36px;
-  border-radius: 50%;
-}
-
-.c14 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.c19 {
-  cursor: auto;
-  color: #7D7D7D;
-}
-
-.c20 {
-  text-align: right;
-  overflow-wrap: break-word;
-}
-
-.c21 {
-  background-color: transparent;
-  border: none;
-  cursor: pointer;
-  -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: 0;
-  grid-template-columns: 1fr auto;
-  grid-gap: 0.25rem;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  text-align: left;
-  -webkit-flex-wrap: wrap;
-  -ms-flex-wrap: wrap;
-  flex-wrap: wrap;
-  -webkit-user-select: text;
-  -moz-user-select: text;
-  -ms-user-select: text;
-  user-select: text;
-}
-
-.c9 {
-  margin: 28px 0;
-}
-
-.c23 {
-  margin-top: 16px;
-}
-
-<div>
-  <div
-    class="c0"
-  >
-    <div
-      class="c1 c2"
-    >
-      <div
-        class="c3"
-      >
-        <div
-          class="c4"
-        >
-          <img
-            class="c5"
-            src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
-          />
-          <img
-            class="c5"
-            src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png"
-          />
-        </div>
-      </div>
-      <div
-        class="c0"
-      >
-        <div
-          class="c6 css-rjqmed"
-        >
-          Order pending
-        </div>
-        <div
-          class="c7 css-1aekuku"
-        >
-          Mock Date
-        </div>
-      </div>
-    </div>
-    <div
-      class="c8 c9"
-    />
-    <div
-      class="c10"
-    >
-      <div
-        class="c1 c11"
-      >
-        <div
-          class="c12"
-        >
-          <div
-            class="c12"
-          >
-            <div
-              class="c13 css-15popx1"
-              data-testid="INPUT-amount"
-            >
-              252.074
-               
-              DAI
-            </div>
-            <div
-              class="c7 css-142zc9n"
-            >
-              -
-            </div>
-          </div>
-        </div>
-        <div
-          class="c14"
-          style="height: 36px; width: 36px;"
-        >
-          <div
-            class="c3"
-          >
-            <img
-              class="c15"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
-            />
-          </div>
-        </div>
-      </div>
-      <svg
-        fill="none"
-        height="24"
-        stroke="#CECECE"
-        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="12"
-          x2="12"
-          y1="5"
-          y2="19"
-        />
-        <polyline
-          points="19 12 12 19 5 12"
-        />
-      </svg>
-      <div
-        class="c1 c11"
-      >
-        <div
-          class="c12"
-        >
-          <div
-            class="c12"
-          >
-            <div
-              class="c13 css-15popx1"
-              data-testid="OUTPUT-amount"
-            >
-              0.10684
-               
-              WETH
-            </div>
-            <div
-              class="c7 css-142zc9n"
-            >
-              -
-            </div>
-          </div>
-        </div>
-        <div
-          class="c14"
-          style="height: 36px; width: 36px;"
-        >
-          <div
-            class="c3"
-          >
-            <img
-              class="c15"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png"
-            />
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="c8 c9"
-    />
-    <div
-      class="c16"
-    >
-      <div
-        class="c1 c17 c18"
-      >
-        <div
-          class="c6 c19 css-142zc9n"
-          data-testid="swap-li-label"
-        >
-          Rate
-        </div>
-        <div
-          class="c6 c20 css-142zc9n"
-        >
-          <button
-            class="c21"
-            title="1 WETH = 2,359.34 DAI "
-          >
-            <div
-              class="c6 css-142zc9n"
-            >
-              1 WETH = 2,359.34 DAI 
-            </div>
-             
-          </button>
-        </div>
-      </div>
-      <div
-        class="c1 c17 c18"
-      >
-        <div
-          class="c6 c19 css-142zc9n"
-          data-testid="swap-li-label"
-        >
-          Expiry
-        </div>
-        <div
-          class="c6 c20 css-142zc9n"
-        >
-          <span>
-            Mock Date
-          </span>
-        </div>
-      </div>
-      <div
-        class="c1 c17 c18"
-      >
-        <div
-          class="c6 c19 css-142zc9n"
-          data-testid="swap-li-label"
-        >
-          Network cost
-        </div>
-        <div
-          class="c6 c20 css-142zc9n"
-        >
-          <span>
-            $0
-          </span>
-        </div>
-      </div>
-    </div>
-    <button
-      class="c22 c23"
-      size="2"
-    >
-      <div
-        class="c24 c25"
-      />
-      Cancel
-    </button>
-  </div>
-</div>
-`;
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/OffchainOrderLineItem.test.tsx.snap b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/OffchainOrderLineItem.test.tsx.snap
index c546eba01f7..7da272fd401 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/OffchainOrderLineItem.test.tsx.snap
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/OffchainOrderLineItem.test.tsx.snap
@@ -34,10 +34,6 @@ exports[`OffchainOrderLineItem should render type EXCHANGE_RATE 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c4 {
@@ -144,10 +140,6 @@ exports[`OffchainOrderLineItem should render type NETWORK_COST 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c4 {
@@ -214,10 +206,6 @@ exports[`OffchainOrderLineItem should render type TRANSACTION_ID 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c6 {
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/parseRemote.test.tsx.snap b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/parseRemote.test.tsx.snap
index a70db79e6fe..2b8777ff0e6 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/parseRemote.test.tsx.snap
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/__snapshots__/parseRemote.test.tsx.snap
@@ -103,18 +103,15 @@ Object {
   "offchainOrderDetails": Object {
     "addedTime": 10000,
     "chainId": 1,
-    "id": "someId",
-    "offerer": "someOfferer",
-    "orderHash": "someHash",
     "status": "expired",
     "swapInfo": Object {
-      "expectedOutputCurrencyAmountRaw": "200000000000000000000",
-      "inputCurrencyAmountRaw": "100000000000000000000",
+      "expectedOutputCurrencyAmountRaw": "200",
+      "inputCurrencyAmountRaw": "100",
       "inputCurrencyId": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
       "isUniswapXOrder": true,
-      "minimumOutputCurrencyAmountRaw": "200000000000000000000",
+      "minimumOutputCurrencyAmountRaw": "200",
       "outputCurrencyId": "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
-      "settledOutputCurrencyAmountRaw": "200000000000000000000",
+      "settledOutputCurrencyAmountRaw": "200",
       "tradeType": 0,
       "type": 1,
     },
@@ -398,9 +395,6 @@ Object {
   "offchainOrderDetails": Object {
     "addedTime": 10000,
     "chainId": 1,
-    "id": "transactionId",
-    "offerer": "0x50EC05ADe8280758E2077fcBC08D878D4aef79C3",
-    "orderHash": "someHash",
     "status": "filled",
     "swapInfo": Object {
       "expectedOutputCurrencyAmountRaw": "100000000000000000000",
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/hooks.ts b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/hooks.ts
index 76902314054..ebbbfca7617 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/hooks.ts
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/hooks.ts
@@ -1,12 +1,11 @@
-import { useLocalActivities } from 'components/AccountDrawer/MiniPortfolio/Activity/parseLocal'
 import { TransactionStatus, useActivityQuery } from 'graphql/data/__generated__/types-and-hooks'
 import { GQL_MAINNET_CHAINS } from 'graphql/data/util'
 import { useEffect, useMemo } from 'react'
 import { usePendingOrders } from 'state/signatures/hooks'
-import { SignatureType } from 'state/signatures/types'
 import { usePendingTransactions, useTransactionCanceller } from 'state/transactions/hooks'
 import { useFormatter } from 'utils/formatNumbers'
 
+import { useLocalActivities } from './parseLocal'
 import { parseRemoteActivities } from './parseRemote'
 import { Activity, ActivityMap } from './types'
 
@@ -93,29 +92,12 @@ export function useAllActivities(account: string) {
   return { loading, activities: combinedActivities, refetch }
 }
 
-export function useOpenLimitOrders(account: string) {
-  const { activities, loading, refetch } = useAllActivities(account)
-  const openLimitOrders =
-    activities?.filter(
-      (activity) =>
-        activity.offchainOrderDetails?.type === SignatureType.SIGN_LIMIT &&
-        activity.status === TransactionStatus.Pending
-    ) ?? []
-  return {
-    openLimitOrders,
-    loading,
-    refetch,
-  }
-}
-
 export function usePendingActivity() {
   const pendingTransactions = usePendingTransactions()
   const pendingOrders = usePendingOrders()
 
-  const pendingOrdersWithoutLimits = pendingOrders.filter((order) => order.type !== SignatureType.SIGN_LIMIT)
-
-  const hasPendingActivity = pendingTransactions.length > 0 || pendingOrdersWithoutLimits.length > 0
-  const pendingActivityCount = pendingTransactions.length + pendingOrdersWithoutLimits.length
+  const hasPendingActivity = pendingTransactions.length > 0 || pendingOrders.length > 0
+  const pendingActivityCount = pendingTransactions.length + pendingOrders.length
 
   return { hasPendingActivity, pendingActivityCount }
 }
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 7fe7811e34f..5d5d8269d4f 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseLocal.test.ts
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseLocal.test.ts
@@ -1,14 +1,14 @@
-import { ChainId, TradeType as MockTradeType, Token } from '@uniswap/sdk-core'
+import { ChainId, Token, TradeType as MockTradeType } from '@uniswap/sdk-core'
 import { PERMIT2_ADDRESS } from '@uniswap/universal-router-sdk'
-import { DAI as MockDAI, USDC_MAINNET as MockUSDC_MAINNET, USDT as MockUSDT, nativeOnChain } from 'constants/tokens'
+import { DAI as MockDAI, nativeOnChain, USDC_MAINNET as MockUSDC_MAINNET, USDT as MockUSDT } from 'constants/tokens'
 import { TransactionStatus as MockTxStatus } from 'graphql/data/__generated__/types-and-hooks'
 import { ChainTokenMap } from 'hooks/Tokens'
 import {
   ExactInputSwapTransactionInfo,
   ExactOutputSwapTransactionInfo,
-  TransactionType as MockTxType,
   TransactionDetails,
   TransactionInfo,
+  TransactionType as MockTxType,
 } from 'state/transactions/types'
 import { renderHook } from 'test-utils/render'
 import { useFormatter } from 'utils/formatNumbers'
@@ -502,7 +502,7 @@ describe('parseLocalActivity', () => {
     })
   })
 
-  it('Signature to activity - returns undefined if is filled onchain order', () => {
+  it('Signature to activity - returns undefined if is on chain order', () => {
     const { formatNumber } = renderHook(() => useFormatter()).result.current
 
     expect(
@@ -515,65 +515,16 @@ describe('parseLocalActivity', () => {
         formatNumber
       )
     ).toBeUndefined()
-  })
-
-  it('Signature to activity - returns activity if is cancelled onchain order', () => {
-    const { formatNumber } = renderHook(() => useFormatter()).result.current
 
     expect(
       signatureToActivity(
         {
           type: SignatureType.SIGN_UNISWAPX_ORDER,
           status: UniswapXOrderStatus.CANCELLED,
-          chainId: ChainId.MAINNET,
-          swapInfo: mockSwapInfo(
-            MockTradeType.EXACT_INPUT,
-            MockUSDC_MAINNET,
-            mockCurrencyAmountRawUSDC,
-            MockDAI,
-            mockCurrencyAmountRaw
-          ),
         } as SignatureDetails,
-        {
-          [ChainId.MAINNET]: {
-            [MockUSDC_MAINNET.address]: MockUSDC_MAINNET,
-            [MockDAI.address]: MockDAI,
-          },
-        },
+        {},
         formatNumber
       )
-    ).toEqual({
-      chainId: 1,
-      currencies: [MockUSDC_MAINNET, MockDAI],
-      descriptor: '1.00 USDC for 1.00 DAI',
-      from: undefined,
-      hash: undefined,
-      offchainOrderDetails: {
-        addedTime: undefined,
-        chainId: 1,
-        encodedOrder: undefined,
-        id: undefined,
-        offerer: undefined,
-        orderHash: undefined,
-        status: 'cancelled',
-        swapInfo: {
-          expectedOutputCurrencyAmountRaw: '1000000000000000000',
-          inputCurrencyAmountRaw: '1000000',
-          inputCurrencyId: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-          isUniswapXOrder: false,
-          minimumOutputCurrencyAmountRaw: '1000000000000000000',
-          outputCurrencyId: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
-          tradeType: 0,
-          type: 1,
-        },
-        txHash: undefined,
-        type: 'signUniswapXOrder',
-      },
-      prefixIconSrc: undefined,
-      status: 'FAILED',
-      statusMessage: undefined,
-      timestamp: NaN,
-      title: 'Swap cancelled',
-    })
+    ).toBeUndefined()
   })
 })
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseLocal.ts b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseLocal.ts
index ba01932ad56..b7773d2a395 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseLocal.ts
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseLocal.ts
@@ -19,15 +19,13 @@ import {
   ExactOutputSwapTransactionInfo,
   MigrateV2LiquidityToV3TransactionInfo,
   RemoveLiquidityV3TransactionInfo,
-  SendTransactionInfo,
   TransactionDetails,
   TransactionType,
   WrapTransactionInfo,
 } from 'state/transactions/types'
-import { isAddress } from 'utils'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
-import { CancelledTransactionTitleTable, getActivityTitle, LimitOrderTextTable, OrderTextTable } from '../constants'
+import { CancelledTransactionTitleTable, getActivityTitle, OrderTextTable } from '../constants'
 import { Activity, ActivityMap } from './types'
 
 type FormatNumberFunctionType = ReturnType<typeof useFormatter>['formatNumber']
@@ -176,28 +174,6 @@ function parseMigrateCreateV3(
   return { descriptor, currencies: [baseCurrency, quoteCurrency] }
 }
 
-function parseSend(
-  send: SendTransactionInfo,
-  chainId: ChainId,
-  tokens: ChainTokenMap,
-  formatNumber: FormatNumberFunctionType
-): Partial<Activity> {
-  const { currencyId, amount, recipient } = send
-  const currency = getCurrency(currencyId, chainId, tokens)
-  const formattedAmount = currency
-    ? formatNumber({
-        input: parseFloat(CurrencyAmount.fromRawAmount(currency, amount).toSignificant()),
-        type: NumberType.TokenNonTx,
-      })
-    : t`Unknown`
-
-  return {
-    descriptor: `${formattedAmount} ${currency?.symbol} ${t`to`} `,
-    otherAccount: isAddress(recipient) || undefined,
-    currencies: [currency],
-  }
-}
-
 export function getTransactionStatus(details: TransactionDetails): TransactionStatus {
   return !details.receipt
     ? TransactionStatus.Pending
@@ -244,8 +220,6 @@ export function transactionToActivity(
       additionalFields = parseCollectFees(info, chainId, tokens, formatNumber)
     } else if (info.type === TransactionType.MIGRATE_LIQUIDITY_V3 || info.type === TransactionType.CREATE_V3_POOL) {
       additionalFields = parseMigrateCreateV3(info, chainId, tokens)
-    } else if (info.type === TransactionType.SEND) {
-      additionalFields = parseSend(info, chainId, tokens, formatNumber)
     }
 
     const activity = { ...defaultFields, ...additionalFields }
@@ -268,15 +242,11 @@ export function signatureToActivity(
   formatNumber: FormatNumberFunctionType
 ): Activity | undefined {
   switch (signature.type) {
-    case SignatureType.SIGN_UNISWAPX_ORDER:
-    case SignatureType.SIGN_LIMIT: {
+    case SignatureType.SIGN_UNISWAPX_ORDER: {
       // Only returns Activity items for orders that don't have an on-chain counterpart
       if (isOnChainOrder(signature.status)) return undefined
 
-      const { title, statusMessage, status } =
-        signature.type === SignatureType.SIGN_LIMIT
-          ? LimitOrderTextTable[signature.status]
-          : OrderTextTable[signature.status]
+      const { title, statusMessage, status } = OrderTextTable[signature.status]
 
       return {
         hash: signature.orderHash,
@@ -284,20 +254,14 @@ export function signatureToActivity(
         title,
         status,
         offchainOrderDetails: {
-          orderHash: signature.orderHash,
-          id: signature.id,
-          offerer: signature.offerer,
-          txHash: signature.txHash,
+          txHash: signature.orderHash,
           chainId: signature.chainId,
-          type:
-            signature.type === SignatureType.SIGN_LIMIT ? SignatureType.SIGN_LIMIT : SignatureType.SIGN_UNISWAPX_ORDER,
+          type: SignatureType.SIGN_UNISWAPX_ORDER,
           status: signature.status,
           swapInfo: signature.swapInfo,
           addedTime: signature.addedTime,
-          encodedOrder: signature.encodedOrder,
-          expiry: signature.expiry,
         },
-        timestamp: signature.addedTime / 1000,
+        timestamp: signature.addedTime,
         from: signature.offerer,
         statusMessage,
         prefixIconSrc: UniswapXBolt,
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseRemote.test.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseRemote.test.tsx
index cc592aab2d2..6da8f6d30d5 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseRemote.test.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseRemote.test.tsx
@@ -207,9 +207,6 @@ describe('parseRemote', () => {
       expect(result).toEqual({
         chainId: 1,
         status: 'filled',
-        id: 'tx123',
-        offerer: '0xSenderAddress',
-        orderHash: '0xHashValue',
         swapInfo: {
           expectedOutputCurrencyAmountRaw: '100000000000000000000',
           inputCurrencyAmountRaw: '100000000000000000000',
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseRemote.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseRemote.tsx
index 9da0e590815..2e5ea930ad7 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseRemote.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/parseRemote.tsx
@@ -3,8 +3,7 @@ import { ChainId, Currency, NONFUNGIBLE_POSITION_MANAGER_ADDRESSES, TradeType, U
 import UniswapXBolt from 'assets/svg/bolt.svg'
 import moonpayLogoSrc from 'assets/svg/moonpay.svg'
 import { nativeOnChain } from 'constants/tokens'
-import { BigNumber } from 'ethers/lib/ethers'
-import { formatUnits, parseUnits } from 'ethers/lib/utils'
+import { parseUnits } from 'ethers/lib/utils'
 import {
   AssetActivityPartsFragment,
   Currency as GQLCurrency,
@@ -26,7 +25,7 @@ import ms from 'ms'
 import { useEffect, useState } from 'react'
 import store from 'state'
 import { addSignature } from 'state/signatures/reducer'
-import { SignatureType, UniswapXOrderDetails } from 'state/signatures/types'
+import { SignatureType } from 'state/signatures/types'
 import { TransactionType as LocalTransactionType } from 'state/transactions/types'
 import { isAddress } from 'utils'
 import { isSameAddress } from 'utils/addresses'
@@ -34,7 +33,7 @@ import { currencyId } from 'utils/currencyId'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
 import { MOONPAY_SENDER_ADDRESSES, OrderStatusTable, OrderTextTable } from '../constants'
-import { Activity } from './types'
+import { Activity, OffchainOrderDetails } from './types'
 
 type TransactionChanges = {
   NftTransfer: NftTransferPartsFragment[]
@@ -191,18 +190,10 @@ export function parseSwapAmounts(
   const inputCurrencyId = sent.asset.standard === 'NATIVE' ? 'ETH' : sent.asset.address
   const outputCurrencyId = received.asset.standard === 'NATIVE' ? 'ETH' : received.asset.address
   if (!inputCurrencyId || !outputCurrencyId) return undefined
-
-  const sentQuantity = parseUnits(sent.quantity, sent.asset.decimals)
-  const refundQuantity = refund ? parseUnits(refund.quantity, refund.asset.decimals) : BigNumber.from(0)
-  const receivedQuantity = parseUnits(received.quantity, received.asset.decimals)
-
-  const adjustedInput = sentQuantity.sub(refundQuantity)
-  const inputAmountRaw = adjustedInput.toString()
-  const outputAmountRaw = receivedQuantity.toString()
-  const inputAmount = formatNumberOrString({
-    input: formatUnits(adjustedInput, sent.asset.decimals),
-    type: NumberType.TokenNonTx,
-  })
+  const adjustedInput = parseFloat(sent.quantity) - parseFloat(refund?.quantity ?? '0')
+  const inputAmountRaw = parseUnits(adjustedInput.toString(), sent.asset.decimals).toString()
+  const outputAmountRaw = parseUnits(received.quantity, received.asset.decimals).toString()
+  const inputAmount = formatNumberOrString({ input: adjustedInput, type: NumberType.TokenNonTx })
   const outputAmount = formatNumberOrString({ input: received.quantity, type: NumberType.TokenNonTx })
   return {
     sent,
@@ -279,7 +270,7 @@ export function offchainOrderDetailsFromGraphQLTransactionActivity(
   activity: AssetActivityPartsFragment & { details: TransactionDetailsPartsFragment },
   changes: TransactionChanges,
   formatNumberOrString: FormatNumberOrStringFunctionType
-): UniswapXOrderDetails | undefined {
+): OffchainOrderDetails | undefined {
   const chainId = supportedChainIdFromGQLChain(activity.chain)
   if (!activity || !activity.details || !chainId) return undefined
   if (changes.TokenTransfer.length < 2) return undefined
@@ -291,9 +282,6 @@ export function offchainOrderDetailsFromGraphQLTransactionActivity(
   const { inputCurrencyId, outputCurrencyId, inputAmountRaw, outputAmountRaw } = swapAmounts
 
   return {
-    orderHash: activity.details.hash,
-    id: activity.details.id,
-    offerer: activity.details.from,
     txHash: activity.details.hash,
     chainId,
     type: SignatureType.SIGN_UNISWAPX_ORDER,
@@ -511,12 +499,8 @@ function parseUniswapXOrder({ details, chain, timestamp }: OrderActivity): Activ
     status,
     statusMessage,
     offchainOrderDetails: {
-      id: details.id,
-      // TODO(limits): check type from backend and use SignatureType.SIGN_LIMIT here if necessary
       type: SignatureType.SIGN_UNISWAPX_ORDER,
       txHash: details.hash,
-      orderHash: details.hash,
-      offerer: details.offerer,
       chainId: supportedChain,
       status: uniswapXOrderStatus,
       addedTime: timestamp,
@@ -524,12 +508,12 @@ function parseUniswapXOrder({ details, chain, timestamp }: OrderActivity): Activ
         isUniswapXOrder: true,
         type: LocalTransactionType.SWAP,
         tradeType: TradeType.EXACT_INPUT,
-        inputCurrencyId: inputToken.address ?? '',
-        outputCurrencyId: outputToken.address ?? '',
-        inputCurrencyAmountRaw: parseUnits(inputTokenQuantity, inputToken.decimals).toString(),
-        expectedOutputCurrencyAmountRaw: parseUnits(outputTokenQuantity, outputToken.decimals).toString(),
-        minimumOutputCurrencyAmountRaw: parseUnits(outputTokenQuantity, outputToken.decimals).toString(),
-        settledOutputCurrencyAmountRaw: parseUnits(outputTokenQuantity, outputToken.decimals).toString(),
+        inputCurrencyId: inputToken.id,
+        outputCurrencyId: outputToken.id,
+        inputCurrencyAmountRaw: inputTokenQuantity,
+        expectedOutputCurrencyAmountRaw: outputTokenQuantity,
+        minimumOutputCurrencyAmountRaw: outputTokenQuantity,
+        settledOutputCurrencyAmountRaw: outputTokenQuantity,
       },
     },
     timestamp,
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/types.ts b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/types.ts
index 5197b0048a7..6eb1ffa459e 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/types.ts
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/types.ts
@@ -6,11 +6,16 @@ import { UniswapXOrderDetails } from 'state/signatures/types'
  * TODO: refactor parsing / Activity so that all Activity Types can have a detail sheet.
  */
 
+export type OffchainOrderDetails = Pick<
+  UniswapXOrderDetails,
+  'txHash' | 'chainId' | 'type' | 'status' | 'swapInfo' | 'addedTime' | 'expiry'
+>
+
 export type Activity = {
   hash: string
   chainId: ChainId
   status: TransactionStatus
-  offchainOrderDetails?: UniswapXOrderDetails
+  offchainOrderDetails?: OffchainOrderDetails
   statusMessage?: string
   timestamp: number
   title: string
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/utils.ts b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/utils.ts
index 114b9ec6951..6e0ba5e5ad3 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/utils.ts
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Activity/utils.ts
@@ -1,13 +1,7 @@
-import { Web3Provider } from '@ethersproject/providers'
 import { t } from '@lingui/macro'
-import { ChainId } from '@uniswap/sdk-core'
-import { DutchOrder, getCancelSingleParams } from '@uniswap/uniswapx-sdk'
 import { getYear, isSameDay, isSameMonth, isSameWeek, isSameYear } from 'date-fns'
 import { TransactionStatus } from 'graphql/data/__generated__/types-and-hooks'
-import { didUserReject } from 'utils/swapErrorToUserReadableMessage'
-import { Permit2 } from 'wallet/src/abis/types'
 
-import { BigNumber } from 'ethers/lib/ethers'
 import { Activity } from './types'
 
 interface ActivityGroup {
@@ -69,88 +63,3 @@ export const createGroups = (activities?: Array<Activity>) => {
 
   return transactionGroups.filter((transactionInformation) => transactionInformation.transactions.length > 0)
 }
-
-export async function cancelUniswapXOrder({
-  encodedOrder,
-  chainId,
-  permit2,
-  provider,
-}: {
-  encodedOrder: string
-  chainId: ChainId
-  permit2: Permit2 | null
-  provider?: Web3Provider
-}) {
-  const parsedOrder = DutchOrder.parse(encodedOrder, chainId)
-  const invalidateNonceInput = getCancelSingleParams(parsedOrder.info.nonce)
-  if (!permit2 || !provider) return
-  try {
-    return await permit2.invalidateUnorderedNonces(invalidateNonceInput.word, invalidateNonceInput.mask)
-  } catch (error) {
-    if (!didUserReject(error)) console.error(error)
-    return undefined
-  }
-}
-
-// TODO(WEB-3594): just use the uniswapx-sdk when getCancelMultipleParams is available
-
-interface SplitNonce {
-  word: BigNumber
-  bitPos: BigNumber
-}
-
-function splitNonce(nonce: BigNumber): SplitNonce {
-  const word = nonce.div(256)
-  const bitPos = nonce.mod(256)
-  return { word, bitPos }
-}
-
-// Get parameters to cancel multiple nonces
-// source: https://github.com/Uniswap/uniswapx-sdk/pull/112
-function getCancelMultipleParams(noncesToCancel: BigNumber[]): {
-  word: BigNumber
-  mask: BigNumber
-}[] {
-  const splitNonces = noncesToCancel.map(splitNonce)
-  const splitNoncesByWord: { [word: string]: SplitNonce[] } = {}
-  splitNonces.forEach((splitNonce) => {
-    const word = splitNonce.word.toString()
-    if (!splitNoncesByWord[word]) {
-      splitNoncesByWord[word] = []
-    }
-    splitNoncesByWord[word].push(splitNonce)
-  })
-  return Object.entries(splitNoncesByWord).map(([word, splitNonce]) => {
-    let mask = BigNumber.from(0)
-    splitNonce.forEach((splitNonce) => {
-      mask = mask.or(BigNumber.from(2).pow(splitNonce.bitPos))
-    })
-    return { word: BigNumber.from(word), mask }
-  })
-}
-
-export async function cancelMultipleUniswapXOrders({
-  encodedOrders,
-  chainId,
-  permit2,
-  provider,
-}: {
-  encodedOrders: string[]
-  chainId: ChainId
-  permit2: Permit2 | null
-  provider?: Web3Provider
-}) {
-  const parsedOrders = encodedOrders.map((encodedOrder) => DutchOrder.parse(encodedOrder, chainId))
-  const nonces: BigNumber[] = parsedOrders.map((order) => order.info.nonce)
-  const cancelParams = getCancelMultipleParams(nonces)
-  if (!permit2 || !provider) return
-  try {
-    for (const params of cancelParams) {
-      await permit2.invalidateUnorderedNonces(params.word, params.mask)
-    }
-    return true
-  } catch (error) {
-    if (!didUserReject(error)) console.error(error)
-    return undefined
-  }
-}
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitDetailActivityRow.test.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitDetailActivityRow.test.tsx
deleted file mode 100644
index f50f9fedd42..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitDetailActivityRow.test.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { ChainId, WETH9 } from '@uniswap/sdk-core'
-import { Activity } from 'components/AccountDrawer/MiniPortfolio/Activity/types'
-import { LimitDetailActivityRow } from 'components/AccountDrawer/MiniPortfolio/Limits/LimitDetailActivityRow'
-import { DAI } from 'constants/tokens'
-import { TransactionStatus } from 'graphql/data/__generated__/types-and-hooks'
-import { UniswapXOrderStatus } from 'lib/hooks/orders/types'
-import { SignatureType, UniswapXOrderDetails } from 'state/signatures/types'
-import { render, screen } from 'test-utils/render'
-
-jest.mock('components/AccountDrawer/MiniPortfolio/formatTimestamp', () => {
-  return {
-    formatTimestamp: () => 'Expires January 1, 1970 at 12:00 AM',
-  }
-})
-
-jest.mock('hooks/Tokens', () => {
-  return {
-    useCurrency: (address?: string) => {
-      if (address?.toLowerCase() === DAI.address.toLowerCase()) {
-        return DAI
-      }
-      if (address?.toLowerCase() === WETH9[ChainId.MAINNET].address.toLowerCase()) {
-        return WETH9[ChainId.MAINNET]
-      }
-      return undefined
-    },
-  }
-})
-
-const mockOrderDetails: UniswapXOrderDetails = {
-  type: SignatureType.SIGN_LIMIT,
-  orderHash: '0x1234',
-  status: UniswapXOrderStatus.OPEN,
-  swapInfo: {
-    isUniswapXOrder: true,
-    type: 1,
-    tradeType: 0,
-    inputCurrencyId: DAI.address,
-    outputCurrencyId: WETH9[ChainId.MAINNET].address,
-    inputCurrencyAmountRaw: '252074033564766400000',
-    expectedOutputCurrencyAmountRaw: '106841079134757921',
-    minimumOutputCurrencyAmountRaw: '106841079134757921',
-    settledOutputCurrencyAmountRaw: '106841079134757921',
-  },
-  txHash: '0x1234',
-  encodedOrder: '0xencodedOrder',
-  id: '0x1234',
-  addedTime: 3,
-  chainId: ChainId.MAINNET,
-  expiry: 4,
-  offerer: '0x1234',
-}
-
-const mockOrder: Activity = {
-  hash: '0x123',
-  chainId: ChainId.MAINNET,
-  status: TransactionStatus.Pending,
-  timestamp: 1,
-  title: 'Limit pending',
-  from: '0x456',
-  offchainOrderDetails: mockOrderDetails,
-}
-
-describe('LimitDetailActivityRow', () => {
-  it('should not render with invalid details', () => {
-    const { container } = render(
-      <LimitDetailActivityRow
-        order={{ ...mockOrder, offchainOrderDetails: undefined }}
-        onToggleSelect={jest.fn()}
-        selected={false}
-      />
-    )
-    expect(container.firstChild).toBeNull()
-  })
-
-  it('should not render with invalid amounts', () => {
-    const { container } = render(
-      <LimitDetailActivityRow
-        onToggleSelect={jest.fn()}
-        selected={false}
-        order={{ ...mockOrder, offchainOrderDetails: { ...mockOrderDetails, swapInfo: undefined as any } }}
-      />
-    )
-    expect(container.firstChild).toBeNull()
-  })
-
-  it('should render with valid details', () => {
-    const { container } = render(
-      <LimitDetailActivityRow onToggleSelect={jest.fn()} selected={false} order={mockOrder} />
-    )
-    expect(container.firstChild).toMatchSnapshot()
-    expect(screen.getByText('when 0.00042 WETH/DAI')).toBeInTheDocument()
-  })
-})
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitDetailActivityRow.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitDetailActivityRow.tsx
deleted file mode 100644
index 94b19459009..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitDetailActivityRow.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { Trans } from '@lingui/macro'
-import { CurrencyAmount, Price } from '@uniswap/sdk-core'
-import {
-  useOpenOffchainActivityModal,
-  useOrderAmounts,
-} from 'components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal'
-import { Activity } from 'components/AccountDrawer/MiniPortfolio/Activity/types'
-import { formatTimestamp } from 'components/AccountDrawer/MiniPortfolio/formatTimestamp'
-import { PortfolioLogo } from 'components/AccountDrawer/MiniPortfolio/PortfolioLogo'
-import PortfolioRow from 'components/AccountDrawer/MiniPortfolio/PortfolioRow'
-import Column from 'components/Column'
-import Row from 'components/Row'
-import { parseUnits } from 'ethers/lib/utils'
-import { Checkbox } from 'nft/components/layout/Checkbox'
-import { useMemo } from 'react'
-import { ArrowRight } from 'react-feather'
-import styled, { useTheme } from 'styled-components'
-import { ThemedText } from 'theme/components'
-import { useFormatter } from 'utils/formatNumbers'
-
-const StyledPortfolioRow = styled(PortfolioRow)`
-  padding: 8px 16px;
-  height: unset;
-`
-
-interface LimitDetailActivityRowProps {
-  order: Activity
-  onToggleSelect: (order: Activity) => void
-  selected: boolean
-}
-
-export function LimitDetailActivityRow({ order, onToggleSelect, selected }: LimitDetailActivityRowProps) {
-  const theme = useTheme()
-  const { chainId, logos, otherAccount, currencies, offchainOrderDetails } = order
-  const openOffchainActivityModal = useOpenOffchainActivityModal()
-  const { formatReviewSwapCurrencyAmount } = useFormatter()
-
-  const amounts = useOrderAmounts(order.offchainOrderDetails)
-  const amountsDefined = !!amounts?.inputAmount?.currency && !!amounts?.outputAmount?.currency
-
-  const displayPrice = useMemo(() => {
-    if (!amountsDefined) return undefined
-    const tradePrice = new Price({ baseAmount: amounts?.inputAmount, quoteAmount: amounts?.outputAmount })
-    return tradePrice.quote(
-      CurrencyAmount.fromRawAmount(
-        amounts.inputAmount.currency,
-        parseUnits('1', amounts.inputAmount.currency.decimals).toString()
-      )
-    )
-  }, [amounts?.inputAmount, amounts?.outputAmount, amountsDefined])
-
-  if (!offchainOrderDetails || !amountsDefined) return null
-
-  return (
-    <Row>
-      <StyledPortfolioRow
-        left={
-          <Column>
-            <PortfolioLogo chainId={chainId} currencies={currencies} images={logos} accountAddress={otherAccount} />
-          </Column>
-        }
-        title={
-          offchainOrderDetails?.expiry ? (
-            <ThemedText.LabelMicro fontWeight={500}>
-              <Trans>Expires {formatTimestamp(offchainOrderDetails.expiry * 1000, true)}</Trans>
-            </ThemedText.LabelMicro>
-          ) : undefined
-        }
-        descriptor={
-          <Column>
-            <Row gap="sm" align="center">
-              <ThemedText.SubHeader color="neutral1">
-                {formatReviewSwapCurrencyAmount(amounts.inputAmount)} {amounts.inputAmount.currency.symbol}
-              </ThemedText.SubHeader>
-              <ArrowRight color={theme.neutral1} size="12px" />
-              <ThemedText.SubHeader color="neutral1">
-                {formatReviewSwapCurrencyAmount(amounts.outputAmount)} {amounts.outputAmount.currency.symbol}
-              </ThemedText.SubHeader>
-            </Row>
-            {displayPrice && (
-              <ThemedText.SubHeaderSmall color={theme.neutral1}>
-                <Trans>
-                  when {formatReviewSwapCurrencyAmount(displayPrice)} {amounts.outputAmount.currency.symbol}/
-                  {amounts.inputAmount.currency.symbol}
-                </Trans>
-              </ThemedText.SubHeaderSmall>
-            )}
-          </Column>
-        }
-        right={undefined}
-        onClick={() => {
-          openOffchainActivityModal(offchainOrderDetails, {
-            inputLogo: order?.logos?.[0],
-            outputLogo: order?.logos?.[1],
-          })
-        }}
-      />
-      <Checkbox size={16} hovered={false} checked={selected} onChange={() => onToggleSelect(order)} />
-    </Row>
-  )
-}
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitsMenu.test.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitsMenu.test.tsx
deleted file mode 100644
index d5a908f7530..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitsMenu.test.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-import { ChainId, WETH9 } from '@uniswap/sdk-core'
-import { useOpenLimitOrders } from 'components/AccountDrawer/MiniPortfolio/Activity/hooks'
-import { Activity } from 'components/AccountDrawer/MiniPortfolio/Activity/types'
-import { LimitsMenu } from 'components/AccountDrawer/MiniPortfolio/Limits/LimitsMenu'
-import { DAI } from 'constants/tokens'
-import { TransactionStatus } from 'graphql/data/__generated__/types-and-hooks'
-import { UniswapXOrderStatus } from 'lib/hooks/orders/types'
-import { SignatureType, UniswapXOrderDetails } from 'state/signatures/types'
-import { mocked } from 'test-utils/mocked'
-import { act, fireEvent, render, screen } from 'test-utils/render'
-
-jest.mock('components/AccountDrawer/MiniPortfolio/Activity/hooks', () => ({
-  useOpenLimitOrders: jest.fn(),
-}))
-
-jest.mock('components/AccountDrawer/MiniPortfolio/formatTimestamp', () => ({
-  formatTimestamp: () => 'January 26, 2024 at 1:52PM',
-}))
-
-jest.mock('hooks/Tokens', () => {
-  return {
-    useCurrency: (address?: string) => {
-      if (address?.toLowerCase() === DAI.address.toLowerCase()) {
-        return DAI
-      }
-      if (address?.toLowerCase() === WETH9[ChainId.MAINNET].address.toLowerCase()) {
-        return WETH9[ChainId.MAINNET]
-      }
-      return undefined
-    },
-  }
-})
-
-const mockOrderDetails: UniswapXOrderDetails = {
-  type: SignatureType.SIGN_LIMIT,
-  orderHash: '0x1234',
-  status: UniswapXOrderStatus.OPEN,
-  swapInfo: {
-    isUniswapXOrder: true,
-    type: 1,
-    tradeType: 0,
-    inputCurrencyId: DAI.address,
-    outputCurrencyId: WETH9[ChainId.MAINNET].address,
-    inputCurrencyAmountRaw: '252074033564766400000',
-    expectedOutputCurrencyAmountRaw: '106841079134757921',
-    minimumOutputCurrencyAmountRaw: '106841079134757921',
-    settledOutputCurrencyAmountRaw: '106841079134757921',
-  },
-  txHash: '0x1234',
-  encodedOrder: '0xencodedOrder',
-  id: '0x1234',
-  addedTime: 3,
-  chainId: ChainId.MAINNET,
-  expiry: 4,
-  offerer: '0x1234',
-}
-
-const mockLimitActivity: Activity = {
-  hash: '0x123',
-  chainId: ChainId.MAINNET,
-  status: TransactionStatus.Pending,
-  timestamp: 1,
-  title: 'Limit pending',
-  from: '0x456',
-  offchainOrderDetails: mockOrderDetails,
-}
-
-describe('LimitsMenu', () => {
-  it('should render when there is one open order', () => {
-    mocked(useOpenLimitOrders).mockReturnValue({
-      openLimitOrders: [mockLimitActivity],
-      loading: false,
-      refetch: jest.fn(),
-    })
-    const { container } = render(<LimitsMenu onClose={jest.fn()} account="0x123" />)
-    expect(container).toMatchSnapshot()
-    expect(screen.getByText('Open limits')).toBeInTheDocument()
-    expect(screen.getByTestId('LimitsMenuContainer').children.length).toEqual(2) // one order and the cancel button
-  })
-
-  it('should render when there are two open orders', () => {
-    mocked(useOpenLimitOrders).mockReturnValue({
-      openLimitOrders: [mockLimitActivity, { ...mockLimitActivity, hash: '0x456' }],
-      loading: false,
-      refetch: jest.fn(),
-    })
-    const { container } = render(<LimitsMenu onClose={jest.fn()} account="0x123" />)
-    expect(container).toMatchSnapshot()
-    expect(screen.getByText('Open limits')).toBeInTheDocument()
-    expect(screen.getByTestId('LimitsMenuContainer').children.length).toEqual(3) // two orders and the cancel button
-  })
-
-  it('should call the close callback', () => {
-    const onClose = jest.fn()
-    mocked(useOpenLimitOrders).mockReturnValue({
-      openLimitOrders: [mockLimitActivity],
-      loading: false,
-      refetch: jest.fn(),
-    })
-    render(<LimitsMenu onClose={onClose} account="0x123" />)
-    act(() => {
-      fireEvent.click(screen.getByTestId('wallet-back'))
-    })
-    expect(onClose).toHaveBeenCalled()
-  })
-})
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitsMenu.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitsMenu.tsx
deleted file mode 100644
index 47851f8bc27..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/LimitsMenu.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { Plural, Trans } from '@lingui/macro'
-import { PERMIT2_ADDRESS } from '@uniswap/permit2-sdk'
-import { useWeb3React } from '@web3-react/core'
-import {
-  CancelLimitsDialog,
-  CancellationState,
-} from 'components/AccountDrawer/MiniPortfolio/Activity/CancelLimitsDialog'
-import { useOpenLimitOrders } from 'components/AccountDrawer/MiniPortfolio/Activity/hooks'
-import { Activity } from 'components/AccountDrawer/MiniPortfolio/Activity/types'
-import { cancelMultipleUniswapXOrders } from 'components/AccountDrawer/MiniPortfolio/Activity/utils'
-import { LimitDetailActivityRow } from 'components/AccountDrawer/MiniPortfolio/Limits/LimitDetailActivityRow'
-import { SlideOutMenu } from 'components/AccountDrawer/SlideOutMenu'
-import { ButtonEmphasis, ButtonSize, ThemeButton } from 'components/Button'
-import Column from 'components/Column'
-import { useContract } from 'hooks/useContract'
-import { useCallback, useState } from 'react'
-import { UniswapXOrderDetails } from 'state/signatures/types'
-import styled from 'styled-components'
-import PERMIT2_ABI from 'wallet/src/abis/permit2.json'
-import { Permit2 } from 'wallet/src/abis/types/Permit2'
-
-const Container = styled(Column)`
-  height: 100%;
-  position: relative;
-`
-
-const StyledCancelButton = styled(ThemeButton)`
-  position: absolute;
-  bottom: 16px;
-  width: 100%;
-`
-
-function useCancelMultipleOrders(orders?: UniswapXOrderDetails[]): () => Promise<true | undefined> {
-  const { provider } = useWeb3React()
-  const permit2 = useContract<Permit2>(PERMIT2_ADDRESS, PERMIT2_ABI, true)
-  return useCallback(async () => {
-    if (!orders || orders.length === 0) return undefined
-    return cancelMultipleUniswapXOrders({
-      encodedOrders: orders.map((order) => order.encodedOrder as string),
-      permit2,
-      provider,
-      chainId: orders?.[0].chainId,
-    })
-  }, [orders, permit2, provider])
-}
-
-export function LimitsMenu({ onClose, account }: { account: string; onClose: () => void }) {
-  const { openLimitOrders } = useOpenLimitOrders(account)
-  const [selectedOrders, setSelectedOrders] = useState<Record<string, UniswapXOrderDetails>>({})
-  const [cancelState, setCancelState] = useState(CancellationState.NOT_STARTED)
-  const cancelOrders = useCancelMultipleOrders(Object.values(selectedOrders))
-
-  const toggleOrderSelection = (order: Activity) => {
-    const newSelectedOrders = { ...selectedOrders }
-    if (order.hash in selectedOrders) {
-      delete newSelectedOrders[order.hash]
-    } else if (order.offchainOrderDetails) {
-      newSelectedOrders[order.hash] = order.offchainOrderDetails
-    }
-    setSelectedOrders(newSelectedOrders)
-  }
-
-  return (
-    <SlideOutMenu title={<Trans>Open limits</Trans>} onClose={onClose}>
-      <Container data-testid="LimitsMenuContainer">
-        {openLimitOrders.map((order) => (
-          <LimitDetailActivityRow
-            key={order.hash}
-            order={order}
-            selected={order.hash in selectedOrders}
-            onToggleSelect={toggleOrderSelection}
-          />
-        ))}
-        <StyledCancelButton
-          emphasis={ButtonEmphasis.destructive}
-          onClick={() => setCancelState(CancellationState.REVIEWING_CANCELLATION)}
-          size={ButtonSize.large}
-          disabled={cancelState !== CancellationState.NOT_STARTED || Object.keys(selectedOrders).length === 0}
-        >
-          <Plural
-            id="cancelling"
-            value={Object.keys(selectedOrders).length}
-            one="Cancel limit"
-            other={`Cancel ${Object.keys(selectedOrders).length} limits`}
-          />
-        </StyledCancelButton>
-      </Container>
-      <CancelLimitsDialog
-        isVisible={cancelState !== CancellationState.NOT_STARTED}
-        orders={Object.values(selectedOrders)}
-        onCancel={() => setCancelState(CancellationState.NOT_STARTED)}
-        onConfirm={async () => {
-          setCancelState(CancellationState.CANCELLING)
-          const result = await cancelOrders()
-          setCancelState(result ? CancellationState.NOT_STARTED : CancellationState.REVIEWING_CANCELLATION)
-        }}
-        cancelling={cancelState === CancellationState.CANCELLING}
-      />
-    </SlideOutMenu>
-  )
-}
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/OpenLimitOrdersButton.test.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/OpenLimitOrdersButton.test.tsx
deleted file mode 100644
index 9324564cd13..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/OpenLimitOrdersButton.test.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-import { ChainId } from '@uniswap/sdk-core'
-import { useOpenLimitOrders } from 'components/AccountDrawer/MiniPortfolio/Activity/hooks'
-import { OpenLimitOrdersButton } from 'components/AccountDrawer/MiniPortfolio/Limits/OpenLimitOrdersButton'
-import { TransactionStatus } from 'graphql/data/__generated__/types-and-hooks'
-import { mocked } from 'test-utils/mocked'
-import { act, fireEvent, render, screen } from 'test-utils/render'
-
-jest.mock('components/AccountDrawer/MiniPortfolio/Activity/hooks', () => ({
-  useOpenLimitOrders: jest.fn(),
-}))
-
-const mockLimitActivity = {
-  hash: '0x123',
-  chainId: ChainId.MAINNET,
-  status: TransactionStatus.Pending,
-  timestamp: 1,
-  title: 'Limit pending',
-  from: '0x456',
-}
-
-describe('OpenLimitOrdersButton', () => {
-  it('should not render if there are no open limit orders', () => {
-    mocked(useOpenLimitOrders).mockReturnValue({ openLimitOrders: [], loading: false, refetch: jest.fn() })
-    const { container } = render(<OpenLimitOrdersButton account="0x123" openLimitsMenu={jest.fn()} />)
-    expect(container.firstChild).toBeNull()
-  })
-  it('should render if there are open limit orders', () => {
-    mocked(useOpenLimitOrders).mockReturnValue({
-      openLimitOrders: [mockLimitActivity],
-      loading: false,
-      refetch: jest.fn(),
-    })
-    const { container } = render(<OpenLimitOrdersButton account="0x123" openLimitsMenu={jest.fn()} />)
-    expect(container).toMatchSnapshot()
-    expect(screen.getByText('1 open limit')).toBeInTheDocument()
-  })
-  it('should call the callback when clicked', () => {
-    mocked(useOpenLimitOrders).mockReturnValue({
-      openLimitOrders: [mockLimitActivity],
-      loading: false,
-      refetch: jest.fn(),
-    })
-    const clickCallback = jest.fn()
-    const { container } = render(<OpenLimitOrdersButton account="0x123" openLimitsMenu={clickCallback} />)
-    act(() => {
-      fireEvent.click(container.firstChild as HTMLElement)
-    })
-    expect(clickCallback).toHaveBeenCalled()
-  })
-  it('should have a warning when the limit is reached', () => {
-    mocked(useOpenLimitOrders).mockReturnValue({
-      openLimitOrders: Array(100).fill(mockLimitActivity),
-      loading: false,
-      refetch: jest.fn(),
-    })
-    render(<OpenLimitOrdersButton account="0x123" openLimitsMenu={jest.fn()} />)
-    expect(screen.getByText('Cancel limits to proceed')).toBeInTheDocument()
-  })
-
-  it('should have a warning when the limit is almost reached', () => {
-    mocked(useOpenLimitOrders).mockReturnValue({
-      openLimitOrders: Array(90).fill(mockLimitActivity),
-      loading: false,
-      refetch: jest.fn(),
-    })
-    render(<OpenLimitOrdersButton account="0x123" openLimitsMenu={jest.fn()} />)
-    expect(screen.getByText('Approaching 100 limit maximum')).toBeInTheDocument()
-  })
-})
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/OpenLimitOrdersButton.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/OpenLimitOrdersButton.tsx
deleted file mode 100644
index 343277db59f..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/OpenLimitOrdersButton.tsx
+++ /dev/null
@@ -1,58 +0,0 @@
-import { Plural, t, Trans } from '@lingui/macro'
-import { useOpenLimitOrders } from 'components/AccountDrawer/MiniPortfolio/Activity/hooks'
-import Column from 'components/Column'
-import { TimeForwardIcon } from 'components/Icons/TimeForward'
-import Row from 'components/Row'
-import { ChevronRight } from 'react-feather'
-import styled, { useTheme } from 'styled-components'
-import { ClickableStyle, ThemedText } from 'theme/components'
-
-const Container = styled.button`
-  border-radius: 16px;
-  border: 1px solid ${({ theme }) => theme.surface3};
-  background: ${({ theme }) => theme.surface2};
-  padding: 12px 16px;
-  margin-top: 8px;
-  ${ClickableStyle}
-`
-
-function getExtraWarning(openLimitOrders: any[]) {
-  if (openLimitOrders.length >= 100) return <Trans>Cancel limits to proceed</Trans>
-  if (openLimitOrders.length >= 90) return <Trans>Approaching 100 limit maximum</Trans>
-  return undefined
-}
-
-export function OpenLimitOrdersButton({
-  openLimitsMenu,
-  account,
-  disabled,
-}: {
-  account: string
-  openLimitsMenu: () => void
-  disabled?: boolean
-}) {
-  const { openLimitOrders } = useOpenLimitOrders(account)
-  const theme = useTheme()
-  const extraWarning = getExtraWarning(openLimitOrders)
-  if (!openLimitOrders || openLimitOrders.length < 1) return null
-  return (
-    <Container onClick={openLimitsMenu} disabled={disabled}>
-      <Row justify="space-between" align="center">
-        <Row gap="md">
-          <TimeForwardIcon />
-          <Column>
-            <ThemedText.SubHeader textAlign="start">
-              <Plural
-                value={openLimitOrders.length}
-                _1={t`1 open limit`}
-                other={t`${openLimitOrders.length} open limits`}
-              />
-            </ThemedText.SubHeader>
-            {extraWarning && <ThemedText.LabelMicro>{extraWarning}</ThemedText.LabelMicro>}
-          </Column>
-        </Row>
-        <ChevronRight color={theme.neutral1} />
-      </Row>
-    </Container>
-  )
-}
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
deleted file mode 100644
index eb363691348..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/__snapshots__/LimitDetailActivityRow.test.tsx.snap
+++ /dev/null
@@ -1,285 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`LimitDetailActivityRow should render with valid details 1`] = `
-.c0 {
-  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;
-}
-
-.c9 {
-  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: 8px;
-}
-
-.c8 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c10 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c11 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.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;
-}
-
-.c7 {
-  display: grid;
-  grid-auto-rows: auto;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
-.c6 {
-  color: #7D7D7D;
-}
-
-.c5 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c2 {
-  gap: 12px;
-  height: 68px;
-  padding: 0 16px;
-  -webkit-transition: 250ms ease background-color;
-  transition: 250ms ease background-color;
-  cursor: pointer;
-}
-
-.c2:hover {
-  cursor: pointer;
-}
-
-.c12 {
-  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;
-  position: relative;
-  overflow: hidden;
-  cursor: pointer;
-  line-height: 1;
-}
-
-.c13 {
-  border-color: #7D7D7D;
-  display: inline-block;
-  margin-right: 1px;
-  border-radius: 4px;
-  height: 16px;
-  width: 16px;
-  border-style: solid;
-  border-width: 2px;
-  position: relative;
-}
-
-.c14 {
-  position: absolute;
-  top: -24px;
-  -webkit-clip: rect(0 0 0 0);
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(50%);
-  clip-path: inset(50%);
-  height: 1px;
-  overflow: hidden;
-  position: absolute;
-  white-space: nowrap;
-  width: 1px;
-}
-
-.c15 {
-  display: none;
-  height: 16px;
-  width: 16px;
-  color: white;
-  position: absolute;
-  right: 1px;
-}
-
-.c3 {
-  padding: 8px 16px;
-  height: unset;
-}
-
-<div
-  class="c0 c1"
->
-  <div
-    class="c0 c1 c2 c3"
-  >
-    <div
-      class="c4"
-    >
-      <div
-        class="c5"
-      >
-        <svg
-          class="c6"
-          height="40px"
-          width="40px"
-        >
-          contract-interaction.svg
-        </svg>
-      </div>
-    </div>
-    <div
-      class="c7"
-    >
-      <div
-        class="c8 css-15li2d9"
-      >
-        Expires Expires January 1, 1970 at 12:00 AM
-      </div>
-      <div
-        class="c4"
-      >
-        <div
-          class="c0 c9"
-        >
-          <div
-            class="c10 css-n8z49y"
-          >
-            252.074
-             
-            DAI
-          </div>
-          <svg
-            fill="none"
-            height="12px"
-            stroke="#222222"
-            stroke-linecap="round"
-            stroke-linejoin="round"
-            stroke-width="2"
-            viewBox="0 0 24 24"
-            width="12px"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <line
-              x1="5"
-              x2="19"
-              y1="12"
-              y2="12"
-            />
-            <polyline
-              points="12 5 19 12 12 19"
-            />
-          </svg>
-          <div
-            class="c10 css-n8z49y"
-          >
-            0.10684
-             
-            WETH
-          </div>
-        </div>
-        <div
-          class="c11 css-142zc9n"
-        >
-          when 0.00042 WETH/DAI
-        </div>
-      </div>
-    </div>
-  </div>
-  <label
-    class="c12"
-  >
-    <span
-      aria-hidden="true"
-      class="c13"
-      size="16"
-    />
-    <input
-      class="c14"
-      size="16"
-      type="checkbox"
-    />
-    <svg
-      class="c15"
-      fill="none"
-      height="28"
-      size="16"
-      viewBox="0 0 28 28"
-      width="28"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <path
-        d="M13.7464 21.1101C13.3792 21.6796 12.8372 22 12.2076 22C11.5607 22 11.0536 21.733 10.5814 21.1101L6.45464 15.9844C6.15738 15.6107 6 15.2191 6 14.792C6 13.9021 6.66448 13.208 7.52131 13.208C8.0459 13.208 8.46557 13.4038 8.88525 13.9555L12.1377 18.1735L19.0448 6.88988C19.412 6.28476 19.8842 6 20.4087 6C21.2306 6 22 6.58732 22 7.4594C22 7.86874 21.7902 8.29588 21.5628 8.66963L13.7464 21.1101Z"
-        fill="currentColor"
-      />
-    </svg>
-  </label>
-</div>
-`;
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
deleted file mode 100644
index f1e17488641..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/__snapshots__/LimitsMenu.test.tsx.snap
+++ /dev/null
@@ -1,1099 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`LimitsMenu should render when there are two open orders 1`] = `
-.c7 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.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;
-}
-
-.c15 {
-  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: 8px;
-}
-
-.c5 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c14 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c16 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c24 {
-  background-color: transparent;
-  bottom: 0;
-  border-radius: inherit;
-  height: 100%;
-  left: 0;
-  position: absolute;
-  right: 0;
-  top: 0;
-  -webkit-transition: 150ms ease background-color;
-  transition: 150ms ease background-color;
-  width: 100%;
-}
-
-.c21 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #FF5F52;
-  border-radius: 16px;
-  border: 0;
-  color: #222222;
-  cursor: pointer;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  font-size: 20px;
-  font-weight: 535;
-  gap: 12px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  line-height: 24px;
-  padding: 16px;
-  position: relative;
-  -webkit-transition: 150ms ease opacity;
-  transition: 150ms ease opacity;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c21:active .c23 {
-  background-color: #B8C0DC3d;
-}
-
-.c21:focus .c23 {
-  background-color: #B8C0DC3d;
-}
-
-.c21:hover .c23 {
-  background-color: #98A1C014;
-}
-
-.c21:disabled {
-  cursor: default;
-  opacity: 0.6;
-}
-
-.c21:disabled:active .c23,
-.c21:disabled:focus .c23,
-.c21:disabled:hover .c23 {
-  background-color: transparent;
-}
-
-.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;
-}
-
-.c13 {
-  display: grid;
-  grid-auto-rows: auto;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
-.c12 {
-  color: #7D7D7D;
-}
-
-.c11 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c9 {
-  gap: 12px;
-  height: 68px;
-  padding: 0 16px;
-  -webkit-transition: 250ms ease background-color;
-  transition: 250ms ease background-color;
-  cursor: pointer;
-}
-
-.c9:hover {
-  cursor: pointer;
-}
-
-.c17 {
-  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;
-  position: relative;
-  overflow: hidden;
-  cursor: pointer;
-  line-height: 1;
-}
-
-.c18 {
-  border-color: #7D7D7D;
-  display: inline-block;
-  margin-right: 1px;
-  border-radius: 4px;
-  height: 16px;
-  width: 16px;
-  border-style: solid;
-  border-width: 2px;
-  position: relative;
-}
-
-.c19 {
-  position: absolute;
-  top: -24px;
-  -webkit-clip: rect(0 0 0 0);
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(50%);
-  clip-path: inset(50%);
-  height: 1px;
-  overflow: hidden;
-  position: absolute;
-  white-space: nowrap;
-  width: 1px;
-}
-
-.c20 {
-  display: none;
-  height: 16px;
-  width: 16px;
-  color: white;
-  position: absolute;
-  right: 1px;
-}
-
-.c10 {
-  padding: 8px 16px;
-  height: unset;
-}
-
-.c1 {
-  width: 100%;
-  overflow: auto;
-  margin-top: 4px;
-  padding: 14px 16px 16px;
-  -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%;
-}
-
-.c1::-webkit-scrollbar {
-  background: transparent;
-  width: 4px;
-  overflow-y: scroll;
-}
-
-.c1::-webkit-scrollbar-thumb {
-  background: #22222212;
-  border-radius: 8px;
-}
-
-.c1::-webkit-scrollbar-track {
-  margin-top: 40px;
-}
-
-.c4 {
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  -webkit-transform: translate(-50%,-50%);
-  -ms-transform: translate(-50%,-50%);
-  transform: translate(-50%,-50%);
-}
-
-.c3 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c3:hover {
-  opacity: 0.6;
-}
-
-.c3:active {
-  opacity: 0.4;
-}
-
-.c2 {
-  color: #222222;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  position: relative;
-  width: 100%;
-  margin-bottom: 20px;
-}
-
-.c6 {
-  height: 100%;
-  position: relative;
-}
-
-.c22 {
-  position: absolute;
-  bottom: 16px;
-  width: 100%;
-}
-
-<div>
-  <div
-    class="c0 c1"
-  >
-    <div
-      class="c2"
-    >
-      <svg
-        class="c3"
-        data-testid="wallet-back"
-        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="19"
-          x2="5"
-          y1="12"
-          y2="12"
-        />
-        <polyline
-          points="12 19 5 12 12 5"
-        />
-      </svg>
-      <span
-        class="c4"
-      >
-        <div
-          class="c5 css-n8z49y"
-        >
-          Open limits
-        </div>
-      </span>
-    </div>
-    <div
-      class="c0 c6"
-      data-testid="LimitsMenuContainer"
-    >
-      <div
-        class="c7 c8"
-      >
-        <div
-          class="c7 c8 c9 c10"
-        >
-          <div
-            class="c0"
-          >
-            <div
-              class="c11"
-            >
-              <svg
-                class="c12"
-                height="40px"
-                width="40px"
-              >
-                contract-interaction.svg
-              </svg>
-            </div>
-          </div>
-          <div
-            class="c13"
-          >
-            <div
-              class="c14 css-15li2d9"
-            >
-              Expires January 26, 2024 at 1:52PM
-            </div>
-            <div
-              class="c0"
-            >
-              <div
-                class="c7 c15"
-              >
-                <div
-                  class="c5 css-n8z49y"
-                >
-                  252.074
-                   
-                  DAI
-                </div>
-                <svg
-                  fill="none"
-                  height="12px"
-                  stroke="#222222"
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  viewBox="0 0 24 24"
-                  width="12px"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <line
-                    x1="5"
-                    x2="19"
-                    y1="12"
-                    y2="12"
-                  />
-                  <polyline
-                    points="12 5 19 12 12 19"
-                  />
-                </svg>
-                <div
-                  class="c5 css-n8z49y"
-                >
-                  0.10684
-                   
-                  WETH
-                </div>
-              </div>
-              <div
-                class="c16 css-142zc9n"
-              >
-                when 0.00042 WETH/DAI
-              </div>
-            </div>
-          </div>
-        </div>
-        <label
-          class="c17"
-        >
-          <span
-            aria-hidden="true"
-            class="c18"
-            size="16"
-          />
-          <input
-            class="c19"
-            size="16"
-            type="checkbox"
-          />
-          <svg
-            class="c20"
-            fill="none"
-            height="28"
-            size="16"
-            viewBox="0 0 28 28"
-            width="28"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M13.7464 21.1101C13.3792 21.6796 12.8372 22 12.2076 22C11.5607 22 11.0536 21.733 10.5814 21.1101L6.45464 15.9844C6.15738 15.6107 6 15.2191 6 14.792C6 13.9021 6.66448 13.208 7.52131 13.208C8.0459 13.208 8.46557 13.4038 8.88525 13.9555L12.1377 18.1735L19.0448 6.88988C19.412 6.28476 19.8842 6 20.4087 6C21.2306 6 22 6.58732 22 7.4594C22 7.86874 21.7902 8.29588 21.5628 8.66963L13.7464 21.1101Z"
-              fill="currentColor"
-            />
-          </svg>
-        </label>
-      </div>
-      <div
-        class="c7 c8"
-      >
-        <div
-          class="c7 c8 c9 c10"
-        >
-          <div
-            class="c0"
-          >
-            <div
-              class="c11"
-            >
-              <svg
-                class="c12"
-                height="40px"
-                width="40px"
-              >
-                contract-interaction.svg
-              </svg>
-            </div>
-          </div>
-          <div
-            class="c13"
-          >
-            <div
-              class="c14 css-15li2d9"
-            >
-              Expires January 26, 2024 at 1:52PM
-            </div>
-            <div
-              class="c0"
-            >
-              <div
-                class="c7 c15"
-              >
-                <div
-                  class="c5 css-n8z49y"
-                >
-                  252.074
-                   
-                  DAI
-                </div>
-                <svg
-                  fill="none"
-                  height="12px"
-                  stroke="#222222"
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  viewBox="0 0 24 24"
-                  width="12px"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <line
-                    x1="5"
-                    x2="19"
-                    y1="12"
-                    y2="12"
-                  />
-                  <polyline
-                    points="12 5 19 12 12 19"
-                  />
-                </svg>
-                <div
-                  class="c5 css-n8z49y"
-                >
-                  0.10684
-                   
-                  WETH
-                </div>
-              </div>
-              <div
-                class="c16 css-142zc9n"
-              >
-                when 0.00042 WETH/DAI
-              </div>
-            </div>
-          </div>
-        </div>
-        <label
-          class="c17"
-        >
-          <span
-            aria-hidden="true"
-            class="c18"
-            size="16"
-          />
-          <input
-            class="c19"
-            size="16"
-            type="checkbox"
-          />
-          <svg
-            class="c20"
-            fill="none"
-            height="28"
-            size="16"
-            viewBox="0 0 28 28"
-            width="28"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M13.7464 21.1101C13.3792 21.6796 12.8372 22 12.2076 22C11.5607 22 11.0536 21.733 10.5814 21.1101L6.45464 15.9844C6.15738 15.6107 6 15.2191 6 14.792C6 13.9021 6.66448 13.208 7.52131 13.208C8.0459 13.208 8.46557 13.4038 8.88525 13.9555L12.1377 18.1735L19.0448 6.88988C19.412 6.28476 19.8842 6 20.4087 6C21.2306 6 22 6.58732 22 7.4594C22 7.86874 21.7902 8.29588 21.5628 8.66963L13.7464 21.1101Z"
-              fill="currentColor"
-            />
-          </svg>
-        </label>
-      </div>
-      <button
-        class="c21 c22"
-        disabled=""
-        size="2"
-      >
-        <div
-          class="c23 c24"
-        />
-        Cancel 0 limits
-      </button>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`LimitsMenu should render when there is one open order 1`] = `
-.c7 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.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;
-}
-
-.c15 {
-  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: 8px;
-}
-
-.c5 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c14 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c16 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c24 {
-  background-color: transparent;
-  bottom: 0;
-  border-radius: inherit;
-  height: 100%;
-  left: 0;
-  position: absolute;
-  right: 0;
-  top: 0;
-  -webkit-transition: 150ms ease background-color;
-  transition: 150ms ease background-color;
-  width: 100%;
-}
-
-.c21 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #FF5F52;
-  border-radius: 16px;
-  border: 0;
-  color: #222222;
-  cursor: pointer;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  font-size: 20px;
-  font-weight: 535;
-  gap: 12px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  line-height: 24px;
-  padding: 16px;
-  position: relative;
-  -webkit-transition: 150ms ease opacity;
-  transition: 150ms ease opacity;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c21:active .c23 {
-  background-color: #B8C0DC3d;
-}
-
-.c21:focus .c23 {
-  background-color: #B8C0DC3d;
-}
-
-.c21:hover .c23 {
-  background-color: #98A1C014;
-}
-
-.c21:disabled {
-  cursor: default;
-  opacity: 0.6;
-}
-
-.c21:disabled:active .c23,
-.c21:disabled:focus .c23,
-.c21:disabled:hover .c23 {
-  background-color: transparent;
-}
-
-.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;
-}
-
-.c13 {
-  display: grid;
-  grid-auto-rows: auto;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
-.c12 {
-  color: #7D7D7D;
-}
-
-.c11 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c9 {
-  gap: 12px;
-  height: 68px;
-  padding: 0 16px;
-  -webkit-transition: 250ms ease background-color;
-  transition: 250ms ease background-color;
-  cursor: pointer;
-}
-
-.c9:hover {
-  cursor: pointer;
-}
-
-.c17 {
-  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;
-  position: relative;
-  overflow: hidden;
-  cursor: pointer;
-  line-height: 1;
-}
-
-.c18 {
-  border-color: #7D7D7D;
-  display: inline-block;
-  margin-right: 1px;
-  border-radius: 4px;
-  height: 16px;
-  width: 16px;
-  border-style: solid;
-  border-width: 2px;
-  position: relative;
-}
-
-.c19 {
-  position: absolute;
-  top: -24px;
-  -webkit-clip: rect(0 0 0 0);
-  clip: rect(0 0 0 0);
-  -webkit-clip-path: inset(50%);
-  clip-path: inset(50%);
-  height: 1px;
-  overflow: hidden;
-  position: absolute;
-  white-space: nowrap;
-  width: 1px;
-}
-
-.c20 {
-  display: none;
-  height: 16px;
-  width: 16px;
-  color: white;
-  position: absolute;
-  right: 1px;
-}
-
-.c10 {
-  padding: 8px 16px;
-  height: unset;
-}
-
-.c1 {
-  width: 100%;
-  overflow: auto;
-  margin-top: 4px;
-  padding: 14px 16px 16px;
-  -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%;
-}
-
-.c1::-webkit-scrollbar {
-  background: transparent;
-  width: 4px;
-  overflow-y: scroll;
-}
-
-.c1::-webkit-scrollbar-thumb {
-  background: #22222212;
-  border-radius: 8px;
-}
-
-.c1::-webkit-scrollbar-track {
-  margin-top: 40px;
-}
-
-.c4 {
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  -webkit-transform: translate(-50%,-50%);
-  -ms-transform: translate(-50%,-50%);
-  transform: translate(-50%,-50%);
-}
-
-.c3 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c3:hover {
-  opacity: 0.6;
-}
-
-.c3:active {
-  opacity: 0.4;
-}
-
-.c2 {
-  color: #222222;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  position: relative;
-  width: 100%;
-  margin-bottom: 20px;
-}
-
-.c6 {
-  height: 100%;
-  position: relative;
-}
-
-.c22 {
-  position: absolute;
-  bottom: 16px;
-  width: 100%;
-}
-
-<div>
-  <div
-    class="c0 c1"
-  >
-    <div
-      class="c2"
-    >
-      <svg
-        class="c3"
-        data-testid="wallet-back"
-        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="19"
-          x2="5"
-          y1="12"
-          y2="12"
-        />
-        <polyline
-          points="12 19 5 12 12 5"
-        />
-      </svg>
-      <span
-        class="c4"
-      >
-        <div
-          class="c5 css-n8z49y"
-        >
-          Open limits
-        </div>
-      </span>
-    </div>
-    <div
-      class="c0 c6"
-      data-testid="LimitsMenuContainer"
-    >
-      <div
-        class="c7 c8"
-      >
-        <div
-          class="c7 c8 c9 c10"
-        >
-          <div
-            class="c0"
-          >
-            <div
-              class="c11"
-            >
-              <svg
-                class="c12"
-                height="40px"
-                width="40px"
-              >
-                contract-interaction.svg
-              </svg>
-            </div>
-          </div>
-          <div
-            class="c13"
-          >
-            <div
-              class="c14 css-15li2d9"
-            >
-              Expires January 26, 2024 at 1:52PM
-            </div>
-            <div
-              class="c0"
-            >
-              <div
-                class="c7 c15"
-              >
-                <div
-                  class="c5 css-n8z49y"
-                >
-                  252.074
-                   
-                  DAI
-                </div>
-                <svg
-                  fill="none"
-                  height="12px"
-                  stroke="#222222"
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  viewBox="0 0 24 24"
-                  width="12px"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <line
-                    x1="5"
-                    x2="19"
-                    y1="12"
-                    y2="12"
-                  />
-                  <polyline
-                    points="12 5 19 12 12 19"
-                  />
-                </svg>
-                <div
-                  class="c5 css-n8z49y"
-                >
-                  0.10684
-                   
-                  WETH
-                </div>
-              </div>
-              <div
-                class="c16 css-142zc9n"
-              >
-                when 0.00042 WETH/DAI
-              </div>
-            </div>
-          </div>
-        </div>
-        <label
-          class="c17"
-        >
-          <span
-            aria-hidden="true"
-            class="c18"
-            size="16"
-          />
-          <input
-            class="c19"
-            size="16"
-            type="checkbox"
-          />
-          <svg
-            class="c20"
-            fill="none"
-            height="28"
-            size="16"
-            viewBox="0 0 28 28"
-            width="28"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              d="M13.7464 21.1101C13.3792 21.6796 12.8372 22 12.2076 22C11.5607 22 11.0536 21.733 10.5814 21.1101L6.45464 15.9844C6.15738 15.6107 6 15.2191 6 14.792C6 13.9021 6.66448 13.208 7.52131 13.208C8.0459 13.208 8.46557 13.4038 8.88525 13.9555L12.1377 18.1735L19.0448 6.88988C19.412 6.28476 19.8842 6 20.4087 6C21.2306 6 22 6.58732 22 7.4594C22 7.86874 21.7902 8.29588 21.5628 8.66963L13.7464 21.1101Z"
-              fill="currentColor"
-            />
-          </svg>
-        </label>
-      </div>
-      <button
-        class="c21 c22"
-        disabled=""
-        size="2"
-      >
-        <div
-          class="c23 c24"
-        />
-        Cancel 0 limits
-      </button>
-    </div>
-  </div>
-</div>
-`;
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/__snapshots__/OpenLimitOrdersButton.test.tsx.snap b/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/__snapshots__/OpenLimitOrdersButton.test.tsx.snap
deleted file mode 100644
index 83651454072..00000000000
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Limits/__snapshots__/OpenLimitOrdersButton.test.tsx.snap
+++ /dev/null
@@ -1,138 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`OpenLimitOrdersButton should render if there are open limit orders 1`] = `
-.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;
-}
-
-.c1 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c2 {
-  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;
-}
-
-.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 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c0 {
-  border-radius: 16px;
-  border: 1px solid #22222212;
-  background: #F9F9F9;
-  padding: 12px 16px;
-  margin-top: 8px;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c0:hover {
-  opacity: 0.6;
-}
-
-.c0:active {
-  opacity: 0.4;
-}
-
-<div>
-  <button
-    class="c0"
-  >
-    <div
-      class="c1 c2"
-    >
-      <div
-        class="c1 c3"
-      >
-        <svg
-          fill="none"
-          height="20"
-          viewBox="0 0 20 20"
-          width="20"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M10.8333 6.66669V9.65497L12.2558 11.0775C12.5817 11.4033 12.5817 11.93 12.2558 12.2559C12.0933 12.4184 11.88 12.5 11.6667 12.5C11.4533 12.5 11.24 12.4184 11.0775 12.2559L9.4108 10.5892C9.25413 10.4325 9.16666 10.2209 9.16666 10V6.66669C9.16666 6.20669 9.53916 5.83335 9.99999 5.83335C10.4608 5.83335 10.8333 6.20669 10.8333 6.66669ZM12.5 5.83335C12.5 6.29335 12.8725 6.66669 13.3333 6.66669H16.6667C17.1275 6.66669 17.5 6.29335 17.5 5.83335V2.50002C17.5 2.04002 17.1275 1.66669 16.6667 1.66669C16.2058 1.66669 15.8333 2.04002 15.8333 2.50002V4.1083C14.2917 2.56496 12.2034 1.66669 9.97842 1.66669C5.39592 1.66669 1.66666 5.40502 1.66666 10C1.66666 14.595 5.39592 18.3334 9.97842 18.3334C13.1643 18.3334 16.0141 16.5583 17.4149 13.7C17.6174 13.2866 17.4474 12.7876 17.0341 12.5851C16.6208 12.3826 16.1208 12.5534 15.9192 12.9667C14.8 15.2492 12.5243 16.6667 9.97842 16.6667C6.31509 16.6667 3.33332 13.6759 3.33332 10C3.33332 6.32419 6.31426 3.33335 9.97842 3.33335C11.6176 3.33335 13.1683 3.93919 14.3658 5.00002H13.3333C12.8725 5.00002 12.5 5.37335 12.5 5.83335Z"
-            fill="#222222"
-          />
-        </svg>
-        <div
-          class="c4"
-        >
-          <div
-            class="c5 css-8gwze7"
-          >
-            1 open limit
-          </div>
-        </div>
-      </div>
-      <svg
-        fill="none"
-        height="24"
-        stroke="#222222"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-width="2"
-        viewBox="0 0 24 24"
-        width="24"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <polyline
-          points="9 18 15 12 9 6"
-        />
-      </svg>
-    </div>
-  </button>
-</div>
-`;
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/getTokensAsync.ts b/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/getTokensAsync.ts
index 775787290ee..eae544385e7 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/getTokensAsync.ts
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/getTokensAsync.ts
@@ -1,13 +1,13 @@
 import { ChainId, Token } from '@uniswap/sdk-core'
+import ERC20_ABI from 'abis/erc20.json'
+import { Erc20Interface } from 'abis/types/Erc20'
+import { Erc20Bytes32Interface } from 'abis/types/Erc20Bytes32'
 import { DEFAULT_ERC20_DECIMALS } from 'constants/tokens'
 import { Interface } from 'ethers/lib/utils'
+import { UniswapInterfaceMulticall } from 'types/v3'
 import { isAddress } from 'utils'
 import { arrayToSlices } from 'utils/arrays'
-import { CurrencyKey, buildCurrencyKey, currencyKey } from 'utils/currencyKey'
-import ERC20_ABI from 'wallet/src/abis/erc20.json'
-import { Erc20Interface } from 'wallet/src/abis/types/Erc20'
-import { Erc20Bytes32Interface } from 'wallet/src/abis/types/Erc20Bytes32'
-import { UniswapInterfaceMulticall } from 'wallet/src/abis/types/v3'
+import { buildCurrencyKey, CurrencyKey, currencyKey } from 'utils/currencyKey'
 
 type TokenMap = { [address: string]: Token | undefined }
 export type Call = { target: string; callData: string; gasLimit: number }
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/hooks.ts b/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/hooks.ts
index 3eb80acdb19..937eb1d6b31 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/hooks.ts
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/hooks.ts
@@ -1,12 +1,12 @@
 import {
   ChainId,
   MULTICALL_ADDRESSES,
-  Token,
   NONFUNGIBLE_POSITION_MANAGER_ADDRESSES as V3NFT_ADDRESSES,
+  Token,
 } from '@uniswap/sdk-core'
 import type { AddressMap } from '@uniswap/smart-order-router'
-import NFTPositionManagerJSON from '@uniswap/v3-periphery/artifacts/contracts/NonfungiblePositionManager.sol/NonfungiblePositionManager.json'
 import MulticallJSON from '@uniswap/v3-periphery/artifacts/contracts/lens/UniswapInterfaceMulticall.sol/UniswapInterfaceMulticall.json'
+import NFTPositionManagerJSON from '@uniswap/v3-periphery/artifacts/contracts/NonfungiblePositionManager.sol/NonfungiblePositionManager.json'
 import { useWeb3React } from '@web3-react/core'
 import { isSupportedChain } from 'constants/chains'
 import { DEPRECATED_RPC_PROVIDERS, RPC_PROVIDERS } from 'constants/providers'
@@ -16,9 +16,9 @@ import { ContractInput, useUniswapPricesQuery } from 'graphql/data/__generated__
 import { toContractInput } from 'graphql/data/util'
 import useStablecoinPrice from 'hooks/useStablecoinPrice'
 import { useMemo } from 'react'
+import { NonfungiblePositionManager, UniswapInterfaceMulticall } from 'types/v3'
 import { getContract } from 'utils'
 import { CurrencyKey, currencyKey, currencyKeyFromGraphQL } from 'utils/currencyKey'
-import { NonfungiblePositionManager, UniswapInterfaceMulticall } from 'wallet/src/abis/types/v3'
 
 import { PositionInfo } from './cache'
 
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/useMultiChainPositions.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/useMultiChainPositions.tsx
index c8ce4ef9fcb..e433848fc59 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/useMultiChainPositions.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/Pools/useMultiChainPositions.tsx
@@ -1,14 +1,14 @@
 import { ChainId, CurrencyAmount, Token, V3_CORE_FACTORY_ADDRESSES } from '@uniswap/sdk-core'
 import IUniswapV3PoolStateJSON from '@uniswap/v3-core/artifacts/contracts/interfaces/pool/IUniswapV3PoolState.sol/IUniswapV3PoolState.json'
-import { Pool, Position, computePoolAddress } from '@uniswap/v3-sdk'
+import { computePoolAddress, Pool, Position } from '@uniswap/v3-sdk'
 import { DEFAULT_ERC20_DECIMALS } from 'constants/tokens'
 import { BigNumber } from 'ethers/lib/ethers'
 import { Interface } from 'ethers/lib/utils'
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import { PositionDetails } from 'types/position'
+import { NonfungiblePositionManager, UniswapInterfaceMulticall } from 'types/v3'
+import { UniswapV3PoolInterface } from 'types/v3/UniswapV3Pool'
 import { currencyKey } from 'utils/currencyKey'
-import { NonfungiblePositionManager, UniswapInterfaceMulticall } from 'wallet/src/abis/types/v3'
-import { UniswapV3PoolInterface } from 'wallet/src/abis/types/v3/UniswapV3Pool'
 
 import { PositionInfo, useCachedPositions, useGetCachedTokens, usePoolAddressCache } from './cache'
 import { Call, DEFAULT_GAS_LIMIT } from './getTokensAsync'
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioLogo.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioLogo.tsx
index 7d714c888bc..e0345c2a686 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioLogo.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioLogo.tsx
@@ -57,13 +57,13 @@ const CircleLogoImage = styled.img<{ size: string }>`
 `
 
 const L2LogoContainer = styled.div`
-  position: absolute;
   border-radius: ${getDefaultBorderRadius(16)}px;
-  left: 65%;
-  top: 65%;
-  outline: 1.5px solid ${({ theme }) => theme.surface1};
-  width: 40%;
-  height: 40%;
+  height: 16px;
+  left: 70%;
+  position: absolute;
+  top: 70%;
+  outline: 2px solid ${({ theme }) => theme.surface1};
+  width: 16px;
   display: flex;
   align-items: center;
   justify-content: center;
@@ -146,7 +146,7 @@ function SquareL2Logo({ chainId }: { chainId: ChainId }) {
 
   return (
     <L2LogoContainer>
-      <ChainLogo fillContainer={true} chainId={chainId} />
+      <ChainLogo chainId={chainId} />
     </L2LogoContainer>
   )
 }
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioRow.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioRow.tsx
index 7e55431cea9..ffc2542d491 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioRow.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/PortfolioRow.tsx
@@ -28,7 +28,6 @@ export default function PortfolioRow({
   descriptor,
   right,
   onClick,
-  className,
 }: {
   'data-testid'?: string
   left: React.ReactNode
@@ -37,10 +36,9 @@ export default function PortfolioRow({
   right?: React.ReactNode
   setIsHover?: (b: boolean) => void
   onClick?: () => void
-  className?: string
 }) {
   return (
-    <PortfolioRowWrapper data-testid={testId} onClick={onClick} className={className}>
+    <PortfolioRowWrapper data-testid={testId} onClick={onClick}>
       {left}
       <AutoColumn grow>
         {title}
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/__snapshots__/PortfolioLogo.test.tsx.snap b/apps/web/src/components/AccountDrawer/MiniPortfolio/__snapshots__/PortfolioLogo.test.tsx.snap
index aea8969d0e1..7421009a903 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/__snapshots__/PortfolioLogo.test.tsx.snap
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/__snapshots__/PortfolioLogo.test.tsx.snap
@@ -52,13 +52,13 @@ exports[`PortfolioLogo renders with L2 icon 1`] = `
 }
 
 .c3 {
-  position: absolute;
   border-radius: 4px;
-  left: 65%;
-  top: 65%;
-  outline: 1.5px solid #FFFFFF;
-  width: 40%;
-  height: 40%;
+  height: 16px;
+  left: 70%;
+  position: absolute;
+  top: 70%;
+  outline: 2px solid #FFFFFF;
+  width: 16px;
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -94,9 +94,8 @@ exports[`PortfolioLogo renders with L2 icon 1`] = `
     >
       <svg
         aria-labelledby="titleID"
-        height="100%"
-        style="width: 100%; height: 100%;"
-        width="100%"
+        height="16"
+        width="16"
       >
         <title
           id="titleID"
@@ -105,19 +104,19 @@ exports[`PortfolioLogo renders with L2 icon 1`] = `
         </title>
         <rect
           fill="#F9F9F9"
-          height="100%"
-          rx="2"
-          width="100%"
+          height="16"
+          rx="4"
+          width="16"
         />
         <rect
           fill="#00A3FF33"
-          height="100%"
-          rx="2"
-          width="100%"
+          height="16"
+          rx="4"
+          width="16"
         />
         <svg
-          height="100%"
-          width="100%"
+          height="16"
+          width="16"
         >
           arbitrum.svg
         </svg>
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/constants.tsx b/apps/web/src/components/AccountDrawer/MiniPortfolio/constants.tsx
index 7ee72642823..d9033c60ec5 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/constants.tsx
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/constants.tsx
@@ -137,11 +137,6 @@ const TransactionTitleTable: { [key in TransactionType]: { [state in Transaction
     [TransactionStatus.Confirmed]: t`Submitted proposal`,
     [TransactionStatus.Failed]: t`Submit proposal failed`,
   },
-  [TransactionType.LIMIT]: {
-    [TransactionStatus.Pending]: t`Limit opened`,
-    [TransactionStatus.Confirmed]: t`Limit executed`,
-    [TransactionStatus.Failed]: t`Limit failed`,
-  },
 }
 
 export const CancelledTransactionTitleTable: { [key in TransactionType]: string } = {
@@ -171,7 +166,6 @@ export const CancelledTransactionTitleTable: { [key in TransactionType]: string
   [TransactionType.ADD_LIQUIDITY_V2_POOL]: t`Add V2 liquidity cancelled`,
   [TransactionType.MIGRATE_LIQUIDITY_V3]: t`Migrate liquidity cancelled`,
   [TransactionType.SUBMIT_PROPOSAL]: t`Submit proposal cancelled`,
-  [TransactionType.LIMIT]: t`Limit cancelled`,
 }
 
 const AlternateTransactionTitleTable: { [key in TransactionType]?: { [state in TransactionStatus]: string } } = {
@@ -227,38 +221,6 @@ export const OrderTextTable: {
   },
 }
 
-const LimitTitleTable = TransactionTitleTable[TransactionType.LIMIT]
-export const LimitOrderTextTable: {
-  [status in UniswapXOrderStatus]: { title: string; status: TransactionStatus; statusMessage?: string }
-} = {
-  [UniswapXOrderStatus.OPEN]: {
-    title: LimitTitleTable.PENDING,
-    status: TransactionStatus.Pending,
-  },
-  [UniswapXOrderStatus.FILLED]: {
-    title: LimitTitleTable.CONFIRMED,
-    status: TransactionStatus.Confirmed,
-  },
-  [UniswapXOrderStatus.EXPIRED]: {
-    title: t`Limit expired`,
-    statusMessage: t`Your limit could not be fulfilled at this time. Please try again.`,
-    status: TransactionStatus.Failed,
-  },
-  [UniswapXOrderStatus.ERROR]: {
-    title: LimitTitleTable.FAILED,
-    status: TransactionStatus.Failed,
-  },
-  [UniswapXOrderStatus.INSUFFICIENT_FUNDS]: {
-    title: LimitTitleTable.FAILED,
-    statusMessage: t`Your account had insufficent funds to complete this swap.`,
-    status: TransactionStatus.Failed,
-  },
-  [UniswapXOrderStatus.CANCELLED]: {
-    title: t`Limit cancelled`,
-    status: TransactionStatus.Failed,
-  },
-}
-
 // Non-exhaustive list of addresses Moonpay uses when sending purchased tokens
 export const MOONPAY_SENDER_ADDRESSES = [
   '0x8216874887415e2650d12d53ff53516f04a74fd7',
diff --git a/apps/web/src/components/AccountDrawer/MiniPortfolio/formatTimestamp.ts b/apps/web/src/components/AccountDrawer/MiniPortfolio/formatTimestamp.ts
index 612a6b97365..38b9c1887e9 100644
--- a/apps/web/src/components/AccountDrawer/MiniPortfolio/formatTimestamp.ts
+++ b/apps/web/src/components/AccountDrawer/MiniPortfolio/formatTimestamp.ts
@@ -1,11 +1,10 @@
-export function formatTimestamp(timestamp: number | undefined, includeYear?: boolean): string {
+export function formatTimestamp(timestamp: number | undefined): string {
   const options: Intl.DateTimeFormatOptions = {
     month: 'long',
     day: 'numeric',
     hour: 'numeric',
     minute: 'numeric',
     hour12: true,
-    year: includeYear ? 'numeric' : undefined,
   }
   return new Intl.DateTimeFormat('en-US', options).format(timestamp)
 }
diff --git a/apps/web/src/components/AccountDrawer/index.tsx b/apps/web/src/components/AccountDrawer/index.tsx
index f50f6e9bf3b..77e949c0b17 100644
--- a/apps/web/src/components/AccountDrawer/index.tsx
+++ b/apps/web/src/components/AccountDrawer/index.tsx
@@ -20,7 +20,7 @@ const DRAWER_WIDTH_XL = '390px'
 const DRAWER_WIDTH = '320px'
 const DRAWER_MARGIN = '8px'
 const DRAWER_OFFSET = '10px'
-const DRAWER_TOP_MARGIN_MOBILE_WEB = '24px'
+const DRAWER_TOP_MARGIN_MOBILE_WEB = '72px'
 
 const ScrimBackground = styled.div<{ $open: boolean }>`
   z-index: ${Z_INDEX.modalBackdrop};
diff --git a/apps/web/src/components/AirdropModal/index.tsx b/apps/web/src/components/AirdropModal/index.tsx
index 819a8b2b21f..20b76e7000a 100644
--- a/apps/web/src/components/AirdropModal/index.tsx
+++ b/apps/web/src/components/AirdropModal/index.tsx
@@ -2,6 +2,7 @@ import { BigNumber } from '@ethersproject/bignumber'
 import type { TransactionResponse } from '@ethersproject/providers'
 import { UNISWAP_NFT_AIRDROP_CLAIM_ADDRESS } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
+import uniswapNftAirdropClaim from 'abis/uniswap-nft-airdrop-claim.json'
 import airdropBackgroundv2 from 'assets/images/airdopBackground.png'
 import { ButtonEmphasis, ButtonSize, ThemeButton } from 'components/Button'
 import { OpacityHoverState } from 'components/Common'
@@ -17,7 +18,6 @@ import { useModalIsOpen, useToggleModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
 import styled from 'styled-components'
 import { CloseIcon, ThemedText } from 'theme/components'
-import uniswapNftAirdropClaim from 'wallet/src/abis/uniswap-nft-airdrop-claim.json'
 
 import Modal from '../Modal'
 
diff --git a/apps/web/src/components/Banner/MobileAppAnnouncementBanner/index.tsx b/apps/web/src/components/Banner/MobileAppAnnouncementBanner/index.tsx
index 5753f04ea61..602328d273d 100644
--- a/apps/web/src/components/Banner/MobileAppAnnouncementBanner/index.tsx
+++ b/apps/web/src/components/Banner/MobileAppAnnouncementBanner/index.tsx
@@ -24,7 +24,7 @@ import {
   StyledXButton,
   TextContainer,
   Thumbnail,
-} from '../shared/styled'
+} from './styled'
 
 export default function WalletAppPromoBanner() {
   const [hideAppPromoBanner, toggleHideAppPromoBanner] = useHideAppPromoBanner()
diff --git a/apps/web/src/components/Banner/shared/styled.tsx b/apps/web/src/components/Banner/MobileAppAnnouncementBanner/styled.tsx
similarity index 99%
rename from apps/web/src/components/Banner/shared/styled.tsx
rename to apps/web/src/components/Banner/MobileAppAnnouncementBanner/styled.tsx
index fc830d93910..a635746f5a0 100644
--- a/apps/web/src/components/Banner/shared/styled.tsx
+++ b/apps/web/src/components/Banner/MobileAppAnnouncementBanner/styled.tsx
@@ -11,12 +11,11 @@ export const PopupContainer = styled.div<{ show: boolean }>`
   color: ${({ theme }) => theme.neutral1};
   position: fixed;
   z-index: ${Z_INDEX.sticky};
+  user-select: none;
+  border-radius: 20px;
   bottom: 40px;
   right: 20px;
   width: 360px;
-
-  user-select: none;
-  border-radius: 20px;
   height: 92px;
   border: 1.3px solid ${({ theme }) => theme.surface3};
 
diff --git a/apps/web/src/components/Banner/Outage/OutageBanner.tsx b/apps/web/src/components/Banner/Outage/OutageBanner.tsx
deleted file mode 100644
index 9d572729d63..00000000000
--- a/apps/web/src/components/Banner/Outage/OutageBanner.tsx
+++ /dev/null
@@ -1,80 +0,0 @@
-import { Trans } from '@lingui/macro'
-import { ChainId } from '@uniswap/sdk-core'
-import { Container, PopupContainer, StyledXButton, TextContainer } from 'components/Banner/shared/styled'
-import { chainIdToBackendName } from 'graphql/data/util'
-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'
-
-const IconContainer = styled.div`
-  height: 100%;
-  margin: 12px 0 0 12px;
-  align-self: flex-start;
-`
-
-const IconBackground = styled.div`
-  background-color: #1f1e02;
-  padding: 10px;
-  border-radius: 12px;
-`
-
-const StyledPopupContainer = styled(PopupContainer)`
-  height: unset;
-`
-
-const OutageTextContainer = styled(TextContainer)`
-  padding: 10px 10px 10px 0;
-`
-
-const HelpCenterLink = styled(ExternalLink)`
-  font-size: 14px;
-  margin-top: 4px;
-`
-
-export function getOutageBannerSessionStorageKey(chainId: ChainId) {
-  return `hideOutageBanner-${chainId}`
-}
-
-export function OutageBanner({ chainId }: { chainId: ChainId }) {
-  const [hidden, setHidden] = useState(false)
-  const theme = useTheme()
-
-  return (
-    <StyledPopupContainer show={!hidden}>
-      <Container>
-        <IconContainer>
-          <IconBackground>
-            <Globe size={28} color={theme.warning2} />
-          </IconBackground>
-        </IconContainer>
-        <OutageTextContainer>
-          <ThemedText.BodySmall lineHeight="20px">
-            <Trans>Data will be back soon</Trans>
-          </ThemedText.BodySmall>
-          <ThemedText.LabelMicro>
-            <Trans>
-              The subgraph for {capitalize(chainIdToBackendName(chainId).toLowerCase())} is down right now, but we
-              expect the issue to be resolved shortly.
-            </Trans>
-          </ThemedText.LabelMicro>
-          <ThemedText.LabelMicro>
-            <Trans>You can still swap and provide liquidity for this token without issue.</Trans>
-          </ThemedText.LabelMicro>
-          <HelpCenterLink href="https://support.uniswap.org/hc/en-us/articles/23952001935373-Subgraph-downtime">
-            <Trans>Learn more</Trans>
-          </HelpCenterLink>
-        </OutageTextContainer>
-        <StyledXButton
-          data-testid="uniswap-outage-banner"
-          size={24}
-          onClick={() => {
-            setHidden(true)
-            sessionStorage.setItem(getOutageBannerSessionStorageKey(chainId), 'true')
-          }}
-        />
-      </Container>
-    </StyledPopupContainer>
-  )
-}
diff --git a/apps/web/src/components/Banner/shared/Banners.tsx b/apps/web/src/components/Banner/shared/Banners.tsx
deleted file mode 100644
index e1e5ffbbffa..00000000000
--- a/apps/web/src/components/Banner/shared/Banners.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { InterfacePageName } from '@uniswap/analytics-events'
-import { ChainId } from '@uniswap/sdk-core'
-import WalletAppPromoBanner from 'components/Banner/MobileAppAnnouncementBanner'
-import { OutageBanner, getOutageBannerSessionStorageKey } from 'components/Banner/Outage/OutageBanner'
-import { useOutageBanners } from 'featureFlags/flags/outageBanner'
-import { getValidUrlChainId } from 'graphql/data/util'
-import { useMemo } from 'react'
-import { useLocation } from 'react-router-dom'
-import { getCurrentPageFromLocation } from 'utils/urlRoutes'
-
-export function Banners() {
-  const { pathname } = useLocation()
-  const currentPage = getCurrentPageFromLocation(pathname)
-
-  const outageBanners = useOutageBanners()
-
-  // Calculate the chainId for the current page's contextual chain (e.g. /tokens/ethereum or /tokens/arbitrum), if it exists.
-  const pageChainId = useMemo(() => {
-    const chainName = pathname.split('/').find((maybeChainName) => {
-      const validatedChainId = getValidUrlChainId(maybeChainName)
-      return validatedChainId !== undefined
-    })
-    return chainName ? getValidUrlChainId(chainName) : undefined
-  }, [pathname])
-
-  const showOutageBanner = useMemo(() => {
-    return (
-      currentPage &&
-      pageChainId &&
-      outageBanners[pageChainId as ChainId] &&
-      !sessionStorage.getItem(getOutageBannerSessionStorageKey(pageChainId)) &&
-      [
-        InterfacePageName.EXPLORE_PAGE,
-        InterfacePageName.TOKEN_DETAILS_PAGE,
-        // InterfacePageName.POOL_DETAILS_PAGE,
-        InterfacePageName.TOKENS_PAGE,
-      ].includes(currentPage)
-    )
-  }, [currentPage, outageBanners, pageChainId])
-
-  // Outage Banners should take precedence over the Wallet Download Banner
-  if (pageChainId && showOutageBanner) {
-    return <OutageBanner chainId={pageChainId} />
-  }
-
-  return <WalletAppPromoBanner />
-}
diff --git a/apps/web/src/components/BreadcrumbNav/ShareButton.tsx b/apps/web/src/components/BreadcrumbNav/ShareButton.tsx
index 1deea79051f..85205b43c0e 100644
--- a/apps/web/src/components/BreadcrumbNav/ShareButton.tsx
+++ b/apps/web/src/components/BreadcrumbNav/ShareButton.tsx
@@ -10,7 +10,8 @@ import { useModalIsOpen, useToggleModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
 import styled, { css, useTheme } from 'styled-components'
 import { colors } from 'theme/colors'
-import { ClickableStyle, CopyHelper, CopyHelperRefType } from 'theme/components'
+import { ClickableStyle, CopyHelperRefType } from 'theme/components'
+import { CopyHelper } from 'theme/components'
 import { opacify } from 'theme/utils'
 import { Z_INDEX } from 'theme/zIndex'
 
diff --git a/apps/web/src/components/Button/index.tsx b/apps/web/src/components/Button/index.tsx
index d3f3f53f1a9..c210b0f671b 100644
--- a/apps/web/src/components/Button/index.tsx
+++ b/apps/web/src/components/Button/index.tsx
@@ -1,7 +1,7 @@
 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 { Button as RebassButton, ButtonProps as ButtonPropsOriginal } from 'rebass/styled-components'
 import styled, { DefaultTheme, useTheme } from 'styled-components'
 
 import { RowBetween } from '../Row'
@@ -72,7 +72,7 @@ export const ButtonPrimary = styled(BaseButton)`
   font-size: 20px;
   font-weight: 535;
   padding: 16px;
-  color: ${({ theme }) => theme.neutralContrast};
+  color: ${({ theme }) => theme.white};
   &:focus {
     box-shadow: 0 0 0 1pt ${({ theme }) => darken(0.05, theme.accent1)};
     background-color: ${({ theme }) => darken(0.05, theme.accent1)};
@@ -88,7 +88,7 @@ export const ButtonPrimary = styled(BaseButton)`
     background-color: ${({ theme, altDisabledStyle, disabled }) =>
       altDisabledStyle ? (disabled ? theme.accent1 : theme.surface3) : theme.surface3};
     color: ${({ altDisabledStyle, disabled, theme }) =>
-      altDisabledStyle ? (disabled ? theme.neutralContrast : theme.neutral2) : theme.neutral2};
+      altDisabledStyle ? (disabled ? theme.white : theme.neutral2) : theme.neutral2};
     cursor: auto;
     box-shadow: none;
     border: 1px solid transparent;
diff --git a/apps/web/src/components/Charts/AnimatedInLineChart.tsx b/apps/web/src/components/Charts/AnimatedInLineChart.tsx
index 508f90fba6a..a56550c9896 100644
--- a/apps/web/src/components/Charts/AnimatedInLineChart.tsx
+++ b/apps/web/src/components/Charts/AnimatedInLineChart.tsx
@@ -2,7 +2,8 @@ import { Group } from '@visx/group'
 import { LinePath } from '@visx/shape'
 import { easeSinOut } from 'd3'
 import ms from 'ms'
-import React, { useEffect, useRef, useState } from 'react'
+import React from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { animated, useSpring } from 'react-spring'
 import { useTheme } from 'styled-components'
 
diff --git a/apps/web/src/components/Charts/ChartHeader.tsx b/apps/web/src/components/Charts/ChartHeader.tsx
deleted file mode 100644
index 9d27ecd2f49..00000000000
--- a/apps/web/src/components/Charts/ChartHeader.tsx
+++ /dev/null
@@ -1,122 +0,0 @@
-import { useHeaderDateFormatter } from 'components/Charts/hooks'
-import Column from 'components/Column'
-import Row, { RowBetween } from 'components/Row'
-import { PriceSource } from 'graphql/data/__generated__/types-and-hooks'
-import { getProtocolColor, getProtocolName } from 'graphql/data/util'
-import { UTCTimestamp } from 'lightweight-charts'
-import { ReactElement, ReactNode } from 'react'
-import styled, { useTheme } from 'styled-components'
-import { ThemedText } from 'theme/components/text'
-import { textFadeIn } from 'theme/styles'
-import { NumberType, useFormatter } from 'utils/formatNumbers'
-
-export type ChartHeaderProtocolInfo = { protocol: PriceSource; value?: number }
-
-const ChartHeaderWrapper = styled(RowBetween)`
-  ${textFadeIn};
-  position: absolute;
-  width: 100%;
-  gap: 8px;
-  align-items: flex-start;
-`
-const ChartHeaderLeftDisplay = styled.div`
-  display: flex;
-  flex-direction: column;
-  gap: 4px;
-  padding-bottom: 14px;
-  text-align: left;
-  pointer-events: none;
-`
-const ProtocolLegendWrapper = styled(Column)`
-  padding: 4px 12px;
-  gap: 12px;
-  text-align: left;
-  pointer-events: none;
-`
-const ProtocolBlip = styled.div<{ color: string }>`
-  background-color: ${({ color }) => color};
-  border-radius: 4px;
-  width: 12px;
-  height: 12px;
-`
-
-function ProtocolLegend({ protocolData }: { protocolData?: ChartHeaderProtocolInfo[] }) {
-  const { formatFiatPrice } = useFormatter()
-  const theme = useTheme()
-
-  return (
-    <ProtocolLegendWrapper>
-      {protocolData
-        ?.map(({ value, protocol }) => {
-          const display = value
-            ? formatFiatPrice({ price: value, type: NumberType.FiatTokenStatChartHeader })
-            : getProtocolName(protocol)
-          return (
-            <Row gap="6px" justify="flex-end" key={protocol + '_blip'}>
-              <ThemedText.Caption>{display}</ThemedText.Caption>
-              <ProtocolBlip color={getProtocolColor(protocol, theme)} />
-            </Row>
-          )
-        })
-        .reverse()}
-    </ProtocolLegendWrapper>
-  )
-}
-
-interface HeaderValueDisplayProps {
-  /** The number to be formatted and displayed, or the ReactElement to be displayed */
-  value?: number | ReactElement
-  /** Used to override default format NumberType (FiatTokenStatChartHeader) */
-  valueFormatterType?: NumberType
-}
-
-function HeaderValueDisplay({
-  value,
-  valueFormatterType = NumberType.FiatTokenStatChartHeader,
-}: HeaderValueDisplayProps) {
-  const { formatFiatPrice } = useFormatter()
-
-  if (typeof value !== 'number' && typeof value !== 'undefined') {
-    return <>{value}</>
-  }
-
-  return (
-    <ThemedText.HeadlineLarge>{formatFiatPrice({ price: value, type: valueFormatterType })}</ThemedText.HeadlineLarge>
-  )
-}
-
-interface HeaderTimeDisplayProps {
-  time?: UTCTimestamp
-  /** Optional string to display when time is undefined */
-  timePlaceholder?: string
-}
-
-function HeaderTimeDisplay({ time, timePlaceholder }: HeaderTimeDisplayProps) {
-  const headerDateFormatter = useHeaderDateFormatter()
-  return <ThemedText.Caption color="neutral2">{time ? headerDateFormatter(time) : timePlaceholder}</ThemedText.Caption>
-}
-
-interface ChartHeaderProps extends HeaderValueDisplayProps, HeaderTimeDisplayProps {
-  protocolData?: ChartHeaderProtocolInfo[]
-  additionalFields?: ReactNode
-}
-
-export function ChartHeader({
-  value,
-  valueFormatterType,
-  time,
-  timePlaceholder,
-  protocolData,
-  additionalFields,
-}: ChartHeaderProps) {
-  return (
-    <ChartHeaderWrapper>
-      <ChartHeaderLeftDisplay>
-        <HeaderValueDisplay value={value} valueFormatterType={valueFormatterType} />
-        {additionalFields}
-        <HeaderTimeDisplay time={time} timePlaceholder={timePlaceholder} />
-      </ChartHeaderLeftDisplay>
-      <ProtocolLegend protocolData={protocolData} />
-    </ChartHeaderWrapper>
-  )
-}
diff --git a/apps/web/src/components/Charts/ChartModel.tsx b/apps/web/src/components/Charts/ChartModel.tsx
index 63ee511ed19..547bb594949 100644
--- a/apps/web/src/components/Charts/ChartModel.tsx
+++ b/apps/web/src/components/Charts/ChartModel.tsx
@@ -1,5 +1,4 @@
 import { formatTickMarks } from 'components/Charts/utils'
-import { useActiveLocale } from 'hooks/useActiveLocale'
 import { useUpdateAtom } from 'jotai/utils'
 import {
   BarPrice,
@@ -14,29 +13,23 @@ import {
   Time,
   TimeChartOptions,
 } from 'lightweight-charts'
-import { ReactElement, useEffect, useMemo, useRef, useState } from 'react'
-import styled, { DefaultTheme, useTheme } from 'styled-components'
+import { useEffect, useRef, useState } from 'react'
+import { DefaultTheme } from 'styled-components'
 import { useFormatter } from 'utils/formatNumbers'
 
 import { refitChartContentAtom } from './TimeSelector'
 
 type SeriesDataItemType = SeriesDataItemTypeMap<Time>[keyof SeriesOptionsMap]
 
-interface ChartUtilParams<TDataType extends SeriesDataItemType> {
+export interface ChartModelParams<TDataType extends SeriesDataItemType> {
   locale: string
   theme: DefaultTheme
-  format: ReturnType<typeof useFormatter>
-  onCrosshairMove?: (data: TDataType | undefined) => void
-}
-
-interface ChartDataParams<TDataType extends SeriesDataItemType> {
   color?: string
   data: TDataType[]
+  format: ReturnType<typeof useFormatter>
+  onCrosshairMove?: (data: TDataType | undefined) => void
 }
 
-export type ChartModelParams<TDataType extends SeriesDataItemType> = ChartUtilParams<TDataType> &
-  ChartDataParams<TDataType>
-
 /** Util for managing lightweight-charts' state outside of the React Lifecycle. */
 export abstract class ChartModel<TDataType extends SeriesDataItemType> {
   protected api: IChartApi
@@ -143,53 +136,35 @@ export abstract class ChartModel<TDataType extends SeriesDataItemType> {
   }
 }
 
-const ChartDiv = styled.div<{ height?: number }>`
-  ${({ height }) => height && `height: ${height}px`};
-  width: 100%;
-  position: relative;
-`
-
 /** Returns a div injected with a lightweight-chart, corresponding to the given Model and params */
-export function Chart<TParamType extends ChartDataParams<TDataType>, TDataType extends SeriesDataItemType>({
+export function Chart<TParamType extends ChartModelParams<TDataType>, TDataType extends SeriesDataItemType>({
   Model,
   params,
   height,
-  children,
-  className,
 }: {
-  Model: new (chartDiv: HTMLDivElement, params: TParamType & ChartUtilParams<TDataType>) => ChartModel<TDataType>
+  Model: new (chartDiv: HTMLDivElement, params: TParamType) => ChartModel<TDataType>
   params: TParamType
-  height?: number
-  children?: (crosshair?: TDataType) => ReactElement
-  className?: string
+  height: number
 }) {
   const setRefitChartContent = useUpdateAtom(refitChartContentAtom)
   // Lightweight-charts injects a canvas into the page through the div referenced below
   // It is stored in state to cause a re-render upon div mount, avoiding delay in chart creation
   const [chartDivElement, setChartDivElement] = useState<HTMLDivElement | null>(null)
-  const [crosshairData, setCrosshairData] = useState<TDataType | undefined>(undefined)
-  const format = useFormatter()
-  const theme = useTheme()
-  const locale = useActiveLocale()
-  const modelParams = useMemo(
-    () => ({ ...params, format, theme, locale, onCrosshairMove: setCrosshairData }),
-    [format, locale, params, theme]
-  )
 
   // Chart model state should not affect React render cycles since the chart canvas is drawn outside of React, so we store via ref
   const chartModelRef = useRef<ChartModel<TDataType>>()
 
   // Creates the chart as soon as the chart div ref is defined
   if (chartDivElement && chartModelRef.current === undefined) {
-    chartModelRef.current = new Model(chartDivElement, modelParams)
+    chartModelRef.current = new Model(chartDivElement, params)
     // Providers the time period selector with a handle to refit the chart
     setRefitChartContent(() => () => chartModelRef.current?.fitContent())
   }
 
   // Keeps the chart up-to-date with latest data/params, without re-creating the entire chart
   useEffect(() => {
-    chartModelRef.current?.updateOptions(modelParams)
-  }, [modelParams])
+    chartModelRef.current?.updateOptions(params)
+  }, [params])
 
   // Handles chart removal on unmount
   useEffect(() => {
@@ -203,8 +178,12 @@ export function Chart<TParamType extends ChartDataParams<TDataType>, TDataType e
   }, [setRefitChartContent])
 
   return (
-    <ChartDiv ref={setChartDivElement} height={height} className={className}>
-      {children && children(crosshairData)}
-    </ChartDiv>
+    <div
+      ref={setChartDivElement}
+      style={{
+        height,
+        width: '100%',
+      }}
+    />
   )
 }
diff --git a/apps/web/src/components/Charts/FadeInLineChart.tsx b/apps/web/src/components/Charts/FadeInLineChart.tsx
index d04998be084..b58066ad649 100644
--- a/apps/web/src/components/Charts/FadeInLineChart.tsx
+++ b/apps/web/src/components/Charts/FadeInLineChart.tsx
@@ -1,7 +1,8 @@
 import { Group } from '@visx/group'
 import { LinePath } from '@visx/shape'
 import { easeCubicInOut } from 'd3'
-import React, { useEffect, useRef, useState } from 'react'
+import React from 'react'
+import { useEffect, useRef, useState } from 'react'
 import { animated, useSpring } from 'react-spring'
 import { useTheme } from 'styled-components'
 
diff --git a/apps/web/src/components/Charts/LineChart.tsx b/apps/web/src/components/Charts/LineChart.tsx
index f92eddaac4b..2db1664bf5a 100644
--- a/apps/web/src/components/Charts/LineChart.tsx
+++ b/apps/web/src/components/Charts/LineChart.tsx
@@ -1,7 +1,8 @@
 import { Group } from '@visx/group'
 import { LinePath } from '@visx/shape'
 import { CurveFactory } from 'd3'
-import React, { ReactNode } from 'react'
+import React from 'react'
+import { ReactNode } from 'react'
 import { useTheme } from 'styled-components'
 
 export interface LineChartProps<T> {
diff --git a/apps/web/src/components/Charts/PriceChart/__snapshots__/index.test.tsx.snap b/apps/web/src/components/Charts/PriceChart/__snapshots__/index.test.tsx.snap
index 20324233462..9d5dc2461b2 100644
--- a/apps/web/src/components/Charts/PriceChart/__snapshots__/index.test.tsx.snap
+++ b/apps/web/src/components/Charts/PriceChart/__snapshots__/index.test.tsx.snap
@@ -2,14 +2,7 @@
 
 exports[`PriceChart renders correctly with all prices filled 1`] = `
 <DocumentFragment>
-  .c2 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c4 {
+  .c3 {
   color: #40B66B;
 }
 
@@ -31,7 +24,7 @@ exports[`PriceChart renders correctly with all prices filled 1`] = `
   line-height: 44px;
 }
 
-.c3 {
+.c2 {
   height: 16px;
   display: -webkit-box;
   display: -webkit-flex;
@@ -53,18 +46,18 @@ exports[`PriceChart renders correctly with all prices filled 1`] = `
       class="c1"
     >
       <div
-        class="c2 css-15popx1"
+        class="css-15popx1"
       >
         $1.00
       </div>
     </div>
     <div
-      class="c3"
+      class="c2"
     >
       0.00%
       <svg
         aria-label="up"
-        class="c4"
+        class="c3"
         fill="none"
         height="16"
         viewBox="0 0 24 24"
@@ -356,10 +349,6 @@ exports[`PriceChart renders correctly with empty price array 1`] = `
 <DocumentFragment>
   .c1 {
   color: #CECECE;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c0 {
@@ -405,18 +394,11 @@ exports[`PriceChart renders correctly with empty price array 1`] = `
 exports[`PriceChart renders correctly with some prices filled 1`] = `
 <DocumentFragment>
   .c2 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c3 {
   display: inline-block;
   height: inherit;
 }
 
-.c5 {
+.c4 {
   color: #7D7D7D;
 }
 
@@ -439,7 +421,7 @@ exports[`PriceChart renders correctly with some prices filled 1`] = `
   line-height: 44px;
 }
 
-.c4 {
+.c3 {
   height: 16px;
   display: -webkit-box;
   display: -webkit-flex;
@@ -461,12 +443,12 @@ exports[`PriceChart renders correctly with some prices filled 1`] = `
       class="c1"
     >
       <div
-        class="c2 css-15popx1"
+        class="css-15popx1"
       >
         $1.00
       </div>
       <div
-        class="c3"
+        class="c2"
       >
         <div>
           <svg
@@ -503,12 +485,12 @@ exports[`PriceChart renders correctly with some prices filled 1`] = `
       </div>
     </div>
     <div
-      class="c4"
+      class="c3"
     >
       0.00%
       <svg
         aria-label="up"
-        class="c5"
+        class="c4"
         fill="none"
         height="16"
         viewBox="0 0 24 24"
@@ -800,10 +782,6 @@ exports[`PriceChart renders correctly with undefined prices 1`] = `
 <DocumentFragment>
   .c1 {
   color: #CECECE;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c0 {
@@ -849,18 +827,11 @@ exports[`PriceChart renders correctly with undefined prices 1`] = `
 exports[`PriceChart renders stale UI 1`] = `
 <DocumentFragment>
   .c2 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c3 {
   display: inline-block;
   height: inherit;
 }
 
-.c5 {
+.c4 {
   color: #7D7D7D;
 }
 
@@ -883,7 +854,7 @@ exports[`PriceChart renders stale UI 1`] = `
   line-height: 44px;
 }
 
-.c4 {
+.c3 {
   height: 16px;
   display: -webkit-box;
   display: -webkit-flex;
@@ -905,12 +876,12 @@ exports[`PriceChart renders stale UI 1`] = `
       class="c1"
     >
       <div
-        class="c2 css-15popx1"
+        class="css-15popx1"
       >
         $1.00
       </div>
       <div
-        class="c3"
+        class="c2"
       >
         <div>
           <svg
@@ -947,12 +918,12 @@ exports[`PriceChart renders stale UI 1`] = `
       </div>
     </div>
     <div
-      class="c4"
+      class="c3"
     >
       0.00%
       <svg
         aria-label="up"
-        class="c5"
+        class="c4"
         fill="none"
         height="16"
         viewBox="0 0 24 24"
diff --git a/apps/web/src/components/Charts/PriceChart/index.tsx b/apps/web/src/components/Charts/PriceChart/index.tsx
index 7eb258605b1..bce2d429cc9 100644
--- a/apps/web/src/components/Charts/PriceChart/index.tsx
+++ b/apps/web/src/components/Charts/PriceChart/index.tsx
@@ -1,9 +1,12 @@
-import { ChartHeader } from 'components/Charts/ChartHeader'
+import { Trans } from '@lingui/macro'
 import { Chart, ChartModel, ChartModelParams } from 'components/Charts/ChartModel'
+import { useHeaderDateFormatter } from 'components/Charts/hooks'
 import { getCandlestickPriceBounds } from 'components/Charts/PriceChart/utils'
 import { PriceChartType } from 'components/Charts/utils'
-import { DeltaArrow, calculateDelta } from 'components/Tokens/TokenDetails/Delta'
+import { calculateDelta, DeltaArrow } from 'components/Tokens/TokenDetails/Delta'
+import { MouseoverTooltip } from 'components/Tooltip'
 import { PricePoint } from 'graphql/data/util'
+import { useActiveLocale } from 'hooks/useActiveLocale'
 import {
   AreaData,
   CandlestickData,
@@ -14,10 +17,13 @@ import {
   PriceLineOptions,
   UTCTimestamp,
 } from 'lightweight-charts'
-import { useMemo } from 'react'
-import styled from 'styled-components'
+import React, { useMemo, useState } from 'react'
+import { Info } from 'react-feather'
+import styled, { useTheme } from 'styled-components'
+import { ThemedText } from 'theme/components'
+import { textFadeIn } from 'theme/styles'
 import { opacify } from 'theme/utils'
-import { NumberType, useFormatter } from 'utils/formatNumbers'
+import { useFormatter } from 'utils/formatNumbers'
 
 type PriceChartData = CandlestickData<UTCTimestamp> & AreaData<UTCTimestamp>
 
@@ -25,7 +31,7 @@ interface PriceChartModelParams extends ChartModelParams<PriceChartData> {
   type: PriceChartType
 }
 
-export class PriceChartModel extends ChartModel<PriceChartData> {
+class PriceChartModel extends ChartModel<PriceChartData> {
   protected series: ISeriesApi<'Area' | 'Candlestick'>
   private type: PriceChartType
   private minPriceLine: IPriceLine
@@ -103,15 +109,30 @@ export class PriceChartModel extends ChartModel<PriceChartData> {
   }
 }
 
+const ChartHeaderWrapper = styled.div<{ stale?: boolean }>`
+  position: absolute;
+  ${textFadeIn};
+  animation-duration: ${({ theme }) => theme.transition.duration.medium};
+  ${({ theme, stale }) => stale && `color: ${theme.neutral2}`};
+
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+`
+const PriceContainer = styled.div`
+  display: flex;
+  gap: 6px;
+  line-height: 50px;
+`
 const DeltaContainer = styled.div`
   height: 16px;
   display: flex;
   align-items: center;
+  margin-top: 4px;
   color: ${({ theme }) => theme.neutral2};
-  gap: 4px;
 `
 
-export const mockCandlestickData = (prices: PricePoint[] | undefined): PriceChartData[] => {
+const mockCandlestickData = (prices: PricePoint[] | undefined): PriceChartData[] => {
   if (!prices) return []
 
   let minIndex = 0
@@ -146,18 +167,52 @@ interface PriceChartDeltaProps {
   noColor?: boolean
 }
 
-export function PriceChartDelta({ startingPrice, endingPrice, noColor }: PriceChartDeltaProps) {
+function PriceChartDelta({ startingPrice, endingPrice, noColor }: PriceChartDeltaProps) {
   const delta = calculateDelta(startingPrice.close ?? startingPrice.value, endingPrice.close ?? endingPrice.value)
   const { formatDelta } = useFormatter()
 
   return (
     <DeltaContainer>
-      <DeltaArrow delta={delta} noColor={noColor} />
       {formatDelta(delta)}
+      <DeltaArrow delta={delta} noColor={noColor} />
     </DeltaContainer>
   )
 }
 
+function PriceChartHeader({ crosshairPrice, data }: { crosshairPrice?: PriceChartData; data: PriceChartData[] }) {
+  const { formatFiatPrice } = useFormatter()
+  const headerDateFormatter = useHeaderDateFormatter()
+
+  const startingPrice = data[0]
+  const endingPrice = data[data.length - 1]
+
+  const lastValidPrice = useMemo(
+    () => [...data].reverse().find((price) => price.close !== 0 || price.value !== 0),
+    [data]
+  )
+
+  const priceOutdated = lastValidPrice !== endingPrice
+  const displayPrice = crosshairPrice ?? lastValidPrice ?? startingPrice
+
+  const displayIsStale = priceOutdated && !crosshairPrice
+  return (
+    <ChartHeaderWrapper data-cy="chart-header" stale={displayIsStale}>
+      <PriceContainer>
+        <ThemedText.HeadlineLarge color="inherit">
+          {formatFiatPrice({ price: displayPrice?.close ?? displayPrice.value })}
+        </ThemedText.HeadlineLarge>
+        {displayIsStale && (
+          <MouseoverTooltip text={<Trans>This price may not be up-to-date due to low trading volume.</Trans>}>
+            <Info size={16} data-testid="chart-stale-icon" />
+          </MouseoverTooltip>
+        )}
+      </PriceContainer>
+      <ThemedText.Caption color="neutral2">{headerDateFormatter(displayPrice?.time)}</ThemedText.Caption>
+      <PriceChartDelta startingPrice={startingPrice} endingPrice={displayPrice} noColor={priceOutdated} />
+    </ChartHeaderWrapper>
+  )
+}
+
 interface PriceChartProps {
   type: PriceChartType
   height: number
@@ -166,24 +221,19 @@ interface PriceChartProps {
 
 export function PriceChart({ height, prices, type }: PriceChartProps) {
   const mockedPrices = useMemo(() => mockCandlestickData(prices), [prices]) // TODO(info) - update to use real candlestick data
-  const params = useMemo(() => ({ data: mockedPrices, type }), [mockedPrices, type])
+  const locale = useActiveLocale()
+  const theme = useTheme()
+  const format = useFormatter()
+  const [crosshairPrice, setCrosshairPrice] = useState<PriceChartData>()
 
-  // TODO(WEB-3430): Add error state for lack of data
-  if (!mockedPrices.length) return null
+  const params: PriceChartModelParams = useMemo(() => {
+    return { data: mockedPrices, locale, theme, format, type, onCrosshairMove: setCrosshairPrice }
+  }, [mockedPrices, locale, theme, format, type])
 
-  const lastPrice = mockedPrices[mockedPrices.length - 1]
   return (
-    <Chart Model={PriceChartModel} params={params} height={height}>
-      {(crosshairData) => (
-        <ChartHeader
-          value={(crosshairData ?? lastPrice).value ?? (crosshairData ?? lastPrice).close}
-          additionalFields={
-            <PriceChartDelta startingPrice={mockedPrices[0]} endingPrice={crosshairData ?? lastPrice} />
-          }
-          valueFormatterType={NumberType.FiatTokenPrice}
-          time={crosshairData?.time}
-        />
-      )}
-    </Chart>
+    <>
+      <PriceChartHeader crosshairPrice={crosshairPrice} data={mockedPrices} />
+      <Chart Model={PriceChartModel} params={params} height={height} />
+    </>
   )
 }
diff --git a/apps/web/src/components/Charts/StackedLineChart/index.tsx b/apps/web/src/components/Charts/StackedLineChart/index.tsx
index 40a53e5eb62..a2e1cadec79 100644
--- a/apps/web/src/components/Charts/StackedLineChart/index.tsx
+++ b/apps/web/src/components/Charts/StackedLineChart/index.tsx
@@ -1,13 +1,20 @@
-import { ChartHeader } from 'components/Charts/ChartHeader'
 import { Chart, ChartModel, ChartModelParams } from 'components/Charts/ChartModel'
+import { useHeaderDateFormatter } from 'components/Charts/hooks'
+import { ChartContainer } from 'components/Charts/shared'
 import { HARDCODED_TVL_DATA } from 'components/Charts/StackedLineChart/mockData'
 import { StackedAreaSeriesOptions } from 'components/Charts/StackedLineChart/stacked-area-series/options'
 import { StackedAreaSeries } from 'components/Charts/StackedLineChart/stacked-area-series/stacked-area-series'
+import { ProtocolDetail, ProtocolLegend } from 'components/Charts/StackedVolumeChart'
+import { RowBetween } from 'components/Row'
 import { PriceSource } from 'graphql/data/__generated__/types-and-hooks'
 import { getProtocolColor } from 'graphql/data/util'
+import { useActiveLocale } from 'hooks/useActiveLocale'
 import { CustomStyleOptions, DeepPartial, ISeriesApi, Logical, UTCTimestamp, WhitespaceData } from 'lightweight-charts'
-import { useMemo } from 'react'
-import { useTheme } from 'styled-components'
+import React, { useMemo, useState } from 'react'
+import styled, { useTheme } from 'styled-components'
+import { ThemedText } from 'theme/components/text'
+import { textFadeIn } from 'theme/styles'
+import { NumberType, useFormatter } from 'utils/formatNumbers'
 
 export interface StackedLineData extends WhitespaceData<UTCTimestamp> {
   values: number[]
@@ -17,7 +24,7 @@ interface TVLChartParams extends ChartModelParams<StackedLineData> {
   colors: string[]
 }
 
-export class TVLChartModel extends ChartModel<StackedLineData> {
+class TVLChartModel extends ChartModel<StackedLineData> {
   protected series: ISeriesApi<'Custom'>
 
   private hoveredLogicalIndex: Logical | null | undefined
@@ -43,8 +50,6 @@ export class TVLChartModel extends ChartModel<StackedLineData> {
 
   updateOptions(params: TVLChartParams) {
     super.updateOptions(params, {
-      handleScale: false,
-      handleScroll: false,
       rightPriceScale: {
         visible: params.colors.length == 1, // Hide pricescale on multi-line charts
         borderVisible: false,
@@ -73,6 +78,59 @@ export class TVLChartModel extends ChartModel<StackedLineData> {
   }
 }
 
+const Header = styled(RowBetween)`
+  ${textFadeIn};
+  position: absolute;
+  width: 100%;
+  gap: 8px;
+`
+const HeaderDisplay = styled.div`
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding-bottom: 14px;
+  text-align: left;
+  pointer-events: none;
+`
+
+interface ChartHeaderProps {
+  data: StackedLineData[]
+  sources?: PriceSource[]
+  crosshairData?: StackedLineData
+}
+
+function ChartHeader({ data, crosshairData, sources }: ChartHeaderProps) {
+  const { formatFiatPrice } = useFormatter()
+  const headerDateFormatter = useHeaderDateFormatter()
+
+  const lastEntry = data[data.length - 1]
+
+  return (
+    <Header>
+      <RowBetween align="flex-start">
+        <HeaderDisplay>
+          <ThemedText.HeadlineLarge>
+            {formatFiatPrice({
+              price: (crosshairData ?? lastEntry)?.values.reduce((v, sum) => (sum += v), 0),
+              type: NumberType.FiatTokenStatChartHeader,
+            })}
+          </ThemedText.HeadlineLarge>
+          {crosshairData && (
+            <ThemedText.Caption color="neutral2">{headerDateFormatter(crosshairData.time)}</ThemedText.Caption>
+          )}
+        </HeaderDisplay>
+        <ProtocolLegend>
+          {sources
+            ?.map((protocol, index) => (
+              <ProtocolDetail value={crosshairData?.values[index]} protocol={protocol} key={protocol + '_blip'} />
+            ))
+            .reverse()}
+        </ProtocolLegend>
+      </RowBetween>
+    </Header>
+  )
+}
+
 interface StackedLineChartProps {
   height: number
   data?: StackedLineData[]
@@ -80,26 +138,27 @@ interface StackedLineChartProps {
 }
 
 export function StackedLineChart({ height, data = HARDCODED_TVL_DATA, sources }: StackedLineChartProps) {
+  const locale = useActiveLocale()
   const theme = useTheme()
-  const params = useMemo(() => {
-    const colors = sources?.map((source) => getProtocolColor(source, theme)) ?? [theme.accent1]
-    return { data, colors }
-  }, [data, theme, sources])
-
-  const lastEntry = data[data.length - 1]
+  const format = useFormatter()
+  const [crosshairData, setCrosshairData] = useState<StackedLineData>()
 
-  // TODO(WEB-3430): Add error state for lack of data
-  if (!lastEntry) return null
+  const params: TVLChartParams = useMemo(() => {
+    const colors = sources?.map((source) => getProtocolColor(source, theme)) ?? [theme.accent1]
+    return {
+      data,
+      locale,
+      theme,
+      format,
+      onCrosshairMove: setCrosshairData,
+      colors,
+    }
+  }, [data, locale, theme, format, sources])
 
   return (
-    <Chart Model={TVLChartModel} params={params} height={height}>
-      {(crosshairData: StackedLineData | undefined) => (
-        <ChartHeader
-          value={(crosshairData ?? lastEntry)?.values.reduce((v, sum) => (sum += v), 0)}
-          time={crosshairData?.time}
-          protocolData={sources?.map((source, index) => ({ protocol: source, value: crosshairData?.values[index] }))}
-        />
-      )}
-    </Chart>
+    <ChartContainer $height={height}>
+      <ChartHeader data={data} sources={sources} crosshairData={crosshairData} />
+      <Chart Model={TVLChartModel} params={params} height={height} />
+    </ChartContainer>
   )
 }
diff --git a/apps/web/src/components/Charts/StackedVolumeChart/index.tsx b/apps/web/src/components/Charts/StackedVolumeChart/index.tsx
new file mode 100644
index 00000000000..e6a896bbc70
--- /dev/null
+++ b/apps/web/src/components/Charts/StackedVolumeChart/index.tsx
@@ -0,0 +1,232 @@
+import { t } from '@lingui/macro'
+import { Chart, ChartModel, ChartModelParams } from 'components/Charts/ChartModel'
+import { useHeaderDateFormatter } from 'components/Charts/hooks'
+import { ChartContainer } from 'components/Charts/shared'
+import Column from 'components/Column'
+import Row, { RowBetween } from 'components/Row'
+import { PriceSource } from 'graphql/data/__generated__/types-and-hooks'
+import { getProtocolColor, getProtocolName, TimePeriod } from 'graphql/data/util'
+import { useActiveLocale } from 'hooks/useActiveLocale'
+import { ISeriesApi } from 'lightweight-charts'
+import { useMemo, useState } from 'react'
+import styled, { useTheme } from 'styled-components'
+import { colors } from 'theme/colors'
+import { ThemedText } from 'theme/components'
+import { NumberType, useFormatter } from 'utils/formatNumbers'
+
+import { CrosshairHighlightPrimitive } from '../VolumeChart/CrosshairHighlightPrimitive'
+import { StackedBarsData } from './renderer'
+import { getCumulativeSum, StackedBarsSeries } from './stacked-bar-series'
+
+const ChartHeader = styled(RowBetween)`
+  position: absolute;
+  padding-bottom: 14px;
+  text-align: left;
+  pointer-events: none;
+
+  @media only screen and (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
+    padding: 0px;
+    gap: 4px;
+  }
+`
+export const ProtocolLegend = styled(Column)`
+  padding: 4px 12px;
+  gap: 12px;
+  text-align: left;
+  pointer-events: none;
+`
+const ProtocolBlip = styled.div<{ color: string }>`
+  background-color: ${({ color }) => color};
+  border-radius: 4px;
+  width: 12px;
+  height: 12px;
+`
+
+type StackedVolumeChartModelParams = ChartModelParams<StackedBarsData> & { colors: [string, string] }
+
+class StackedVolumeChartModel extends ChartModel<StackedBarsData> {
+  protected series: ISeriesApi<'Custom'>
+  private highlightBarPrimitive: CrosshairHighlightPrimitive
+
+  constructor(chartDiv: HTMLDivElement, params: StackedVolumeChartModelParams) {
+    super(chartDiv, params)
+
+    this.series = this.api.addCustomSeries(new StackedBarsSeries({ colors: params.colors }))
+
+    this.series.setData(this.data)
+
+    // Add crosshair highlight bar
+    this.highlightBarPrimitive = new CrosshairHighlightPrimitive({
+      color: params.theme.surface3,
+      crosshairYPosition: 85,
+    })
+    this.series.attachPrimitive(this.highlightBarPrimitive)
+
+    this.updateOptions(params)
+    this.fitContent()
+  }
+
+  updateOptions(params: StackedVolumeChartModelParams) {
+    const stackedVolumeChartOptions = {
+      localization: {
+        locale: params.locale,
+      },
+      rightPriceScale: {
+        visible: false,
+      },
+      handleScale: {
+        axisPressedMouseMove: false,
+      },
+      handleScroll: {
+        vertTouchDrag: false,
+      },
+      grid: {
+        vertLines: {
+          visible: false,
+        },
+        horzLines: {
+          visible: false,
+        },
+      },
+      crosshair: {
+        horzLine: {
+          visible: false,
+          labelVisible: false,
+        },
+        vertLine: {
+          visible: false,
+          labelVisible: false,
+        },
+      },
+    }
+
+    super.updateOptions(params, stackedVolumeChartOptions)
+    const { data, theme } = params
+
+    // Handles changes in data, e.g. time period selection
+    if (this.data !== data) {
+      this.data = data
+      this.series.setData(data)
+      this.fitContent()
+    }
+
+    this.series.applyOptions({
+      priceFormat: {
+        type: 'volume',
+      },
+      priceLineVisible: false,
+      lastValueVisible: false,
+    })
+
+    this.series.priceScale().applyOptions({
+      scaleMargins: {
+        top: 0.3,
+        bottom: 0,
+      },
+    })
+
+    this.highlightBarPrimitive.applyOptions({ color: theme.surface3 })
+  }
+}
+
+const TIME_PERIOD_DESCRIPTOR: { [key in TimePeriod]: string } = {
+  [TimePeriod.HOUR]: t`Past hour`,
+  [TimePeriod.DAY]: t`Past day`,
+  [TimePeriod.WEEK]: t`Past week`,
+  [TimePeriod.MONTH]: t`Past month`,
+  [TimePeriod.YEAR]: t`Past year`,
+}
+
+export function ProtocolDetail({ protocol, value }: { protocol: PriceSource; value?: number }) {
+  const { formatFiatPrice } = useFormatter()
+  const theme = useTheme()
+
+  return (
+    <Row gap="6px" justify="flex-end">
+      <ThemedText.Caption>
+        {value
+          ? formatFiatPrice({ price: value, type: NumberType.FiatTokenStatChartHeader })
+          : getProtocolName(protocol)}
+      </ThemedText.Caption>
+      <ProtocolBlip color={getProtocolColor(protocol, theme)} />
+    </Row>
+  )
+}
+
+export function getCumulativeVolume(data: StackedBarsData[]) {
+  return data.reduce((sum, curr) => (sum += getCumulativeSum(curr)), 0)
+}
+
+function StackedVolumeChartHeader({
+  data,
+  crosshairData,
+  timePeriod,
+}: {
+  data: StackedBarsData[]
+  crosshairData?: StackedBarsData
+  timePeriod: TimePeriod
+}) {
+  const { formatFiatPrice } = useFormatter()
+  const headerDateFormatter = useHeaderDateFormatter()
+
+  const { sum, time } = useMemo(() => {
+    if (crosshairData) {
+      const sum = getCumulativeSum(crosshairData)
+      return { sum, time: headerDateFormatter(crosshairData.time) }
+    }
+
+    const sum = getCumulativeVolume(data)
+    const time = TIME_PERIOD_DESCRIPTOR[timePeriod]
+
+    return { sum, time }
+  }, [data, crosshairData, timePeriod, headerDateFormatter])
+
+  return (
+    <ChartHeader>
+      <Column>
+        <ThemedText.HeadlineLarge>
+          {formatFiatPrice({ price: sum, type: NumberType.FiatTokenStatChartHeader })}
+        </ThemedText.HeadlineLarge>
+        <ThemedText.Caption color="neutral2">{time}</ThemedText.Caption>
+      </Column>
+      <ProtocolLegend>
+        <ProtocolDetail protocol={PriceSource.SubgraphV3} value={crosshairData?.values.v3} />
+        <ProtocolDetail protocol={PriceSource.SubgraphV2} value={crosshairData?.values.v2} />
+      </ProtocolLegend>
+    </ChartHeader>
+  )
+}
+
+export function StackedVolumeChart({
+  height,
+  data,
+  timePeriod,
+}: {
+  height: number
+  data: StackedBarsData[]
+  timePeriod: TimePeriod
+}) {
+  const locale = useActiveLocale()
+  const theme = useTheme()
+  const format = useFormatter()
+
+  const [crosshairData, setCrosshairData] = useState<StackedBarsData>()
+
+  const params: StackedVolumeChartModelParams = useMemo(() => {
+    return {
+      data,
+      locale,
+      theme,
+      colors: [theme.accent1, colors.blue400],
+      format,
+      onCrosshairMove: setCrosshairData,
+    }
+  }, [data, locale, theme, format])
+
+  return (
+    <ChartContainer $height={height}>
+      <StackedVolumeChartHeader data={data} crosshairData={crosshairData} timePeriod={timePeriod} />
+      <Chart Model={StackedVolumeChartModel} params={params} height={height} />
+    </ChartContainer>
+  )
+}
diff --git a/apps/web/src/components/Charts/VolumeChart/renderer.tsx b/apps/web/src/components/Charts/StackedVolumeChart/renderer.tsx
similarity index 66%
rename from apps/web/src/components/Charts/VolumeChart/renderer.tsx
rename to apps/web/src/components/Charts/StackedVolumeChart/renderer.tsx
index 5b16113b681..ff75c2c95bb 100644
--- a/apps/web/src/components/Charts/VolumeChart/renderer.tsx
+++ b/apps/web/src/components/Charts/StackedVolumeChart/renderer.tsx
@@ -3,9 +3,7 @@
  * Modifications are called out with comments.
  */
 import { BitmapCoordinatesRenderingScope, CanvasRenderingTarget2D } from 'fancy-canvas'
-import { PriceSource } from 'graphql/data/__generated__/types-and-hooks'
 import {
-  CustomData,
   CustomSeriesOptions,
   ICustomSeriesPaneRenderer,
   PaneRendererCustomData,
@@ -13,51 +11,43 @@ import {
   Time,
   UTCTimestamp,
 } from 'lightweight-charts'
+import { CustomData } from 'lightweight-charts'
 
-import { calculateColumnPositionsInPlace, ColumnPosition, isStackedHistogramData, positionsBox } from './utils'
+import { calculateColumnPositionsInPlace, ColumnPosition, positionsBox } from './utils'
 
-// Modification: custom implementations of lw-chart's histogram data types
-export interface SingleHistogramData extends CustomData {
-  value: number
+export interface StackedBarsData extends CustomData {
   time: UTCTimestamp
+  values: { v2?: number; v3?: number }
 }
 
-export interface StackedHistogramData extends CustomData {
-  values: Record<PriceSource, number>
-  time: UTCTimestamp
-}
-
-export type CustomHistogramData = SingleHistogramData | StackedHistogramData
-
-interface BarItem {
+interface StackedBarsBarItem {
   x: number
   ys: number[]
   column?: ColumnPosition
 }
 
-export interface CustomHistogramSeriesOptions extends CustomSeriesOptions {
-  colors: string[]
+export interface StackedBarsSeriesOptions extends CustomSeriesOptions {
+  colors: [string, string]
 }
 
-function cumulativeBuildUp(data: StackedHistogramData): number[] {
+function cumulativeBuildUp(arr: number[]): number[] {
   let sum = 0
-  return Object.values(data.values).map((value) => {
+  return arr.map((value) => {
     const newValue = sum + value
     sum = newValue
     return newValue
   })
 }
 
-export interface CustomHistogramProps {
-  colors: string[]
+export interface StackedBarsProps {
+  colors: [string, string]
 }
-
-export class CustomHistogramSeriesRenderer<TData extends CustomHistogramData> implements ICustomSeriesPaneRenderer {
+export class StackedBarsSeriesRenderer<TData extends StackedBarsData> implements ICustomSeriesPaneRenderer {
   _data: PaneRendererCustomData<Time, TData> | null = null
-  _options: CustomHistogramSeriesOptions | null = null
-  _colors: string[]
+  _options: StackedBarsSeriesOptions | null = null
+  _colors: [string, string]
 
-  constructor(props: CustomHistogramProps) {
+  constructor(props: StackedBarsProps) {
     this._colors = props.colors
   }
 
@@ -65,7 +55,7 @@ export class CustomHistogramSeriesRenderer<TData extends CustomHistogramData> im
     target.useBitmapCoordinateSpace((scope) => this._drawImpl(scope, priceConverter))
   }
 
-  update(data: PaneRendererCustomData<Time, TData>, options: CustomHistogramSeriesOptions): void {
+  update(data: PaneRendererCustomData<Time, TData>, options: StackedBarsSeriesOptions): void {
     this._data = data
     this._options = options
   }
@@ -80,14 +70,12 @@ export class CustomHistogramSeriesRenderer<TData extends CustomHistogramData> im
       return
     }
     const ctx = renderingScope.context
-    const bars: BarItem[] = this._data.bars.map((bar) => {
-      // Modification: CustomHistogramSeries is generalized to handle both single and stacked histograms
-      const cumulativePrice = isStackedHistogramData(bar.originalData)
-        ? cumulativeBuildUp(bar.originalData)
-        : [bar.originalData.value]
+    const bars: StackedBarsBarItem[] = this._data.bars.map((bar) => {
       return {
         x: bar.x,
-        ys: cumulativePrice.map((value) => priceToCoordinate(value) ?? 0),
+        ys: cumulativeBuildUp([bar.originalData.values.v2 ?? 0, bar.originalData.values.v3 ?? 0]).map(
+          (value) => priceToCoordinate(value) ?? 0
+        ),
       }
     })
     calculateColumnPositionsInPlace(
diff --git a/apps/web/src/components/Charts/StackedVolumeChart/stacked-bar-series.tsx b/apps/web/src/components/Charts/StackedVolumeChart/stacked-bar-series.tsx
new file mode 100644
index 00000000000..fc646839c36
--- /dev/null
+++ b/apps/web/src/components/Charts/StackedVolumeChart/stacked-bar-series.tsx
@@ -0,0 +1,50 @@
+/* Copied from https://github.com/tradingview/lightweight-charts/blob/master/plugin-examples/src/plugins/stacked-bars-series/stacked-bars-series.ts */
+import {
+  customSeriesDefaultOptions,
+  CustomSeriesPricePlotValues,
+  ICustomSeriesPaneView,
+  PaneRendererCustomData,
+  Time,
+  WhitespaceData,
+} from 'lightweight-charts'
+
+import { StackedBarsData, StackedBarsProps, StackedBarsSeriesOptions, StackedBarsSeriesRenderer } from './renderer'
+
+export function getCumulativeSum(data: StackedBarsData): number {
+  return (data.values?.v2 || 0) + (data.values?.v3 || 0)
+}
+
+export class StackedBarsSeries<TData extends StackedBarsData>
+  implements ICustomSeriesPaneView<Time, TData, StackedBarsSeriesOptions>
+{
+  _renderer: StackedBarsSeriesRenderer<TData>
+  _colors: [string, string]
+
+  constructor(props: StackedBarsProps) {
+    this._renderer = new StackedBarsSeriesRenderer(props)
+    this._colors = props.colors
+  }
+
+  priceValueBuilder(plotRow: TData): CustomSeriesPricePlotValues {
+    return [0, getCumulativeSum(plotRow)]
+  }
+
+  isWhitespace(data: TData | WhitespaceData): data is WhitespaceData {
+    return !(data as Partial<TData>).values || !getCumulativeSum(data as TData)
+  }
+
+  renderer(): StackedBarsSeriesRenderer<TData> {
+    return this._renderer
+  }
+
+  update(data: PaneRendererCustomData<Time, TData>, options: StackedBarsSeriesOptions): void {
+    this._renderer.update(data, options)
+  }
+
+  defaultOptions() {
+    return {
+      ...customSeriesDefaultOptions,
+      colors: this._colors,
+    }
+  }
+}
diff --git a/apps/web/src/components/Charts/VolumeChart/utils.ts b/apps/web/src/components/Charts/StackedVolumeChart/utils.ts
similarity index 87%
rename from apps/web/src/components/Charts/VolumeChart/utils.ts
rename to apps/web/src/components/Charts/StackedVolumeChart/utils.ts
index c09d746189c..174637dd846 100644
--- a/apps/web/src/components/Charts/VolumeChart/utils.ts
+++ b/apps/web/src/components/Charts/StackedVolumeChart/utils.ts
@@ -1,31 +1,3 @@
-import { ChartHeaderProtocolInfo } from 'components/Charts/ChartHeader'
-import { PriceSource } from 'graphql/data/__generated__/types-and-hooks'
-
-import { CustomHistogramData, StackedHistogramData } from './renderer'
-
-export function isStackedHistogramData(data: CustomHistogramData): data is StackedHistogramData {
-  return (data as StackedHistogramData).values !== undefined
-}
-
-export function getCumulativeSum(data: CustomHistogramData): number {
-  return isStackedHistogramData(data) ? Object.values(data.values).reduce((sum, curr) => (sum += curr), 0) : data.value
-}
-
-export function getCumulativeVolume(data: StackedHistogramData[]) {
-  return data.reduce((sum, curr) => (sum += getCumulativeSum(curr)), 0)
-}
-
-export function getVolumeProtocolInfo(
-  data: StackedHistogramData | undefined,
-  sources: PriceSource[]
-): ChartHeaderProtocolInfo[] {
-  const info = new Array<ChartHeaderProtocolInfo>()
-  for (const source of sources) {
-    info.push({ protocol: source, value: data?.values[source] })
-  }
-  return info
-}
-
 /* Copied from https://github.com/tradingview/lightweight-charts/blob/master/plugin-examples/src/helpers/ */
 
 interface BitmapPositionLength {
diff --git a/apps/web/src/components/Charts/VolumeChart/CrosshairHighlightPrimitive.tsx b/apps/web/src/components/Charts/VolumeChart/CrosshairHighlightPrimitive.tsx
index 42e0f4b99a7..2b0aad82c7f 100644
--- a/apps/web/src/components/Charts/VolumeChart/CrosshairHighlightPrimitive.tsx
+++ b/apps/web/src/components/Charts/VolumeChart/CrosshairHighlightPrimitive.tsx
@@ -71,18 +71,10 @@ class CrosshairHighlightPaneRenderer implements ISeriesPrimitivePaneRenderer {
       ctx.fillStyle = this._data.color
       const crosshairYPosition = this._data.crosshairYPosition * scope.verticalPixelRatio
 
-      // Modification: increase space between bars
-      const margin =
-        Math.min(
-          Math.max(scope.horizontalPixelRatio, crosshairPos.length),
-          this._data.barSpacing * scope.horizontalPixelRatio
-        ) * 0.035
-      const crosshairXPosition = crosshairPos.position + margin
-
       // Modification: use rounded rectangle
       ctx.beginPath()
       ctx.roundRect(
-        crosshairXPosition,
+        crosshairPos.position,
         crosshairYPosition,
         crosshairPos.length,
         scope.bitmapSize.height - crosshairYPosition,
@@ -96,12 +88,12 @@ class CrosshairHighlightPaneRenderer implements ISeriesPrimitivePaneRenderer {
       ctx.fillStyle = 'black'
 
       // lower opacity to left of highlight bar
-      ctx.fillRect(0, crosshairYPosition, crosshairXPosition, scope.bitmapSize.height - crosshairYPosition)
+      ctx.fillRect(0, crosshairYPosition, crosshairPos.position, scope.bitmapSize.height - crosshairYPosition)
       // lower opacity to right of highlight bar
       ctx.fillRect(
-        crosshairXPosition + crosshairPos.length,
+        crosshairPos.position + crosshairPos.length,
         crosshairYPosition,
-        scope.bitmapSize.width - (crosshairXPosition + crosshairPos.length),
+        scope.bitmapSize.width - (crosshairPos.position + crosshairPos.length),
         scope.bitmapSize.height - crosshairYPosition
       )
       // reset global settings
diff --git a/apps/web/src/components/Charts/VolumeChart/CustomVolumeChartModel.tsx b/apps/web/src/components/Charts/VolumeChart/CustomVolumeChartModel.tsx
deleted file mode 100644
index d4da48a7a12..00000000000
--- a/apps/web/src/components/Charts/VolumeChart/CustomVolumeChartModel.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-import { ChartModel, ChartModelParams } from 'components/Charts/ChartModel'
-import { BarPrice, ISeriesApi } from 'lightweight-charts'
-import { NumberType } from 'utils/formatNumbers'
-
-import { CrosshairHighlightPrimitive } from './CrosshairHighlightPrimitive'
-import { CustomHistogramSeries } from './custom-histogram-series'
-import { CustomHistogramData } from './renderer'
-
-export type CustomVolumeChartModelParams = {
-  colors: string[]
-  headerHeight: number
-}
-
-// Custom volume chart model, uses stacked volume chart as base model
-// Extensible to other volume charts (i.e. see VolumeChartModel for single-histogram volume chart implementation)
-export class CustomVolumeChartModel<TDataType extends CustomHistogramData> extends ChartModel<TDataType> {
-  protected series: ISeriesApi<'Custom'>
-  private highlightBarPrimitive: CrosshairHighlightPrimitive
-
-  constructor(chartDiv: HTMLDivElement, params: ChartModelParams<TDataType> & CustomVolumeChartModelParams) {
-    super(chartDiv, params)
-
-    this.series = this.api.addCustomSeries(new CustomHistogramSeries({ colors: params.colors }))
-
-    this.series.setData(this.data)
-
-    // Add crosshair highlight bar
-    this.highlightBarPrimitive = new CrosshairHighlightPrimitive({
-      color: params.theme.surface3,
-      crosshairYPosition: params.headerHeight,
-    })
-    this.series.attachPrimitive(this.highlightBarPrimitive)
-
-    this.updateOptions(params)
-    this.fitContent()
-  }
-
-  updateOptions(params: ChartModelParams<TDataType> & CustomVolumeChartModelParams, options?: any) {
-    // Use stacked volume chart set-up options as default base options
-    const stackedVolumeChartOptions = {
-      localization: {
-        locale: params.locale,
-        priceFormatter: (price: BarPrice) =>
-          params.format.formatFiatPrice({ price, type: NumberType.FiatTokenChartStatsScale }),
-      },
-      rightPriceScale: {
-        visible: false,
-      },
-      handleScale: false,
-      handleScroll: false,
-      grid: {
-        vertLines: {
-          visible: false,
-        },
-        horzLines: {
-          visible: false,
-        },
-      },
-      crosshair: {
-        horzLine: {
-          visible: false,
-          labelVisible: false,
-        },
-        vertLine: {
-          visible: false,
-          labelVisible: false,
-        },
-      },
-      ...options,
-    }
-
-    super.updateOptions(params, stackedVolumeChartOptions)
-    const { data } = params
-
-    // Handles changes in data, e.g. time period selection
-    if (this.data !== data) {
-      this.data = data
-      this.series.setData(data)
-      this.fitContent()
-    }
-
-    this.series.applyOptions({
-      priceFormat: {
-        type: 'volume',
-      },
-      priceLineVisible: false,
-      lastValueVisible: false,
-    })
-
-    this.series.priceScale().applyOptions({
-      scaleMargins: {
-        top: 0.3,
-        bottom: 0,
-      },
-    })
-  }
-}
diff --git a/apps/web/src/components/Charts/VolumeChart/custom-histogram-series.tsx b/apps/web/src/components/Charts/VolumeChart/custom-histogram-series.tsx
deleted file mode 100644
index c776534eb02..00000000000
--- a/apps/web/src/components/Charts/VolumeChart/custom-histogram-series.tsx
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Copied from https://github.com/tradingview/lightweight-charts/blob/master/plugin-examples/src/plugins/stacked-bars-series/stacked-bars-series.ts
- * Renamed component/variable names from StackedBars to CustomHistogram since we generalized the series to handle both single and stacked histograms.
- */
-import { getCumulativeSum } from 'components/Charts/VolumeChart/utils'
-import {
-  customSeriesDefaultOptions,
-  CustomSeriesPricePlotValues,
-  ICustomSeriesPaneView,
-  PaneRendererCustomData,
-  Time,
-  WhitespaceData,
-} from 'lightweight-charts'
-
-import {
-  CustomHistogramData,
-  CustomHistogramProps,
-  CustomHistogramSeriesOptions,
-  CustomHistogramSeriesRenderer,
-} from './renderer'
-
-export class CustomHistogramSeries<TData extends CustomHistogramData>
-  implements ICustomSeriesPaneView<Time, TData, CustomHistogramSeriesOptions>
-{
-  _renderer: CustomHistogramSeriesRenderer<TData>
-  _colors: string[]
-
-  constructor(props: CustomHistogramProps) {
-    this._renderer = new CustomHistogramSeriesRenderer(props)
-    this._colors = props.colors
-  }
-
-  priceValueBuilder(plotRow: TData): CustomSeriesPricePlotValues {
-    return [0, getCumulativeSum(plotRow)]
-  }
-
-  isWhitespace(data: TData | WhitespaceData): data is WhitespaceData {
-    return !(data as Partial<TData>).time || !getCumulativeSum(data as TData)
-  }
-
-  renderer(): CustomHistogramSeriesRenderer<TData> {
-    return this._renderer
-  }
-
-  update(data: PaneRendererCustomData<Time, TData>, options: CustomHistogramSeriesOptions): void {
-    this._renderer.update(data, options)
-  }
-
-  defaultOptions() {
-    return {
-      ...customSeriesDefaultOptions,
-      colors: this._colors,
-    }
-  }
-}
diff --git a/apps/web/src/components/Charts/VolumeChart/index.tsx b/apps/web/src/components/Charts/VolumeChart/index.tsx
index e0b8eb4c80b..ac1d5b98c2f 100644
--- a/apps/web/src/components/Charts/VolumeChart/index.tsx
+++ b/apps/web/src/components/Charts/VolumeChart/index.tsx
@@ -1,27 +1,48 @@
 import { t, Trans } from '@lingui/macro'
-import { ChartHeader } from 'components/Charts/ChartHeader'
-import { Chart, ChartModelParams } from 'components/Charts/ChartModel'
+import { Chart, ChartModel, ChartModelParams } from 'components/Charts/ChartModel'
 import { useHeaderDateFormatter } from 'components/Charts/hooks'
 import Column from 'components/Column'
 import { BIPS_BASE } from 'constants/misc'
 import { PricePoint, TimePeriod, toHistoryDuration } from 'graphql/data/util'
-import { UTCTimestamp } from 'lightweight-charts'
-import { useMemo } from 'react'
-import { useTheme } from 'styled-components'
+import { useActiveLocale } from 'hooks/useActiveLocale'
+import { BarPrice, HistogramData, ISeriesApi, UTCTimestamp } from 'lightweight-charts'
+import { useMemo, useState } from 'react'
+import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
+import { textFadeIn } from 'theme/styles'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
-import { CustomVolumeChartModel, CustomVolumeChartModelParams } from './CustomVolumeChartModel'
-import { SingleHistogramData } from './renderer'
+import { CrosshairHighlightPrimitive } from './CrosshairHighlightPrimitive'
 
-class VolumeChartModel extends CustomVolumeChartModel<SingleHistogramData> {
-  constructor(chartDiv: HTMLDivElement, params: ChartModelParams<SingleHistogramData> & CustomVolumeChartModelParams) {
+type VolumeChartModelParams = ChartModelParams<HistogramData<UTCTimestamp>> & { headerHeight: number }
+
+class VolumeChartModel extends ChartModel<HistogramData<UTCTimestamp>> {
+  protected series: ISeriesApi<'Histogram'>
+  private highlightBarPrimitive: CrosshairHighlightPrimitive
+
+  constructor(chartDiv: HTMLDivElement, params: VolumeChartModelParams) {
     super(chartDiv, params)
+
+    this.series = this.api.addHistogramSeries()
+    this.series.setData(this.data)
+    this.highlightBarPrimitive = new CrosshairHighlightPrimitive({
+      color: params.theme.surface3,
+      crosshairYPosition: params.headerHeight,
+    })
+    this.series.attachPrimitive(this.highlightBarPrimitive)
+
+    this.updateOptions(params)
+    this.fitContent()
   }
 
-  updateOptions(params: ChartModelParams<SingleHistogramData> & CustomVolumeChartModelParams) {
+  updateOptions(params: VolumeChartModelParams) {
     const volumeChartOptions = {
       autoSize: true,
+      localization: {
+        locale: params.locale,
+        priceFormatter: (price: BarPrice) =>
+          params.format.formatFiatPrice({ price, type: NumberType.FiatTokenChartStatsScale }),
+      },
       rightPriceScale: {
         borderVisible: false,
         scaleMargins: {
@@ -35,15 +56,56 @@ class VolumeChartModel extends CustomVolumeChartModel<SingleHistogramData> {
       handleScroll: {
         vertTouchDrag: false,
       },
+      crosshair: {
+        horzLine: {
+          visible: false,
+          labelVisible: false,
+        },
+        vertLine: {
+          visible: false,
+          labelVisible: false,
+        },
+      },
     }
 
     super.updateOptions(params, volumeChartOptions)
+    const { data, theme, color } = params
+
+    // Handles changes in data, e.g. time period selection
+    if (this.data !== data) {
+      this.data = data
+      this.series.setData(data)
+      this.fitContent()
+    }
+
+    this.series.applyOptions({
+      color,
+      priceFormat: {
+        type: 'volume',
+      },
+      priceLineVisible: false,
+      lastValueVisible: false,
+    })
+
+    // Add crosshair highlight bar
+    this.highlightBarPrimitive.applyOptions({
+      color: theme.surface3,
+      crosshairYPosition: params.headerHeight,
+    })
   }
 }
 
-export function getTimePeriodDisplay(timePeriod: TimePeriod) {
-  return t`Past ${toHistoryDuration(timePeriod).toLowerCase()}`
-}
+const ChartHeaderWrapper = styled.div<{ stale?: boolean }>`
+  position: absolute;
+  ${textFadeIn};
+  animation-duration: ${({ theme }) => theme.transition.duration.medium};
+  ${({ theme, stale }) => stale && `color: ${theme.neutral2}`};
+
+  display: flex;
+  flex-direction: column;
+  gap: 4px;
+  padding-bottom: 14px;
+`
 
 function VolumeChartHeader({
   crosshairData,
@@ -51,7 +113,7 @@ function VolumeChartHeader({
   feeTier,
   noFeesData,
 }: {
-  crosshairData?: SingleHistogramData
+  crosshairData?: HistogramData<UTCTimestamp>
   timePeriod: TimePeriod
   feeTier?: number
   noFeesData: boolean
@@ -85,25 +147,24 @@ function VolumeChartHeader({
     return mockDisplay
   }, [crosshairData, feeTier, formatFiatPrice, headerDateFormatter, timePeriod])
 
+  const statsTextDisplay = noFeesData ? (
+    <ThemedText.HeadlineLarge color="inherit">{display.volume}</ThemedText.HeadlineLarge>
+  ) : (
+    <Column>
+      <ThemedText.HeadlineSmall color="inherit">
+        {display.volume} <Trans>volume</Trans>
+      </ThemedText.HeadlineSmall>
+      <ThemedText.HeadlineSmall color="inherit">
+        {display.fees} <Trans>fees</Trans>
+      </ThemedText.HeadlineSmall>
+    </Column>
+  )
+
   return (
-    <ChartHeader
-      value={
-        noFeesData ? (
-          <ThemedText.HeadlineLarge color="inherit">{display.volume}</ThemedText.HeadlineLarge>
-        ) : (
-          <Column>
-            <ThemedText.HeadlineSmall color="inherit">
-              {display.volume} <Trans>volume</Trans>
-            </ThemedText.HeadlineSmall>
-            <ThemedText.HeadlineSmall color="inherit">
-              {display.fees} <Trans>fees</Trans>
-            </ThemedText.HeadlineSmall>
-          </Column>
-        )
-      }
-      time={crosshairData?.time}
-      timePlaceholder={getTimePeriodDisplay(timePeriod)}
-    />
+    <ChartHeaderWrapper data-cy="chart-header">
+      {statsTextDisplay}
+      <ThemedText.Caption color="neutral2">{display.time}</ThemedText.Caption>
+    </ChartHeaderWrapper>
   )
 }
 
@@ -112,12 +173,16 @@ interface VolumeChartProps {
   volumes?: PricePoint[]
   feeTier?: number
   timePeriod: TimePeriod
+  color?: string
 }
 
-export function VolumeChart({ height, volumes, feeTier, timePeriod }: VolumeChartProps) {
+export function VolumeChart({ height, volumes, feeTier, timePeriod, color }: VolumeChartProps) {
+  const locale = useActiveLocale()
   const theme = useTheme()
+  const format = useFormatter()
+  const [crosshairData, setCrosshairData] = useState<HistogramData<UTCTimestamp>>()
 
-  const data: SingleHistogramData[] = useMemo(
+  const data = useMemo(
     () =>
       volumes?.map((volumePoint) => {
         return { value: volumePoint.value, time: volumePoint.timestamp as UTCTimestamp }
@@ -126,21 +191,27 @@ export function VolumeChart({ height, volumes, feeTier, timePeriod }: VolumeChar
   )
 
   const noFeesData = feeTier === undefined // i.e. if is token volume chart
-  const params = useMemo(
-    () => ({ data, colors: [theme.accent1], headerHeight: noFeesData ? 75 : 90 }),
-    [data, theme.accent1, noFeesData]
-  )
+  const params: VolumeChartModelParams = useMemo(() => {
+    return {
+      data,
+      locale,
+      theme,
+      color: color ?? theme.accent1,
+      format,
+      onCrosshairMove: setCrosshairData,
+      headerHeight: noFeesData ? 75 : 90,
+    }
+  }, [data, locale, theme, color, format, noFeesData])
 
   return (
-    <Chart Model={VolumeChartModel} params={params} height={height}>
-      {(crosshairData) => (
-        <VolumeChartHeader
-          crosshairData={crosshairData}
-          timePeriod={timePeriod}
-          feeTier={feeTier}
-          noFeesData={noFeesData}
-        />
-      )}
-    </Chart>
+    <>
+      <VolumeChartHeader
+        crosshairData={crosshairData}
+        timePeriod={timePeriod}
+        feeTier={feeTier}
+        noFeesData={noFeesData}
+      />
+      <Chart Model={VolumeChartModel} params={params} height={height} />
+    </>
   )
 }
diff --git a/apps/web/src/components/Charts/shared.ts b/apps/web/src/components/Charts/shared.ts
new file mode 100644
index 00000000000..66db3d9569d
--- /dev/null
+++ b/apps/web/src/components/Charts/shared.ts
@@ -0,0 +1,7 @@
+import styled from 'styled-components'
+
+export const ChartContainer = styled.div<{ $height: number }>`
+  width: 100%;
+  height: ${({ $height }) => $height}px;
+  position: relative;
+`
diff --git a/apps/web/src/components/ConfirmSwapModalV2/Error.test.tsx b/apps/web/src/components/ConfirmSwapModalV2/Error.test.tsx
deleted file mode 100644
index 7da91e16a86..00000000000
--- a/apps/web/src/components/ConfirmSwapModalV2/Error.test.tsx
+++ /dev/null
@@ -1,20 +0,0 @@
-import { PendingModalError } from 'components/swap/PendingModalContent/ErrorModalContent'
-import { LIMIT_ORDER_TRADE, TEST_TRADE_EXACT_INPUT } from 'test-utils/constants'
-import { render, screen } from 'test-utils/render'
-
-import Error from './Error'
-
-describe('ConfirmSwapModalV2/Error', () => {
-  it.each([
-    ['classic trade', PendingModalError.CONFIRMATION_ERROR, TEST_TRADE_EXACT_INPUT, 'Swap failed'],
-    ['classic trade', PendingModalError.PERMIT_ERROR, TEST_TRADE_EXACT_INPUT, 'Permit approval failed'],
-    ['classic trade', PendingModalError.TOKEN_APPROVAL_ERROR, TEST_TRADE_EXACT_INPUT, 'Token approval failed'],
-    ['classic trade', PendingModalError.WRAP_ERROR, TEST_TRADE_EXACT_INPUT, 'Wrap failed'],
-    ['limit order', PendingModalError.CONFIRMATION_ERROR, LIMIT_ORDER_TRADE, 'Limit failed'],
-    ['limit order', PendingModalError.WRAP_ERROR, LIMIT_ORDER_TRADE, 'Wrap failed'],
-  ])('renders %p correctly, with error= %p', async (testCaseName, errorType, trade, expectedError) => {
-    const { asFragment } = render(<Error errorType={errorType} trade={trade} onRetry={jest.fn()} />)
-    expect(asFragment()).toMatchSnapshot()
-    expect(screen.getByText(expectedError)).toBeInTheDocument()
-  })
-})
diff --git a/apps/web/src/components/ConfirmSwapModalV2/Error.tsx b/apps/web/src/components/ConfirmSwapModalV2/Error.tsx
index 2119121ffb8..1e57b6a7343 100644
--- a/apps/web/src/components/ConfirmSwapModalV2/Error.tsx
+++ b/apps/web/src/components/ConfirmSwapModalV2/Error.tsx
@@ -5,7 +5,6 @@ import { SupportArticleURL } from 'constants/supportArticles'
 import { SwapResult } from 'hooks/useSwapCallback'
 import { AlertTriangle } from 'react-feather'
 import { InterfaceTrade, TradeFillType } from 'state/routing/types'
-import { isLimitTrade } from 'state/routing/utils'
 import styled, { useTheme } from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
@@ -26,19 +25,7 @@ interface ErrorModalContentProps {
   onRetry: () => void
 }
 
-function getErrorContent({
-  errorType,
-  trade,
-  swapResult,
-}: {
-  errorType: PendingModalError
-  swapResult?: SwapResult
-  trade?: InterfaceTrade
-}): {
-  title: JSX.Element
-  message?: JSX.Element
-  supportArticleURL?: SupportArticleURL
-} {
+function getErrorContent(errorType: PendingModalError, swapResult?: SwapResult) {
   switch (errorType) {
     case PendingModalError.TOKEN_APPROVAL_ERROR:
       return {
@@ -57,22 +44,13 @@ function getErrorContent({
         supportArticleURL: SupportArticleURL.APPROVALS_EXPLAINER,
       }
     case PendingModalError.CONFIRMATION_ERROR:
-      if (isLimitTrade(trade)) {
-        return {
-          title: <Trans>Limit failed</Trans>,
-          supportArticleURL: SupportArticleURL.UNISWAP_X_FAILURE,
-        }
-      } else {
-        return {
-          title: <Trans>Swap failed</Trans>,
-          message: (
-            <Trans>Try using higher than normal slippage and gas to ensure your transaction is completed.</Trans>
-          ),
-          supportArticleURL:
-            swapResult?.type === TradeFillType.UniswapX
-              ? SupportArticleURL.UNISWAP_X_FAILURE
-              : SupportArticleURL.TRANSACTION_FAILURE,
-        }
+      return {
+        title: <Trans>Swap failed</Trans>,
+        message: <Trans>Try using higher than normal slippage and gas to ensure your transaction is completed.</Trans>,
+        supportArticleURL:
+          swapResult?.type === TradeFillType.UniswapX
+            ? SupportArticleURL.UNISWAP_X_FAILURE
+            : SupportArticleURL.TRANSACTION_FAILURE,
       }
     case PendingModalError.WRAP_ERROR:
       return {
@@ -104,7 +82,7 @@ const Section = styled(ColumnCenter)`
 `
 export default function Error({ errorType, trade, swapResult, onRetry }: ErrorModalContentProps) {
   const theme = useTheme()
-  const { title, message, supportArticleURL } = getErrorContent({ errorType, swapResult, trade })
+  const { title, message, supportArticleURL } = getErrorContent(errorType, swapResult)
 
   return (
     <Container gap="md">
diff --git a/apps/web/src/components/ConfirmSwapModalV2/Head.test.tsx b/apps/web/src/components/ConfirmSwapModalV2/Head.test.tsx
deleted file mode 100644
index d369d6534e7..00000000000
--- a/apps/web/src/components/ConfirmSwapModalV2/Head.test.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { fireEvent, render, screen } from 'test-utils/render'
-
-import Head from './Head'
-
-describe('ConfirmSwapModalV2/Head', () => {
-  it('should render correctly for a classic swap', () => {
-    const { asFragment } = render(<Head onDismiss={jest.fn()} isLimitTrade={false} />)
-    expect(asFragment()).toMatchSnapshot()
-    expect(screen.getByText('Review swap')).toBeInTheDocument()
-  })
-
-  it('should render correctly for a Limit order', () => {
-    const { asFragment } = render(<Head onDismiss={jest.fn()} isLimitTrade={true} />)
-    expect(asFragment()).toMatchSnapshot()
-    expect(screen.getByText('Review limit')).toBeInTheDocument()
-  })
-
-  it('should call the close callback', () => {
-    const callback = jest.fn()
-    const component = render(<Head onDismiss={callback} isLimitTrade={false} />)
-
-    const button = component.getByTestId('confirmation-close-icon')
-
-    fireEvent.click(button)
-
-    expect(callback).toHaveBeenCalled()
-  })
-})
diff --git a/apps/web/src/components/ConfirmSwapModalV2/Head.tsx b/apps/web/src/components/ConfirmSwapModalV2/Head.tsx
index 3c2d8ff75a3..7967abafb91 100644
--- a/apps/web/src/components/ConfirmSwapModalV2/Head.tsx
+++ b/apps/web/src/components/ConfirmSwapModalV2/Head.tsx
@@ -12,13 +12,13 @@ const CloseIcon = styled(X)<{ onClick: () => void }>`
   cursor: pointer;
   ${ClickableStyle}
 `
-export default function Head({ onDismiss, isLimitTrade }: { onDismiss: () => void; isLimitTrade: boolean }) {
+export default function Head({ onDismiss }: { onDismiss: () => void }) {
   return (
     <Row width="100%" align="center">
       <Row justify="left">
         <FadePresence>
           <ThemedText.SubHeader>
-            {isLimitTrade ? <Trans>Review limit</Trans> : <Trans>Review swap</Trans>}
+            <Trans>Review swap</Trans>
           </ThemedText.SubHeader>
         </FadePresence>
       </Row>
diff --git a/apps/web/src/components/ConfirmSwapModalV2/Pending.test.tsx b/apps/web/src/components/ConfirmSwapModalV2/Pending.test.tsx
deleted file mode 100644
index 7b8a9c5c285..00000000000
--- a/apps/web/src/components/ConfirmSwapModalV2/Pending.test.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { ChainId, WETH9 } from '@uniswap/sdk-core'
-import Pending from 'components/ConfirmSwapModalV2/Pending'
-import { BigNumber } from 'ethers/lib/ethers'
-import { TransactionStatus } from 'graphql/data/__generated__/types-and-hooks'
-import { SwapResult } from 'hooks/useSwapCallback'
-import { UniswapXOrderStatus } from 'lib/hooks/orders/types'
-import { TradeFillType } from 'state/routing/types'
-import { useOrder } from 'state/signatures/hooks'
-import { SignatureType, UniswapXOrderDetails } from 'state/signatures/types'
-import { useSwapTransactionStatus } from 'state/transactions/hooks'
-import { LIMIT_ORDER_TRADE, TEST_TRADE_EXACT_INPUT } from 'test-utils/constants'
-import { mocked } from 'test-utils/mocked'
-import { render, screen } from 'test-utils/render'
-
-jest.mock('state/transactions/hooks', () => ({
-  useSwapTransactionStatus: jest.fn(),
-  useIsTransactionConfirmed: jest.fn(),
-}))
-
-jest.mock('state/signatures/hooks', () => ({
-  useOrder: jest.fn(),
-}))
-
-const classicSwapResult: SwapResult = {
-  type: TradeFillType.Classic,
-  response: {
-    hash: '0x123',
-    timestamp: 1000,
-    from: '0x123',
-    wait: jest.fn(),
-    nonce: 1,
-    gasLimit: BigNumber.from(1000),
-    data: '0x',
-    value: BigNumber.from(0),
-    chainId: ChainId.MAINNET,
-    confirmations: 0,
-    blockNumber: undefined,
-    blockHash: undefined,
-  },
-}
-
-const uniswapXSwapResult: SwapResult = {
-  type: TradeFillType.UniswapX,
-  response: {
-    orderHash: '0x1234',
-    deadline: 1234,
-    encodedOrder: '0xencodedOrder',
-  },
-}
-
-const filledOrderDetails: UniswapXOrderDetails = {
-  type: SignatureType.SIGN_LIMIT,
-  orderHash: '0x1234',
-  status: UniswapXOrderStatus.FILLED,
-  swapInfo: {
-    isUniswapXOrder: true,
-    type: 1,
-    tradeType: 0,
-    inputCurrencyId: '0x6b175474e89094c44da98b954eedeac495271d0f',
-    outputCurrencyId: WETH9[ChainId.MAINNET].address,
-    inputCurrencyAmountRaw: '252074033564766400000',
-    expectedOutputCurrencyAmountRaw: '106841079134757921',
-    minimumOutputCurrencyAmountRaw: '106841079134757921',
-    settledOutputCurrencyAmountRaw: '106841079134757921',
-  },
-  txHash: '0x1234',
-  encodedOrder: '0xencodedOrder',
-  id: '0x1234',
-  addedTime: 3,
-  chainId: ChainId.MAINNET,
-  expiry: 4,
-  offerer: '0x1234',
-}
-
-describe('Pending - classic trade titles', () => {
-  it.each([
-    [false, false, undefined, TEST_TRADE_EXACT_INPUT, classicSwapResult, TransactionStatus.Pending, 'Swap submitted'],
-    [false, false, undefined, TEST_TRADE_EXACT_INPUT, classicSwapResult, TransactionStatus.Confirmed, 'Swap success!'],
-    [false, false, undefined, TEST_TRADE_EXACT_INPUT, undefined, undefined, 'Confirm swap'],
-  ])(
-    'renders classic trade correctly, with approvalPending= %p , revocationPending= %p, wrapTxHash= %p',
-    async (approvalPending, revocationPending, wrapTxHash, trade, swapResult, swapTxStatus, expectedTitle) => {
-      mocked(useSwapTransactionStatus).mockReturnValue(swapTxStatus)
-      const { asFragment } = render(
-        <Pending
-          trade={trade}
-          tokenApprovalPending={approvalPending}
-          revocationPending={revocationPending}
-          wrapTxHash={wrapTxHash}
-          swapResult={swapResult}
-        />
-      )
-      expect(asFragment()).toMatchSnapshot()
-      expect(screen.getByText(expectedTitle)).toBeInTheDocument()
-    }
-  )
-})
-
-describe('Pending - uniswapX trade titles', () => {
-  it.each([
-    [false, false, undefined, LIMIT_ORDER_TRADE, uniswapXSwapResult, undefined, 'Limit submitted'],
-    [false, false, undefined, LIMIT_ORDER_TRADE, uniswapXSwapResult, filledOrderDetails, 'Limit filled!'],
-    [false, false, undefined, LIMIT_ORDER_TRADE, undefined, undefined, 'Confirm limit'],
-  ])(
-    'renders limit order correctly, with approvalPending= %p , revocationPending= %p, wrapTxHash= %p',
-    async (approvalPending, revocationPending, wrapTxHash, trade, swapResult, orderDetails, expectedTitle) => {
-      mocked(useOrder).mockReturnValue(orderDetails)
-      const { asFragment } = render(
-        <Pending
-          trade={trade}
-          tokenApprovalPending={approvalPending}
-          revocationPending={revocationPending}
-          wrapTxHash={wrapTxHash}
-          swapResult={swapResult}
-        />
-      )
-      expect(asFragment()).toMatchSnapshot()
-      expect(screen.getByText(expectedTitle)).toBeInTheDocument()
-    }
-  )
-})
diff --git a/apps/web/src/components/ConfirmSwapModalV2/Pending.tsx b/apps/web/src/components/ConfirmSwapModalV2/Pending.tsx
index 43e8d633882..0cdb3d19e63 100644
--- a/apps/web/src/components/ConfirmSwapModalV2/Pending.tsx
+++ b/apps/web/src/components/ConfirmSwapModalV2/Pending.tsx
@@ -2,9 +2,9 @@ import { t, Trans } from '@lingui/macro'
 import { ChainId } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
 import { OrderContent } from 'components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal'
-import Column, { ColumnCenter } from 'components/Column'
+import { ColumnCenter } from 'components/Column'
+import Column from 'components/Column'
 import Row from 'components/Row'
-import { getTitle } from 'components/swap/PendingModalContent'
 import { SupportArticleURL } from 'constants/supportArticles'
 import { TransactionStatus } from 'graphql/data/__generated__/types-and-hooks'
 import { SwapResult } from 'hooks/useSwapCallback'
@@ -18,7 +18,8 @@ import styled, { css } from 'styled-components'
 import { ExternalLink } from 'theme/components'
 import { AnimationType } from 'theme/components/FadePresence'
 import { ThemedText } from 'theme/components/text'
-import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
+import { getExplorerLink } from 'utils/getExplorerLink'
+import { ExplorerDataType } from 'utils/getExplorerLink'
 
 import { slideInAnimation, slideOutAnimation } from '../swap/PendingModalContent/animations'
 import {
@@ -131,7 +132,7 @@ export default function Pending({
         <AnimationWrapper>
           <StepTitleAnimationContainer gap="md" ref={currentStepContainerRef} disableEntranceAnimation>
             <ThemedText.SubHeader width="100%" textAlign="center" data-testid="pending-modal-content-title">
-              {getTitle({ trade, swapPending, swapConfirmed })}
+              {swapPending ? t`Swap submitted` : swapConfirmed ? t`Swap success` : t`Confirm Swap`}
             </ThemedText.SubHeader>
             {trade && (
               <ThemedText.LabelSmall textAlign="center">
diff --git a/apps/web/src/components/ConfirmSwapModalV2/ProgressIndicator.tsx b/apps/web/src/components/ConfirmSwapModalV2/ProgressIndicator.tsx
index 2548a21a552..3f6eb82114b 100644
--- a/apps/web/src/components/ConfirmSwapModalV2/ProgressIndicator.tsx
+++ b/apps/web/src/components/ConfirmSwapModalV2/ProgressIndicator.tsx
@@ -13,7 +13,6 @@ import { UniswapXOrderStatus } from 'lib/hooks/orders/types'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
 import { useEffect, useMemo, useState } from 'react'
 import { InterfaceTrade, TradeFillType } from 'state/routing/types'
-import { isUniswapXTrade } from 'state/routing/utils'
 import { useOrder } from 'state/signatures/hooks'
 import { useIsTransactionConfirmed, useSwapTransactionStatus } from 'state/transactions/hooks'
 import styled, { useTheme } from 'styled-components'
@@ -162,9 +161,9 @@ export default function ProgressIndicator({
         inProgressTitle: t`Swap pending...`,
         timeToEnd: estimatedTransactionTime,
         delayedEndTitle: t`Longer than expected...`,
-        ...(isUniswapXTrade(trade)
+        ...(trade?.fillType === TradeFillType.UniswapX
           ? {
-              timeToStart: trade.asDutchOrderTrade().order.info.deadline - Math.floor(Date.now() / 1000),
+              timeToStart: trade.order.info.deadline - Math.floor(Date.now() / 1000),
               delayedStartTitle: t`Confirmation timed out. Please retry.`,
               timeToEnd: 60, // TODO: dynamically update UniswapX estimated fill time
             }
diff --git a/apps/web/src/components/ConfirmSwapModalV2/__snapshots__/Error.test.tsx.snap b/apps/web/src/components/ConfirmSwapModalV2/__snapshots__/Error.test.tsx.snap
deleted file mode 100644
index 807218151bf..00000000000
--- a/apps/web/src/components/ConfirmSwapModalV2/__snapshots__/Error.test.tsx.snap
+++ /dev/null
@@ -1,2185 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ConfirmSwapModalV2/Error renders "classic trade" correctly, with error= 0 1`] = `
-<DocumentFragment>
-  .c5 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c12 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  display: inline-block;
-  text-align: center;
-  line-height: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font-size: inherit;
-  padding-left: 16px;
-  padding-right: 16px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: white;
-  background-color: primary;
-  border: 0;
-  border-radius: 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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 8px;
-}
-
-.c4 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c10 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c10:hover {
-  opacity: 0.6;
-}
-
-.c10:active {
-  opacity: 0.4;
-}
-
-.c13 {
-  padding: 16px;
-  width: 100%;
-  line-height: 24px;
-  font-weight: 535;
-  text-align: center;
-  border-radius: 16px;
-  outline: none;
-  border: 1px solid transparent;
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-flex-wrap: nowrap;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-  will-change: transform;
-  -webkit-transition: -webkit-transform 450ms ease;
-  -webkit-transition: transform 450ms ease;
-  transition: transform 450ms ease;
-  -webkit-transform: perspective(1px) translateZ(0);
-  -ms-transform: perspective(1px) translateZ(0);
-  transform: perspective(1px) translateZ(0);
-}
-
-.c13:disabled {
-  opacity: 50%;
-  cursor: auto;
-  pointer-events: none;
-}
-
-.c13 > * {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c13 > a {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c14 {
-  background-color: #FC72FF;
-  font-size: 20px;
-  font-weight: 535;
-  padding: 16px;
-  color: #FFFFFF;
-}
-
-.c14:focus {
-  box-shadow: 0 0 0 1pt #fb58ff;
-  background-color: #fb58ff;
-}
-
-.c14:hover {
-  background-color: #fb58ff;
-}
-
-.c14:active {
-  box-shadow: 0 0 0 1pt #fb3fff;
-  background-color: #fb3fff;
-}
-
-.c14:disabled {
-  background-color: #22222212;
-  color: #7D7D7D;
-  cursor: auto;
-  box-shadow: none;
-  border: 1px solid transparent;
-  outline: none;
-}
-
-.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: 12px;
-}
-
-.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;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c8 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c9 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c7 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.c2 {
-  margin: 8px 0px;
-}
-
-.c3 {
-  padding: 8px 16px;
-}
-
-<div
-    class="c0 c1 c2"
-  >
-    <div
-      class="c0 c1 c3"
-    >
-      <svg
-        data-testid="pending-modal-failure-icon"
-        fill="#FF5F52"
-        height="64px"
-        stroke="#FFFFFF"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-width="1"
-        viewBox="0 0 24 24"
-        width="64px"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"
-        />
-        <line
-          x1="12"
-          x2="12"
-          y1="9"
-          y2="13"
-        />
-        <line
-          x1="12"
-          x2="12.01"
-          y1="17"
-          y2="17"
-        />
-      </svg>
-      <div
-        class="c4 css-n8z49y"
-      >
-        Token approval failed
-      </div>
-      <div
-        class="c5 c6"
-      >
-        <div
-          class="c7"
-          style="height: 16px; width: 16px;"
-        >
-          <div
-            class="c8"
-          >
-            <img
-              class="c9"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
-            />
-          </div>
-        </div>
-        <div
-          class="c4 css-142zc9n"
-        >
-          &lt;0.00001 ABC
-        </div>
-        <svg
-          fill="none"
-          height="12px"
-          stroke="#222222"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          viewBox="0 0 24 24"
-          width="12px"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <line
-            x1="5"
-            x2="19"
-            y1="12"
-            y2="12"
-          />
-          <polyline
-            points="12 5 19 12 12 19"
-          />
-        </svg>
-        <div
-          class="c7"
-          style="height: 16px; width: 16px;"
-        >
-          <div
-            class="c8"
-          >
-            <img
-              class="c9"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
-            />
-          </div>
-        </div>
-        <div
-          class="c4 css-142zc9n"
-        >
-          &lt;0.00001 DEF
-        </div>
-      </div>
-      <div
-        class="c4 css-1urox24"
-      >
-        This provides the Uniswap protocol access to your token for trading. For security, it expires after 30 days. 
-        <a
-          class="c10"
-          href="https://support.uniswap.org/hc/en-us/articles/8120520483085-What-is-an-approval-transaction"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Learn more
-        </a>
-      </div>
-    </div>
-    <div
-      class="c11 c1 c3"
-    >
-      <button
-        class="c12 c13 c14"
-      >
-        Try again
-      </button>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`ConfirmSwapModalV2/Error renders "classic trade" correctly, with error= 1 1`] = `
-<DocumentFragment>
-  .c5 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c12 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  display: inline-block;
-  text-align: center;
-  line-height: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font-size: inherit;
-  padding-left: 16px;
-  padding-right: 16px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: white;
-  background-color: primary;
-  border: 0;
-  border-radius: 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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 8px;
-}
-
-.c4 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c10 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c10:hover {
-  opacity: 0.6;
-}
-
-.c10:active {
-  opacity: 0.4;
-}
-
-.c13 {
-  padding: 16px;
-  width: 100%;
-  line-height: 24px;
-  font-weight: 535;
-  text-align: center;
-  border-radius: 16px;
-  outline: none;
-  border: 1px solid transparent;
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-flex-wrap: nowrap;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-  will-change: transform;
-  -webkit-transition: -webkit-transform 450ms ease;
-  -webkit-transition: transform 450ms ease;
-  transition: transform 450ms ease;
-  -webkit-transform: perspective(1px) translateZ(0);
-  -ms-transform: perspective(1px) translateZ(0);
-  transform: perspective(1px) translateZ(0);
-}
-
-.c13:disabled {
-  opacity: 50%;
-  cursor: auto;
-  pointer-events: none;
-}
-
-.c13 > * {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c13 > a {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c14 {
-  background-color: #FC72FF;
-  font-size: 20px;
-  font-weight: 535;
-  padding: 16px;
-  color: #FFFFFF;
-}
-
-.c14:focus {
-  box-shadow: 0 0 0 1pt #fb58ff;
-  background-color: #fb58ff;
-}
-
-.c14:hover {
-  background-color: #fb58ff;
-}
-
-.c14:active {
-  box-shadow: 0 0 0 1pt #fb3fff;
-  background-color: #fb3fff;
-}
-
-.c14:disabled {
-  background-color: #22222212;
-  color: #7D7D7D;
-  cursor: auto;
-  box-shadow: none;
-  border: 1px solid transparent;
-  outline: none;
-}
-
-.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: 12px;
-}
-
-.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;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c8 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c9 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c7 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.c2 {
-  margin: 8px 0px;
-}
-
-.c3 {
-  padding: 8px 16px;
-}
-
-<div
-    class="c0 c1 c2"
-  >
-    <div
-      class="c0 c1 c3"
-    >
-      <svg
-        data-testid="pending-modal-failure-icon"
-        fill="#FF5F52"
-        height="64px"
-        stroke="#FFFFFF"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-width="1"
-        viewBox="0 0 24 24"
-        width="64px"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"
-        />
-        <line
-          x1="12"
-          x2="12"
-          y1="9"
-          y2="13"
-        />
-        <line
-          x1="12"
-          x2="12.01"
-          y1="17"
-          y2="17"
-        />
-      </svg>
-      <div
-        class="c4 css-n8z49y"
-      >
-        Permit approval failed
-      </div>
-      <div
-        class="c5 c6"
-      >
-        <div
-          class="c7"
-          style="height: 16px; width: 16px;"
-        >
-          <div
-            class="c8"
-          >
-            <img
-              class="c9"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
-            />
-          </div>
-        </div>
-        <div
-          class="c4 css-142zc9n"
-        >
-          &lt;0.00001 ABC
-        </div>
-        <svg
-          fill="none"
-          height="12px"
-          stroke="#222222"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          viewBox="0 0 24 24"
-          width="12px"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <line
-            x1="5"
-            x2="19"
-            y1="12"
-            y2="12"
-          />
-          <polyline
-            points="12 5 19 12 12 19"
-          />
-        </svg>
-        <div
-          class="c7"
-          style="height: 16px; width: 16px;"
-        >
-          <div
-            class="c8"
-          >
-            <img
-              class="c9"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
-            />
-          </div>
-        </div>
-        <div
-          class="c4 css-142zc9n"
-        >
-          &lt;0.00001 DEF
-        </div>
-      </div>
-      <div
-        class="c4 css-1urox24"
-      >
-        Permit2 allows token approvals to be shared and managed across different applications. 
-        <a
-          class="c10"
-          href="https://support.uniswap.org/hc/en-us/articles/8120520483085-What-is-an-approval-transaction"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Learn more
-        </a>
-      </div>
-    </div>
-    <div
-      class="c11 c1 c3"
-    >
-      <button
-        class="c12 c13 c14"
-      >
-        Try again
-      </button>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`ConfirmSwapModalV2/Error renders "classic trade" correctly, with error= 2 1`] = `
-<DocumentFragment>
-  .c5 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c12 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  display: inline-block;
-  text-align: center;
-  line-height: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font-size: inherit;
-  padding-left: 16px;
-  padding-right: 16px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: white;
-  background-color: primary;
-  border: 0;
-  border-radius: 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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 8px;
-}
-
-.c4 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c10 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c10:hover {
-  opacity: 0.6;
-}
-
-.c10:active {
-  opacity: 0.4;
-}
-
-.c13 {
-  padding: 16px;
-  width: 100%;
-  line-height: 24px;
-  font-weight: 535;
-  text-align: center;
-  border-radius: 16px;
-  outline: none;
-  border: 1px solid transparent;
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-flex-wrap: nowrap;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-  will-change: transform;
-  -webkit-transition: -webkit-transform 450ms ease;
-  -webkit-transition: transform 450ms ease;
-  transition: transform 450ms ease;
-  -webkit-transform: perspective(1px) translateZ(0);
-  -ms-transform: perspective(1px) translateZ(0);
-  transform: perspective(1px) translateZ(0);
-}
-
-.c13:disabled {
-  opacity: 50%;
-  cursor: auto;
-  pointer-events: none;
-}
-
-.c13 > * {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c13 > a {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c14 {
-  background-color: #FC72FF;
-  font-size: 20px;
-  font-weight: 535;
-  padding: 16px;
-  color: #FFFFFF;
-}
-
-.c14:focus {
-  box-shadow: 0 0 0 1pt #fb58ff;
-  background-color: #fb58ff;
-}
-
-.c14:hover {
-  background-color: #fb58ff;
-}
-
-.c14:active {
-  box-shadow: 0 0 0 1pt #fb3fff;
-  background-color: #fb3fff;
-}
-
-.c14:disabled {
-  background-color: #22222212;
-  color: #7D7D7D;
-  cursor: auto;
-  box-shadow: none;
-  border: 1px solid transparent;
-  outline: none;
-}
-
-.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: 12px;
-}
-
-.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;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c8 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c9 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c7 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.c2 {
-  margin: 8px 0px;
-}
-
-.c3 {
-  padding: 8px 16px;
-}
-
-<div
-    class="c0 c1 c2"
-  >
-    <div
-      class="c0 c1 c3"
-    >
-      <svg
-        data-testid="pending-modal-failure-icon"
-        fill="#FF5F52"
-        height="64px"
-        stroke="#FFFFFF"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-width="1"
-        viewBox="0 0 24 24"
-        width="64px"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"
-        />
-        <line
-          x1="12"
-          x2="12"
-          y1="9"
-          y2="13"
-        />
-        <line
-          x1="12"
-          x2="12.01"
-          y1="17"
-          y2="17"
-        />
-      </svg>
-      <div
-        class="c4 css-n8z49y"
-      >
-        Swap failed
-      </div>
-      <div
-        class="c5 c6"
-      >
-        <div
-          class="c7"
-          style="height: 16px; width: 16px;"
-        >
-          <div
-            class="c8"
-          >
-            <img
-              class="c9"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
-            />
-          </div>
-        </div>
-        <div
-          class="c4 css-142zc9n"
-        >
-          &lt;0.00001 ABC
-        </div>
-        <svg
-          fill="none"
-          height="12px"
-          stroke="#222222"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          viewBox="0 0 24 24"
-          width="12px"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <line
-            x1="5"
-            x2="19"
-            y1="12"
-            y2="12"
-          />
-          <polyline
-            points="12 5 19 12 12 19"
-          />
-        </svg>
-        <div
-          class="c7"
-          style="height: 16px; width: 16px;"
-        >
-          <div
-            class="c8"
-          >
-            <img
-              class="c9"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
-            />
-          </div>
-        </div>
-        <div
-          class="c4 css-142zc9n"
-        >
-          &lt;0.00001 DEF
-        </div>
-      </div>
-      <div
-        class="c4 css-1urox24"
-      >
-        Try using higher than normal slippage and gas to ensure your transaction is completed. 
-        <a
-          class="c10"
-          href="https://support.uniswap.org/hc/en-us/articles/8643975058829-Why-did-my-transaction-fail-"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Learn more
-        </a>
-      </div>
-    </div>
-    <div
-      class="c11 c1 c3"
-    >
-      <button
-        class="c12 c13 c14"
-      >
-        Try again
-      </button>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`ConfirmSwapModalV2/Error renders "classic trade" correctly, with error= 3 1`] = `
-<DocumentFragment>
-  .c5 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c12 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  display: inline-block;
-  text-align: center;
-  line-height: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font-size: inherit;
-  padding-left: 16px;
-  padding-right: 16px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: white;
-  background-color: primary;
-  border: 0;
-  border-radius: 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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 8px;
-}
-
-.c4 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c10 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c10:hover {
-  opacity: 0.6;
-}
-
-.c10:active {
-  opacity: 0.4;
-}
-
-.c13 {
-  padding: 16px;
-  width: 100%;
-  line-height: 24px;
-  font-weight: 535;
-  text-align: center;
-  border-radius: 16px;
-  outline: none;
-  border: 1px solid transparent;
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-flex-wrap: nowrap;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-  will-change: transform;
-  -webkit-transition: -webkit-transform 450ms ease;
-  -webkit-transition: transform 450ms ease;
-  transition: transform 450ms ease;
-  -webkit-transform: perspective(1px) translateZ(0);
-  -ms-transform: perspective(1px) translateZ(0);
-  transform: perspective(1px) translateZ(0);
-}
-
-.c13:disabled {
-  opacity: 50%;
-  cursor: auto;
-  pointer-events: none;
-}
-
-.c13 > * {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c13 > a {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c14 {
-  background-color: #FC72FF;
-  font-size: 20px;
-  font-weight: 535;
-  padding: 16px;
-  color: #FFFFFF;
-}
-
-.c14:focus {
-  box-shadow: 0 0 0 1pt #fb58ff;
-  background-color: #fb58ff;
-}
-
-.c14:hover {
-  background-color: #fb58ff;
-}
-
-.c14:active {
-  box-shadow: 0 0 0 1pt #fb3fff;
-  background-color: #fb3fff;
-}
-
-.c14:disabled {
-  background-color: #22222212;
-  color: #7D7D7D;
-  cursor: auto;
-  box-shadow: none;
-  border: 1px solid transparent;
-  outline: none;
-}
-
-.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: 12px;
-}
-
-.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;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c8 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c9 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c7 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.c2 {
-  margin: 8px 0px;
-}
-
-.c3 {
-  padding: 8px 16px;
-}
-
-<div
-    class="c0 c1 c2"
-  >
-    <div
-      class="c0 c1 c3"
-    >
-      <svg
-        data-testid="pending-modal-failure-icon"
-        fill="#FF5F52"
-        height="64px"
-        stroke="#FFFFFF"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-width="1"
-        viewBox="0 0 24 24"
-        width="64px"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"
-        />
-        <line
-          x1="12"
-          x2="12"
-          y1="9"
-          y2="13"
-        />
-        <line
-          x1="12"
-          x2="12.01"
-          y1="17"
-          y2="17"
-        />
-      </svg>
-      <div
-        class="c4 css-n8z49y"
-      >
-        Wrap failed
-      </div>
-      <div
-        class="c5 c6"
-      >
-        <div
-          class="c7"
-          style="height: 16px; width: 16px;"
-        >
-          <div
-            class="c8"
-          >
-            <img
-              class="c9"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
-            />
-          </div>
-        </div>
-        <div
-          class="c4 css-142zc9n"
-        >
-          &lt;0.00001 ABC
-        </div>
-        <svg
-          fill="none"
-          height="12px"
-          stroke="#222222"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          viewBox="0 0 24 24"
-          width="12px"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <line
-            x1="5"
-            x2="19"
-            y1="12"
-            y2="12"
-          />
-          <polyline
-            points="12 5 19 12 12 19"
-          />
-        </svg>
-        <div
-          class="c7"
-          style="height: 16px; width: 16px;"
-        >
-          <div
-            class="c8"
-          >
-            <img
-              class="c9"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
-            />
-          </div>
-        </div>
-        <div
-          class="c4 css-142zc9n"
-        >
-          &lt;0.00001 DEF
-        </div>
-      </div>
-      <div
-        class="c4 css-1urox24"
-      >
-        Swaps on the Uniswap Protocol can start and end with ETH. However, during the swap ETH is wrapped into WETH. 
-        <a
-          class="c10"
-          href="https://support.uniswap.org/hc/en-us/articles/16015852009997-Why-do-ETH-swaps-involve-converting-to-WETH"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Learn more
-        </a>
-      </div>
-    </div>
-    <div
-      class="c11 c1 c3"
-    >
-      <button
-        class="c12 c13 c14"
-      >
-        Try again
-      </button>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`ConfirmSwapModalV2/Error renders "limit order" correctly, with error= 2 1`] = `
-<DocumentFragment>
-  .c5 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c12 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  display: inline-block;
-  text-align: center;
-  line-height: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font-size: inherit;
-  padding-left: 16px;
-  padding-right: 16px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: white;
-  background-color: primary;
-  border: 0;
-  border-radius: 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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 8px;
-}
-
-.c4 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c10 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c10:hover {
-  opacity: 0.6;
-}
-
-.c10:active {
-  opacity: 0.4;
-}
-
-.c13 {
-  padding: 16px;
-  width: 100%;
-  line-height: 24px;
-  font-weight: 535;
-  text-align: center;
-  border-radius: 16px;
-  outline: none;
-  border: 1px solid transparent;
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-flex-wrap: nowrap;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-  will-change: transform;
-  -webkit-transition: -webkit-transform 450ms ease;
-  -webkit-transition: transform 450ms ease;
-  transition: transform 450ms ease;
-  -webkit-transform: perspective(1px) translateZ(0);
-  -ms-transform: perspective(1px) translateZ(0);
-  transform: perspective(1px) translateZ(0);
-}
-
-.c13:disabled {
-  opacity: 50%;
-  cursor: auto;
-  pointer-events: none;
-}
-
-.c13 > * {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c13 > a {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c14 {
-  background-color: #FC72FF;
-  font-size: 20px;
-  font-weight: 535;
-  padding: 16px;
-  color: #FFFFFF;
-}
-
-.c14:focus {
-  box-shadow: 0 0 0 1pt #fb58ff;
-  background-color: #fb58ff;
-}
-
-.c14:hover {
-  background-color: #fb58ff;
-}
-
-.c14:active {
-  box-shadow: 0 0 0 1pt #fb3fff;
-  background-color: #fb3fff;
-}
-
-.c14:disabled {
-  background-color: #22222212;
-  color: #7D7D7D;
-  cursor: auto;
-  box-shadow: none;
-  border: 1px solid transparent;
-  outline: none;
-}
-
-.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: 12px;
-}
-
-.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;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c8 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c9 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c7 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.c2 {
-  margin: 8px 0px;
-}
-
-.c3 {
-  padding: 8px 16px;
-}
-
-<div
-    class="c0 c1 c2"
-  >
-    <div
-      class="c0 c1 c3"
-    >
-      <svg
-        data-testid="pending-modal-failure-icon"
-        fill="#FF5F52"
-        height="64px"
-        stroke="#FFFFFF"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-width="1"
-        viewBox="0 0 24 24"
-        width="64px"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"
-        />
-        <line
-          x1="12"
-          x2="12"
-          y1="9"
-          y2="13"
-        />
-        <line
-          x1="12"
-          x2="12.01"
-          y1="17"
-          y2="17"
-        />
-      </svg>
-      <div
-        class="c4 css-n8z49y"
-      >
-        Limit failed
-      </div>
-      <div
-        class="c5 c6"
-      >
-        <div
-          class="c7"
-          style="height: 16px; width: 16px;"
-        >
-          <div
-            class="c8"
-          >
-            <img
-              class="c9"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
-            />
-          </div>
-        </div>
-        <div
-          class="c4 css-142zc9n"
-        >
-          &lt;0.00001 DAI
-        </div>
-        <svg
-          fill="none"
-          height="12px"
-          stroke="#222222"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          viewBox="0 0 24 24"
-          width="12px"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <line
-            x1="5"
-            x2="19"
-            y1="12"
-            y2="12"
-          />
-          <polyline
-            points="12 5 19 12 12 19"
-          />
-        </svg>
-        <div
-          class="c7"
-          style="height: 16px; width: 16px;"
-        >
-          <div
-            class="c8"
-          >
-            <img
-              class="c9"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
-            />
-          </div>
-        </div>
-        <div
-          class="c4 css-142zc9n"
-        >
-          0.0001 USDC
-        </div>
-      </div>
-      <div
-        class="c4 css-1urox24"
-      >
-         
-        <a
-          class="c10"
-          href="https://support.uniswap.org/hc/en-us/articles/17515489874189-Why-can-my-swap-not-be-filled-"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Learn more
-        </a>
-      </div>
-    </div>
-    <div
-      class="c11 c1 c3"
-    >
-      <button
-        class="c12 c13 c14"
-      >
-        Try again
-      </button>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`ConfirmSwapModalV2/Error renders "limit order" correctly, with error= 3 1`] = `
-<DocumentFragment>
-  .c5 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c12 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  display: inline-block;
-  text-align: center;
-  line-height: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font-size: inherit;
-  padding-left: 16px;
-  padding-right: 16px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: white;
-  background-color: primary;
-  border: 0;
-  border-radius: 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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 8px;
-}
-
-.c4 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c10 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c10:hover {
-  opacity: 0.6;
-}
-
-.c10:active {
-  opacity: 0.4;
-}
-
-.c13 {
-  padding: 16px;
-  width: 100%;
-  line-height: 24px;
-  font-weight: 535;
-  text-align: center;
-  border-radius: 16px;
-  outline: none;
-  border: 1px solid transparent;
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-flex-wrap: nowrap;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-  will-change: transform;
-  -webkit-transition: -webkit-transform 450ms ease;
-  -webkit-transition: transform 450ms ease;
-  transition: transform 450ms ease;
-  -webkit-transform: perspective(1px) translateZ(0);
-  -ms-transform: perspective(1px) translateZ(0);
-  transform: perspective(1px) translateZ(0);
-}
-
-.c13:disabled {
-  opacity: 50%;
-  cursor: auto;
-  pointer-events: none;
-}
-
-.c13 > * {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c13 > a {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c14 {
-  background-color: #FC72FF;
-  font-size: 20px;
-  font-weight: 535;
-  padding: 16px;
-  color: #FFFFFF;
-}
-
-.c14:focus {
-  box-shadow: 0 0 0 1pt #fb58ff;
-  background-color: #fb58ff;
-}
-
-.c14:hover {
-  background-color: #fb58ff;
-}
-
-.c14:active {
-  box-shadow: 0 0 0 1pt #fb3fff;
-  background-color: #fb3fff;
-}
-
-.c14:disabled {
-  background-color: #22222212;
-  color: #7D7D7D;
-  cursor: auto;
-  box-shadow: none;
-  border: 1px solid transparent;
-  outline: none;
-}
-
-.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: 12px;
-}
-
-.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;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c8 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c9 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c7 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.c2 {
-  margin: 8px 0px;
-}
-
-.c3 {
-  padding: 8px 16px;
-}
-
-<div
-    class="c0 c1 c2"
-  >
-    <div
-      class="c0 c1 c3"
-    >
-      <svg
-        data-testid="pending-modal-failure-icon"
-        fill="#FF5F52"
-        height="64px"
-        stroke="#FFFFFF"
-        stroke-linecap="round"
-        stroke-linejoin="round"
-        stroke-width="1"
-        viewBox="0 0 24 24"
-        width="64px"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"
-        />
-        <line
-          x1="12"
-          x2="12"
-          y1="9"
-          y2="13"
-        />
-        <line
-          x1="12"
-          x2="12.01"
-          y1="17"
-          y2="17"
-        />
-      </svg>
-      <div
-        class="c4 css-n8z49y"
-      >
-        Wrap failed
-      </div>
-      <div
-        class="c5 c6"
-      >
-        <div
-          class="c7"
-          style="height: 16px; width: 16px;"
-        >
-          <div
-            class="c8"
-          >
-            <img
-              class="c9"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
-            />
-          </div>
-        </div>
-        <div
-          class="c4 css-142zc9n"
-        >
-          &lt;0.00001 DAI
-        </div>
-        <svg
-          fill="none"
-          height="12px"
-          stroke="#222222"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          viewBox="0 0 24 24"
-          width="12px"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <line
-            x1="5"
-            x2="19"
-            y1="12"
-            y2="12"
-          />
-          <polyline
-            points="12 5 19 12 12 19"
-          />
-        </svg>
-        <div
-          class="c7"
-          style="height: 16px; width: 16px;"
-        >
-          <div
-            class="c8"
-          >
-            <img
-              class="c9"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
-            />
-          </div>
-        </div>
-        <div
-          class="c4 css-142zc9n"
-        >
-          0.0001 USDC
-        </div>
-      </div>
-      <div
-        class="c4 css-1urox24"
-      >
-        Swaps on the Uniswap Protocol can start and end with ETH. However, during the swap ETH is wrapped into WETH. 
-        <a
-          class="c10"
-          href="https://support.uniswap.org/hc/en-us/articles/16015852009997-Why-do-ETH-swaps-involve-converting-to-WETH"
-          rel="noopener noreferrer"
-          target="_blank"
-        >
-          Learn more
-        </a>
-      </div>
-    </div>
-    <div
-      class="c11 c1 c3"
-    >
-      <button
-        class="c12 c13 c14"
-      >
-        Try again
-      </button>
-    </div>
-  </div>
-</DocumentFragment>
-`;
diff --git a/apps/web/src/components/ConfirmSwapModalV2/__snapshots__/Head.test.tsx.snap b/apps/web/src/components/ConfirmSwapModalV2/__snapshots__/Head.test.tsx.snap
deleted file mode 100644
index 0c64f739ad1..00000000000
--- a/apps/web/src/components/ConfirmSwapModalV2/__snapshots__/Head.test.tsx.snap
+++ /dev/null
@@ -1,485 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ConfirmSwapModalV2/Head should render correctly for a Limit order 1`] = `
-<DocumentFragment>
-  .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;
-  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;
-}
-
-.c5 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c7 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c7:hover {
-  opacity: 0.6;
-}
-
-.c7:active {
-  opacity: 0.4;
-}
-
-.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;
-  animation: iCPeaJ 250ms ease-in-out;
-}
-
-.c4.exiting {
-  -webkit-animation: bbnGid 250ms ease-in-out;
-  animation: bbnGid 250ms ease-in-out;
-}
-
-.c8 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  border-radius: 16px;
-  padding: 4px 6px;
-  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;
-}
-
-.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;
-}
-
-<div
-    class="c0 c1"
-    width="100%"
-  >
-    <div
-      class="c2 c3"
-    >
-      <div
-        class="c4"
-      >
-        <div
-          class="c5 css-n8z49y"
-        >
-          Review limit
-        </div>
-      </div>
-    </div>
-    <div
-      class="c2 c6"
-    >
-      <a
-        class="c7 c8"
-        href="https://support.uniswap.org/hc/en-us"
-        rel="noopener noreferrer"
-        target="_blank"
-      >
-        <div
-          class="c2 c9"
-        >
-          <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="confirmation-close-icon"
-        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>
-</DocumentFragment>
-`;
-
-exports[`ConfirmSwapModalV2/Head should render correctly for a classic swap 1`] = `
-<DocumentFragment>
-  .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;
-  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;
-}
-
-.c5 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c7 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c7:hover {
-  opacity: 0.6;
-}
-
-.c7:active {
-  opacity: 0.4;
-}
-
-.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;
-  animation: iCPeaJ 250ms ease-in-out;
-}
-
-.c4.exiting {
-  -webkit-animation: bbnGid 250ms ease-in-out;
-  animation: bbnGid 250ms ease-in-out;
-}
-
-.c8 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  border-radius: 16px;
-  padding: 4px 6px;
-  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;
-}
-
-.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;
-}
-
-<div
-    class="c0 c1"
-    width="100%"
-  >
-    <div
-      class="c2 c3"
-    >
-      <div
-        class="c4"
-      >
-        <div
-          class="c5 css-n8z49y"
-        >
-          Review swap
-        </div>
-      </div>
-    </div>
-    <div
-      class="c2 c6"
-    >
-      <a
-        class="c7 c8"
-        href="https://support.uniswap.org/hc/en-us"
-        rel="noopener noreferrer"
-        target="_blank"
-      >
-        <div
-          class="c2 c9"
-        >
-          <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="confirmation-close-icon"
-        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>
-</DocumentFragment>
-`;
diff --git a/apps/web/src/components/ConfirmSwapModalV2/__snapshots__/Pending.test.tsx.snap b/apps/web/src/components/ConfirmSwapModalV2/__snapshots__/Pending.test.tsx.snap
deleted file mode 100644
index 23e5b61490f..00000000000
--- a/apps/web/src/components/ConfirmSwapModalV2/__snapshots__/Pending.test.tsx.snap
+++ /dev/null
@@ -1,2108 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Pending - classic trade titles renders classic trade correctly, with approvalPending= false , revocationPending= false, wrapTxHash= undefined 1`] = `
-<DocumentFragment>
-  .c12 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c17 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  margin-top: 32px;
-  min-height: 24px;
-}
-
-.c13 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 8px;
-}
-
-.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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-}
-
-.c10 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c11 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c19 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c19:hover {
-  opacity: 0.6;
-}
-
-.c19:active {
-  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;
-}
-
-.c15 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c16 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c14 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.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: dDLNFg 250ms ease-in-out;
-  animation: dDLNFg 250ms ease-in-out;
-}
-
-.c4.exiting {
-  -webkit-animation: hNFZXE 250ms ease-in-out;
-  animation: hNFZXE 250ms ease-in-out;
-}
-
-.c3 {
-  height: 64px;
-  width: 64px;
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  border-radius: 50%;
-  overflow: visible;
-}
-
-.c5 {
-  height: 64px;
-  width: 64px;
-}
-
-.c2 {
-  margin: 48px 0 8px;
-}
-
-.c7 {
-  opacity: 0.5;
-  padding: 0 32px;
-  overflow: visible;
-}
-
-.c8 {
-  position: relative;
-  width: 100%;
-  min-height: 72px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
-.c9 {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-transition: display 250ms ease-in-out;
-  transition: display 250ms ease-in-out;
-}
-
-.c9.exiting {
-  -webkit-animation: ifZjLM 250ms ease-in-out;
-  animation: ifZjLM 250ms ease-in-out;
-}
-
-<div
-    class="c0 c1 c2"
-  >
-    <div
-      class="c3"
-    >
-      <div
-        class="c4"
-      >
-        <svg
-          class="c5"
-          data-testid="submitted-icon"
-          fill="none"
-          height="54"
-          viewBox="0 0 54 54"
-          width="54"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M26.9997 0.333496C12.2717 0.333496 0.333008 12.2722 0.333008 27.0002C0.333008 41.7282 12.2717 53.6668 26.9997 53.6668C41.7277 53.6668 53.6663 41.7282 53.6663 27.0002C53.6663 12.2722 41.7277 0.333496 26.9997 0.333496ZM36.4131 25.7469C36.0238 26.1362 35.5117 26.3335 34.9997 26.3335C34.4877 26.3335 33.9756 26.1389 33.5863 25.7469L28.9997 21.1603V37.6668C28.9997 38.7708 28.1037 39.6668 26.9997 39.6668C25.8957 39.6668 24.9997 38.7708 24.9997 37.6668V21.1629L20.4131 25.7495C19.6318 26.5308 18.365 26.5308 17.5837 25.7495C16.8023 24.9682 16.8023 23.7014 17.5837 22.9201L25.5837 14.9201C25.7677 14.7361 25.9887 14.5898 26.2341 14.4884C26.722 14.2858 27.274 14.2858 27.762 14.4884C28.0074 14.5898 28.2291 14.7361 28.4131 14.9201L36.4131 22.9201C37.1944 23.7014 37.1944 24.9656 36.4131 25.7469Z"
-            fill="#FC72FF"
-          />
-        </svg>
-      </div>
-    </div>
-    <div
-      class="c6 c1 c7"
-    >
-      <div
-        class="c8"
-      >
-        <div
-          class="c6 c9"
-        >
-          <div
-            class="c10 css-16qljo6"
-            data-testid="pending-modal-content-title"
-          >
-            Swap submitted
-          </div>
-          <div
-            class="c11 css-wjxizv"
-          >
-            <div
-              class="c12 c13"
-            >
-              <div
-                class="c14"
-                style="height: 16px; width: 16px;"
-              >
-                <div
-                  class="c15"
-                >
-                  <img
-                    class="c16"
-                    src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
-                  />
-                </div>
-              </div>
-              <div
-                class="c10 css-142zc9n"
-              >
-                &lt;0.00001 ABC
-              </div>
-              <svg
-                fill="none"
-                height="12px"
-                stroke="#222222"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-                stroke-width="2"
-                viewBox="0 0 24 24"
-                width="12px"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <line
-                  x1="5"
-                  x2="19"
-                  y1="12"
-                  y2="12"
-                />
-                <polyline
-                  points="12 5 19 12 12 19"
-                />
-              </svg>
-              <div
-                class="c14"
-                style="height: 16px; width: 16px;"
-              >
-                <div
-                  class="c15"
-                >
-                  <img
-                    class="c16"
-                    src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
-                  />
-                </div>
-              </div>
-              <div
-                class="c10 css-142zc9n"
-              >
-                &lt;0.00001 DEF
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="c17 c18"
-      >
-        <div
-          class="c11 css-142zc9n"
-        >
-          <a
-            class="c19"
-            color="neutral2"
-            href="https://etherscan.io/tx/0x123"
-            rel="noopener noreferrer"
-            target="_blank"
-          >
-            View on Explorer
-          </a>
-        </div>
-      </div>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`Pending - classic trade titles renders classic trade correctly, with approvalPending= false , revocationPending= false, wrapTxHash= undefined 2`] = `
-<DocumentFragment>
-  .c12 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c17 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  margin-top: 32px;
-  min-height: 24px;
-}
-
-.c13 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 8px;
-}
-
-.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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-}
-
-.c10 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c11 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c19 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c19:hover {
-  opacity: 0.6;
-}
-
-.c19:active {
-  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;
-}
-
-.c15 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c16 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c14 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.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: dDLNFg 250ms ease-in-out;
-  animation: dDLNFg 250ms ease-in-out;
-}
-
-.c4.exiting {
-  -webkit-animation: hNFZXE 250ms ease-in-out;
-  animation: hNFZXE 250ms ease-in-out;
-}
-
-.c3 {
-  height: 64px;
-  width: 64px;
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  border-radius: 50%;
-  overflow: visible;
-}
-
-.c5 {
-  height: 64px;
-  width: 64px;
-}
-
-.c2 {
-  margin: 48px 0 8px;
-}
-
-.c7 {
-  padding: 0 32px;
-  overflow: visible;
-}
-
-.c8 {
-  position: relative;
-  width: 100%;
-  min-height: 72px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
-.c9 {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-transition: display 250ms ease-in-out;
-  transition: display 250ms ease-in-out;
-}
-
-.c9.exiting {
-  -webkit-animation: ifZjLM 250ms ease-in-out;
-  animation: ifZjLM 250ms ease-in-out;
-}
-
-<div
-    class="c0 c1 c2"
-  >
-    <div
-      class="c3"
-    >
-      <div
-        class="c4"
-      >
-        <svg
-          class="c5"
-          data-testid="confirmed-icon"
-          fill="none"
-          height="54"
-          viewBox="0 0 54 54"
-          width="54"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M27 0.333008C12.28 0.333008 0.333313 12.2797 0.333313 26.9997C0.333313 41.7197 12.28 53.6663 27 53.6663C41.72 53.6663 53.6666 41.7197 53.6666 26.9997C53.6666 12.2797 41.72 0.333008 27 0.333008ZM37.7466 22.1997L25.2933 34.6263C24.9199 35.0263 24.4133 35.2131 23.8799 35.2131C23.3733 35.2131 22.8666 35.0263 22.4666 34.6263L16.2533 28.4131C15.48 27.6398 15.48 26.3596 16.2533 25.5863C17.0266 24.8129 18.3066 24.8129 19.08 25.5863L23.8799 30.3864L34.92 19.373C35.6933 18.573 36.9733 18.573 37.7466 19.373C38.52 20.1464 38.52 21.3997 37.7466 22.1997Z"
-            fill="#40B66B"
-          />
-        </svg>
-      </div>
-    </div>
-    <div
-      class="c6 c1 c7"
-    >
-      <div
-        class="c8"
-      >
-        <div
-          class="c6 c9"
-        >
-          <div
-            class="c10 css-16qljo6"
-            data-testid="pending-modal-content-title"
-          >
-            Swap success!
-          </div>
-          <div
-            class="c11 css-wjxizv"
-          >
-            <div
-              class="c12 c13"
-            >
-              <div
-                class="c14"
-                style="height: 16px; width: 16px;"
-              >
-                <div
-                  class="c15"
-                >
-                  <img
-                    class="c16"
-                    src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
-                  />
-                </div>
-              </div>
-              <div
-                class="c10 css-142zc9n"
-              >
-                &lt;0.00001 ABC
-              </div>
-              <svg
-                fill="none"
-                height="12px"
-                stroke="#222222"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-                stroke-width="2"
-                viewBox="0 0 24 24"
-                width="12px"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <line
-                  x1="5"
-                  x2="19"
-                  y1="12"
-                  y2="12"
-                />
-                <polyline
-                  points="12 5 19 12 12 19"
-                />
-              </svg>
-              <div
-                class="c14"
-                style="height: 16px; width: 16px;"
-              >
-                <div
-                  class="c15"
-                >
-                  <img
-                    class="c16"
-                    src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
-                  />
-                </div>
-              </div>
-              <div
-                class="c10 css-142zc9n"
-              >
-                &lt;0.00001 DEF
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="c17 c18"
-      >
-        <div
-          class="c11 css-142zc9n"
-        >
-          <a
-            class="c19"
-            color="neutral2"
-            href="https://etherscan.io/tx/0x123"
-            rel="noopener noreferrer"
-            target="_blank"
-          >
-            View on Explorer
-          </a>
-        </div>
-      </div>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`Pending - classic trade titles renders classic trade correctly, with approvalPending= false , revocationPending= false, wrapTxHash= undefined 3`] = `
-<DocumentFragment>
-  .c14 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c19 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  margin-top: 32px;
-  min-height: 24px;
-}
-
-.c15 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 8px;
-}
-
-.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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-}
-
-.c12 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c13 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  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;
-}
-
-.c17 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c18 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c16 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.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;
-  animation: iCPeaJ 250ms ease-in-out;
-}
-
-.c4.exiting {
-  -webkit-animation: bbnGid 250ms ease-in-out;
-  animation: bbnGid 250ms ease-in-out;
-}
-
-.c5 {
-  height: 16px;
-  width: 16px;
-}
-
-.c5 path {
-  stroke: #CECECE;
-  background: #7D7D7D;
-  fill: #CECECE;
-}
-
-.c6 {
-  -webkit-animation: 2s fvtopB linear infinite;
-  animation: 2s fvtopB linear infinite;
-}
-
-.c3 {
-  height: 64px;
-  width: 64px;
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  border-radius: 50%;
-  overflow: visible;
-}
-
-.c7 {
-  stroke: #CECECE;
-  fill: #CECECE;
-  width: calc(100% + 8px);
-  height: calc(100% + 8px);
-  top: -4px;
-  left: -4px;
-  position: absolute;
-}
-
-.c2 {
-  margin: 48px 0 8px;
-}
-
-.c9 {
-  padding: 0 32px;
-  overflow: visible;
-}
-
-.c10 {
-  position: relative;
-  width: 100%;
-  min-height: 72px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
-.c11 {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-transition: display 250ms ease-in-out;
-  transition: display 250ms ease-in-out;
-}
-
-.c11.exiting {
-  -webkit-animation: ifZjLM 250ms ease-in-out;
-  animation: ifZjLM 250ms ease-in-out;
-}
-
-<div
-    class="c0 c1 c2"
-  >
-    <div
-      class="c3"
-    >
-      <div
-        class="c4"
-      >
-        <svg
-          class="c5 c6 c7"
-          fill="#CECECE"
-          stroke="#CECECE"
-          viewBox="0 0 54 54"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M53.6666 26.9999C53.6666 41.7275 41.7276 53.6666 27 53.6666C12.2724 53.6666 0.333313 41.7275 0.333313 26.9999C0.333313 12.2723 12.2724 0.333252 27 0.333252C41.7276 0.333252 53.6666 12.2723 53.6666 26.9999ZM8.33331 26.9999C8.33331 37.3092 16.6907 45.6666 27 45.6666C37.3093 45.6666 45.6666 37.3092 45.6666 26.9999C45.6666 16.6906 37.3093 8.33325 27 8.33325C16.6907 8.33325 8.33331 16.6906 8.33331 26.9999Z"
-            fill="#CECECE"
-            opacity="0.1"
-          />
-          <path
-            d="M49.6666 26.9999C51.8758 26.9999 53.6973 25.1992 53.3672 23.0149C53.0452 20.884 52.4652 18.7951 51.6368 16.795C50.2966 13.5597 48.3324 10.62 45.8562 8.14374C43.3799 5.66751 40.4402 3.70326 37.2049 2.36313C35.2048 1.53466 33.1159 0.954747 30.985 0.632693C28.8007 0.30256 27 2.12411 27 4.33325C27 6.54239 28.8108 8.29042 30.9695 8.76019C32.0523 8.99585 33.1146 9.32804 34.1434 9.75417C36.4081 10.6923 38.4659 12.0672 40.1993 13.8006C41.9327 15.534 43.3076 17.5918 44.2457 19.8565C44.6719 20.8853 45.004 21.9476 45.2397 23.0304C45.7095 25.1891 47.4575 26.9999 49.6666 26.9999Z"
-            fill="#CECECE"
-          />
-        </svg>
-      </div>
-    </div>
-    <div
-      class="c8 c1 c9"
-    >
-      <div
-        class="c10"
-      >
-        <div
-          class="c8 c11"
-        >
-          <div
-            class="c12 css-16qljo6"
-            data-testid="pending-modal-content-title"
-          >
-            Confirm swap
-          </div>
-          <div
-            class="c13 css-wjxizv"
-          >
-            <div
-              class="c14 c15"
-            >
-              <div
-                class="c16"
-                style="height: 16px; width: 16px;"
-              >
-                <div
-                  class="c17"
-                >
-                  <img
-                    class="c18"
-                    src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
-                  />
-                </div>
-              </div>
-              <div
-                class="c12 css-142zc9n"
-              >
-                &lt;0.00001 ABC
-              </div>
-              <svg
-                fill="none"
-                height="12px"
-                stroke="#222222"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-                stroke-width="2"
-                viewBox="0 0 24 24"
-                width="12px"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <line
-                  x1="5"
-                  x2="19"
-                  y1="12"
-                  y2="12"
-                />
-                <polyline
-                  points="12 5 19 12 12 19"
-                />
-              </svg>
-              <div
-                class="c16"
-                style="height: 16px; width: 16px;"
-              >
-                <div
-                  class="c17"
-                >
-                  <img
-                    class="c18"
-                    src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
-                  />
-                </div>
-              </div>
-              <div
-                class="c12 css-142zc9n"
-              >
-                &lt;0.00001 DEF
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="c19 c20"
-      >
-        <div
-          class="c13 css-142zc9n"
-        >
-          Proceed in your wallet
-        </div>
-      </div>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`Pending - uniswapX trade titles renders limit order correctly, with approvalPending= false , revocationPending= false, wrapTxHash= undefined 1`] = `
-<DocumentFragment>
-  .c12 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c13 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 8px;
-}
-
-.c10 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c11 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  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;
-}
-
-.c15 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c16 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c14 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.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: dDLNFg 250ms ease-in-out;
-  animation: dDLNFg 250ms ease-in-out;
-}
-
-.c4.exiting {
-  -webkit-animation: hNFZXE 250ms ease-in-out;
-  animation: hNFZXE 250ms ease-in-out;
-}
-
-.c3 {
-  height: 64px;
-  width: 64px;
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  border-radius: 50%;
-  overflow: visible;
-}
-
-.c5 {
-  height: 64px;
-  width: 64px;
-}
-
-.c2 {
-  margin: 48px 0 8px;
-}
-
-.c7 {
-  opacity: 0.5;
-  padding: 0 32px;
-  overflow: visible;
-}
-
-.c8 {
-  position: relative;
-  width: 100%;
-  min-height: 72px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
-.c9 {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-transition: display 250ms ease-in-out;
-  transition: display 250ms ease-in-out;
-}
-
-.c9.exiting {
-  -webkit-animation: ifZjLM 250ms ease-in-out;
-  animation: ifZjLM 250ms ease-in-out;
-}
-
-<div
-    class="c0 c1 c2"
-  >
-    <div
-      class="c3"
-    >
-      <div
-        class="c4"
-      >
-        <svg
-          class="c5"
-          data-testid="submitted-icon"
-          fill="none"
-          height="54"
-          viewBox="0 0 54 54"
-          width="54"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M26.9997 0.333496C12.2717 0.333496 0.333008 12.2722 0.333008 27.0002C0.333008 41.7282 12.2717 53.6668 26.9997 53.6668C41.7277 53.6668 53.6663 41.7282 53.6663 27.0002C53.6663 12.2722 41.7277 0.333496 26.9997 0.333496ZM36.4131 25.7469C36.0238 26.1362 35.5117 26.3335 34.9997 26.3335C34.4877 26.3335 33.9756 26.1389 33.5863 25.7469L28.9997 21.1603V37.6668C28.9997 38.7708 28.1037 39.6668 26.9997 39.6668C25.8957 39.6668 24.9997 38.7708 24.9997 37.6668V21.1629L20.4131 25.7495C19.6318 26.5308 18.365 26.5308 17.5837 25.7495C16.8023 24.9682 16.8023 23.7014 17.5837 22.9201L25.5837 14.9201C25.7677 14.7361 25.9887 14.5898 26.2341 14.4884C26.722 14.2858 27.274 14.2858 27.762 14.4884C28.0074 14.5898 28.2291 14.7361 28.4131 14.9201L36.4131 22.9201C37.1944 23.7014 37.1944 24.9656 36.4131 25.7469Z"
-            fill="#FC72FF"
-          />
-        </svg>
-      </div>
-    </div>
-    <div
-      class="c6 c1 c7"
-    >
-      <div
-        class="c8"
-      >
-        <div
-          class="c6 c9"
-        >
-          <div
-            class="c10 css-16qljo6"
-            data-testid="pending-modal-content-title"
-          >
-            Limit submitted
-          </div>
-          <div
-            class="c11 css-wjxizv"
-          >
-            <div
-              class="c12 c13"
-            >
-              <div
-                class="c14"
-                style="height: 16px; width: 16px;"
-              >
-                <div
-                  class="c15"
-                >
-                  <img
-                    class="c16"
-                    src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
-                  />
-                </div>
-              </div>
-              <div
-                class="c10 css-142zc9n"
-              >
-                &lt;0.00001 DAI
-              </div>
-              <svg
-                fill="none"
-                height="12px"
-                stroke="#222222"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-                stroke-width="2"
-                viewBox="0 0 24 24"
-                width="12px"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <line
-                  x1="5"
-                  x2="19"
-                  y1="12"
-                  y2="12"
-                />
-                <polyline
-                  points="12 5 19 12 12 19"
-                />
-              </svg>
-              <div
-                class="c14"
-                style="height: 16px; width: 16px;"
-              >
-                <div
-                  class="c15"
-                >
-                  <img
-                    class="c16"
-                    src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
-                  />
-                </div>
-              </div>
-              <div
-                class="c10 css-142zc9n"
-              >
-                0.0001 USDC
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`Pending - uniswapX trade titles renders limit order correctly, with approvalPending= false , revocationPending= false, wrapTxHash= undefined 2`] = `
-<DocumentFragment>
-  .c12 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c17 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  margin-top: 32px;
-  min-height: 24px;
-}
-
-.c13 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 8px;
-}
-
-.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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-}
-
-.c10 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c11 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c19 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c19:hover {
-  opacity: 0.6;
-}
-
-.c19:active {
-  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;
-}
-
-.c15 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c16 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c14 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.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: dDLNFg 250ms ease-in-out;
-  animation: dDLNFg 250ms ease-in-out;
-}
-
-.c4.exiting {
-  -webkit-animation: hNFZXE 250ms ease-in-out;
-  animation: hNFZXE 250ms ease-in-out;
-}
-
-.c3 {
-  height: 64px;
-  width: 64px;
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  border-radius: 50%;
-  overflow: visible;
-}
-
-.c5 {
-  height: 64px;
-  width: 64px;
-}
-
-.c2 {
-  margin: 48px 0 8px;
-}
-
-.c7 {
-  padding: 0 32px;
-  overflow: visible;
-}
-
-.c8 {
-  position: relative;
-  width: 100%;
-  min-height: 72px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
-.c9 {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-transition: display 250ms ease-in-out;
-  transition: display 250ms ease-in-out;
-}
-
-.c9.exiting {
-  -webkit-animation: ifZjLM 250ms ease-in-out;
-  animation: ifZjLM 250ms ease-in-out;
-}
-
-<div
-    class="c0 c1 c2"
-  >
-    <div
-      class="c3"
-    >
-      <div
-        class="c4"
-      >
-        <svg
-          class="c5"
-          data-testid="confirmed-icon"
-          fill="none"
-          height="54"
-          viewBox="0 0 54 54"
-          width="54"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M27 0.333008C12.28 0.333008 0.333313 12.2797 0.333313 26.9997C0.333313 41.7197 12.28 53.6663 27 53.6663C41.72 53.6663 53.6666 41.7197 53.6666 26.9997C53.6666 12.2797 41.72 0.333008 27 0.333008ZM37.7466 22.1997L25.2933 34.6263C24.9199 35.0263 24.4133 35.2131 23.8799 35.2131C23.3733 35.2131 22.8666 35.0263 22.4666 34.6263L16.2533 28.4131C15.48 27.6398 15.48 26.3596 16.2533 25.5863C17.0266 24.8129 18.3066 24.8129 19.08 25.5863L23.8799 30.3864L34.92 19.373C35.6933 18.573 36.9733 18.573 37.7466 19.373C38.52 20.1464 38.52 21.3997 37.7466 22.1997Z"
-            fill="#40B66B"
-          />
-        </svg>
-      </div>
-    </div>
-    <div
-      class="c6 c1 c7"
-    >
-      <div
-        class="c8"
-      >
-        <div
-          class="c6 c9"
-        >
-          <div
-            class="c10 css-16qljo6"
-            data-testid="pending-modal-content-title"
-          >
-            Limit filled!
-          </div>
-          <div
-            class="c11 css-wjxizv"
-          >
-            <div
-              class="c12 c13"
-            >
-              <div
-                class="c14"
-                style="height: 16px; width: 16px;"
-              >
-                <div
-                  class="c15"
-                >
-                  <img
-                    class="c16"
-                    src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
-                  />
-                </div>
-              </div>
-              <div
-                class="c10 css-142zc9n"
-              >
-                &lt;0.00001 DAI
-              </div>
-              <svg
-                fill="none"
-                height="12px"
-                stroke="#222222"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-                stroke-width="2"
-                viewBox="0 0 24 24"
-                width="12px"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <line
-                  x1="5"
-                  x2="19"
-                  y1="12"
-                  y2="12"
-                />
-                <polyline
-                  points="12 5 19 12 12 19"
-                />
-              </svg>
-              <div
-                class="c14"
-                style="height: 16px; width: 16px;"
-              >
-                <div
-                  class="c15"
-                >
-                  <img
-                    class="c16"
-                    src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
-                  />
-                </div>
-              </div>
-              <div
-                class="c10 css-142zc9n"
-              >
-                0.0001 USDC
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="c17 c18"
-      >
-        <div
-          class="c11 css-142zc9n"
-        >
-          <a
-            class="c19"
-            color="neutral2"
-            href="https://etherscan.io/tx/0x1234"
-            rel="noopener noreferrer"
-            target="_blank"
-          >
-            View on Explorer
-          </a>
-        </div>
-      </div>
-    </div>
-  </div>
-</DocumentFragment>
-`;
-
-exports[`Pending - uniswapX trade titles renders limit order correctly, with approvalPending= false , revocationPending= false, wrapTxHash= undefined 3`] = `
-<DocumentFragment>
-  .c14 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c19 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  margin-top: 32px;
-  min-height: 24px;
-}
-
-.c15 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 8px;
-}
-
-.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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-}
-
-.c12 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c13 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  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;
-}
-
-.c17 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c18 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c16 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.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;
-  animation: iCPeaJ 250ms ease-in-out;
-}
-
-.c4.exiting {
-  -webkit-animation: bbnGid 250ms ease-in-out;
-  animation: bbnGid 250ms ease-in-out;
-}
-
-.c5 {
-  height: 16px;
-  width: 16px;
-}
-
-.c5 path {
-  stroke: #CECECE;
-  background: #7D7D7D;
-  fill: #CECECE;
-}
-
-.c6 {
-  -webkit-animation: 2s fvtopB linear infinite;
-  animation: 2s fvtopB linear infinite;
-}
-
-.c3 {
-  height: 64px;
-  width: 64px;
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  border-radius: 50%;
-  overflow: visible;
-}
-
-.c7 {
-  stroke: #CECECE;
-  fill: #CECECE;
-  width: calc(100% + 8px);
-  height: calc(100% + 8px);
-  top: -4px;
-  left: -4px;
-  position: absolute;
-}
-
-.c2 {
-  margin: 48px 0 8px;
-}
-
-.c9 {
-  padding: 0 32px;
-  overflow: visible;
-}
-
-.c10 {
-  position: relative;
-  width: 100%;
-  min-height: 72px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
-.c11 {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-transition: display 250ms ease-in-out;
-  transition: display 250ms ease-in-out;
-}
-
-.c11.exiting {
-  -webkit-animation: ifZjLM 250ms ease-in-out;
-  animation: ifZjLM 250ms ease-in-out;
-}
-
-<div
-    class="c0 c1 c2"
-  >
-    <div
-      class="c3"
-    >
-      <div
-        class="c4"
-      >
-        <svg
-          class="c5 c6 c7"
-          fill="#CECECE"
-          stroke="#CECECE"
-          viewBox="0 0 54 54"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M53.6666 26.9999C53.6666 41.7275 41.7276 53.6666 27 53.6666C12.2724 53.6666 0.333313 41.7275 0.333313 26.9999C0.333313 12.2723 12.2724 0.333252 27 0.333252C41.7276 0.333252 53.6666 12.2723 53.6666 26.9999ZM8.33331 26.9999C8.33331 37.3092 16.6907 45.6666 27 45.6666C37.3093 45.6666 45.6666 37.3092 45.6666 26.9999C45.6666 16.6906 37.3093 8.33325 27 8.33325C16.6907 8.33325 8.33331 16.6906 8.33331 26.9999Z"
-            fill="#CECECE"
-            opacity="0.1"
-          />
-          <path
-            d="M49.6666 26.9999C51.8758 26.9999 53.6973 25.1992 53.3672 23.0149C53.0452 20.884 52.4652 18.7951 51.6368 16.795C50.2966 13.5597 48.3324 10.62 45.8562 8.14374C43.3799 5.66751 40.4402 3.70326 37.2049 2.36313C35.2048 1.53466 33.1159 0.954747 30.985 0.632693C28.8007 0.30256 27 2.12411 27 4.33325C27 6.54239 28.8108 8.29042 30.9695 8.76019C32.0523 8.99585 33.1146 9.32804 34.1434 9.75417C36.4081 10.6923 38.4659 12.0672 40.1993 13.8006C41.9327 15.534 43.3076 17.5918 44.2457 19.8565C44.6719 20.8853 45.004 21.9476 45.2397 23.0304C45.7095 25.1891 47.4575 26.9999 49.6666 26.9999Z"
-            fill="#CECECE"
-          />
-        </svg>
-      </div>
-    </div>
-    <div
-      class="c8 c1 c9"
-    >
-      <div
-        class="c10"
-      >
-        <div
-          class="c8 c11"
-        >
-          <div
-            class="c12 css-16qljo6"
-            data-testid="pending-modal-content-title"
-          >
-            Confirm limit
-          </div>
-          <div
-            class="c13 css-wjxizv"
-          >
-            <div
-              class="c14 c15"
-            >
-              <div
-                class="c16"
-                style="height: 16px; width: 16px;"
-              >
-                <div
-                  class="c17"
-                >
-                  <img
-                    class="c18"
-                    src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
-                  />
-                </div>
-              </div>
-              <div
-                class="c12 css-142zc9n"
-              >
-                &lt;0.00001 DAI
-              </div>
-              <svg
-                fill="none"
-                height="12px"
-                stroke="#222222"
-                stroke-linecap="round"
-                stroke-linejoin="round"
-                stroke-width="2"
-                viewBox="0 0 24 24"
-                width="12px"
-                xmlns="http://www.w3.org/2000/svg"
-              >
-                <line
-                  x1="5"
-                  x2="19"
-                  y1="12"
-                  y2="12"
-                />
-                <polyline
-                  points="12 5 19 12 12 19"
-                />
-              </svg>
-              <div
-                class="c16"
-                style="height: 16px; width: 16px;"
-              >
-                <div
-                  class="c17"
-                >
-                  <img
-                    class="c18"
-                    src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
-                  />
-                </div>
-              </div>
-              <div
-                class="c12 css-142zc9n"
-              >
-                0.0001 USDC
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="c19 c20"
-      >
-        <div
-          class="c13 css-142zc9n"
-        >
-          Proceed in your wallet
-        </div>
-      </div>
-    </div>
-  </div>
-</DocumentFragment>
-`;
diff --git a/apps/web/src/components/ConfirmSwapModalV2/index.tsx b/apps/web/src/components/ConfirmSwapModalV2/index.tsx
index 70227861ae6..78996630f30 100644
--- a/apps/web/src/components/ConfirmSwapModalV2/index.tsx
+++ b/apps/web/src/components/ConfirmSwapModalV2/index.tsx
@@ -14,11 +14,10 @@ import { useCallback, useEffect, useMemo } from 'react'
 import { useSuppressPopups } from 'state/application/hooks'
 import { PopupType } from 'state/application/reducer'
 import { InterfaceTrade, TradeFillType } from 'state/routing/types'
-import { isLimitTrade, isPreviewTrade } from 'state/routing/utils'
+import { isPreviewTrade } 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 { SignatureExpiredError } from 'utils/errors'
 import { formatSwapPriceUpdatedEventProperties } from 'utils/loggingFormatters'
@@ -72,7 +71,7 @@ export default function ConfirmSwapModalV2({
   swapResult?: SwapResult
   swapError?: Error
   clearSwapState: () => void
-  onAcceptChanges?: () => void
+  onAcceptChanges: () => void
   onConfirm: () => void
   onCurrencySelection: (field: Field, currency: Currency) => void
   onDismiss: () => void
@@ -177,84 +176,81 @@ export default function ConfirmSwapModalV2({
   }, [confirmModalState, doesTradeDiffer, onCancel, onDismiss, priceUpdate, unsuppressPopups, trade])
 
   return (
-    // Wrapping in a new theme provider resets any color extraction overriding on the current page. Swap modal should use default/non-overridden theme.
-    <ThemeProvider>
-      <SwapModal confirmModalState={confirmModalState} onDismiss={onModalDismiss}>
-        {/* Head section displays title, help button, close icon */}
-        <Container $height="24px" $padding="6px 12px 4px 12px">
-          <SwapHead onDismiss={onModalDismiss} isLimitTrade={isLimitTrade(trade)} />
+    <SwapModal confirmModalState={confirmModalState} onDismiss={onModalDismiss}>
+      {/* Head section displays title, help button, close icon */}
+      <Container $height="36px" $padding="6px 12px 4px 12px">
+        <SwapHead onDismiss={onModalDismiss} />
+      </Container>
+      {/* Preview section displays input / output currency amounts */}
+      {showPreview && (
+        <Container $padding="12px 16px 0px 16px">
+          <SwapPreview inputCurrency={inputCurrency} trade={trade} allowedSlippage={allowedSlippage} />
         </Container>
-        {/* Preview section displays input / output currency amounts */}
-        {showPreview && (
-          <Container $padding="12px 12px 0px 12px">
-            <SwapPreview inputCurrency={inputCurrency} trade={trade} allowedSlippage={allowedSlippage} />
-          </Container>
-        )}
-        {/* Details section displays rate, fees, network cost, etc. w/ additional details in drop-down menu .*/}
-        {showDetails && (
-          <Container>
-            <FadePresence>
-              <AutoColumn gap="md">
-                <SwapDetails
-                  onConfirm={() => {
-                    suppressPopups()
-                    startSwapFlow()
-                  }}
-                  trade={trade}
-                  allowance={allowance}
-                  swapResult={swapResult}
-                  allowedSlippage={allowedSlippage}
-                  isLoading={isPreviewTrade(trade)}
-                  disabledConfirm={
-                    showAcceptChanges || isPreviewTrade(trade) || allowance.state === AllowanceState.LOADING
-                  }
-                  fiatValueInput={fiatValueInput}
-                  fiatValueOutput={fiatValueOutput}
-                  showAcceptChanges={Boolean(showAcceptChanges)}
-                  onAcceptChanges={onAcceptChanges}
-                  swapErrorMessage={swapFailed ? swapError?.message : undefined}
-                />
-              </AutoColumn>
-            </FadePresence>
-          </Container>
-        )}
-        {/* Progress indicator displays all the steps of the swap flow and their current status  */}
-        {confirmModalState !== ConfirmModalState.REVIEWING && showProgressIndicator && (
-          <Container>
-            <FadePresence>
-              <SwapProgressIndicator
-                steps={pendingModalSteps}
-                currentStep={confirmModalState}
+      )}
+      {/* Details section displays rate, fees, network cost, etc. w/ additional details in drop-down menu .*/}
+      {showDetails && (
+        <Container>
+          <FadePresence>
+            <AutoColumn gap="md">
+              <SwapDetails
+                onConfirm={() => {
+                  suppressPopups()
+                  startSwapFlow()
+                }}
                 trade={trade}
+                allowance={allowance}
                 swapResult={swapResult}
-                wrapTxHash={wrapTxHash}
-                tokenApprovalPending={allowance.state === AllowanceState.REQUIRED && allowance.isApprovalPending}
-                revocationPending={allowance.state === AllowanceState.REQUIRED && allowance.isRevocationPending}
-                swapError={swapError}
-                onRetryUniswapXSignature={onConfirm}
+                allowedSlippage={allowedSlippage}
+                isLoading={isPreviewTrade(trade)}
+                disabledConfirm={
+                  showAcceptChanges || isPreviewTrade(trade) || allowance.state === AllowanceState.LOADING
+                }
+                fiatValueInput={fiatValueInput}
+                fiatValueOutput={fiatValueOutput}
+                showAcceptChanges={Boolean(showAcceptChanges)}
+                onAcceptChanges={onAcceptChanges}
+                swapErrorMessage={swapFailed ? swapError?.message : undefined}
               />
-            </FadePresence>
-          </Container>
-        )}
-        {/* Pending screen displays spinner for single-step confirmations, as well as success screen for all flows */}
-        {(showConfirming || showSuccess) && (
-          <Container>
-            <FadePresence>
-              <SwapPending
-                trade={trade}
-                swapResult={swapResult}
-                wrapTxHash={wrapTxHash}
-                tokenApprovalPending={allowance.state === AllowanceState.REQUIRED && allowance.isApprovalPending}
-                revocationPending={allowance.state === AllowanceState.REQUIRED && allowance.isRevocationPending}
-              />
-            </FadePresence>
-          </Container>
-        )}
-        {/* Error screen handles all error types with custom messaging and retry logic */}
-        {errorType && showError && (
-          <SwapError trade={trade} swapResult={swapResult} errorType={errorType} onRetry={startSwapFlow} />
-        )}
-      </SwapModal>
-    </ThemeProvider>
+            </AutoColumn>
+          </FadePresence>
+        </Container>
+      )}
+      {/* Progress indicator displays all the steps of the swap flow and their current status  */}
+      {confirmModalState !== ConfirmModalState.REVIEWING && showProgressIndicator && (
+        <Container>
+          <FadePresence>
+            <SwapProgressIndicator
+              steps={pendingModalSteps}
+              currentStep={confirmModalState}
+              trade={trade}
+              swapResult={swapResult}
+              wrapTxHash={wrapTxHash}
+              tokenApprovalPending={allowance.state === AllowanceState.REQUIRED && allowance.isApprovalPending}
+              revocationPending={allowance.state === AllowanceState.REQUIRED && allowance.isRevocationPending}
+              swapError={swapError}
+              onRetryUniswapXSignature={onConfirm}
+            />
+          </FadePresence>
+        </Container>
+      )}
+      {/* Pending screen displays spinner for single-step confirmations, as well as success screen for all flows */}
+      {(showConfirming || showSuccess) && (
+        <Container>
+          <FadePresence>
+            <SwapPending
+              trade={trade}
+              swapResult={swapResult}
+              wrapTxHash={wrapTxHash}
+              tokenApprovalPending={allowance.state === AllowanceState.REQUIRED && allowance.isApprovalPending}
+              revocationPending={allowance.state === AllowanceState.REQUIRED && allowance.isRevocationPending}
+            />
+          </FadePresence>
+        </Container>
+      )}
+      {/* Error screen handles all error types with custom messaging and retry logic */}
+      {errorType && showError && (
+        <SwapError trade={trade} swapResult={swapResult} errorType={errorType} onRetry={startSwapFlow} />
+      )}
+    </SwapModal>
   )
 }
diff --git a/apps/web/src/components/ConnectedAccountBlocked/index.tsx b/apps/web/src/components/ConnectedAccountBlocked/index.tsx
index e3420d9acac..a73be912016 100644
--- a/apps/web/src/components/ConnectedAccountBlocked/index.tsx
+++ b/apps/web/src/components/ConnectedAccountBlocked/index.tsx
@@ -2,7 +2,8 @@ import { Trans } from '@lingui/macro'
 import Column from 'components/Column'
 import { BlockedIcon } from 'components/TokenSafety/TokenSafetyIcon'
 import styled, { useTheme } from 'styled-components'
-import { CopyHelper, ExternalLink, ThemedText } from 'theme/components'
+import { ExternalLink, ThemedText } from 'theme/components'
+import { CopyHelper } from 'theme/components'
 
 import Modal from '../Modal'
 
diff --git a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceButton.test.tsx b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceButton.test.tsx
deleted file mode 100644
index cf917ffb809..00000000000
--- a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceButton.test.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import userEvent from '@testing-library/user-event'
-import { act, render, screen } from 'test-utils/render'
-
-import { LimitCustomMarketPriceButton, LimitPresetPriceButton } from './LimitPriceButton'
-
-describe('LimitPresetPriceButton', () => {
-  it.each([
-    [0, false, false],
-    [0, true, false],
-    [0, false, true],
-    [5, false, true],
-    [5, true, false],
-    [10, false, true],
-  ])('renders %p correctly, disabled %p and selected %p', async (num, disabled, selected) => {
-    const onSelect = jest.fn()
-    const { container } = render(
-      <LimitPresetPriceButton
-        priceAdjustmentPercentage={num}
-        onSelect={onSelect}
-        disabled={disabled}
-        selected={selected}
-      />
-    )
-    await act(() => userEvent.click(screen.getByText(num > 0 ? `+${num}%` : 'Current')))
-    expect(container.firstChild).toMatchSnapshot()
-    expect(onSelect).toHaveBeenCalledTimes(disabled ? 0 : 1)
-  })
-})
-
-describe('LimitCustomMarketPriceButton', () => {
-  it('renders the custom amount correctly', async () => {
-    const onSelect = jest.fn()
-    const { container } = render(<LimitCustomMarketPriceButton customAdjustmentPercentage={10} onSelect={onSelect} />)
-    await act(() => userEvent.click(screen.getByText('+10%')))
-    expect(container.firstChild).toMatchSnapshot()
-    expect(onSelect).toHaveBeenCalledWith(0)
-  })
-
-  it('renders the custom amount correctly, negative change', async () => {
-    const onSelect = jest.fn()
-    const { container } = render(<LimitCustomMarketPriceButton customAdjustmentPercentage={-10} onSelect={onSelect} />)
-    await act(() => userEvent.click(screen.getByText('-10%')))
-    expect(container.firstChild).toMatchSnapshot()
-    expect(onSelect).toHaveBeenCalledWith(0)
-  })
-
-  it('renders disabled correctly', async () => {
-    const onSelect = jest.fn()
-    render(<LimitCustomMarketPriceButton customAdjustmentPercentage={10} onSelect={onSelect} disabled={true} />)
-    await act(() => userEvent.click(screen.getByText('+10%')))
-    expect(onSelect).toHaveBeenCalledTimes(0)
-  })
-
-  it('renders selected correctly', async () => {
-    const onSelect = jest.fn()
-    render(<LimitCustomMarketPriceButton customAdjustmentPercentage={10} onSelect={onSelect} selected={true} />)
-    await act(() => userEvent.click(screen.getByText('+10%')))
-    expect(onSelect).toHaveBeenCalledTimes(1)
-  })
-})
diff --git a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceButton.tsx b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceButton.tsx
deleted file mode 100644
index 39a792ca617..00000000000
--- a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceButton.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-import { Trans } from '@lingui/macro'
-import { Percent } from '@uniswap/sdk-core'
-import Row from 'components/Row'
-import { X } from 'react-feather'
-import styled, { css } from 'styled-components'
-import { ClickableStyle, ThemedText } from 'theme/components'
-import { useFormatter } from 'utils/formatNumbers'
-
-interface LimitPriceButtonProps {
-  priceAdjustmentPercentage: number
-  disabled?: boolean
-  selected?: boolean
-  onSelect: (priceAdjustmentPercentage: number) => void
-}
-
-const containerBorderCss = css`
-  border-radius: 999px;
-  border: 1px solid ${({ theme }) => theme.surface3};
-`
-
-const highlightedBorderCss = css`
-  border-radius: 999px 0px 0px 999px;
-  border-top: 1px solid ${({ theme }) => theme.surface3};
-  border-bottom: 1px solid ${({ theme }) => theme.surface3};
-  border-left: 1px solid ${({ theme }) => theme.surface3};
-  border-right: 1px solid transparent;
-`
-
-const Container = styled.button<{ $selected?: boolean; $disabled?: boolean; $highlighted: boolean }>`
-  background-color: ${({ theme, $highlighted }) => ($highlighted ? theme.surface3 : 'unset')};
-  color: ${({ theme, $selected, $disabled, $highlighted }) =>
-    $highlighted || ($selected && !$disabled) ? theme.neutral1 : theme.neutral2};
-  padding: 2px 8px;
-  height: 24px;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background-color: ${({ theme, $selected, $highlighted }) =>
-    $selected || $highlighted ? theme.surface3 : 'transparent'};
-  ${({ $highlighted }) => ($highlighted ? highlightedBorderCss : containerBorderCss)};
-  ${({ $disabled }) => !$disabled && ClickableStyle};
-`
-
-const HighlightedContainerXButton = styled.button`
-  ${ClickableStyle}
-  background-color: ${({ theme }) => theme.surface3};
-  color: ${({ theme }) => theme.neutral2};
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  text-align: center;
-  padding: 6px 6px 6px 4px;
-  height: 24px;
-  border-radius: 0px 999px 999px 0px;
-  border-top: 1px solid ${({ theme }) => theme.surface3};
-  border-bottom: 1px solid ${({ theme }) => theme.surface3};
-  border-right: 1px solid ${({ theme }) => theme.surface3};
-  border-left: 1px solid transparent;
-`
-
-export function LimitPresetPriceButton({
-  priceAdjustmentPercentage,
-  selected,
-  disabled,
-  onSelect,
-}: LimitPriceButtonProps) {
-  const { formatPercent } = useFormatter()
-  return (
-    <Container
-      $selected={selected}
-      $disabled={disabled}
-      $highlighted={false}
-      onClick={() => !disabled && onSelect(priceAdjustmentPercentage)}
-    >
-      {priceAdjustmentPercentage === 0 ? (
-        <Trans>Current</Trans>
-      ) : (
-        <ThemedText.LabelSmall>+{formatPercent(new Percent(priceAdjustmentPercentage, 100))}</ThemedText.LabelSmall>
-      )}
-    </Container>
-  )
-}
-
-/**
- * A button to reset the price to the market price (i.e. an adjustment of 0%)
- * When defined, this button displays customAdjustmentPercentage instead of "Current"
- */
-export function LimitCustomMarketPriceButton({
-  customAdjustmentPercentage,
-  selected,
-  disabled,
-  onSelect,
-}: Omit<LimitPriceButtonProps, 'priceAdjustmentPercentage'> & { customAdjustmentPercentage?: number }) {
-  const onSetAdjustmentPercentage = () => !disabled && onSelect(0)
-  const { formatPercent } = useFormatter()
-
-  return (
-    <Row width="unset" gap="1px">
-      <Container
-        $selected={selected}
-        $disabled={disabled}
-        $highlighted={customAdjustmentPercentage !== undefined}
-        onClick={onSetAdjustmentPercentage}
-      >
-        {!customAdjustmentPercentage ? (
-          <Trans>Current</Trans>
-        ) : (
-          <ThemedText.LabelSmall>
-            {customAdjustmentPercentage > 0 ? '+' : ''}
-            {formatPercent(new Percent(Math.floor(customAdjustmentPercentage), 100))}
-          </ThemedText.LabelSmall>
-        )}
-      </Container>
-      {customAdjustmentPercentage && (
-        <HighlightedContainerXButton onClick={onSetAdjustmentPercentage}>
-          <X size={12} />
-        </HighlightedContainerXButton>
-      )}
-    </Row>
-  )
-}
diff --git a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceIncrementButtons.test.tsx b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceIncrementButtons.test.tsx
deleted file mode 100644
index 6a2b0cdc24e..00000000000
--- a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceIncrementButtons.test.tsx
+++ /dev/null
@@ -1,16 +0,0 @@
-import { render } from 'test-utils/render'
-
-import { LimitPriceIncrementButtons } from './LimitPriceIncrementButtons'
-
-describe('LimitPriceIncrementButtons', () => {
-  it('should render both buttons and callbacks should fire', () => {
-    const increment = jest.fn()
-    const decrement = jest.fn()
-    const { container } = render(<LimitPriceIncrementButtons onIncrement={increment} onDecrement={decrement} />)
-    expect(container.querySelectorAll('button')).toHaveLength(2)
-    container.querySelectorAll('button')[0].click()
-    expect(decrement).toHaveBeenCalled()
-    container.querySelectorAll('button')[1].click()
-    expect(increment).toHaveBeenCalled()
-  })
-})
diff --git a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceIncrementButtons.tsx b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceIncrementButtons.tsx
deleted file mode 100644
index 70a766a7bcb..00000000000
--- a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceIncrementButtons.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import Row from 'components/Row'
-import { Minus, Plus } from 'react-feather'
-import styled from 'styled-components'
-import { ClickableStyle } from 'theme/components'
-
-const Container = styled(Row)`
-  width: fit-content;
-  button {
-    display: flex;
-    align-items: center;
-    justify-content: center;
-    color: ${({ theme }) => theme.neutral2};
-    background-color: ${({ theme }) => theme.surface3};
-    border: 1px solid transparent;
-    ${ClickableStyle}
-    height: 24px;
-    padding-bottom: 2px;
-  }
-`
-
-const IncrementButton = styled.button`
-  border-radius: 0px 999px 999px 0px;
-  padding-right: 10px;
-`
-
-const DecrementButton = styled.button`
-  padding-left: 10px;
-  border-radius: 999px 0px 0px 999px;
-`
-
-export function LimitPriceIncrementButtons({
-  onDecrement,
-  onIncrement,
-}: {
-  onDecrement: () => void
-  onIncrement: () => void
-}) {
-  return (
-    <Container gap="1px">
-      <DecrementButton onClick={onDecrement}>
-        <Minus size={12} />
-      </DecrementButton>
-      <IncrementButton onClick={onIncrement}>
-        <Plus size={12} />
-      </IncrementButton>
-    </Container>
-  )
-}
diff --git a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputLabel.tsx b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputLabel.tsx
deleted file mode 100644
index 369faf9203c..00000000000
--- a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputLabel.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-import { Trans } from '@lingui/macro'
-import { Currency } from '@uniswap/sdk-core'
-import CurrencyLogo from 'components/Logo/CurrencyLogo'
-import Row from 'components/Row'
-import styled from 'styled-components'
-import { ThemedText } from 'theme/components'
-
-const CurrencySymbolContainer = styled.span`
-  display: inline-block;
-  margin: 0 8px;
-`
-
-export function LimitPriceInputLabel({
-  currency,
-  showCurrencyMessage,
-}: {
-  currency?: Currency
-  showCurrencyMessage: boolean
-}) {
-  if (!currency || !showCurrencyMessage) {
-    return (
-      <ThemedText.LabelSmall style={{ userSelect: 'none' }}>
-        <Trans>Limit price</Trans>
-      </ThemedText.LabelSmall>
-    )
-  }
-  return (
-    <ThemedText.LabelSmall style={{ userSelect: 'none' }}>
-      <Row align="center">
-        <Trans>When 1</Trans>{' '}
-        <CurrencySymbolContainer>
-          <Row gap="xs" align="center" height="100%">
-            <CurrencyLogo currency={currency} size="16px" />
-            <ThemedText.BodyPrimary display="inline">{currency.symbol}</ThemedText.BodyPrimary>
-          </Row>
-        </CurrencySymbolContainer>{' '}
-        <Trans>is worth</Trans>
-      </Row>
-    </ThemedText.LabelSmall>
-  )
-}
diff --git a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputPanel.test.tsx b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputPanel.test.tsx
deleted file mode 100644
index 5b229158b05..00000000000
--- a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputPanel.test.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import { SwapTab } from 'components/swap/constants'
-import { DAI, USDC_MAINNET } from 'constants/tokens'
-import { LimitContext } from 'state/limit/LimitContext'
-import { SwapAndLimitContext } from 'state/swap/SwapContext'
-import { render, screen } from 'test-utils/render'
-
-import { LimitPriceInputPanel } from './LimitPriceInputPanel'
-
-const mockSwapAndLimitContextValue = {
-  currencyState: {
-    inputCurrency: DAI,
-    outputCurrency: undefined,
-  },
-  prefilledState: {},
-  setCurrencyState: jest.fn(),
-  currentTab: SwapTab.Limit,
-  setCurrentTab: jest.fn(),
-}
-
-const mockLimitContextValue = {
-  limitState: {
-    inputAmount: '',
-    limitPrice: '100',
-    outputAmount: '',
-    expiry: 1,
-    isInputAmountFixed: true,
-    limitPriceEdited: false,
-  },
-  setLimitState: jest.fn(),
-  derivedLimitInfo: {
-    currencyBalances: {},
-    parsedAmounts: {},
-  },
-}
-
-describe('LimitPriceInputPanel', () => {
-  it('should render the component with no currencies selected', () => {
-    const { container } = render(<LimitPriceInputPanel />)
-    expect(screen.getByText('Limit price')).toBeVisible()
-    expect(screen.getByPlaceholderText('0')).toBeVisible()
-    expect(screen.getByText('Current')).toBeVisible()
-    expect(screen.getByText('+1%')).toBeVisible()
-    expect(screen.getByText('+5%')).toBeVisible()
-    expect(screen.getByText('+10%')).toBeVisible()
-    expect(container.firstChild).toMatchSnapshot()
-  })
-
-  it('should render correct subheader with inputCurrency defined, but no price', () => {
-    const { container } = render(
-      <SwapAndLimitContext.Provider value={mockSwapAndLimitContextValue}>
-        <LimitPriceInputPanel />
-      </SwapAndLimitContext.Provider>
-    )
-    expect(screen.getByText('Limit price')).toBeVisible()
-    expect(screen.getByPlaceholderText('0')).toBeVisible()
-    expect(container.firstChild).toMatchSnapshot()
-  })
-
-  it('should render correct subheader with input currency and limit price defined', () => {
-    render(
-      <SwapAndLimitContext.Provider value={mockSwapAndLimitContextValue}>
-        <LimitContext.Provider value={mockLimitContextValue}>
-          <LimitPriceInputPanel />
-        </LimitContext.Provider>
-      </SwapAndLimitContext.Provider>
-    )
-    expect(screen.getByText('DAI')).toBeVisible()
-    expect(screen.getByPlaceholderText('0')).toBeVisible()
-  })
-
-  it('should render the output currency when defined', () => {
-    const { container } = render(
-      <SwapAndLimitContext.Provider
-        value={{
-          ...mockSwapAndLimitContextValue,
-          currencyState: {
-            ...mockSwapAndLimitContextValue.currencyState,
-            outputCurrency: USDC_MAINNET,
-          },
-        }}
-      >
-        <LimitContext.Provider value={mockLimitContextValue}>
-          <LimitPriceInputPanel />
-        </LimitContext.Provider>
-      </SwapAndLimitContext.Provider>
-    )
-    expect(screen.getByText('DAI')).toBeVisible() // subheader
-    expect(container.querySelector('.token-symbol-container')).toHaveTextContent('USDC')
-    expect(screen.getByPlaceholderText('0')).toBeVisible()
-  })
-})
diff --git a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputPanel.tsx b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputPanel.tsx
deleted file mode 100644
index 7341537341a..00000000000
--- a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputPanel.tsx
+++ /dev/null
@@ -1,195 +0,0 @@
-import { Currency, CurrencyAmount, Fraction, Price } from '@uniswap/sdk-core'
-import { InputPanel } from 'components/CurrencyInputPanel/SwapCurrencyInputPanel'
-import CurrencyLogo from 'components/Logo/CurrencyLogo'
-import { StyledNumericalInput } from 'components/NumericalInput'
-import Row from 'components/Row'
-import { parseUnits } from 'ethers/lib/utils'
-import JSBI from 'jsbi'
-import { useCallback, useMemo } from 'react'
-import { useLimitContext, useLimitPrice } from 'state/limit/LimitContext'
-import { useSwapAndLimitContext } from 'state/swap/SwapContext'
-import styled from 'styled-components'
-import { ThemedText } from 'theme/components'
-import { NumberType, useFormatter } from 'utils/formatNumbers'
-
-import { formatCurrencySymbol } from '../utils'
-import { LimitCustomMarketPriceButton, LimitPresetPriceButton } from './LimitPriceButton'
-import { LimitPriceIncrementButtons } from './LimitPriceIncrementButtons'
-import { LimitPriceInputLabel } from './LimitPriceInputLabel'
-
-const OutputCurrencyContainer = styled(Row)`
-  user-select: none;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-`
-
-const TextInputRow = styled.div`
-  display: flex;
-  flex-grow: 1;
-`
-
-const PRICE_ADJUSTMENT_PRESETS = [1, 5, 10]
-
-export function LimitPriceInputPanel() {
-  const { limitPrice, setLimitPrice } = useLimitPrice()
-  const {
-    derivedLimitInfo: { parsedLimitPrice, marketPrice },
-    setLimitState,
-  } = useLimitContext()
-
-  const {
-    currencyState: { inputCurrency, outputCurrency },
-  } = useSwapAndLimitContext()
-
-  const { formatCurrencyAmount } = useFormatter()
-
-  const oneUnitOfInputCurrency: CurrencyAmount<Currency> | undefined = useMemo(() => {
-    if (!inputCurrency) return undefined
-    return CurrencyAmount.fromRawAmount(inputCurrency, JSBI.BigInt(parseUnits('1', inputCurrency?.decimals)))
-  }, [inputCurrency])
-
-  const formattedLimitPriceOutputAmount: string = useMemo(() => {
-    // If the user has manually typed in a limit price, use that.
-    if (limitPrice) return limitPrice
-    // Otherwise, use parsedLimitPrice which may have been calculated from input/output amounts.
-    if (!inputCurrency) return ''
-    return formatCurrencyAmount({
-      amount: parsedLimitPrice?.quote(CurrencyAmount.fromRawAmount(inputCurrency, 1)),
-      type: NumberType.SwapTradeAmount,
-      placeholder: '',
-    })
-  }, [limitPrice, inputCurrency, formatCurrencyAmount, parsedLimitPrice])
-
-  const adjustedPrices = useMemo(() => {
-    if (!marketPrice || !inputCurrency || !oneUnitOfInputCurrency || !outputCurrency) return undefined
-    const getAdjustedPrice = (priceAdjustmentPercentage: number) => {
-      return new Price({
-        // 100 input token
-        baseAmount: CurrencyAmount.fromRawAmount(inputCurrency, JSBI.BigInt(parseUnits('100', inputCurrency.decimals))),
-        // (100 + adjustmentPercentage) times the market quote amount for 1 input token
-        quoteAmount: CurrencyAmount.fromRawAmount(
-          outputCurrency,
-          JSBI.multiply(
-            JSBI.BigInt(100 + priceAdjustmentPercentage),
-            marketPrice.quote(oneUnitOfInputCurrency).quotient
-          )
-        ),
-      })
-    }
-    return {
-      1: getAdjustedPrice(1),
-      5: getAdjustedPrice(5),
-      10: getAdjustedPrice(10),
-    }
-  }, [marketPrice, inputCurrency, oneUnitOfInputCurrency, outputCurrency])
-
-  const onePercentOfMarketPrice: CurrencyAmount<Currency> | undefined = useMemo(() => {
-    if (!marketPrice || !oneUnitOfInputCurrency || !outputCurrency) return undefined
-    const marketQuote = marketPrice.quote(oneUnitOfInputCurrency).quotient
-    return CurrencyAmount.fromRawAmount(outputCurrency, JSBI.divide(marketQuote, JSBI.BigInt(100)))
-  }, [oneUnitOfInputCurrency, marketPrice, outputCurrency])
-
-  const currentPriceAdjustment: number | undefined = useMemo(() => {
-    if (!parsedLimitPrice || !marketPrice || !oneUnitOfInputCurrency || !outputCurrency) return undefined
-    const marketQuote = marketPrice.quote(oneUnitOfInputCurrency).quotient
-    const parsedPriceQuote = parsedLimitPrice.quote(oneUnitOfInputCurrency).quotient
-    const difference = JSBI.subtract(parsedPriceQuote, marketQuote)
-    const percentageChange = new Fraction(difference, marketQuote)
-
-    return Number(percentageChange.multiply(100).toFixed(2))
-  }, [oneUnitOfInputCurrency, outputCurrency, marketPrice, parsedLimitPrice])
-
-  const onSelectLimitPrice = useCallback(
-    (adjustedPrice: Price<Currency, Currency> | undefined) => {
-      if (!oneUnitOfInputCurrency) return
-      const marketOutputAmount = adjustedPrice?.quote(oneUnitOfInputCurrency)
-      setLimitPrice(
-        formatCurrencyAmount({
-          amount: marketOutputAmount,
-          type: NumberType.SwapTradeAmount,
-          placeholder: limitPrice,
-        })
-      )
-      setLimitState((prev) => ({ ...prev, limitPriceEdited: true }))
-    },
-    [formatCurrencyAmount, limitPrice, oneUnitOfInputCurrency, setLimitPrice, setLimitState]
-  )
-
-  return (
-    <InputPanel>
-      <LimitPriceInputLabel currency={inputCurrency} showCurrencyMessage={!!formattedLimitPriceOutputAmount} />
-      <TextInputRow>
-        <StyledNumericalInput
-          disabled={!(inputCurrency && outputCurrency)}
-          className="limit-price-input"
-          value={formattedLimitPriceOutputAmount}
-          onUserInput={setLimitPrice}
-          $loading={false}
-        />
-        {outputCurrency && (
-          <OutputCurrencyContainer gap="xs" width="unset">
-            <CurrencyLogo currency={outputCurrency} size="16px" />
-            <ThemedText.BodyPrimary className="token-symbol-container">
-              {formatCurrencySymbol(outputCurrency)}
-            </ThemedText.BodyPrimary>
-          </OutputCurrencyContainer>
-        )}
-      </TextInputRow>
-      <Row marginTop="8px" justify="space-between">
-        <Row gap="sm">
-          <LimitCustomMarketPriceButton
-            key="limit-price-market"
-            customAdjustmentPercentage={
-              currentPriceAdjustment !== undefined &&
-              currentPriceAdjustment !== 0 &&
-              !PRICE_ADJUSTMENT_PRESETS.includes(currentPriceAdjustment)
-                ? currentPriceAdjustment
-                : undefined
-            }
-            disabled={!inputCurrency || !outputCurrency}
-            selected={Boolean(
-              currentPriceAdjustment !== undefined && !PRICE_ADJUSTMENT_PRESETS.includes(currentPriceAdjustment)
-            )}
-            onSelect={() => onSelectLimitPrice(marketPrice)}
-          />
-          {PRICE_ADJUSTMENT_PRESETS.map((adjustmentPercentage) => {
-            const adjustedPrice = adjustedPrices?.[adjustmentPercentage as keyof typeof adjustedPrices]
-            return (
-              <LimitPresetPriceButton
-                key={`limit-price-${adjustmentPercentage}`}
-                priceAdjustmentPercentage={adjustmentPercentage}
-                disabled={!inputCurrency || !outputCurrency || !marketPrice}
-                // TODO (WEB-3416): give this equality check some small +- threshold
-                selected={currentPriceAdjustment === adjustmentPercentage}
-                onSelect={() => onSelectLimitPrice(adjustedPrice)}
-              />
-            )
-          })}
-        </Row>
-        {parsedLimitPrice && onePercentOfMarketPrice && oneUnitOfInputCurrency && (
-          <LimitPriceIncrementButtons
-            onIncrement={() => {
-              setLimitPrice(
-                formatCurrencyAmount({
-                  amount: parsedLimitPrice?.quote(oneUnitOfInputCurrency).add(onePercentOfMarketPrice),
-                  type: NumberType.SwapTradeAmount,
-                  placeholder: limitPrice,
-                })
-              )
-            }}
-            onDecrement={() => {
-              setLimitPrice(
-                formatCurrencyAmount({
-                  amount: parsedLimitPrice?.quote(oneUnitOfInputCurrency).subtract(onePercentOfMarketPrice),
-                  type: NumberType.SwapTradeAmount,
-                  placeholder: limitPrice,
-                })
-              )
-            }}
-          />
-        )}
-      </Row>
-    </InputPanel>
-  )
-}
diff --git a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/__snapshots__/LimitPriceButton.test.tsx.snap b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/__snapshots__/LimitPriceButton.test.tsx.snap
deleted file mode 100644
index 6189d3897ed..00000000000
--- a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/__snapshots__/LimitPriceButton.test.tsx.snap
+++ /dev/null
@@ -1,581 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`LimitCustomMarketPriceButton renders the custom amount correctly 1`] = `
-.c0 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: unset;
-}
-
-.c1 {
-  width: unset;
-  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: 1px;
-}
-
-.c3 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c2 {
-  background-color: #22222212;
-  color: #222222;
-  padding: 2px 8px;
-  height: 24px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #22222212;
-  border-radius: 999px 0px 0px 999px;
-  border-top: 1px solid #22222212;
-  border-bottom: 1px solid #22222212;
-  border-left: 1px solid #22222212;
-  border-right: 1px solid transparent;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c2:hover {
-  opacity: 0.6;
-}
-
-.c2:active {
-  opacity: 0.4;
-}
-
-.c4 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  background-color: #22222212;
-  color: #7D7D7D;
-  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;
-  text-align: center;
-  padding: 6px 6px 6px 4px;
-  height: 24px;
-  border-radius: 0px 999px 999px 0px;
-  border-top: 1px solid #22222212;
-  border-bottom: 1px solid #22222212;
-  border-right: 1px solid #22222212;
-  border-left: 1px solid transparent;
-}
-
-.c4:hover {
-  opacity: 0.6;
-}
-
-.c4:active {
-  opacity: 0.4;
-}
-
-<div
-  class="c0 c1"
-  width="unset"
->
-  <button
-    class="c2"
-  >
-    <div
-      class="c3 css-142zc9n"
-    >
-      +
-      10%
-    </div>
-  </button>
-  <button
-    class="c4"
-  >
-    <svg
-      fill="none"
-      height="12"
-      stroke="currentColor"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-      stroke-width="2"
-      viewBox="0 0 24 24"
-      width="12"
-      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>
-  </button>
-</div>
-`;
-
-exports[`LimitCustomMarketPriceButton renders the custom amount correctly, negative change 1`] = `
-.c0 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: unset;
-}
-
-.c1 {
-  width: unset;
-  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: 1px;
-}
-
-.c3 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c2 {
-  background-color: #22222212;
-  color: #222222;
-  padding: 2px 8px;
-  height: 24px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #22222212;
-  border-radius: 999px 0px 0px 999px;
-  border-top: 1px solid #22222212;
-  border-bottom: 1px solid #22222212;
-  border-left: 1px solid #22222212;
-  border-right: 1px solid transparent;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c2:hover {
-  opacity: 0.6;
-}
-
-.c2:active {
-  opacity: 0.4;
-}
-
-.c4 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  background-color: #22222212;
-  color: #7D7D7D;
-  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;
-  text-align: center;
-  padding: 6px 6px 6px 4px;
-  height: 24px;
-  border-radius: 0px 999px 999px 0px;
-  border-top: 1px solid #22222212;
-  border-bottom: 1px solid #22222212;
-  border-right: 1px solid #22222212;
-  border-left: 1px solid transparent;
-}
-
-.c4:hover {
-  opacity: 0.6;
-}
-
-.c4:active {
-  opacity: 0.4;
-}
-
-<div
-  class="c0 c1"
-  width="unset"
->
-  <button
-    class="c2"
-  >
-    <div
-      class="c3 css-142zc9n"
-    >
-      -10%
-    </div>
-  </button>
-  <button
-    class="c4"
-  >
-    <svg
-      fill="none"
-      height="12"
-      stroke="currentColor"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-      stroke-width="2"
-      viewBox="0 0 24 24"
-      width="12"
-      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>
-  </button>
-</div>
-`;
-
-exports[`LimitPresetPriceButton renders 0 correctly, disabled false and selected false 1`] = `
-.c0 {
-  background-color: unset;
-  color: #7D7D7D;
-  padding: 2px 8px;
-  height: 24px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: transparent;
-  border-radius: 999px;
-  border: 1px solid #22222212;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c0:hover {
-  opacity: 0.6;
-}
-
-.c0:active {
-  opacity: 0.4;
-}
-
-<button
-  class="c0"
->
-  Current
-</button>
-`;
-
-exports[`LimitPresetPriceButton renders 0 correctly, disabled false and selected true 1`] = `
-.c0 {
-  background-color: unset;
-  color: #222222;
-  padding: 2px 8px;
-  height: 24px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #22222212;
-  border-radius: 999px;
-  border: 1px solid #22222212;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c0:hover {
-  opacity: 0.6;
-}
-
-.c0:active {
-  opacity: 0.4;
-}
-
-<button
-  class="c0"
->
-  Current
-</button>
-`;
-
-exports[`LimitPresetPriceButton renders 0 correctly, disabled true and selected false 1`] = `
-.c0 {
-  background-color: unset;
-  color: #7D7D7D;
-  padding: 2px 8px;
-  height: 24px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: transparent;
-  border-radius: 999px;
-  border: 1px solid #22222212;
-}
-
-<button
-  class="c0"
->
-  Current
-</button>
-`;
-
-exports[`LimitPresetPriceButton renders 5 correctly, disabled false and selected true 1`] = `
-.c1 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c0 {
-  background-color: unset;
-  color: #222222;
-  padding: 2px 8px;
-  height: 24px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #22222212;
-  border-radius: 999px;
-  border: 1px solid #22222212;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c0:hover {
-  opacity: 0.6;
-}
-
-.c0:active {
-  opacity: 0.4;
-}
-
-<button
-  class="c0"
->
-  <div
-    class="c1 css-142zc9n"
-  >
-    +
-    5%
-  </div>
-</button>
-`;
-
-exports[`LimitPresetPriceButton renders 5 correctly, disabled true and selected false 1`] = `
-.c1 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c0 {
-  background-color: unset;
-  color: #7D7D7D;
-  padding: 2px 8px;
-  height: 24px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: transparent;
-  border-radius: 999px;
-  border: 1px solid #22222212;
-}
-
-<button
-  class="c0"
->
-  <div
-    class="c1 css-142zc9n"
-  >
-    +
-    5%
-  </div>
-</button>
-`;
-
-exports[`LimitPresetPriceButton renders 10 correctly, disabled false and selected true 1`] = `
-.c1 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c0 {
-  background-color: unset;
-  color: #222222;
-  padding: 2px 8px;
-  height: 24px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #22222212;
-  border-radius: 999px;
-  border: 1px solid #22222212;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c0:hover {
-  opacity: 0.6;
-}
-
-.c0:active {
-  opacity: 0.4;
-}
-
-<button
-  class="c0"
->
-  <div
-    class="c1 css-142zc9n"
-  >
-    +
-    10%
-  </div>
-</button>
-`;
diff --git a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/__snapshots__/LimitPriceInputPanel.test.tsx.snap b/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/__snapshots__/LimitPriceInputPanel.test.tsx.snap
deleted file mode 100644
index 755fd43390a..00000000000
--- a/apps/web/src/components/CurrencyInputPanel/LimitPriceInputPanel/__snapshots__/LimitPriceInputPanel.test.tsx.snap
+++ /dev/null
@@ -1,545 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`LimitPriceInputPanel should render correct subheader with inputCurrency defined, but no price 1`] = `
-.c5 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  margin-top: 8px;
-}
-
-.c7 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c9 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: unset;
-}
-
-.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: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.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: 8px;
-}
-
-.c10 {
-  width: unset;
-  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: 1px;
-}
-
-.c1 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c3 {
-  color: #222222;
-  pointer-events: none;
-  width: 0;
-  position: relative;
-  font-weight: 485;
-  outline: none;
-  border: none;
-  -webkit-flex: 1 1 auto;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-  background-color: transparent;
-  font-size: 28px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 0px;
-  -webkit-appearance: textfield;
-  text-align: right;
-}
-
-.c3::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-.c3 [type='number'] {
-  -moz-appearance: textfield;
-}
-
-.c3::-webkit-outer-spin-button,
-.c3::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-}
-
-.c3::-webkit-input-placeholder {
-  color: #CECECE;
-}
-
-.c3::-moz-placeholder {
-  color: #CECECE;
-}
-
-.c3:-ms-input-placeholder {
-  color: #CECECE;
-}
-
-.c3::placeholder {
-  color: #CECECE;
-}
-
-.c4 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-  text-align: left;
-  font-size: 36px;
-  font-weight: 485;
-  max-height: 44px;
-}
-
-.c0 {
-  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;
-  position: relative;
-  border-radius: 20px;
-  z-index: 1;
-  width: initial;
-  -webkit-transition: height 1s ease;
-  transition: height 1s ease;
-  will-change: height;
-}
-
-.c11 {
-  background-color: unset;
-  color: #7D7D7D;
-  padding: 2px 8px;
-  height: 24px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: transparent;
-  border-radius: 999px;
-  border: 1px solid #22222212;
-}
-
-.c2 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
-<div
-  class="c0"
->
-  <div
-    class="c1 css-142zc9n"
-    style="user-select: none;"
-  >
-    Limit price
-  </div>
-  <div
-    class="c2"
-  >
-    <input
-      autocomplete="off"
-      autocorrect="off"
-      class="c3 c4 limit-price-input"
-      disabled=""
-      inputmode="decimal"
-      maxlength="79"
-      minlength="1"
-      pattern="^[0-9]*[.,]?[0-9]*$"
-      placeholder="0"
-      spellcheck="false"
-      type="text"
-      value=""
-    />
-  </div>
-  <div
-    class="c5 c6"
-  >
-    <div
-      class="c7 c8"
-    >
-      <div
-        class="c9 c10"
-        width="unset"
-      >
-        <button
-          class="c11"
-        >
-          Current
-        </button>
-      </div>
-      <button
-        class="c11"
-      >
-        <div
-          class="c1 css-142zc9n"
-        >
-          +
-          1%
-        </div>
-      </button>
-      <button
-        class="c11"
-      >
-        <div
-          class="c1 css-142zc9n"
-        >
-          +
-          5%
-        </div>
-      </button>
-      <button
-        class="c11"
-      >
-        <div
-          class="c1 css-142zc9n"
-        >
-          +
-          10%
-        </div>
-      </button>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`LimitPriceInputPanel should render the component with no currencies selected 1`] = `
-.c5 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  margin-top: 8px;
-}
-
-.c7 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c9 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: unset;
-}
-
-.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: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.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: 8px;
-}
-
-.c10 {
-  width: unset;
-  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: 1px;
-}
-
-.c1 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c3 {
-  color: #222222;
-  pointer-events: none;
-  width: 0;
-  position: relative;
-  font-weight: 485;
-  outline: none;
-  border: none;
-  -webkit-flex: 1 1 auto;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-  background-color: transparent;
-  font-size: 28px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 0px;
-  -webkit-appearance: textfield;
-  text-align: right;
-}
-
-.c3::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-.c3 [type='number'] {
-  -moz-appearance: textfield;
-}
-
-.c3::-webkit-outer-spin-button,
-.c3::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-}
-
-.c3::-webkit-input-placeholder {
-  color: #CECECE;
-}
-
-.c3::-moz-placeholder {
-  color: #CECECE;
-}
-
-.c3:-ms-input-placeholder {
-  color: #CECECE;
-}
-
-.c3::placeholder {
-  color: #CECECE;
-}
-
-.c4 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-  text-align: left;
-  font-size: 36px;
-  font-weight: 485;
-  max-height: 44px;
-}
-
-.c0 {
-  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;
-  position: relative;
-  border-radius: 20px;
-  z-index: 1;
-  width: initial;
-  -webkit-transition: height 1s ease;
-  transition: height 1s ease;
-  will-change: height;
-}
-
-.c11 {
-  background-color: unset;
-  color: #7D7D7D;
-  padding: 2px 8px;
-  height: 24px;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: transparent;
-  border-radius: 999px;
-  border: 1px solid #22222212;
-}
-
-.c2 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-}
-
-<div
-  class="c0"
->
-  <div
-    class="c1 css-142zc9n"
-    style="user-select: none;"
-  >
-    Limit price
-  </div>
-  <div
-    class="c2"
-  >
-    <input
-      autocomplete="off"
-      autocorrect="off"
-      class="c3 c4 limit-price-input"
-      disabled=""
-      inputmode="decimal"
-      maxlength="79"
-      minlength="1"
-      pattern="^[0-9]*[.,]?[0-9]*$"
-      placeholder="0"
-      spellcheck="false"
-      type="text"
-      value=""
-    />
-  </div>
-  <div
-    class="c5 c6"
-  >
-    <div
-      class="c7 c8"
-    >
-      <div
-        class="c9 c10"
-        width="unset"
-      >
-        <button
-          class="c11"
-        >
-          Current
-        </button>
-      </div>
-      <button
-        class="c11"
-      >
-        <div
-          class="c1 css-142zc9n"
-        >
-          +
-          1%
-        </div>
-      </button>
-      <button
-        class="c11"
-      >
-        <div
-          class="c1 css-142zc9n"
-        >
-          +
-          5%
-        </div>
-      </button>
-      <button
-        class="c11"
-      >
-        <div
-          class="c1 css-142zc9n"
-        >
-          +
-          10%
-        </div>
-      </button>
-    </div>
-  </div>
-</div>
-`;
diff --git a/apps/web/src/components/CurrencyInputPanel/SwapCurrencyInputPanel.tsx b/apps/web/src/components/CurrencyInputPanel/SwapCurrencyInputPanel.tsx
index dd2f9d59dc4..473db288501 100644
--- a/apps/web/src/components/CurrencyInputPanel/SwapCurrencyInputPanel.tsx
+++ b/apps/web/src/components/CurrencyInputPanel/SwapCurrencyInputPanel.tsx
@@ -5,32 +5,30 @@ import { Pair } from '@uniswap/v2-sdk'
 import { useWeb3React } from '@web3-react/core'
 import { TraceEvent } from 'analytics'
 import { AutoColumn } from 'components/Column'
-import { LoadingOpacityContainer } from 'components/Loader/styled'
+import { LoadingOpacityContainer, loadingOpacityMixin } from 'components/Loader/styled'
 import CurrencyLogo from 'components/Logo/CurrencyLogo'
-import { StyledNumericalInput } from 'components/NumericalInput'
 import PrefetchBalancesWrapper from 'components/PrefetchBalancesWrapper/PrefetchBalancesWrapper'
 import Tooltip from 'components/Tooltip'
 import { isSupportedChain } from 'constants/chains'
 import ms from 'ms'
 import { darken } from 'polished'
-import { ReactNode, forwardRef, useCallback, useEffect, useState } from 'react'
+import { forwardRef, ReactNode, useCallback, useEffect, useState } from 'react'
 import { Lock } from 'react-feather'
 import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { flexColumnNoWrap, flexRowNoWrap } from 'theme/styles'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
-import { CurrencySearchFilters } from 'components/SearchModal/CurrencySearch'
 import { ReactComponent as DropDown } from '../../assets/images/dropdown.svg'
 import { useCurrencyBalance } from '../../state/connection/hooks'
 import { ButtonGray } from '../Button'
 import DoubleCurrencyLogo from '../DoubleLogo'
+import { Input as NumericalInput } from '../NumericalInput'
 import { RowBetween, RowFixed } from '../Row'
 import CurrencySearchModal from '../SearchModal/CurrencySearchModal'
 import { FiatValue } from './FiatValue'
-import { formatCurrencySymbol } from './utils'
 
-export const InputPanel = styled.div<{ hideInput?: boolean }>`
+const InputPanel = styled.div<{ hideInput?: boolean }>`
   ${flexColumnNoWrap};
   position: relative;
   border-radius: ${({ hideInput }) => (hideInput ? '16px' : '20px')};
@@ -67,7 +65,7 @@ const CurrencySelect = styled(ButtonGray)<{
   align-items: center;
   background-color: ${({ selected, theme }) => (selected ? theme.surface1 : theme.accent1)};
   opacity: ${({ disabled }) => (!disabled ? 1 : 0.4)};
-  color: ${({ selected, theme }) => (selected ? theme.neutral1 : theme.neutralContrast)};
+  color: ${({ selected, theme }) => (selected ? theme.neutral1 : theme.white)};
   cursor: pointer;
   height: 36px;
   border-radius: 18px;
@@ -178,7 +176,7 @@ const StyledDropDown = styled(DropDown)<{ selected: boolean }>`
   margin-left: 8px;
 
   path {
-    stroke: ${({ selected, theme }) => (selected ? theme.neutral1 : theme.neutralContrast)};
+    stroke: ${({ selected, theme }) => (selected ? theme.neutral1 : theme.white)};
     stroke-width: 2px;
   }
 `
@@ -209,6 +207,14 @@ const StyledBalanceMax = styled.button<{ disabled?: boolean }>`
   }
 `
 
+const StyledNumericalInput = styled(NumericalInput)<{ $loading: boolean }>`
+  ${loadingOpacityMixin};
+  text-align: left;
+  font-size: 36px;
+  font-weight: 485;
+  max-height: 44px;
+`
+
 interface SwapCurrencyInputPanelProps {
   value: string
   onUserInput: (value: string) => void
@@ -224,11 +230,13 @@ interface SwapCurrencyInputPanelProps {
   fiatValue?: { data?: number; isLoading: boolean }
   priceImpact?: Percent
   id: string
+  showCommonBases?: boolean
+  showCurrencyAmount?: boolean
+  disableNonToken?: boolean
   renderBalance?: (amount: CurrencyAmount<Currency>) => ReactNode
   locked?: boolean
   loading?: boolean
   disabled?: boolean
-  currencySearchFilters?: CurrencySearchFilters
   numericalInputSettings?: {
     disabled?: boolean
     onDisabledClick?: () => void
@@ -247,6 +255,9 @@ const SwapCurrencyInputPanel = forwardRef<HTMLInputElement, SwapCurrencyInputPan
       currency,
       otherCurrency,
       id,
+      showCommonBases,
+      showCurrencyAmount,
+      disableNonToken,
       renderBalance,
       fiatValue,
       priceImpact,
@@ -256,7 +267,6 @@ const SwapCurrencyInputPanel = forwardRef<HTMLInputElement, SwapCurrencyInputPan
       locked = false,
       loading = false,
       disabled = false,
-      currencySearchFilters,
       numericalInputSettings,
       label,
       ...rest
@@ -354,7 +364,11 @@ const SwapCurrencyInputPanel = forwardRef<HTMLInputElement, SwapCurrencyInputPan
                           className="token-symbol-container"
                           active={Boolean(currency && currency.symbol)}
                         >
-                          {currency ? formatCurrencySymbol(currency) : <Trans>Select token</Trans>}
+                          {(currency && currency.symbol && currency.symbol.length > 20
+                            ? currency.symbol.slice(0, 4) +
+                              '...' +
+                              currency.symbol.slice(currency.symbol.length - 5, currency.symbol.length)
+                            : currency?.symbol) || <Trans>Select token</Trans>}
                         </StyledTokenName>
                       )}
                     </RowFixed>
@@ -421,7 +435,9 @@ const SwapCurrencyInputPanel = forwardRef<HTMLInputElement, SwapCurrencyInputPan
             onCurrencySelect={onCurrencySelect}
             selectedCurrency={currency}
             otherSelectedCurrency={otherCurrency}
-            currencySearchFilters={currencySearchFilters}
+            showCommonBases={showCommonBases}
+            showCurrencyAmount={showCurrencyAmount}
+            disableNonToken={disableNonToken}
           />
         )}
       </InputPanel>
diff --git a/apps/web/src/components/CurrencyInputPanel/index.tsx b/apps/web/src/components/CurrencyInputPanel/index.tsx
index cccfdc81f7d..a5cc8549730 100644
--- a/apps/web/src/components/CurrencyInputPanel/index.tsx
+++ b/apps/web/src/components/CurrencyInputPanel/index.tsx
@@ -15,7 +15,6 @@ import { ThemedText } from 'theme/components'
 import { flexColumnNoWrap, flexRowNoWrap } from 'theme/styles'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
-import { CurrencySearchFilters } from 'components/SearchModal/CurrencySearch'
 import { ReactComponent as DropDown } from '../../assets/images/dropdown.svg'
 import { useCurrencyBalance } from '../../state/connection/hooks'
 import { ButtonGray } from '../Button'
@@ -186,11 +185,12 @@ interface CurrencyInputPanelProps {
   otherCurrency?: Currency | null
   fiatValue?: { data?: number; isLoading: boolean }
   id: string
+  showCommonBases?: boolean
   showCurrencyAmount?: boolean
+  disableNonToken?: boolean
   renderBalance?: (amount: CurrencyAmount<Currency>) => ReactNode
   locked?: boolean
   loading?: boolean
-  currencySearchFilters?: CurrencySearchFilters
 }
 
 export default function CurrencyInputPanel({
@@ -202,8 +202,9 @@ export default function CurrencyInputPanel({
   currency,
   otherCurrency,
   id,
-  currencySearchFilters,
+  showCommonBases,
   showCurrencyAmount,
+  disableNonToken,
   renderBalance,
   fiatValue,
   hideBalance = false,
@@ -338,8 +339,9 @@ export default function CurrencyInputPanel({
           onCurrencySelect={onCurrencySelect}
           selectedCurrency={currency}
           otherSelectedCurrency={otherCurrency}
+          showCommonBases={showCommonBases}
           showCurrencyAmount={showCurrencyAmount}
-          currencySearchFilters={currencySearchFilters}
+          disableNonToken={disableNonToken}
         />
       )}
     </InputPanel>
diff --git a/apps/web/src/components/CurrencyInputPanel/utils.test.ts b/apps/web/src/components/CurrencyInputPanel/utils.test.ts
deleted file mode 100644
index 699788be3e1..00000000000
--- a/apps/web/src/components/CurrencyInputPanel/utils.test.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { ChainId, Token } from '@uniswap/sdk-core'
-import { DAI } from 'constants/tokens'
-
-import { formatCurrencySymbol } from './utils'
-
-describe('formatCurrencySymbol', () => {
-  it('should return undefined if currency is undefined', () => {
-    expect(formatCurrencySymbol(undefined)).toBeUndefined()
-  })
-  it('should return DAI for DAI', () => {
-    expect(formatCurrencySymbol(DAI)).toEqual('DAI')
-  })
-  it('should return a truncated symbol if its long', () => {
-    const daiWithLongSymbol = new Token(ChainId.MAINNET, DAI.address, DAI.decimals, DAI.symbol?.repeat(10))
-    expect(formatCurrencySymbol(daiWithLongSymbol)).toEqual('DAID...AIDAI')
-  })
-})
diff --git a/apps/web/src/components/CurrencyInputPanel/utils.ts b/apps/web/src/components/CurrencyInputPanel/utils.ts
deleted file mode 100644
index a06f5b28ed2..00000000000
--- a/apps/web/src/components/CurrencyInputPanel/utils.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { Currency } from '@uniswap/sdk-core'
-
-export function formatCurrencySymbol(currency?: Currency): string | undefined {
-  return currency && currency.symbol && currency.symbol.length > 20
-    ? currency.symbol.slice(0, 4) + '...' + currency.symbol.slice(currency.symbol.length - 5, currency.symbol.length)
-    : currency?.symbol
-}
diff --git a/apps/web/src/components/Dialog/Dialog.test.tsx b/apps/web/src/components/Dialog/Dialog.test.tsx
deleted file mode 100644
index 45e06482efb..00000000000
--- a/apps/web/src/components/Dialog/Dialog.test.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-import '@testing-library/jest-dom/extend-expect'
-
-import { Dialog, DialogButtonType } from 'components/Dialog/Dialog'
-import { fireEvent, render, screen } from 'test-utils/render'
-
-const mockIcon = <div>Mock Icon</div>
-const mockTitle = <div>Mock Title</div>
-const mockDescription = <div>Mock Description</div>
-const mockBody = <div>Mock Body</div>
-
-const mockOnCancel = jest.fn()
-const mockLeftClick = jest.fn()
-const mockRightClick = jest.fn()
-
-const mockButtonsConfig = {
-  left: {
-    title: <div>Left Button</div>,
-    onClick: mockLeftClick,
-  },
-  right: {
-    title: <div>Right Button</div>,
-    onClick: mockRightClick,
-  },
-}
-
-describe('<Dialog />', () => {
-  it('renders the Dialog component correctly', () => {
-    render(
-      <Dialog
-        isVisible={true}
-        icon={mockIcon}
-        title={mockTitle}
-        description={mockDescription}
-        body={mockBody}
-        onCancel={mockOnCancel}
-        buttonsConfig={mockButtonsConfig}
-      />
-    )
-
-    expect(document.body).toMatchSnapshot()
-
-    expect(screen.getByText('Mock Icon')).toBeInTheDocument()
-    expect(screen.getByText('Mock Title')).toBeInTheDocument()
-    expect(screen.getByText('Mock Description')).toBeInTheDocument()
-    expect(screen.getByText('Mock Body')).toBeInTheDocument()
-    expect(screen.getByText('Left Button')).toBeInTheDocument()
-    expect(screen.getByText('Right Button')).toBeInTheDocument()
-  })
-
-  it('handles cancel button click', () => {
-    render(
-      <Dialog
-        isVisible={true}
-        icon={mockIcon}
-        title={mockTitle}
-        description={mockDescription}
-        body={mockBody}
-        onCancel={mockOnCancel}
-        buttonsConfig={mockButtonsConfig}
-      />
-    )
-
-    fireEvent.click(screen.getByTestId('Dialog-closeButton'))
-    expect(mockOnCancel).toHaveBeenCalled()
-  })
-
-  it('handles left button click', () => {
-    render(
-      <Dialog
-        isVisible={true}
-        icon={mockIcon}
-        title={mockTitle}
-        description={mockDescription}
-        body={mockBody}
-        onCancel={mockOnCancel}
-        buttonsConfig={mockButtonsConfig}
-      />
-    )
-
-    fireEvent.click(screen.getByText('Left Button'))
-    expect(mockLeftClick).toHaveBeenCalled()
-  })
-
-  it('handles right button click', () => {
-    render(
-      <Dialog
-        isVisible={true}
-        icon={mockIcon}
-        title={mockTitle}
-        description={mockDescription}
-        body={mockBody}
-        onCancel={mockOnCancel}
-        buttonsConfig={mockButtonsConfig}
-      />
-    )
-
-    fireEvent.click(screen.getByText('Right Button'))
-    expect(mockRightClick).toHaveBeenCalled()
-  })
-
-  it('renders no buttons if not provided', () => {
-    render(
-      <Dialog
-        isVisible={true}
-        buttonsConfig={{}}
-        icon={mockIcon}
-        title={mockTitle}
-        description={mockDescription}
-        body={mockBody}
-        onCancel={mockOnCancel}
-      />
-    )
-    expect(screen.queryByText('Left Button')).not.toBeInTheDocument()
-    expect(screen.queryByText('Right Button')).not.toBeInTheDocument()
-  })
-
-  it('renders different button types', () => {
-    render(
-      <Dialog
-        isVisible={true}
-        buttonsConfig={{
-          left: {
-            ...mockButtonsConfig.left,
-            disabled: true,
-          },
-          right: {
-            ...mockButtonsConfig.right,
-            type: DialogButtonType.Error,
-          },
-        }}
-        icon={mockIcon}
-        title={mockTitle}
-        description={mockDescription}
-        body={mockBody}
-        onCancel={mockOnCancel}
-      />
-    )
-
-    expect(document.body).toMatchSnapshot()
-
-    expect(screen.queryByText('Left Button')).toBeInTheDocument()
-    expect(screen.queryByText('Right Button')).toBeInTheDocument()
-  })
-})
diff --git a/apps/web/src/components/Dialog/Dialog.tsx b/apps/web/src/components/Dialog/Dialog.tsx
deleted file mode 100644
index b2cba84f009..00000000000
--- a/apps/web/src/components/Dialog/Dialog.tsx
+++ /dev/null
@@ -1,142 +0,0 @@
-import { ButtonEmphasis, ButtonSize, ThemeButton } from 'components/Button'
-import GetHelp from 'components/Button/GetHelp'
-import { ColumnCenter } from 'components/Column'
-import Modal from 'components/Modal'
-import Row from 'components/Row'
-import { ReactNode } from 'react'
-import styled from 'styled-components'
-import { ClickableStyle, CloseIcon, ThemedText } from 'theme/components'
-
-const Container = styled(ColumnCenter)`
-  background-color: ${({ theme }) => theme.surface1};
-  outline: 1px solid ${({ theme }) => theme.surface3};
-  border-radius: 20px;
-  padding: 16px 24px 24px 24px;
-  width: 100%;
-`
-
-const IconContainer = styled.div`
-  display: flex;
-  background-color: ${({ theme }) => theme.surface3};
-  width: 48px;
-  height: 48px;
-  justify-content: center;
-  align-items: center;
-  border-radius: 12px;
-`
-
-const TitleText = styled(ThemedText.HeadlineMedium)`
-  font-size: 24px;
-  line-height: 32px;
-  text-align: center;
-  font-weight: 500;
-`
-
-const DescriptionText = styled(ThemedText.BodySecondary)`
-  font-size: 16px;
-  font-weight: 500;
-  line-height: 24px;
-  letter-spacing: 0em;
-  text-align: center;
-`
-
-const StyledButton = styled(ThemeButton)`
-  display: flex;
-  flex-grow: 1;
-  height: 40px;
-`
-
-const StyledReviewCloseIcon = styled(CloseIcon)`
-  ${ClickableStyle}
-`
-
-export enum DialogButtonType {
-  Primary = 'primary',
-  Error = 'error',
-}
-
-function getButtonEmphasis(type?: DialogButtonType) {
-  switch (type) {
-    case DialogButtonType.Error:
-      return ButtonEmphasis.destructive
-    default:
-      return ButtonEmphasis.medium
-  }
-}
-
-type ButtonConfig = {
-  type?: DialogButtonType
-  title: ReactNode
-  onClick: () => void
-  disabled?: boolean
-}
-
-type ButtonsConfig = {
-  left?: ButtonConfig
-  right?: ButtonConfig
-}
-
-export interface DialogProps {
-  isVisible: boolean
-  icon: ReactNode
-  title: ReactNode
-  description: ReactNode
-  body?: ReactNode
-  onCancel: () => void
-  buttonsConfig: ButtonsConfig
-}
-
-/**
- * Displays interruptive timely information.
- * Persists until dismissed by user.
- * Appears on top of a scrim.
- *
- * .------------------.
- * |      icon        |
- * |      title       |
- * |    description   |
- * |      body        |
- * |   left | right   |
- *  ------------------
- */
-export function Dialog({ isVisible, buttonsConfig, icon, title, onCancel, description, body }: DialogProps) {
-  const { left, right } = buttonsConfig
-  return (
-    <Modal $scrollOverlay isOpen={isVisible} onDismiss={onCancel}>
-      <Container gap="lg">
-        <Row gap="10px" width="100%" padding="4px 0px" justify="end" align="center">
-          <GetHelp />
-          <StyledReviewCloseIcon data-testid="Dialog-closeButton" onClick={onCancel} />
-        </Row>
-        <ColumnCenter gap="md">
-          <IconContainer>{icon}</IconContainer>
-          <TitleText>{title}</TitleText>
-          <DescriptionText>{description}</DescriptionText>
-          {body}
-        </ColumnCenter>
-        <Row align="center" justify="center" gap="md">
-          {left && (
-            <StyledButton
-              size={ButtonSize.small}
-              onClick={left.onClick}
-              disabled={left.disabled}
-              emphasis={getButtonEmphasis(left.type)}
-            >
-              {left.title}
-            </StyledButton>
-          )}
-          {right && (
-            <StyledButton
-              size={ButtonSize.small}
-              onClick={right.onClick}
-              disabled={right.disabled}
-              emphasis={getButtonEmphasis(right.type)}
-            >
-              {right.title}
-            </StyledButton>
-          )}
-        </Row>
-      </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
deleted file mode 100644
index 8fd42c17367..00000000000
--- a/apps/web/src/components/Dialog/__snapshots__/Dialog.test.tsx.snap
+++ /dev/null
@@ -1,1132 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`<Dialog /> renders different button types 1`] = `
-.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;
-  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;
-}
-
-.c19 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 12px;
-}
-
-.c15 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c17 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c11 {
-  color: #222222;
-  cursor: pointer;
-}
-
-.c7 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c7:hover {
-  opacity: 0.6;
-}
-
-.c7:active {
-  opacity: 0.4;
-}
-
-.c23 {
-  background-color: transparent;
-  bottom: 0;
-  border-radius: inherit;
-  height: 100%;
-  left: 0;
-  position: absolute;
-  right: 0;
-  top: 0;
-  -webkit-transition: 150ms ease background-color;
-  transition: 150ms ease background-color;
-  width: 100%;
-}
-
-.c20 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #22222212;
-  border-radius: 16px;
-  border: 0;
-  color: #222222;
-  cursor: pointer;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  font-size: 14px;
-  font-weight: 535;
-  gap: 12px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  line-height: 16px;
-  padding: 8px;
-  position: relative;
-  -webkit-transition: 150ms ease opacity;
-  transition: 150ms ease opacity;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c20:active .c22 {
-  background-color: #B8C0DC3d;
-}
-
-.c20:focus .c22 {
-  background-color: #B8C0DC3d;
-}
-
-.c20:hover .c22 {
-  background-color: #98A1C014;
-}
-
-.c20:disabled {
-  cursor: default;
-  opacity: 0.6;
-}
-
-.c20:disabled:active .c22,
-.c20:disabled:focus .c22,
-.c20:disabled:hover .c22 {
-  background-color: transparent;
-}
-
-.c24 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #FF5F52;
-  border-radius: 16px;
-  border: 0;
-  color: #222222;
-  cursor: pointer;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  font-size: 14px;
-  font-weight: 535;
-  gap: 12px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  line-height: 16px;
-  padding: 8px;
-  position: relative;
-  -webkit-transition: 150ms ease opacity;
-  transition: 150ms ease opacity;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c24:active .c22 {
-  background-color: #B8C0DC3d;
-}
-
-.c24:focus .c22 {
-  background-color: #B8C0DC3d;
-}
-
-.c24:hover .c22 {
-  background-color: #98A1C014;
-}
-
-.c24:disabled {
-  cursor: default;
-  opacity: 0.6;
-}
-
-.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 6px;
-  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;
-}
-
-.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;
-}
-
-.c3 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c0 {
-  will-change: transform,opacity;
-}
-
-.c0[data-reach-dialog-overlay] {
-  z-index: 1040;
-  background-color: transparent;
-  overflow: hidden;
-  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;
-  overflow-y: scroll;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  background-color: rgba(0,0,0,0.60);
-}
-
-.c1 {
-  overflow-y: auto;
-}
-
-.c1[data-reach-dialog-content] {
-  margin: auto;
-  background-color: #F9F9F9;
-  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);
-  padding: 0px;
-  width: 50vw;
-  overflow-y: auto;
-  overflow-x: hidden;
-  max-width: 420px;
-  max-height: 90vh;
-  display: inline-table;
-  border-radius: 20px;
-}
-
-.c4 {
-  background-color: #FFFFFF;
-  outline: 1px solid #22222212;
-  border-radius: 20px;
-  padding: 16px 24px 24px 24px;
-  width: 100%;
-}
-
-.c14 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  background-color: #22222212;
-  width: 48px;
-  height: 48px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  border-radius: 12px;
-}
-
-.c16 {
-  font-size: 24px;
-  line-height: 32px;
-  text-align: center;
-  font-weight: 500;
-}
-
-.c18 {
-  font-size: 16px;
-  font-weight: 500;
-  line-height: 24px;
-  -webkit-letter-spacing: 0em;
-  -moz-letter-spacing: 0em;
-  -ms-letter-spacing: 0em;
-  letter-spacing: 0em;
-  text-align: center;
-}
-
-.c21 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-  height: 40px;
-}
-
-.c12 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c12:hover {
-  opacity: 0.6;
-}
-
-.c12:active {
-  opacity: 0.4;
-}
-
-@media screen and (max-width:640px) {
-  .c0[data-reach-dialog-overlay] {
-    -webkit-align-items: flex-end;
-    -webkit-box-align: flex-end;
-    -ms-flex-align: flex-end;
-    align-items: flex-end;
-  }
-}
-
-@media screen and (max-width:768px) {
-  .c1[data-reach-dialog-content] {
-    width: 65vw;
-  }
-}
-
-@media screen and (max-width:640px) {
-  .c1[data-reach-dialog-content] {
-    margin: 0;
-    width: 100vw;
-    border-radius: 20px;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-}
-
-<body>
-  <div
-    aria-hidden="true"
-  />
-  <reach-portal>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="0"
-    />
-    <div
-      data-focus-lock-disabled="false"
-    >
-      <div>
-        <div
-          class="c0"
-          data-reach-dialog-overlay=""
-          style="opacity: 0;"
-        >
-          <div
-            aria-label="dialog"
-            aria-modal="true"
-            class="c1"
-            data-reach-dialog-content=""
-            role="dialog"
-            tabindex="-1"
-          >
-            <div
-              class="c2 c3 c4"
-            >
-              <div
-                class="c5 c6"
-                width="100%"
-              >
-                <a
-                  class="c7 c8"
-                  href="https://support.uniswap.org/hc/en-us"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  <div
-                    class="c9 c10"
-                  >
-                    <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="c11 c12"
-                  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="c13 c3"
-              >
-                <div
-                  class="c14"
-                >
-                  <div>
-                    Mock Icon
-                  </div>
-                </div>
-                <div
-                  class="c15 c16 css-4kpdx7"
-                >
-                  <div>
-                    Mock Title
-                  </div>
-                </div>
-                <div
-                  class="c17 c18 css-1urox24"
-                >
-                  <div>
-                    Mock Description
-                  </div>
-                </div>
-                <div>
-                  Mock Body
-                </div>
-              </div>
-              <div
-                class="c9 c19"
-              >
-                <button
-                  class="c20 c21"
-                  disabled=""
-                >
-                  <div
-                    class="c22 c23"
-                  />
-                  <div>
-                    Left Button
-                  </div>
-                </button>
-                <button
-                  class="c24 c21"
-                >
-                  <div
-                    class="c22 c23"
-                  />
-                  <div>
-                    Right Button
-                  </div>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="0"
-    />
-  </reach-portal>
-</body>
-`;
-
-exports[`<Dialog /> renders the Dialog component correctly 1`] = `
-.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;
-  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;
-}
-
-.c19 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 12px;
-}
-
-.c15 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c17 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c11 {
-  color: #222222;
-  cursor: pointer;
-}
-
-.c7 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c7:hover {
-  opacity: 0.6;
-}
-
-.c7:active {
-  opacity: 0.4;
-}
-
-.c23 {
-  background-color: transparent;
-  bottom: 0;
-  border-radius: inherit;
-  height: 100%;
-  left: 0;
-  position: absolute;
-  right: 0;
-  top: 0;
-  -webkit-transition: 150ms ease background-color;
-  transition: 150ms ease background-color;
-  width: 100%;
-}
-
-.c20 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #22222212;
-  border-radius: 16px;
-  border: 0;
-  color: #222222;
-  cursor: pointer;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  font-size: 14px;
-  font-weight: 535;
-  gap: 12px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  line-height: 16px;
-  padding: 8px;
-  position: relative;
-  -webkit-transition: 150ms ease opacity;
-  transition: 150ms ease opacity;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c20:active .c22 {
-  background-color: #B8C0DC3d;
-}
-
-.c20:focus .c22 {
-  background-color: #B8C0DC3d;
-}
-
-.c20:hover .c22 {
-  background-color: #98A1C014;
-}
-
-.c20:disabled {
-  cursor: default;
-  opacity: 0.6;
-}
-
-.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 6px;
-  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;
-}
-
-.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;
-}
-
-.c3 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c0 {
-  will-change: transform,opacity;
-}
-
-.c0[data-reach-dialog-overlay] {
-  z-index: 1040;
-  background-color: transparent;
-  overflow: hidden;
-  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;
-  overflow-y: scroll;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  background-color: rgba(0,0,0,0.60);
-}
-
-.c1 {
-  overflow-y: auto;
-}
-
-.c1[data-reach-dialog-content] {
-  margin: auto;
-  background-color: #F9F9F9;
-  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);
-  padding: 0px;
-  width: 50vw;
-  overflow-y: auto;
-  overflow-x: hidden;
-  max-width: 420px;
-  max-height: 90vh;
-  display: inline-table;
-  border-radius: 20px;
-}
-
-.c4 {
-  background-color: #FFFFFF;
-  outline: 1px solid #22222212;
-  border-radius: 20px;
-  padding: 16px 24px 24px 24px;
-  width: 100%;
-}
-
-.c14 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  background-color: #22222212;
-  width: 48px;
-  height: 48px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  border-radius: 12px;
-}
-
-.c16 {
-  font-size: 24px;
-  line-height: 32px;
-  text-align: center;
-  font-weight: 500;
-}
-
-.c18 {
-  font-size: 16px;
-  font-weight: 500;
-  line-height: 24px;
-  -webkit-letter-spacing: 0em;
-  -moz-letter-spacing: 0em;
-  -ms-letter-spacing: 0em;
-  letter-spacing: 0em;
-  text-align: center;
-}
-
-.c21 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-  height: 40px;
-}
-
-.c12 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c12:hover {
-  opacity: 0.6;
-}
-
-.c12:active {
-  opacity: 0.4;
-}
-
-@media screen and (max-width:640px) {
-  .c0[data-reach-dialog-overlay] {
-    -webkit-align-items: flex-end;
-    -webkit-box-align: flex-end;
-    -ms-flex-align: flex-end;
-    align-items: flex-end;
-  }
-}
-
-@media screen and (max-width:768px) {
-  .c1[data-reach-dialog-content] {
-    width: 65vw;
-  }
-}
-
-@media screen and (max-width:640px) {
-  .c1[data-reach-dialog-content] {
-    margin: 0;
-    width: 100vw;
-    border-radius: 20px;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-}
-
-<body>
-  <div
-    aria-hidden="true"
-  />
-  <reach-portal>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="0"
-    />
-    <div
-      data-focus-lock-disabled="false"
-    >
-      <div>
-        <div
-          class="c0"
-          data-reach-dialog-overlay=""
-          style="opacity: 0;"
-        >
-          <div
-            aria-label="dialog"
-            aria-modal="true"
-            class="c1"
-            data-reach-dialog-content=""
-            role="dialog"
-            tabindex="-1"
-          >
-            <div
-              class="c2 c3 c4"
-            >
-              <div
-                class="c5 c6"
-                width="100%"
-              >
-                <a
-                  class="c7 c8"
-                  href="https://support.uniswap.org/hc/en-us"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  <div
-                    class="c9 c10"
-                  >
-                    <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="c11 c12"
-                  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="c13 c3"
-              >
-                <div
-                  class="c14"
-                >
-                  <div>
-                    Mock Icon
-                  </div>
-                </div>
-                <div
-                  class="c15 c16 css-4kpdx7"
-                >
-                  <div>
-                    Mock Title
-                  </div>
-                </div>
-                <div
-                  class="c17 c18 css-1urox24"
-                >
-                  <div>
-                    Mock Description
-                  </div>
-                </div>
-                <div>
-                  Mock Body
-                </div>
-              </div>
-              <div
-                class="c9 c19"
-              >
-                <button
-                  class="c20 c21"
-                >
-                  <div
-                    class="c22 c23"
-                  />
-                  <div>
-                    Left Button
-                  </div>
-                </button>
-                <button
-                  class="c20 c21"
-                >
-                  <div
-                    class="c22 c23"
-                  />
-                  <div>
-                    Right Button
-                  </div>
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="0"
-    />
-  </reach-portal>
-</body>
-`;
diff --git a/apps/web/src/components/ErrorBoundary/index.tsx b/apps/web/src/components/ErrorBoundary/index.tsx
index 86d8851a6eb..96f4f7d0291 100644
--- a/apps/web/src/components/ErrorBoundary/index.tsx
+++ b/apps/web/src/components/ErrorBoundary/index.tsx
@@ -4,7 +4,7 @@ import { useWeb3React } from '@web3-react/core'
 import { ButtonLight, SmallButtonPrimary } from 'components/Button'
 import { ChevronUpIcon } from 'nft/components/icons'
 import { useIsMobile } from 'nft/hooks'
-import { PropsWithChildren, useState } from 'react'
+import React, { PropsWithChildren, useState } from 'react'
 import { Copy } from 'react-feather'
 import styled from 'styled-components'
 import { CopyToClipboard, ExternalLink, ThemedText } from 'theme/components'
diff --git a/apps/web/src/components/Expand/index.tsx b/apps/web/src/components/Expand/index.tsx
index 0ab4e25d63b..46ca7a16dc1 100644
--- a/apps/web/src/components/Expand/index.tsx
+++ b/apps/web/src/components/Expand/index.tsx
@@ -1,6 +1,6 @@
 import AnimatedDropdown from 'components/AnimatedDropdown'
 import Column from 'components/Column'
-import { PropsWithChildren, ReactElement } from 'react'
+import React, { PropsWithChildren, ReactElement } from 'react'
 import { ChevronDown } from 'react-feather'
 import styled from 'styled-components'
 
diff --git a/apps/web/src/components/FeatureFlagModal/FeatureFlagModal.tsx b/apps/web/src/components/FeatureFlagModal/FeatureFlagModal.tsx
index 8b631aeacc8..886c3814757 100644
--- a/apps/web/src/components/FeatureFlagModal/FeatureFlagModal.tsx
+++ b/apps/web/src/components/FeatureFlagModal/FeatureFlagModal.tsx
@@ -11,18 +11,11 @@ import { useInfoExploreFlag } from 'featureFlags/flags/infoExplore'
 import { useInfoLiveViewsFlag } from 'featureFlags/flags/infoLiveViews'
 import { useInfoPoolPageFlag } from 'featureFlags/flags/infoPoolPage'
 import { useInfoTDPFlag } from 'featureFlags/flags/infoTDP'
-import { useExitAnimationFlag, useLandingPageV2Flag } from 'featureFlags/flags/landingPageV2'
+import { useLandingPageV2Flag } from 'featureFlags/flags/landingPageV2'
 import { useLimitsEnabledFlag } from 'featureFlags/flags/limits'
-import { useLimitsFeeesEnabledFlag } from 'featureFlags/flags/limitsFees'
 import { useMultichainUXFlag } from 'featureFlags/flags/multichainUx'
-import {
-  useOutageBannerArbitrum,
-  useOutageBannerOptimism,
-  useOutageBannerPolygon,
-} from 'featureFlags/flags/outageBanner'
 import { useProgressIndicatorV2Flag } from 'featureFlags/flags/progressIndicatorV2'
 import { useQuickRouteMainnetFlag } from 'featureFlags/flags/quickRouteMainnet'
-import { useSendEnabledFlag } from 'featureFlags/flags/send'
 import { TraceJsonRpcVariant, useTraceJsonRpcFlag } from 'featureFlags/flags/traceJsonRpc'
 import { useUniswapXSyntheticQuoteFlag } from 'featureFlags/flags/uniswapXUseSyntheticQuote'
 import { useFeesEnabledFlag } from 'featureFlags/flags/useFees'
@@ -54,7 +47,7 @@ const StyledModal = styled.div`
   border: 1px solid ${({ theme }) => theme.surface3};
 
   @media screen and (max-width: ${BREAKPOINTS.sm}px) {
-    max-height: 80vh;
+    max-height: 100vh;
   }
 `
 
@@ -94,10 +87,10 @@ const ToggleButton = styled.button`
 `
 
 const Header = styled(Row)`
-  padding: 0px 16px 8px;
   font-weight: 535;
   font-size: 16px;
   border-bottom: 1px solid ${({ theme }) => theme.surface3};
+  margin-bottom: 8px;
 `
 const FlagName = styled.span`
   font-size: 16px;
@@ -268,25 +261,19 @@ export default function FeatureFlagModal() {
 
   return (
     <Modal open={open}>
-      <Header>
-        Feature Flag Settings
-        <CloseButton onClick={toggleModal}>
-          <X size={24} />
-        </CloseButton>
-      </Header>
       <FlagsColumn>
+        <Header>
+          Feature Flag Settings
+          <CloseButton onClick={toggleModal}>
+            <X size={24} />
+          </CloseButton>
+        </Header>
         <FeatureFlagOption
           variant={BaseVariant}
           value={useGatewayDNSUpdateEnabledFlag()}
           featureFlag={FeatureFlag.gatewayDNSUpdate}
           label="Use gateway URL for routing api"
         />
-        <FeatureFlagOption
-          variant={BaseVariant}
-          value={useSendEnabledFlag()}
-          featureFlag={FeatureFlag.sendEnabled}
-          label="Send on swap component"
-        />
         <FeatureFlagOption
           variant={BaseVariant}
           value={useGatewayDNSUpdateAllEnabledFlag()}
@@ -311,12 +298,6 @@ export default function FeatureFlagModal() {
           featureFlag={FeatureFlag.limitsEnabled}
           label="Enable Limits"
         />
-        <FeatureFlagOption
-          variant={BaseVariant}
-          value={useLimitsFeeesEnabledFlag()}
-          featureFlag={FeatureFlag.limitsFees}
-          label="Enable Limits fees"
-        />
         <FeatureFlagOption
           variant={BaseVariant}
           value={useFallbackProviderEnabledFlag()}
@@ -347,12 +328,6 @@ export default function FeatureFlagModal() {
           featureFlag={FeatureFlag.landingPageV2}
           label="Refreshed landing page"
         />
-        <FeatureFlagOption
-          variant={BaseVariant}
-          value={useExitAnimationFlag()}
-          featureFlag={FeatureFlag.exitAnimation}
-          label="Landing page exit animation"
-        />
         <FeatureFlagGroup name="Quick routes">
           <FeatureFlagOption
             variant={BaseVariant}
@@ -402,26 +377,6 @@ export default function FeatureFlagModal() {
             label="Info site migration - Support live view graphs"
           />
         </FeatureFlagGroup>
-        <FeatureFlagGroup name="Outage Banners">
-          <FeatureFlagOption
-            variant={BaseVariant}
-            value={useOutageBannerArbitrum()}
-            featureFlag={FeatureFlag.outageBannerArbitrum}
-            label="Outage Banner for Arbitrum"
-          />
-          <FeatureFlagOption
-            variant={BaseVariant}
-            value={useOutageBannerPolygon()}
-            featureFlag={FeatureFlag.outageBannerPolygon}
-            label="Outage Banner for Polygon"
-          />
-          <FeatureFlagOption
-            variant={BaseVariant}
-            value={useOutageBannerOptimism()}
-            featureFlag={FeatureFlag.outageBannerOptimism}
-            label="Outage Banner for Optimism"
-          />
-        </FeatureFlagGroup>
         <FeatureFlagGroup name="Debug">
           <FeatureFlagOption
             variant={TraceJsonRpcVariant}
diff --git a/apps/web/src/components/FeeSelector/FeeOption.tsx b/apps/web/src/components/FeeSelector/FeeOption.tsx
index 42842e4caa6..80e8a452860 100644
--- a/apps/web/src/components/FeeSelector/FeeOption.tsx
+++ b/apps/web/src/components/FeeSelector/FeeOption.tsx
@@ -4,6 +4,7 @@ import { ButtonRadioChecked } from 'components/Button'
 import { AutoColumn } from 'components/Column'
 import { useFeeTierDistribution } from 'hooks/useFeeTierDistribution'
 import { PoolState } from 'hooks/usePools'
+import React from 'react'
 import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { useFormatter } from 'utils/formatNumbers'
diff --git a/apps/web/src/components/FeeSelector/FeeTierPercentageBadge.tsx b/apps/web/src/components/FeeSelector/FeeTierPercentageBadge.tsx
index 0f06e040538..611dec8a14e 100644
--- a/apps/web/src/components/FeeSelector/FeeTierPercentageBadge.tsx
+++ b/apps/web/src/components/FeeSelector/FeeTierPercentageBadge.tsx
@@ -3,6 +3,7 @@ import { FeeAmount } from '@uniswap/v3-sdk'
 import Badge from 'components/Badge'
 import { useFeeTierDistribution } from 'hooks/useFeeTierDistribution'
 import { PoolState } from 'hooks/usePools'
+import React from 'react'
 import { ThemedText } from 'theme/components'
 
 export function FeeTierPercentageBadge({
diff --git a/apps/web/src/components/Icons/AppleLogo.tsx b/apps/web/src/components/Icons/AppleLogo.tsx
deleted file mode 100644
index e984e2a75e4..00000000000
--- a/apps/web/src/components/Icons/AppleLogo.tsx
+++ /dev/null
@@ -1,23 +0,0 @@
-import { ComponentProps } from 'react'
-
-export function AppleLogo(props: ComponentProps<'svg'>) {
-  return (
-    <svg
-      width="14"
-      height="16"
-      viewBox="0 0 14 16"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      data-testid="apple-logo"
-    >
-      <path
-        d="M11.6662 8.50891C11.6741 7.89565 11.837 7.29436 12.1397 6.76098C12.4424 6.22759 12.8752 5.77945 13.3976 5.45824C13.0657 4.98422 12.6279 4.59412 12.1188 4.31892C11.6098 4.04372 11.0436 3.89101 10.4652 3.87292C9.23139 3.74341 8.03528 4.6112 7.40655 4.6112C6.76567 4.6112 5.79765 3.88578 4.75526 3.90722C4.08101 3.92901 3.4239 4.12507 2.84796 4.47632C2.27202 4.82757 1.79688 5.32201 1.46884 5.91149C0.0478641 8.37169 1.10779 11.9874 2.46897 13.976C3.14999 14.9498 3.94592 16.0375 4.98737 15.999C6.00649 15.9567 6.38712 15.3491 7.61728 15.3491C8.83603 15.3491 9.19314 15.999 10.2557 15.9744C11.3493 15.9567 12.0383 14.9963 12.6954 14.0133C13.1847 13.3195 13.5613 12.5526 13.8111 11.7411C13.1757 11.4724 12.6336 11.0226 12.2521 10.4479C11.8707 9.87307 11.6669 9.19873 11.6662 8.50891Z"
-        fill={props.fill ?? 'white'}
-      />
-      <path
-        d="M9.65929 2.56468C10.2555 1.8489 10.5493 0.928877 10.4782 0C9.56722 0.0956776 8.72575 0.531052 8.12144 1.21937C7.82597 1.55564 7.59968 1.94684 7.45549 2.37061C7.3113 2.79438 7.25205 3.24242 7.28112 3.68911C7.73676 3.6938 8.18752 3.59504 8.59946 3.40027C9.0114 3.2055 9.37377 2.9198 9.65929 2.56468Z"
-        fill={props.fill ?? 'white'}
-      />
-    </svg>
-  )
-}
diff --git a/apps/web/src/components/Icons/Gas.tsx b/apps/web/src/components/Icons/Gas.tsx
index 512df537014..60ba30e725e 100644
--- a/apps/web/src/components/Icons/Gas.tsx
+++ b/apps/web/src/components/Icons/Gas.tsx
@@ -5,7 +5,7 @@ export const Gas = (props: ComponentProps<'svg'>) => (
     <path
       fillRule="evenodd"
       clipRule="evenodd"
-      d="M15.3078 1.77827C15.7064 1.39599 16.3395 1.40923 16.7217 1.80783L20.9689 6.23633C21.2428 6.47474 21.4729 6.76205 21.6459 7.08464C21.8481 7.43172 22 7.84819 22 8.32698V16.7012C22 18.2484 20.7455 19.5 19.2 19.5C17.6536 19.5 16.4 18.2464 16.4 16.7V14.3999C16.4 13.8476 15.9523 13.3999 15.4 13.3999H14V20.5C14 20.569 13.9965 20.6372 13.9897 20.7045C13.9515 21.08 13.8095 21.4249 13.5927 21.7098C13.2274 22.19 12.6499 22.5 12 22.5H4C3.30964 22.5 2.70098 22.1502 2.34157 21.6182C2.12592 21.299 2.00001 20.9142 2 20.5V5.4999C2 3.84305 3.34315 2.4999 5 2.4999H11C12.6569 2.4999 14 3.84305 14 5.4999V11.3999H15.4C17.0569 11.3999 18.4 12.7431 18.4 14.3999V16.7C18.4 17.1418 18.7582 17.5 19.2 17.5C19.6427 17.5 20 17.1422 20 16.7012V11.3292C19.6872 11.4397 19.3506 11.4999 19 11.4999C17.3431 11.4999 16 10.1568 16 8.4999C16 7.28851 16.718 6.24482 17.7517 5.77117L15.2783 3.19217C14.896 2.79357 14.9092 2.16055 15.3078 1.77827ZM19.6098 7.70731C19.441 7.57725 19.2296 7.4999 19 7.4999C18.4477 7.4999 18 7.94762 18 8.4999C18 9.05219 18.4477 9.4999 19 9.4999C19.5523 9.4999 20 9.05219 20 8.4999C20 8.34084 19.9629 8.19045 19.8968 8.05693C19.8303 7.95164 19.7349 7.83559 19.6098 7.70731ZM5.21572 4.72463C4.66343 4.72463 4.21572 5.17235 4.21572 5.72463V9.72463C4.21572 10.2769 4.66343 10.7246 5.21572 10.7246H10.7157C11.268 10.7246 11.7157 10.2769 11.7157 9.72463V5.72463C11.7157 5.17235 11.268 4.72463 10.7157 4.72463H5.21572Z"
+      d="M15.3078 0.278393C15.7064 -0.103884 16.3395 -0.0906517 16.7217 0.307949L20.9689 4.73645C21.2428 4.97487 21.4729 5.26217 21.6459 5.58477C21.8481 5.93184 22 6.34831 22 6.8271V17.2013C22 18.7486 20.7455 20.0001 19.2 20.0001C17.6536 20.0001 16.4 18.7465 16.4 17.2001V14.9C16.4 14.3477 15.9523 13.9 15.4 13.9H15V21.0001C15 21.0691 14.9965 21.1374 14.9897 21.2046C14.9515 21.5802 14.8095 21.925 14.5927 22.2099C14.2274 22.6901 13.6499 23.0001 13 23.0001H5C4.30964 23.0001 3.70098 22.6503 3.34157 22.1183C3.12592 21.7991 3.00001 21.4143 3 21.0001V4.00003C3 2.34317 4.34315 1.00003 6 1.00003H12C13.6569 1.00003 15 2.34317 15 4.00003V11.9H15.4C17.0569 11.9 18.4 13.2432 18.4 14.9V17.2001C18.4 17.642 18.7582 18.0001 19.2 18.0001C19.6427 18.0001 20 17.6423 20 17.2013V9.82932C19.6872 9.93987 19.3506 10 19 10C17.3431 10 16 8.65688 16 7.00003C16 5.78863 16.718 4.74494 17.7517 4.27129L15.2783 1.6923C14.896 1.2937 14.9092 0.660671 15.3078 0.278393ZM19.6098 6.20743C19.441 6.07738 19.2296 6.00003 19 6.00003C18.4477 6.00003 18 6.44774 18 7.00003C18 7.55231 18.4477 8.00003 19 8.00003C19.5523 8.00003 20 7.55231 20 7.00003C20 6.84096 19.9629 6.69057 19.8968 6.55705C19.8303 6.45176 19.7349 6.33571 19.6098 6.20743ZM5 11C5 10.4477 5.44772 10 6 10H9H12C12.5523 10 13 10.4477 13 11C13 11.5523 12.5523 12 12 12H6C5.44772 12 5 11.5523 5 11ZM5 15C5 14.4477 5.44772 14 6 14H12C12.5523 14 13 14.4477 13 15C13 15.5523 12.5523 16 12 16H6C5.44772 16 5 15.5523 5 15ZM6 18C5.44772 18 5 18.4477 5 19C5 19.5523 5.44772 20 6 20H12C12.5523 20 13 19.5523 13 19C13 18.4477 12.5523 18 12 18H6Z"
       fill="currentColor"
     />
   </svg>
diff --git a/apps/web/src/components/Icons/GooglePlayStoreLogo.tsx b/apps/web/src/components/Icons/GooglePlayStoreLogo.tsx
deleted file mode 100644
index e2f20c07676..00000000000
--- a/apps/web/src/components/Icons/GooglePlayStoreLogo.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-export function GooglePlayStoreLogo() {
-  return (
-    <svg
-      width="16"
-      height="16"
-      viewBox="0 0 16 16"
-      fill="none"
-      xmlns="http://www.w3.org/2000/svg"
-      data-testid="google-play-store-logo"
-    >
-      <path
-        d="M7.48727 7.63928L0.873077 14.6688C0.873077 14.6688 0.873077 14.6688 0.873077 14.675C1.07802 15.4401 1.7736 16 2.5996 16C2.92876 16 3.23928 15.9129 3.50633 15.7512L3.52496 15.7387L10.9652 11.4402L7.48727 7.63928Z"
-        fill="#EA4335"
-      />
-      <path
-        d="M14.1759 6.44484L14.1696 6.43862L10.9588 4.57239L7.33809 7.80097L10.9712 11.4401L14.1696 9.59255C14.7286 9.28773 15.1074 8.69676 15.1074 8.0187C15.1074 7.33441 14.7286 6.74966 14.1759 6.44484Z"
-        fill="#FBBC04"
-      />
-      <path
-        d="M0.873171 1.33118C0.835908 1.48048 0.811066 1.62977 0.811066 1.79151V14.2144C0.811066 14.3761 0.829697 14.5254 0.873171 14.6747L7.71094 7.82566L0.873171 1.33118Z"
-        fill="#4285F4"
-      />
-      <path
-        d="M7.53695 7.99992L10.9589 4.57227L3.52496 0.255052C3.25791 0.0933115 2.94118 0 2.5996 0C1.7736 0 1.07802 0.566091 0.873077 1.32503L7.53695 7.99992Z"
-        fill="#34A853"
-      />
-    </svg>
-  )
-}
diff --git a/apps/web/src/components/Icons/ReverseArrow.tsx b/apps/web/src/components/Icons/ReverseArrow.tsx
deleted file mode 100644
index 2915a145598..00000000000
--- a/apps/web/src/components/Icons/ReverseArrow.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ComponentProps } from 'react'
-
-export const ReverseArrow = (props: ComponentProps<'svg'>) => (
-  <svg width="20" height="20" viewBox="0 0 20 20" {...props} fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path
-      d="M2.05836 6.27468C2.00086 6.21718 1.95514 6.14789 1.92348 6.07123C1.86014 5.91873 1.86014 5.74623 1.92348 5.59373C1.95514 5.51706 2.00086 5.44798 2.05836 5.39048L5.3917 2.05715C5.63586 1.81298 6.03173 1.81298 6.27589 2.05715C6.52006 2.30132 6.52006 2.69718 6.27589 2.94134L4.00925 5.20799H14.1667C14.5117 5.20799 14.7917 5.48799 14.7917 5.83299C14.7917 6.17799 14.5117 6.45799 14.1667 6.45799H4.00925L6.27589 8.72463C6.52006 8.9688 6.52006 9.36466 6.27589 9.60882C6.15423 9.73049 5.9942 9.79213 5.8342 9.79213C5.6742 9.79213 5.51418 9.73132 5.39251 9.60882L2.05836 6.27468ZM18.0766 13.9271C18.045 13.8504 17.9992 13.7813 17.9417 13.7238L14.6084 10.3905C14.3642 10.1463 13.9684 10.1463 13.7242 10.3905C13.4801 10.6346 13.4801 11.0305 13.7242 11.2747L15.9909 13.5413H5.83339C5.48839 13.5413 5.20839 13.8213 5.20839 14.1663C5.20839 14.5113 5.48839 14.7913 5.83339 14.7913H15.9909L13.7242 17.058C13.4801 17.3021 13.4801 17.698 13.7242 17.9422C13.8459 18.0638 14.0059 18.1255 14.1659 18.1255C14.3259 18.1255 14.4859 18.0647 14.6076 17.9422L17.9409 14.6088C17.9984 14.5513 18.0442 14.4822 18.0758 14.4056C18.14 14.2522 18.14 14.0804 18.0766 13.9271Z"
-      fill={props.fill}
-    />
-  </svg>
-)
diff --git a/apps/web/src/components/Icons/TimeForward.tsx b/apps/web/src/components/Icons/TimeForward.tsx
deleted file mode 100644
index d07c8679f9f..00000000000
--- a/apps/web/src/components/Icons/TimeForward.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { useTheme } from 'styled-components'
-
-export const TimeForwardIcon = () => {
-  const theme = useTheme()
-  return (
-    <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 20 20" fill="none">
-      <path
-        d="M10.8333 6.66669V9.65497L12.2558 11.0775C12.5817 11.4033 12.5817 11.93 12.2558 12.2559C12.0933 12.4184 11.88 12.5 11.6667 12.5C11.4533 12.5 11.24 12.4184 11.0775 12.2559L9.4108 10.5892C9.25413 10.4325 9.16666 10.2209 9.16666 10V6.66669C9.16666 6.20669 9.53916 5.83335 9.99999 5.83335C10.4608 5.83335 10.8333 6.20669 10.8333 6.66669ZM12.5 5.83335C12.5 6.29335 12.8725 6.66669 13.3333 6.66669H16.6667C17.1275 6.66669 17.5 6.29335 17.5 5.83335V2.50002C17.5 2.04002 17.1275 1.66669 16.6667 1.66669C16.2058 1.66669 15.8333 2.04002 15.8333 2.50002V4.1083C14.2917 2.56496 12.2034 1.66669 9.97842 1.66669C5.39592 1.66669 1.66666 5.40502 1.66666 10C1.66666 14.595 5.39592 18.3334 9.97842 18.3334C13.1643 18.3334 16.0141 16.5583 17.4149 13.7C17.6174 13.2866 17.4474 12.7876 17.0341 12.5851C16.6208 12.3826 16.1208 12.5534 15.9192 12.9667C14.8 15.2492 12.5243 16.6667 9.97842 16.6667C6.31509 16.6667 3.33332 13.6759 3.33332 10C3.33332 6.32419 6.31426 3.33335 9.97842 3.33335C11.6176 3.33335 13.1683 3.93919 14.3658 5.00002H13.3333C12.8725 5.00002 12.5 5.37335 12.5 5.83335Z"
-        fill={theme.neutral1}
-      />
-    </svg>
-  )
-}
diff --git a/apps/web/src/components/Icons/UserIcon.tsx b/apps/web/src/components/Icons/UserIcon.tsx
deleted file mode 100644
index 985b6ca038e..00000000000
--- a/apps/web/src/components/Icons/UserIcon.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { ComponentProps } from 'react'
-
-export const UserIcon = (props: ComponentProps<'svg'>) => (
-  <svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path
-      d="M20.5625 3.5H7.4375C4.8125 3.5 3.5 4.8125 3.5 7.4375V20.5625C3.5 23.1875 4.8125 24.5 7.4375 24.5H20.5625C23.1875 24.5 24.5 23.1875 24.5 20.5625V7.4375C24.5 4.8125 23.1875 3.5 20.5625 3.5ZM14.0094 8.16667C15.9426 8.16667 17.5094 9.7335 17.5094 11.6667C17.5094 13.5998 15.9426 15.1667 14.0094 15.1667C12.0762 15.1667 10.5094 13.5998 10.5094 11.6667C10.5094 9.7335 12.0762 8.16667 14.0094 8.16667ZM20.5567 22.75H7.44334C7.29167 22.75 7.15168 22.75 7.01168 22.7383C7.16334 20.755 8.28338 18.1649 12.005 18.1649H15.995C19.705 18.1649 20.8367 20.7783 20.9883 22.7383C20.8483 22.75 20.7083 22.75 20.5567 22.75Z"
-      fill={props.fill ?? 'currentColor'}
-    />
-  </svg>
-)
diff --git a/apps/web/src/components/LiquidityChartRangeInput/Area.tsx b/apps/web/src/components/LiquidityChartRangeInput/Area.tsx
index 7a0d36f7478..7c66923c18e 100644
--- a/apps/web/src/components/LiquidityChartRangeInput/Area.tsx
+++ b/apps/web/src/components/LiquidityChartRangeInput/Area.tsx
@@ -1,5 +1,5 @@
 import { area, curveStepAfter, ScaleLinear } from 'd3'
-import { useMemo } from 'react'
+import React, { useMemo } from 'react'
 import styled from 'styled-components'
 
 import { ChartEntry } from './types'
diff --git a/apps/web/src/components/LiquidityChartRangeInput/AxisBottom.tsx b/apps/web/src/components/LiquidityChartRangeInput/AxisBottom.tsx
index dd27a9a9d30..a55261f873f 100644
--- a/apps/web/src/components/LiquidityChartRangeInput/AxisBottom.tsx
+++ b/apps/web/src/components/LiquidityChartRangeInput/AxisBottom.tsx
@@ -1,5 +1,5 @@
-import { NumberValue, ScaleLinear, axisBottom, Axis as d3Axis, select } from 'd3'
-import { useMemo } from 'react'
+import { Axis as d3Axis, axisBottom, NumberValue, ScaleLinear, select } from 'd3'
+import React, { useMemo } from 'react'
 import styled from 'styled-components'
 
 const StyledGroup = styled.g`
diff --git a/apps/web/src/components/LiquidityChartRangeInput/Brush.tsx b/apps/web/src/components/LiquidityChartRangeInput/Brush.tsx
index 659f8bf90ce..320093d61c5 100644
--- a/apps/web/src/components/LiquidityChartRangeInput/Brush.tsx
+++ b/apps/web/src/components/LiquidityChartRangeInput/Brush.tsx
@@ -1,7 +1,7 @@
 import { brushHandleAccentPath, brushHandlePath, OffScreenHandle } from 'components/LiquidityChartRangeInput/svg'
 import { BrushBehavior, brushX, D3BrushEvent, ScaleLinear, select } from 'd3'
 import usePrevious from 'hooks/usePrevious'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
+import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react'
 import styled from 'styled-components'
 
 const Handle = styled.path<{ color: string }>`
diff --git a/apps/web/src/components/LiquidityChartRangeInput/Line.tsx b/apps/web/src/components/LiquidityChartRangeInput/Line.tsx
index e7a9264b3c2..3e7bea5609b 100644
--- a/apps/web/src/components/LiquidityChartRangeInput/Line.tsx
+++ b/apps/web/src/components/LiquidityChartRangeInput/Line.tsx
@@ -1,5 +1,5 @@
 import { ScaleLinear } from 'd3'
-import { useMemo } from 'react'
+import React, { useMemo } from 'react'
 import styled from 'styled-components'
 
 const StyledLine = styled.line`
diff --git a/apps/web/src/components/LiquidityChartRangeInput/Zoom.tsx b/apps/web/src/components/LiquidityChartRangeInput/Zoom.tsx
index f588373f98d..c28c796f056 100644
--- a/apps/web/src/components/LiquidityChartRangeInput/Zoom.tsx
+++ b/apps/web/src/components/LiquidityChartRangeInput/Zoom.tsx
@@ -1,6 +1,6 @@
 import { ButtonGray } from 'components/Button'
 import { ScaleLinear, select, zoom, ZoomBehavior, zoomIdentity, ZoomTransform } from 'd3'
-import { useEffect, useMemo, useRef } from 'react'
+import React, { useEffect, useMemo, useRef } from 'react'
 import { RefreshCcw, ZoomIn, ZoomOut } from 'react-feather'
 import styled from 'styled-components'
 
diff --git a/apps/web/src/components/Logo/AssetLogo.tsx b/apps/web/src/components/Logo/AssetLogo.tsx
index 9f5057e3c09..e302cb060ee 100644
--- a/apps/web/src/components/Logo/AssetLogo.tsx
+++ b/apps/web/src/components/Logo/AssetLogo.tsx
@@ -1,6 +1,6 @@
-import { ChainId, Currency } from '@uniswap/sdk-core'
-import { PortfolioLogo } from 'components/AccountDrawer/MiniPortfolio/PortfolioLogo'
-import React from 'react'
+import { ChainId } from '@uniswap/sdk-core'
+import useTokenLogoSource from 'hooks/useAssetLogoSource'
+import React, { useState } from 'react'
 import styled from 'styled-components'
 
 export const MissingImageLogo = styled.div<{ size?: string }>`
@@ -19,12 +19,28 @@ export const MissingImageLogo = styled.div<{ size?: string }>`
   justify-content: center;
 `
 
+const LogoImage = styled.img<{ size: string; imgLoaded?: boolean }>`
+  opacity: ${({ imgLoaded }) => (imgLoaded ? 1 : 0)};
+  transition: opacity ${({ theme }) => `${theme.transition.duration.medium} ${theme.transition.timing.in}`};
+  width: ${({ size }) => size};
+  height: ${({ size }) => size};
+  border-radius: 50%;
+`
+
+const LogoImageWrapper = styled.div<{ size: string; imgLoaded?: boolean }>`
+  width: ${({ size }) => size};
+  height: ${({ size }) => size};
+  background: ${({ theme, imgLoaded }) => (imgLoaded ? 'none' : theme.surface3)};
+  transition: background-color ${({ theme }) => `${theme.transition.duration.medium} ${theme.transition.timing.in}`};
+  box-shadow: 0 0 1px white;
+  border-radius: 50%;
+`
+
 export type AssetLogoBaseProps = {
   symbol?: string | null
   backupImg?: string | null
   size?: string
   style?: React.CSSProperties
-  currency?: Currency | null
 }
 type AssetLogoProps = AssetLogoBaseProps & { isNative?: boolean; address?: string | null; chainId?: number }
 
@@ -37,15 +53,41 @@ const LogoContainer = styled.div`
  * Renders an image by prioritizing a list of sources, and then eventually a fallback triangle alert
  */
 export default function AssetLogo({
-  currency,
-
+  isNative,
+  address,
   chainId = ChainId.MAINNET,
+  symbol,
+  backupImg,
   size = '24px',
   style,
 }: AssetLogoProps) {
+  const [src, nextSrc] = useTokenLogoSource(address, chainId, isNative, backupImg)
+  const [imgLoaded, setImgLoaded] = useState(() => {
+    const img = document.createElement('img')
+    img.src = src ?? ''
+    return src ? img.complete : false
+  })
+
   return (
     <LogoContainer style={{ height: size, width: size, ...style }}>
-      <PortfolioLogo currencies={currency ? [currency] : []} size={size} chainId={chainId} />
+      {src ? (
+        <LogoImageWrapper size={size} imgLoaded={imgLoaded}>
+          <LogoImage
+            src={src}
+            alt={`${symbol ?? 'token'} logo`}
+            size={size}
+            onLoad={() => void setImgLoaded(true)}
+            onError={nextSrc}
+            imgLoaded={imgLoaded}
+            loading="lazy"
+          />
+        </LogoImageWrapper>
+      ) : (
+        <MissingImageLogo size={size}>
+          {/* use only first 3 characters of Symbol for design reasons */}
+          {symbol?.toUpperCase().replace('$', '').replace(/\s+/g, '').slice(0, 3)}
+        </MissingImageLogo>
+      )}
     </LogoContainer>
   )
 }
diff --git a/apps/web/src/components/Logo/ChainLogo.tsx b/apps/web/src/components/Logo/ChainLogo.tsx
index 07350508983..b15b135e259 100644
--- a/apps/web/src/components/Logo/ChainLogo.tsx
+++ b/apps/web/src/components/Logo/ChainLogo.tsx
@@ -95,16 +95,14 @@ type ChainLogoProps = {
   borderRadius?: number
   style?: CSSProperties
   testId?: string
-  fillContainer?: boolean
 }
 export function ChainLogo({
   chainId,
   className,
   style,
-  size = 12,
+  size = 16,
   borderRadius = getDefaultBorderRadius(size),
   testId,
-  fillContainer = false,
 }: ChainLogoProps) {
   const darkMode = useIsDarkMode()
   const { surface2 } = useTheme()
@@ -113,21 +111,12 @@ export function ChainLogo({
   const { label } = getChainInfo(chainId)
 
   const { Symbol, bgColor } = getChainUI(chainId, darkMode)
-  const iconSize = fillContainer ? '100%' : size
-
   return (
-    <svg
-      width={iconSize}
-      height={iconSize}
-      className={className}
-      style={{ ...style, width: iconSize, height: iconSize }}
-      aria-labelledby="titleID"
-      data-testid={testId}
-    >
+    <svg width={size} height={size} className={className} style={style} aria-labelledby="titleID" data-testid={testId}>
       <title id="titleID">{`${label} logo`}</title>
-      <rect rx={borderRadius} fill={surface2} width={iconSize} height={iconSize} />
-      <rect rx={borderRadius} fill={bgColor} width={iconSize} height={iconSize} />
-      <Symbol width={iconSize} height={iconSize} />
+      <rect rx={borderRadius} fill={surface2} width={size} height={size} />
+      <rect rx={borderRadius} fill={bgColor} width={size} height={size} />
+      <Symbol width={size} height={size} />
     </svg>
   )
 }
diff --git a/apps/web/src/components/Logo/CurrencyLogo.tsx b/apps/web/src/components/Logo/CurrencyLogo.tsx
index ebb50210ca8..08a7078ab4d 100644
--- a/apps/web/src/components/Logo/CurrencyLogo.tsx
+++ b/apps/web/src/components/Logo/CurrencyLogo.tsx
@@ -10,7 +10,6 @@ export default function CurrencyLogo(
 ) {
   return (
     <AssetLogo
-      currency={props.currency}
       isNative={props.currency?.isNative}
       chainId={props.currency?.chainId}
       address={props.currency?.wrapped.address}
diff --git a/apps/web/src/components/Logo/UniIcon.tsx b/apps/web/src/components/Logo/UniIcon.tsx
index 10d80f13c62..68564022753 100644
--- a/apps/web/src/components/Logo/UniIcon.tsx
+++ b/apps/web/src/components/Logo/UniIcon.tsx
@@ -8,11 +8,10 @@ export type SVGProps = React.SVGProps<SVGSVGElement> & {
   height?: string | number
   width?: string | number
   gradientId?: string
-  clickable?: boolean
 }
 
-export const UniIcon = ({ clickable, ...props }: SVGProps) => (
-  <Container clickable={clickable}>
+export const UniIcon = (props: SVGProps) => (
+  <Container>
     {HolidayUniIcon(props) !== null ? (
       <HolidayUniIcon {...props} />
     ) : (
@@ -28,7 +27,6 @@ export const UniIcon = ({ clickable, ...props }: SVGProps) => (
   </Container>
 )
 
-const Container = styled.div<{ clickable?: boolean }>`
+const Container = styled.div`
   position: relative;
-  cursor: ${({ clickable }) => (clickable ? 'pointer' : 'auto')};
 `
diff --git a/apps/web/src/components/NavBar/MenuDropdown.tsx b/apps/web/src/components/NavBar/MenuDropdown.tsx
index 18d1d7cb025..793e13ceb4c 100644
--- a/apps/web/src/components/NavBar/MenuDropdown.tsx
+++ b/apps/web/src/components/NavBar/MenuDropdown.tsx
@@ -1,5 +1,6 @@
 import { t, Trans } from '@lingui/macro'
 import { InterfaceElementName } from '@uniswap/analytics-events'
+import FeatureFlagModal from 'components/FeatureFlagModal/FeatureFlagModal'
 import { PrivacyPolicyModal } from 'components/PrivacyPolicy'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
 import { Box } from 'nft/components/Box'
@@ -242,6 +243,7 @@ export const MenuDropdown = () => {
         )}
       </Box>
       <PrivacyPolicyModal />
+      <FeatureFlagModal />
     </>
   )
 }
diff --git a/apps/web/src/components/NavBar/More/Menu.tsx b/apps/web/src/components/NavBar/More/Menu.tsx
deleted file mode 100644
index 5e73bd940d5..00000000000
--- a/apps/web/src/components/NavBar/More/Menu.tsx
+++ /dev/null
@@ -1,137 +0,0 @@
-import { Trans } from '@lingui/macro'
-import Column from 'components/Column'
-import { ScrollBarStyles } from 'components/Common'
-import Row from 'components/Row'
-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'
-
-import { menuContent, MenuItem, MenuSection } from './menuContent'
-import { MobileAppLogo } from './MobileAppLogo'
-
-const Container = styled.div`
-  width: 295px;
-  max-height: 85vh;
-  padding: 24px;
-  margin-top: 12px;
-  margin-bottom: 8px;
-  background: ${({ theme }) => theme.surface1};
-  user-select: none;
-  overflow: auto;
-  ${ScrollBarStyles}
-  height: unset;
-
-  border-radius: 12px;
-  border: 1px solid ${({ theme }) => theme.surface3};
-  box-shadow: 0px 0px 10px 0px rgba(34, 34, 34, 0.04);
-
-  position: absolute;
-  right: 0px;
-  top: 30px;
-  bottom: unset;
-  @media screen and (max-width: ${BREAKPOINTS.md}px) {
-    top: unset;
-    bottom: 50px;
-  }
-`
-const LinkStyles = css`
-  font-size: 16px;
-  text-decoration: none;
-  color: ${({ theme }) => theme.neutral2};
-  &:hover {
-    color: ${({ theme }) => theme.accent1};
-    opacity: 1;
-  }
-`
-const StyledInternalLink = styled(Link)<{ canHide?: boolean }>`
-  ${LinkStyles}
-  @media screen and (max-width: ${BREAKPOINTS.md}px), (min-width: ${BREAKPOINTS.xl}px) {
-    display: ${({ canHide }) => (canHide ? 'none' : 'block')};
-  }
-`
-const StyledExternalLink = styled(ExternalLink)`
-  ${LinkStyles}
-`
-const Separator = styled.div`
-  width: 100%;
-  height: 1px;
-  background: ${({ theme }) => theme.surface3};
-`
-const StyledRow = styled(Row)`
-  cursor: pointer;
-  :hover {
-    color: ${({ theme }) => theme.accent1};
-  }
-`
-const StyledSocials = styled(Socials)`
-  height: 20px;
-`
-function Item({ label, href, internal, overflow, closeMenu }: MenuItem) {
-  return internal ? (
-    <StyledInternalLink to={href} canHide={overflow} onClick={closeMenu}>
-      {label}
-    </StyledInternalLink>
-  ) : (
-    <StyledExternalLink href={href}>{label}</StyledExternalLink>
-  )
-}
-function Section({ title, items, closeMenu }: MenuSection) {
-  return (
-    <Column gap="sm">
-      <ThemedText.SubHeader>{title}</ThemedText.SubHeader>
-      {items.map((item, index) => (
-        <Item
-          key={`${title}_${index}}`}
-          label={item.label}
-          href={item.href}
-          internal={item.internal}
-          overflow={item.overflow}
-          closeMenu={closeMenu}
-        />
-      ))}
-    </Column>
-  )
-}
-export function Menu({ close }: { close: () => void }) {
-  const openGetTheAppModal = useOpenModal(ApplicationModal.GET_THE_APP)
-
-  return (
-    <Container data-testid="nav-more-menu">
-      <Column gap="lg">
-        {menuContent.map((sectionContent, index) => (
-          <Section
-            key={`menu_section_${index}`}
-            title={sectionContent.title}
-            items={sectionContent.items}
-            closeMenu={close}
-          />
-        ))}
-        <Separator />
-        <StyledRow
-          height="45px"
-          gap="md"
-          onClick={() => {
-            close()
-            openGetTheAppModal()
-          }}
-        >
-          <MobileAppLogo />
-          <Column gap="xs">
-            <Text lineHeight="20px">
-              <Trans>Download Uniswap</Trans>
-            </Text>
-            <ThemedText.LabelSmall lineHeight="18px">
-              <Trans>Available on iOS and Android</Trans>
-            </ThemedText.LabelSmall>
-          </Column>
-        </StyledRow>
-        <StyledSocials iconSize="25px" />
-      </Column>
-    </Container>
-  )
-}
diff --git a/apps/web/src/components/NavBar/More/MobileAppLogo.tsx b/apps/web/src/components/NavBar/More/MobileAppLogo.tsx
deleted file mode 100644
index 4354eb59dcd..00000000000
--- a/apps/web/src/components/NavBar/More/MobileAppLogo.tsx
+++ /dev/null
@@ -1,161 +0,0 @@
-import styled from 'styled-components'
-
-const AppIcon = styled.div`
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 41px;
-  height: 41px;
-  background: white;
-  border: 0.5px solid ${(props) => props.theme.surface3};
-  border-radius: 8px;
-`
-export function MobileAppLogo() {
-  return (
-    <AppIcon>
-      <svg xmlns="http://www.w3.org/2000/svg" width="31" height="32" viewBox="0 0 31 32" fill="none">
-        <path
-          d="M24.7192 4.90121C24.7622 4.14836 24.8647 3.65178 25.0709 3.1983C25.1525 3.01879 25.229 2.87188 25.2408 2.87188C25.2526 2.87188 25.2171 3.00438 25.1619 3.16628C25.012 3.6064 24.9874 4.20836 25.0907 4.90873C25.2217 5.79737 25.2963 5.92558 26.2397 6.88551C26.6822 7.33576 27.1969 7.90362 27.3834 8.14742L27.7227 8.59072L27.3834 8.27391C26.9685 7.88649 26.0144 7.13093 25.8036 7.02292C25.6623 6.95048 25.6413 6.95174 25.5541 7.03812C25.4738 7.11771 25.4569 7.23731 25.4457 7.80272C25.4284 8.68394 25.3077 9.24956 25.0166 9.81513C24.8591 10.121 24.8343 10.0557 24.9768 9.71046C25.0832 9.45267 25.094 9.33934 25.0932 8.48627C25.0916 6.77223 24.8872 6.36016 23.6885 5.65426C23.3849 5.47544 22.8845 5.21754 22.5767 5.08113C22.2688 4.94471 22.0243 4.82589 22.0332 4.81702C22.0672 4.78338 23.2361 5.12306 23.7066 5.30325C24.4065 5.57127 24.522 5.60601 24.607 5.57368C24.664 5.552 24.6915 5.38681 24.7192 4.90121Z"
-          fill="url(#paint0_linear_3063_12011)"
-        />
-        <path
-          d="M9.93229 2.40762C9.51711 2.34362 9.49961 2.33611 9.69498 2.30628C10.0694 2.24906 10.9535 2.32704 11.5627 2.471C12.985 2.80695 14.2792 3.66758 15.6607 5.19604L16.0277 5.6021L16.5527 5.51823C18.7646 5.16501 21.0148 5.44573 22.8968 6.30969C23.4146 6.54738 24.2309 7.02051 24.3329 7.1421C24.3654 7.18085 24.4251 7.43028 24.4655 7.69644C24.6053 8.61726 24.5353 9.32308 24.2519 9.85025C24.0976 10.1371 24.089 10.228 24.1927 10.4735C24.2755 10.6695 24.5063 10.8145 24.7348 10.8141C25.2025 10.8135 25.7059 10.0622 25.9391 9.01685L26.0318 8.60161L26.2153 8.80821C27.2221 9.94168 28.0128 11.4875 28.1487 12.5878L28.1841 12.8746L28.0148 12.6138C27.7236 12.1651 27.431 11.8596 27.0562 11.6132C26.3808 11.169 25.6665 11.0179 23.775 10.9188C22.0667 10.8294 21.0998 10.6844 20.1411 10.3737C18.5099 9.84524 17.6876 9.14141 15.75 6.61524C14.8894 5.49319 14.3575 4.8724 13.8283 4.37245C12.626 3.23648 11.4446 2.64072 9.93229 2.40762Z"
-          fill="url(#paint1_linear_3063_12011)"
-        />
-        <path
-          d="M10.7388 7.84129C9.8959 6.68821 9.37441 4.92028 9.48732 3.59867L9.52223 3.18969L9.71408 3.22448C10.0744 3.28979 10.6956 3.51955 10.9864 3.69512C11.7847 4.17686 12.1302 4.81111 12.4818 6.43978C12.5848 6.91682 12.7199 7.45667 12.7821 7.63943C12.8822 7.93361 13.2604 8.62076 13.5679 9.06703C13.7894 9.38843 13.6422 9.54074 13.1527 9.49682C12.4049 9.42974 11.3921 8.73514 10.7388 7.84129Z"
-          fill="url(#paint2_linear_3063_12011)"
-        />
-        <path
-          d="M23.6959 16.4231C19.757 14.8471 18.3698 13.4792 18.3698 11.1711C18.3698 10.8315 18.3815 10.5536 18.3959 10.5536C18.4102 10.5536 18.5626 10.6657 18.7345 10.8027C19.5332 11.4393 20.4277 11.7112 22.9037 12.0701C24.3608 12.2814 25.1807 12.452 25.9371 12.7013C28.3412 13.4936 29.8286 15.1014 30.1833 17.2914C30.2864 17.9278 30.226 19.1211 30.0589 19.75C29.9269 20.2468 29.5243 21.1422 29.4176 21.1765C29.388 21.1861 29.3589 21.0733 29.3513 20.9199C29.3108 20.0976 28.8927 19.297 28.1903 18.6973C27.3918 18.0154 26.319 17.4726 23.6959 16.4231Z"
-          fill="url(#paint3_linear_3063_12011)"
-        />
-        <path
-          d="M20.9307 17.0778C20.8813 16.7859 20.7957 16.4133 20.7405 16.2496L20.64 15.952L20.8266 16.1602C21.085 16.4484 21.2891 16.8171 21.4621 17.3082C21.5942 17.683 21.6091 17.7944 21.608 18.4035C21.607 19.0014 21.5905 19.1268 21.4686 19.4642C21.2764 19.9961 21.0377 20.3733 20.6373 20.7782C19.9178 21.5059 18.9928 21.9088 17.6578 22.0759C17.4258 22.1049 16.7495 22.1538 16.1549 22.1846C14.6565 22.262 13.6704 22.422 12.7842 22.7312C12.6568 22.7757 12.543 22.8027 12.5315 22.7912C12.4956 22.7558 13.099 22.3984 13.5973 22.1598C14.3 21.8235 14.9995 21.6399 16.5667 21.3806C17.3409 21.2524 18.1404 21.097 18.3434 21.0351C20.2606 20.451 21.2461 18.9436 20.9307 17.0778Z"
-          fill="url(#paint4_linear_3063_12011)"
-        />
-        <path
-          d="M22.7363 20.2643C22.213 19.1464 22.0928 18.067 22.3795 17.0604C22.4102 16.9528 22.4595 16.8648 22.4892 16.8648C22.5188 16.8648 22.6423 16.9311 22.7636 17.0122C23.0047 17.1735 23.4884 17.4452 24.777 18.1434C26.3849 19.0145 27.3017 19.6891 27.9251 20.4598C28.4711 21.1348 28.809 21.9035 28.9716 22.8409C29.0637 23.3719 29.0098 24.6495 28.8727 25.1842C28.4403 26.8701 27.4355 28.1943 26.0024 28.9671C25.7925 29.0802 25.604 29.1732 25.5836 29.1736C25.5632 29.174 25.6397 28.9807 25.7536 28.744C26.2357 27.7426 26.2906 26.7685 25.9261 25.6842C25.7029 25.0203 25.2479 24.2102 24.3291 22.8411C23.261 21.2493 22.9991 20.8257 22.7363 20.2643Z"
-          fill="url(#paint5_linear_3063_12011)"
-        />
-        <path
-          d="M7.94152 26.2961C9.40321 25.0697 11.2219 24.1985 12.8785 23.931C13.5925 23.8158 14.7819 23.8615 15.443 24.0297C16.5028 24.2992 17.4508 24.9028 17.9438 25.622C18.4256 26.3249 18.6323 26.9374 18.8475 28.3002C18.9324 28.8378 19.0248 29.3777 19.0527 29.4999C19.2143 30.2061 19.5289 30.7707 19.9186 31.0543C20.5377 31.5045 21.6036 31.5325 22.6522 31.126C22.8302 31.057 22.9847 31.0093 22.9956 31.0201C23.0336 31.0576 22.5056 31.4089 22.1331 31.5938C21.6318 31.8426 21.2333 31.9388 20.7037 31.9388C19.7433 31.9388 18.9459 31.4533 18.2806 30.4633C18.1497 30.2685 17.8554 29.685 17.6266 29.1666C16.9242 27.5745 16.5773 27.0894 15.7616 26.5586C15.0518 26.0967 14.1364 26.014 13.4478 26.3496C12.5432 26.7903 12.2908 27.9391 12.9387 28.667C13.1962 28.9564 13.6764 29.2059 14.069 29.2545C14.8036 29.3453 15.4349 28.7899 15.4349 28.0529C15.4349 27.5744 15.2498 27.3013 14.7838 27.0924C14.1474 26.807 13.4634 27.1406 13.4666 27.7346C13.4681 27.988 13.5791 28.1471 13.8346 28.262C13.9986 28.3357 14.0024 28.3415 13.8687 28.3139C13.2848 28.1936 13.148 27.4941 13.6175 27.0297C14.1811 26.4722 15.3467 26.7182 15.747 27.4792C15.9151 27.7988 15.9346 28.4354 15.788 28.8198C15.4599 29.6801 14.5032 30.1326 13.5327 29.8864C12.872 29.7187 12.6029 29.5372 11.8063 28.7218C10.4219 27.3047 9.88451 27.0302 7.88879 26.7206L7.50636 26.6613L7.94152 26.2961Z"
-          fill="url(#paint6_linear_3063_12011)"
-        />
-        <path
-          fillRule="evenodd"
-          clipRule="evenodd"
-          d="M1.4461 0.934376C6.06909 6.51007 9.25318 8.81051 9.60703 9.29653C9.89917 9.69784 9.78922 10.0586 9.28872 10.3414C9.01039 10.4986 8.43817 10.6579 8.15167 10.6579C7.82762 10.6579 7.71636 10.5337 7.71636 10.5337C7.52847 10.3566 7.42265 10.3875 6.45778 8.68561C5.11822 6.62011 3.99719 4.90668 3.96661 4.87799C3.89589 4.81165 3.89711 4.81389 6.32119 9.12395C6.71285 10.0223 6.3991 10.352 6.3991 10.48C6.3991 10.7402 6.32764 10.8771 6.00454 11.2352C5.46591 11.8323 5.22513 12.5032 5.05132 13.8917C4.85647 15.4483 4.30856 16.5478 2.79013 18.4296C1.90129 19.5311 1.75585 19.733 1.53158 20.177C1.24908 20.7361 1.1714 21.0493 1.13992 21.7553C1.10664 22.5017 1.17145 22.9839 1.40095 23.6976C1.60187 24.3225 1.81159 24.735 2.34774 25.5602C2.81043 26.2724 3.07684 26.8016 3.07684 27.0086C3.07684 27.1733 3.10849 27.1735 3.82546 27.0127C5.54127 26.6276 6.93451 25.9504 7.71808 25.1206C8.20303 24.6069 8.31688 24.3233 8.32057 23.6194C8.323 23.159 8.3067 23.0626 8.18146 22.7977C7.97759 22.3666 7.60645 22.0082 6.78844 21.4525C5.71662 20.7244 5.25883 20.1383 5.13237 19.3321C5.02864 18.6707 5.14898 18.204 5.74192 16.9691C6.35564 15.6909 6.50773 15.1462 6.61061 13.8577C6.67706 13.0253 6.76908 12.697 7.00976 12.4335C7.26077 12.1588 7.48674 12.0657 8.10795 11.9814C9.12071 11.8439 9.76559 11.5835 10.2957 11.0981C10.7555 10.677 10.9479 10.2713 10.9775 9.66049L10.9999 9.19753L10.7429 8.89981C9.81232 7.82157 0.822882 0.086792 0.765613 0.086792C0.753379 0.086792 1.05961 0.468231 1.4461 0.934376ZM3.59923 22.5999C3.80964 22.2296 3.69784 21.7536 3.3459 21.521C3.01336 21.3013 2.49677 21.4048 2.49677 21.6911C2.49677 21.7785 2.54539 21.8421 2.65497 21.8982C2.83949 21.9925 2.85288 22.0986 2.70771 22.3154C2.56068 22.535 2.57255 22.7281 2.74119 22.8593C3.01298 23.0708 3.39773 22.9545 3.59923 22.5999Z"
-          fill="url(#paint7_linear_3063_12011)"
-        />
-        <path
-          fillRule="evenodd"
-          clipRule="evenodd"
-          d="M11.639 12.2242C11.1636 12.3693 10.7014 12.87 10.5583 13.3951C10.4711 13.7154 10.5206 14.2772 10.6513 14.4508C10.8625 14.731 11.0668 14.8049 11.6198 14.801C12.7025 14.7935 13.6438 14.3321 13.7532 13.7552C13.8429 13.2823 13.4295 12.627 12.8601 12.3393C12.5663 12.1909 11.9414 12.132 11.639 12.2242ZM12.9048 13.2077C13.0717 12.972 12.9987 12.7172 12.7147 12.5448C12.1739 12.2167 11.3561 12.4882 11.3561 12.9959C11.3561 13.2486 11.7826 13.5243 12.1735 13.5243C12.4337 13.5243 12.7897 13.3701 12.9048 13.2077Z"
-          fill="url(#paint8_linear_3063_12011)"
-        />
-        <defs>
-          <linearGradient
-            id="paint0_linear_3063_12011"
-            x1="28.7526"
-            y1="26.953"
-            x2="10.033"
-            y2="11.0335"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stopColor="#FC72FF" />
-            <stop offset="1" stopColor="#FF41F4" />
-          </linearGradient>
-          <linearGradient
-            id="paint1_linear_3063_12011"
-            x1="28.7526"
-            y1="26.953"
-            x2="10.033"
-            y2="11.0335"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stopColor="#FC72FF" />
-            <stop offset="1" stopColor="#FF41F4" />
-          </linearGradient>
-          <linearGradient
-            id="paint2_linear_3063_12011"
-            x1="28.7526"
-            y1="26.953"
-            x2="10.033"
-            y2="11.0335"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stopColor="#FC72FF" />
-            <stop offset="1" stopColor="#FF41F4" />
-          </linearGradient>
-          <linearGradient
-            id="paint3_linear_3063_12011"
-            x1="28.7526"
-            y1="26.953"
-            x2="10.033"
-            y2="11.0335"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stopColor="#FC72FF" />
-            <stop offset="1" stopColor="#FF41F4" />
-          </linearGradient>
-          <linearGradient
-            id="paint4_linear_3063_12011"
-            x1="28.7526"
-            y1="26.953"
-            x2="10.033"
-            y2="11.0335"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stopColor="#FC72FF" />
-            <stop offset="1" stopColor="#FF41F4" />
-          </linearGradient>
-          <linearGradient
-            id="paint5_linear_3063_12011"
-            x1="28.7526"
-            y1="26.953"
-            x2="10.033"
-            y2="11.0335"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stopColor="#FC72FF" />
-            <stop offset="1" stopColor="#FF41F4" />
-          </linearGradient>
-          <linearGradient
-            id="paint6_linear_3063_12011"
-            x1="28.7526"
-            y1="26.953"
-            x2="10.033"
-            y2="11.0335"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stopColor="#FC72FF" />
-            <stop offset="1" stopColor="#FF41F4" />
-          </linearGradient>
-          <linearGradient
-            id="paint7_linear_3063_12011"
-            x1="28.7526"
-            y1="26.953"
-            x2="10.033"
-            y2="11.0335"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stopColor="#FC72FF" />
-            <stop offset="1" stopColor="#FF41F4" />
-          </linearGradient>
-          <linearGradient
-            id="paint8_linear_3063_12011"
-            x1="28.7526"
-            y1="26.953"
-            x2="10.033"
-            y2="11.0335"
-            gradientUnits="userSpaceOnUse"
-          >
-            <stop stopColor="#FC72FF" />
-            <stop offset="1" stopColor="#FF41F4" />
-          </linearGradient>
-        </defs>
-      </svg>
-    </AppIcon>
-  )
-}
diff --git a/apps/web/src/components/NavBar/More/index.tsx b/apps/web/src/components/NavBar/More/index.tsx
deleted file mode 100644
index 424d070fd00..00000000000
--- a/apps/web/src/components/NavBar/More/index.tsx
+++ /dev/null
@@ -1,51 +0,0 @@
-import { ColumnCenter } from 'components/Column'
-import { useOnClickOutside } from 'hooks/useOnClickOutside'
-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'
-
-import { Menu } from './Menu'
-
-const Wrapper = styled.div`
-  width: 100%;
-  display: flex;
-  flex: grow;
-  justify-content: center;
-  align-items: center;
-  position: relative;
-  margin: 4px 0px;
-`
-const IconContainer = styled(ColumnCenter)<{ isActive: boolean }>`
-  min-height: 100%;
-  justify-content: center;
-  border-radius: 14px;
-  padding: 9px 14px;
-  cursor: pointer;
-  color: ${({ isActive, theme }) => (isActive ? theme.neutral1 : theme.neutral2)};
-  :hover {
-    background: ${vars.color.lightGrayOverlay};
-  }
-`
-const ChevronIcon = styled(ChevronDown)<{ $rotated: boolean }>`
-  @media screen and (max-width: ${BREAKPOINTS.md}px) {
-    rotate: 180deg;
-  }
-  transition: transform 0.3s ease;
-  transform: ${({ $rotated }) => ($rotated ? 'rotate(180deg)' : 'none')};
-`
-export function More() {
-  const [isOpen, setIsOpen] = useState(false)
-  const ref = useRef<HTMLDivElement>(null)
-  useOnClickOutside(ref, () => setIsOpen(false))
-
-  return (
-    <Wrapper ref={ref}>
-      <IconContainer isActive={isOpen} onClick={() => setIsOpen(!isOpen)} data-testid="nav-more-button">
-        <ChevronIcon width={20} height={20} $rotated={isOpen} />
-      </IconContainer>
-      {isOpen && <Menu close={() => setIsOpen(false)} />}
-    </Wrapper>
-  )
-}
diff --git a/apps/web/src/components/NavBar/More/menuContent.ts b/apps/web/src/components/NavBar/More/menuContent.ts
deleted file mode 100644
index a90f237221c..00000000000
--- a/apps/web/src/components/NavBar/More/menuContent.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { t } from '@lingui/macro'
-
-export interface MenuSection {
-  title: string
-  items: MenuItem[]
-  closeMenu?: () => void
-}
-
-export interface MenuItem {
-  label: string
-  href: string
-  internal?: boolean
-  overflow?: boolean
-  closeMenu?: () => void
-}
-
-export const menuContent: MenuSection[] = [
-  {
-    title: t`App`,
-    items: [
-      { label: t`Pools`, href: '/pools', internal: true, overflow: true },
-      { label: t`Vote`, href: '/vote', internal: true },
-      { label: t`Analytics`, href: 'https://info.uniswap.org/' },
-    ],
-  },
-  {
-    title: t`Company`,
-    items: [
-      { label: t`Careers`, href: 'https://boards.greenhouse.io/uniswaplabs' },
-      { label: t`Blog`, href: 'https://blog.uniswap.org/' },
-    ],
-  },
-  {
-    title: t`Protocol`,
-    items: [
-      { label: t`Governance`, href: 'https://uniswap.org/governance' },
-      { label: t`Developers`, href: 'https://uniswap.org/developers' },
-    ],
-  },
-  {
-    title: t`Need help?`,
-    items: [
-      { label: t`Contact us`, href: 'https://support.uniswap.org/hc/en-us/requests/new' },
-      { label: t`Help Center`, href: 'https://support.uniswap.org/hc/en-us' },
-    ],
-  },
-]
diff --git a/apps/web/src/components/NavBar/RecentlySearchedAssets.ts b/apps/web/src/components/NavBar/RecentlySearchedAssets.ts
index 5e14cb6f5fe..4950520d8f5 100644
--- a/apps/web/src/components/NavBar/RecentlySearchedAssets.ts
+++ b/apps/web/src/components/NavBar/RecentlySearchedAssets.ts
@@ -1,6 +1,6 @@
 import { NATIVE_CHAIN_ID, nativeOnChain } from 'constants/tokens'
-import { SearchToken } from 'graphql/data/SearchTokens'
 import { Chain, NftCollection, useRecentlySearchedAssetsQuery } from 'graphql/data/__generated__/types-and-hooks'
+import { SearchToken } from 'graphql/data/SearchTokens'
 import { logSentryErrorForUnsupportedChain, supportedChainIdFromGQLChain } from 'graphql/data/util'
 import { useAtom } from 'jotai'
 import { atomWithStorage, useAtomValue } from 'jotai/utils'
diff --git a/apps/web/src/components/NavBar/SearchBarDropdown.tsx b/apps/web/src/components/NavBar/SearchBarDropdown.tsx
index e10371a7e26..62e44377718 100644
--- a/apps/web/src/components/NavBar/SearchBarDropdown.tsx
+++ b/apps/web/src/components/NavBar/SearchBarDropdown.tsx
@@ -6,10 +6,10 @@ import { useTrace } from 'analytics'
 import clsx from 'clsx'
 import Badge from 'components/Badge'
 import { ChainLogo } from 'components/Logo/ChainLogo'
-import { SearchToken } from 'graphql/data/SearchTokens'
-import useTrendingTokens from 'graphql/data/TrendingTokens'
 import { HistoryDuration, SafetyLevel } from 'graphql/data/__generated__/types-and-hooks'
 import { useTrendingCollections } from 'graphql/data/nft/TrendingCollections'
+import { SearchToken } from 'graphql/data/SearchTokens'
+import useTrendingTokens from 'graphql/data/TrendingTokens'
 import { BACKEND_NOT_YET_SUPPORTED_CHAIN_IDS } from 'graphql/data/util'
 import { useDisableNFTRoutes } from 'hooks/useDisableNFTRoutes'
 import { useIsNftPage } from 'hooks/useIsNftPage'
diff --git a/apps/web/src/components/NavBar/SuggestionRow.tsx b/apps/web/src/components/NavBar/SuggestionRow.tsx
index 482c8b9dd3e..8814d5b56ff 100644
--- a/apps/web/src/components/NavBar/SuggestionRow.tsx
+++ b/apps/web/src/components/NavBar/SuggestionRow.tsx
@@ -5,8 +5,8 @@ import QueryTokenLogo from 'components/Logo/QueryTokenLogo'
 import TokenSafetyIcon from 'components/TokenSafety/TokenSafetyIcon'
 import { checkSearchTokenWarning } from 'constants/tokenSafety'
 import { useInfoExplorePageEnabled } from 'featureFlags/flags/infoExplore'
-import { SearchToken } from 'graphql/data/SearchTokens'
 import { Chain, TokenStandard } from 'graphql/data/__generated__/types-and-hooks'
+import { SearchToken } from 'graphql/data/SearchTokens'
 import { getTokenDetailsURL } from 'graphql/data/util'
 import { Box } from 'nft/components/Box'
 import { Column, Row } from 'nft/components/Flex'
diff --git a/apps/web/src/components/NavBar/__snapshots__/ChainSelectorRow.test.tsx.snap b/apps/web/src/components/NavBar/__snapshots__/ChainSelectorRow.test.tsx.snap
index 1041e7185e6..c535254596c 100644
--- a/apps/web/src/components/NavBar/__snapshots__/ChainSelectorRow.test.tsx.snap
+++ b/apps/web/src/components/NavBar/__snapshots__/ChainSelectorRow.test.tsx.snap
@@ -65,7 +65,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 1 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
@@ -185,7 +185,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 5 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
@@ -289,7 +289,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 10 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
@@ -393,7 +393,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 56 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
@@ -497,7 +497,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 137 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
@@ -601,7 +601,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 420 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
@@ -705,7 +705,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 8453 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
@@ -809,7 +809,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 42161 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
@@ -913,7 +913,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 42220 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
@@ -1017,7 +1017,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 43114 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
@@ -1121,7 +1121,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 44787 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
@@ -1225,7 +1225,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 80001 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
@@ -1391,7 +1391,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 421613 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
@@ -1495,7 +1495,7 @@ exports[`ChainSelectorRow should match snapshot for chainId 11155111 1`] = `
     <svg
       aria-labelledby="titleID"
       height="20"
-      style="margin-right: 12px; width: 20px; height: 20px;"
+      style="margin-right: 12px;"
       width="20"
     >
       <title
diff --git a/apps/web/src/components/NavBar/index.tsx b/apps/web/src/components/NavBar/index.tsx
index b783a19647b..2cdcbba1edb 100644
--- a/apps/web/src/components/NavBar/index.tsx
+++ b/apps/web/src/components/NavBar/index.tsx
@@ -1,30 +1,26 @@
 import { Trans } from '@lingui/macro'
 import { useWeb3React } from '@web3-react/core'
+import { useAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
 import { UniIcon } from 'components/Logo/UniIcon'
 import Web3Status from 'components/Web3Status'
 import { useInfoExplorePageEnabled } from 'featureFlags/flags/infoExplore'
-import { useNewLandingPage } from 'featureFlags/flags/landingPageV2'
 import { chainIdToBackendName } from 'graphql/data/util'
 import { useDisableNFTRoutes } from 'hooks/useDisableNFTRoutes'
-import { useIsLandingPage } from 'hooks/useIsLandingPage'
 import { useIsNftPage } from 'hooks/useIsNftPage'
 import { useIsPoolsPage } from 'hooks/useIsPoolsPage'
 import { Box } from 'nft/components/Box'
 import { Row } from 'nft/components/Flex'
 import { useProfilePageState } from 'nft/hooks'
 import { ProfilePageStateType } from 'nft/types'
-import { GetTheAppButton } from 'pages/Landing/components/DownloadApp/GetTheAppButton'
 import { ReactNode, useCallback } from 'react'
 import { NavLink, NavLinkProps, useLocation, useNavigate } from 'react-router-dom'
 import styled from 'styled-components'
 
-import { useAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
 import { useIsNavSearchInputVisible } from '../../nft/hooks/useIsNavSearchInputVisible'
 import { Bag } from './Bag'
 import Blur from './Blur'
 import { ChainSelector } from './ChainSelector'
 import { MenuDropdown } from './MenuDropdown'
-import { More } from './More'
 import { SearchBar } from './SearchBar'
 import * as styles from './style.css'
 
@@ -67,7 +63,6 @@ export const PageTabs = () => {
 
   const shouldDisableNFTRoutes = useDisableNFTRoutes()
   const infoExplorePageEnabled = useInfoExplorePageEnabled()
-  const isNewLandingPageEnabled = useNewLandingPage()
 
   return (
     <>
@@ -75,7 +70,7 @@ export const PageTabs = () => {
         <Trans>Swap</Trans>
       </MenuItem>
       {infoExplorePageEnabled ? (
-        <MenuItem href="/explore" isActive={pathname.startsWith('/explore')}>
+        <MenuItem href={`/explore/tokens/${chainName.toLowerCase()}`} isActive={pathname.startsWith('/explore')}>
           <Trans>Explore</Trans>
         </MenuItem>
       ) : (
@@ -93,31 +88,22 @@ export const PageTabs = () => {
           <Trans>Pools</Trans>
         </MenuItem>
       </Box>
-      {isNewLandingPageEnabled ? (
-        <More />
-      ) : (
-        <Box marginY="4">
-          <MenuDropdown />
-        </Box>
-      )}
+      <Box marginY="4">
+        <MenuDropdown />
+      </Box>
     </>
   )
 }
 
 const Navbar = ({ blur }: { blur: boolean }) => {
   const isNftPage = useIsNftPage()
-  const isLandingPage = useIsLandingPage()
-  const isNewLandingPageEnabled = useNewLandingPage()
   const sellPageState = useProfilePageState((state) => state.state)
   const navigate = useNavigate()
   const isNavSearchInputVisible = useIsNavSearchInputVisible()
 
-  const { account } = useWeb3React()
   const [accountDrawerOpen, toggleAccountDrawer] = useAccountDrawer()
+
   const handleUniIconClick = useCallback(() => {
-    if (account) {
-      return
-    }
     if (accountDrawerOpen) {
       toggleAccountDrawer()
     }
@@ -125,7 +111,7 @@ const Navbar = ({ blur }: { blur: boolean }) => {
       pathname: '/',
       search: '?intro=true',
     })
-  }, [account, accountDrawerOpen, navigate, toggleAccountDrawer])
+  }, [accountDrawerOpen, navigate, toggleAccountDrawer])
 
   return (
     <>
@@ -139,7 +125,6 @@ const Navbar = ({ blur }: { blur: boolean }) => {
                 height="48"
                 data-testid="uniswap-logo"
                 className={styles.logo}
-                clickable={!account}
                 onClick={handleUniIconClick}
               />
             </Box>
@@ -171,7 +156,7 @@ const Navbar = ({ blur }: { blur: boolean }) => {
                   <ChainSelector />
                 </Box>
               )}
-              {isLandingPage && isNewLandingPageEnabled && <GetTheAppButton />}
+
               <Web3Status />
             </Row>
           </Box>
diff --git a/apps/web/src/components/NumericalInput/index.tsx b/apps/web/src/components/NumericalInput/index.tsx
index 0722cd39c05..f619dd496f1 100644
--- a/apps/web/src/components/NumericalInput/index.tsx
+++ b/apps/web/src/components/NumericalInput/index.tsx
@@ -1,4 +1,3 @@
-import { loadingOpacityMixin } from 'components/Loader/styled'
 import { SupportedLocale } from 'constants/locales'
 import React, { forwardRef } from 'react'
 import styled from 'styled-components'
@@ -87,7 +86,7 @@ const Input = forwardRef<HTMLInputElement, InputProps>(
 
             // cut off prepended symbol
             const formattedValue = value.toString().includes(prependSymbol)
-              ? value.toString().slice(prependSymbol.length, value.toString().length + 1)
+              ? value.toString().slice(1, value.toString().length + 1)
               : value
 
             // replace commas with periods, because uniswap exclusively uses period as the decimal separator
@@ -117,11 +116,3 @@ Input.displayName = 'Input'
 const MemoizedInput = React.memo(Input)
 export { MemoizedInput as Input }
 // const inputRegex = RegExp(`^\\d*(?:\\\\[.])?\\d*$`) // match escaped "." characters via in a non-capturing group
-
-export const StyledNumericalInput = styled(MemoizedInput)<{ $loading: boolean }>`
-  ${loadingOpacityMixin};
-  text-align: left;
-  font-size: 36px;
-  font-weight: 485;
-  max-height: 44px;
-`
diff --git a/apps/web/src/components/Pools/PoolDetails/ChartSection.tsx b/apps/web/src/components/Pools/PoolDetails/ChartSection.tsx
index 9a8fdb0ee00..94ee91cbe45 100644
--- a/apps/web/src/components/Pools/PoolDetails/ChartSection.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/ChartSection.tsx
@@ -1,26 +1,14 @@
-import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
-import { ChartHeader } from 'components/Charts/ChartHeader'
-import { Chart } from 'components/Charts/ChartModel'
-import { PriceChartDelta, PriceChartModel, mockCandlestickData } from 'components/Charts/PriceChart'
 import TimePeriodSelector from 'components/Charts/TimeSelector'
-import { VolumeChart } from 'components/Charts/VolumeChart'
 import { ChartType, PriceChartType } from 'components/Charts/utils'
-import { ChartContainer, usePriceHistory } from 'components/Tokens/TokenDetails/ChartSection'
+import { VolumeChart } from 'components/Charts/VolumeChart'
+import { ChartContainer } from 'components/Tokens/TokenDetails/ChartSection'
 import { LoadingChart } from 'components/Tokens/TokenDetails/Skeleton'
-import { useTokenPriceQuery } from 'graphql/data/__generated__/types-and-hooks'
-import { TimePeriod, toContractInput, toHistoryDuration } from 'graphql/data/util'
-import { Token } from 'graphql/thegraph/__generated__/types-and-hooks'
-import { useCurrency } from 'hooks/Tokens'
-import useStablecoinPrice from 'hooks/useStablecoinPrice'
+import { TimePeriod } from 'graphql/data/util'
 import { useMemo, useState } from 'react'
 import styled from 'styled-components'
-import { ThemedText } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
-import { NumberType, useFormatter } from 'utils/formatNumbers'
 
 const PDP_CHART_HEIGHT_PX = 380
-export const PDP_CHART_SELECTOR_OPTIONS = [ChartType.PRICE, ChartType.VOLUME, ChartType.LIQUIDITY] as const
-export type PoolsDetailsChartType = (typeof PDP_CHART_SELECTOR_OPTIONS)[number]
 
 const TimePeriodSelectorContainer = styled.div`
   position: absolute;
@@ -36,49 +24,26 @@ const TimePeriodSelectorContainer = styled.div`
   }
 `
 
-interface ChartSectionProps {
-  token0?: Token
-  token1?: Token
-  chartType: PoolsDetailsChartType
-  priceChartType: PriceChartType
+export default function ChartSection({
+  chartType,
+  priceChartType,
+  feeTier,
+  loading,
+}: {
+  chartType: ChartType
+  priceChartType?: PriceChartType
   feeTier?: number
   loading: boolean
-}
-
-const CHART_TYPE_COMPONENT_MAP: { [key in PoolsDetailsChartType]: React.FC<SelectedChartProps> } = {
-  [ChartType.PRICE]: PriceChart,
-  [ChartType.VOLUME]: VolumeChart,
-  [ChartType.LIQUIDITY]: LoadingChart,
-}
-
-export default function ChartSection(props: ChartSectionProps) {
+}) {
   const [timePeriod, setTimePeriod] = useState<TimePeriod>(TimePeriod.DAY)
-  const [currencyA, currencyB] = [useCurrency(props.token0?.id), useCurrency(props.token1?.id)]
-
-  const mockVolumes = useMemo(
-    () => [...Array(20).keys()].map((i) => ({ value: Math.random() * 10e4 + 500, timestamp: 100123131 + i * 1000 })),
-    // Mock data refresh on timePeriod change
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [timePeriod]
-  )
 
-  if (props.loading || !currencyA || !currencyB) {
+  if (loading) {
     return <LoadingChart />
   }
 
-  const SelectedChart = CHART_TYPE_COMPONENT_MAP[props.chartType]
-  const selectedChartProps = {
-    ...props,
-    height: PDP_CHART_HEIGHT_PX,
-    timePeriod,
-    currencyA,
-    currencyB,
-    volumes: mockVolumes,
-  }
-
   return (
     <ChartContainer isInfoTDPEnabled data-testid="pdp-chart-container">
-      <SelectedChart {...selectedChartProps} />
+      <Chart chartType={chartType} priceChartType={priceChartType} timePeriod={timePeriod} feeTier={feeTier} />
       <TimePeriodSelectorContainer>
         <TimePeriodSelector timePeriod={timePeriod} onChangeTimePeriod={setTimePeriod} />
       </TimePeriodSelectorContainer>
@@ -86,53 +51,41 @@ export default function ChartSection(props: ChartSectionProps) {
   )
 }
 
-interface SelectedChartProps extends ChartSectionProps {
-  currencyA: Currency
-  currencyB: Currency
+const Chart = ({
+  chartType,
+  timePeriod,
+  feeTier,
+}: {
+  chartType: ChartType
+  priceChartType?: PriceChartType
   timePeriod: TimePeriod
-  height: number
-}
-
-function PriceChart({ currencyA, currencyB, timePeriod, height, priceChartType }: SelectedChartProps) {
-  const { formatCurrencyAmount, formatPrice } = useFormatter()
-  // TODO(info): Update to use subgraph data
-  const priceQuery = useTokenPriceQuery({
-    variables: { ...toContractInput(currencyA), duration: toHistoryDuration(timePeriod) },
-  })
-  const prices = usePriceHistory(priceQuery.data)
-
-  const mockedPrices = useMemo(() => mockCandlestickData(prices), [prices])
-  const params = useMemo(() => ({ data: mockedPrices, type: priceChartType }), [mockedPrices, priceChartType])
-
-  const stablecoinPrice = useStablecoinPrice(currencyA)
+  feeTier?: number
+}) => {
+  const mockVolumes = useMemo(
+    () => [
+      { value: Math.random() * 10e4, timestamp: 100123131 },
+      { value: Math.random() * 10e4, timestamp: 100123531 },
+      { value: Math.random() * 10e4, timestamp: 100123731 },
+      { value: Math.random() * 10e4, timestamp: 100123931 },
+      { value: Math.random() * 10e4, timestamp: 100124931 },
+      { value: Math.random() * 10e4, timestamp: 100125931 },
+      { value: Math.random() * 10e4, timestamp: 100127931 },
+      { value: Math.random() * 10e4, timestamp: 100129931 },
+      { value: Math.random() * 10e4, timestamp: 100130031 },
+    ],
+    // Mock data refresh on timePeriod change
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [timePeriod]
+  )
 
-  if (!mockedPrices.length || !currencyA || !currencyB) {
-    return <LoadingChart />
+  switch (chartType) {
+    case ChartType.VOLUME:
+      return (
+        <VolumeChart height={PDP_CHART_HEIGHT_PX} volumes={mockVolumes} feeTier={feeTier} timePeriod={timePeriod} />
+      )
+    case ChartType.PRICE:
+    case ChartType.LIQUIDITY:
+    default:
+      return <LoadingChart />
   }
-
-  const lastPrice = mockedPrices[mockedPrices.length - 1]
-  return (
-    <Chart Model={PriceChartModel} params={params} height={height}>
-      {(crosshairData) => {
-        const displayValue = crosshairData ?? lastPrice
-        const currencyBAmountRaw = Math.floor((displayValue.value ?? displayValue.close) * 10 ** currencyB.decimals)
-        const priceDisplay = (
-          <ThemedText.HeadlineMedium>
-            {`1 ${currencyA.symbol} = ${formatCurrencyAmount({
-              amount: CurrencyAmount.fromRawAmount(currencyB, currencyBAmountRaw),
-            })} 
-            ${currencyB.symbol} ${stablecoinPrice ? '(' + formatPrice({ price: stablecoinPrice }) + ')' : ''}`}
-          </ThemedText.HeadlineMedium>
-        )
-        return (
-          <ChartHeader
-            value={priceDisplay}
-            additionalFields={<PriceChartDelta startingPrice={mockedPrices[0]} endingPrice={displayValue} />}
-            valueFormatterType={NumberType.FiatTokenPrice}
-            time={crosshairData?.time}
-          />
-        )
-      }}
-    </Chart>
-  )
 }
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsHeader.test.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsHeader.test.tsx
index 71fe45c8750..fa34f74e352 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsHeader.test.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsHeader.test.tsx
@@ -67,14 +67,7 @@ describe('PoolDetailsHeader', () => {
     const { asFragment } = render(<PoolDetailsHeader {...mockHeaderProps} />)
     expect(asFragment()).toMatchSnapshot()
 
-    const usdcLink = document.querySelector(
-      'a[href="/explore/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"]'
-    )
-    const wethLink = document.querySelector(
-      'a[href="/explore/tokens/ethereum/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"]'
-    )
-    expect(usdcLink?.textContent).toBe('USDC')
-    expect(wethLink?.textContent).toBe('WETH')
+    expect(screen.getAllByText(/USDC\s*\/\s*WETH/i).length).toBeGreaterThan(0)
     expect(screen.getByText('0.05%')).toBeInTheDocument()
   })
 
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsHeader.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsHeader.tsx
index 24fef641b8c..57e7d5ff2fd 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsHeader.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsHeader.tsx
@@ -2,20 +2,19 @@ import { Trans } from '@lingui/macro'
 import { ChainId, Currency } from '@uniswap/sdk-core'
 import blankTokenUrl from 'assets/svg/blank_token.svg'
 import { BreadcrumbNavContainer, BreadcrumbNavLink, CurrentPageBreadcrumb } from 'components/BreadcrumbNav'
-import { ReverseArrow } from 'components/Icons/ReverseArrow'
 import { ChainLogo } from 'components/Logo/ChainLogo'
 import Row from 'components/Row'
 import { LoadingBubble } from 'components/Tokens/loading'
 import { BIPS_BASE } from 'constants/misc'
-import { chainIdToBackendName, getTokenDetailsURL } from 'graphql/data/util'
+import { chainIdToBackendName } from 'graphql/data/util'
 import { useCurrency } from 'hooks/Tokens'
 import useTokenLogoSource from 'hooks/useAssetLogoSource'
 import React from 'react'
 import { ChevronRight } from 'react-feather'
-import { Link } from 'react-router-dom'
 import styled from 'styled-components'
 import { ClickableStyle, ThemedText } from 'theme/components'
 
+import { ReversedArrowsIcon } from './icons'
 import { DetailBubble } from './shared'
 
 const FeeTier = styled(ThemedText.LabelMicro)`
@@ -24,9 +23,8 @@ const FeeTier = styled(ThemedText.LabelMicro)`
   border-radius: 4px;
 `
 
-const ToggleReverseArrows = styled(ReverseArrow)`
+const ToggleReverseArrows = styled(ReversedArrowsIcon)`
   ${ClickableStyle}
-  fill: ${({ theme }) => theme.neutral2};
 `
 
 const IconBubble = styled(LoadingBubble)`
@@ -74,12 +72,6 @@ export function PoolDetailsBreadcrumb({ chainId, poolAddress, token0, token1, lo
   )
 }
 
-const StyledLink = styled(Link)`
-  color: ${({ theme }) => theme.neutral1};
-  text-decoration: none;
-  ${ClickableStyle}
-`
-
 interface PoolDetailsHeaderProps {
   chainId?: number
   token0?: Token
@@ -115,25 +107,7 @@ export function PoolDetailsHeader({
           <DoubleCurrencyAndChainLogo data-testid="double-token-logo" chainId={chainId} currencies={currencies} />
         )}
         <ThemedText.HeadlineSmall>
-          <StyledLink
-            to={getTokenDetailsURL({
-              address: token0?.id,
-              chain: chainIdToBackendName(chainId),
-              isInfoExplorePageEnabled: true,
-            })}
-          >
-            {token0?.symbol}
-          </StyledLink>
-          &nbsp;/&nbsp;
-          <StyledLink
-            to={getTokenDetailsURL({
-              address: token1?.id,
-              chain: chainIdToBackendName(chainId),
-              isInfoExplorePageEnabled: true,
-            })}
-          >
-            {token1?.symbol}
-          </StyledLink>
+          {token0?.symbol} / {token1?.symbol}
         </ThemedText.HeadlineSmall>
       </Row>
       {!!feeTier && <FeeTier>{feeTier / BIPS_BASE}%</FeeTier>}
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsStats.test.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsStats.test.tsx
index 76d2c7ed19e..76ceabf942a 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsStats.test.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsStats.test.tsx
@@ -51,10 +51,8 @@ describe('PoolDetailsStats', () => {
     expect(asFragment()).toMatchSnapshot()
 
     expect(screen.getByText(/Stats/i)).toBeInTheDocument()
-    expect(screen.getByText('90.9M')).toBeInTheDocument()
-    expect(screen.getByText('USDC')).toBeInTheDocument()
-    expect(screen.getByText('82.5K')).toBeInTheDocument()
-    expect(screen.getByText('WETH')).toBeInTheDocument()
+    expect(screen.getByText('90.93M USDC')).toBeInTheDocument()
+    expect(screen.getByText('82,526.49 WETH')).toBeInTheDocument()
     expect(screen.getByText(/TVL/i)).toBeInTheDocument()
     expect(screen.getByText('$223.2M')).toBeInTheDocument()
     expect(screen.getByTestId('pool-balance-chart')).toBeInTheDocument()
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsStats.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsStats.tsx
index 328d5bd3330..d9c165c4233 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsStats.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsStats.tsx
@@ -1,21 +1,19 @@
 import { Trans } from '@lingui/macro'
-import { Currency } from '@uniswap/sdk-core'
 import Column from 'components/Column'
 import CurrencyLogo from 'components/Logo/CurrencyLogo'
 import Row from 'components/Row'
-import { DeltaArrow } from 'components/Tokens/TokenDetails/Delta'
 import { LoadingBubble } from 'components/Tokens/loading'
-import { chainIdToBackendName, getTokenDetailsURL } from 'graphql/data/util'
+import { DeltaArrow } from 'components/Tokens/TokenDetails/Delta'
 import { PoolData } from 'graphql/thegraph/PoolData'
-import { Token } from 'graphql/thegraph/__generated__/types-and-hooks'
 import { useCurrency } from 'hooks/Tokens'
+import { useColor } from 'hooks/useColor'
 import { useScreenSize } from 'hooks/useScreenSize'
 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 { colors } from 'theme/colors'
+import { ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
 import { DetailBubble } from './shared'
@@ -29,22 +27,19 @@ const HeaderText = styled(Text)`
   }
 `
 
-const StatsWrapper = styled(Column)<{ loaded?: boolean }>`
+const StatsWrapper = styled(Column)`
   gap: 24px;
   padding: 20px;
   border-radius: 20px;
   background: ${({ theme }) => theme.surface2};
   width: 100%;
-  z-index: 1;
-  margin-top: ${({ loaded }) => loaded && '-24px'};
 
   @media (max-width: ${BREAKPOINTS.lg - 1}px) {
     flex-direction: row;
-    background: transparent;
+    background: ${({ theme }) => theme.surface1};
     flex-wrap: wrap;
     padding: 20px 0px;
     justify-content: space-between;
-    margin-top: 0px;
   }
 `
 
@@ -66,9 +61,9 @@ const PoolBalanceSymbols = styled(Row)`
   }
 `
 
-const PoolBalanceTokenNamesContainer = styled(Row)`
+const PoolBalanceTokenNames = styled(Row)`
   font-weight: 485;
-  font-size: 16px;
+  font-size: 18px;
   line-height: 24px;
   width: max-content;
 
@@ -79,13 +74,6 @@ const PoolBalanceTokenNamesContainer = styled(Row)`
   }
 `
 
-const StyledLink = styled(Link)`
-  display: flex;
-  align-items: center;
-  color: ${({ theme }) => theme.neutral1};
-  ${ClickableStyle}
-`
-
 const leftBarChartStyles = css`
   border-top-left-radius: 5px;
   border-bottom-left-radius: 5px;
@@ -116,42 +104,6 @@ const StatHeaderBubble = styled(LoadingBubble)`
   border-radius: 8px;
 `
 
-type TokenFullData = Token & {
-  price: number
-  tvl: number
-  percent: number
-  currency?: Currency
-}
-
-const PoolBalanceTokenNames = ({ token, chainId }: { token: TokenFullData; chainId?: number }) => {
-  const isScreenSize = useScreenSize()
-  const screenIsNotLarge = isScreenSize['lg']
-  const { formatNumber } = useFormatter()
-
-  return (
-    <PoolBalanceTokenNamesContainer>
-      {!screenIsNotLarge && <CurrencyLogo currency={token.currency} size="20px" style={{ marginRight: '8px' }} />}
-      {formatNumber({
-        input: token.tvl,
-        type: NumberType.TokenQuantityStats,
-      })}
-      &nbsp;
-      <StyledLink
-        to={getTokenDetailsURL({
-          address: token.id,
-          chain: chainIdToBackendName(chainId),
-          isInfoExplorePageEnabled: true,
-        })}
-      >
-        {screenIsNotLarge && (
-          <CurrencyLogo currency={token.currency} size="16px" style={{ marginRight: '4px', marginLeft: '4px' }} />
-        )}
-        {token.symbol}
-      </StyledLink>
-    </PoolBalanceTokenNamesContainer>
-  )
-}
-
 interface PoolDetailsStatsProps {
   poolData?: PoolData
   isReversed?: boolean
@@ -162,25 +114,34 @@ interface PoolDetailsStatsProps {
 export function PoolDetailsStats({ poolData, isReversed, chainId, loading }: PoolDetailsStatsProps) {
   const isScreenSize = useScreenSize()
   const screenIsNotLarge = isScreenSize['lg']
+  const { formatNumber } = useFormatter()
   const theme = useTheme()
 
   const currency0 = useCurrency(poolData?.token0?.id, chainId) ?? undefined
   const currency1 = useCurrency(poolData?.token1?.id, chainId) ?? undefined
 
+  const color0 = useColor(currency0, theme.surface2, theme.darkMode)
+  let color1 = useColor(currency1, theme.surface2, theme.darkMode)
+  if (color0 === color1 && color0 === theme.accent1) {
+    color1 = colors.blue400
+  }
+
   const [token0, token1] = useMemo(() => {
     if (poolData) {
       const fullWidth = poolData?.tvlToken0 / poolData?.token0Price + poolData?.tvlToken1
-      const token0FullData: TokenFullData = {
+      const token0FullData = {
         ...poolData?.token0,
         price: poolData?.token0Price,
         tvl: poolData?.tvlToken0,
+        color: color0,
         percent: poolData?.tvlToken0 / poolData?.token0Price / fullWidth,
         currency: currency0,
       }
-      const token1FullData: TokenFullData = {
+      const token1FullData = {
         ...poolData?.token1,
         price: poolData?.token1Price,
         tvl: poolData?.tvlToken1,
+        color: color1,
         percent: poolData?.tvlToken1 / fullWidth,
         currency: currency1,
       }
@@ -188,7 +149,7 @@ export function PoolDetailsStats({ poolData, isReversed, chainId, loading }: Poo
     } else {
       return [undefined, undefined]
     }
-  }, [currency0, currency1, isReversed, poolData])
+  }, [color0, color1, currency0, currency1, isReversed, poolData])
 
   if (loading || !token0 || !token1 || !poolData) {
     return (
@@ -207,7 +168,7 @@ export function PoolDetailsStats({ poolData, isReversed, chainId, loading }: Poo
   }
 
   return (
-    <StatsWrapper loaded>
+    <StatsWrapper>
       <HeaderText>
         <Trans>Stats</Trans>
       </HeaderText>
@@ -216,13 +177,33 @@ export function PoolDetailsStats({ poolData, isReversed, chainId, loading }: Poo
           <Trans>Pool balances</Trans>
         </ThemedText.BodySecondary>
         <PoolBalanceSymbols>
-          <PoolBalanceTokenNames token={token0} chainId={chainId} />
-          <PoolBalanceTokenNames token={token1} chainId={chainId} />
+          <PoolBalanceTokenNames>
+            {!screenIsNotLarge && (
+              <CurrencyLogo currency={token0.currency} size="20px" style={{ marginRight: '8px' }} />
+            )}
+            {formatNumber({
+              input: token0.tvl,
+              type: NumberType.TokenNonTx,
+            })}
+            &nbsp;
+            {token0.symbol}
+          </PoolBalanceTokenNames>
+          <PoolBalanceTokenNames>
+            {!screenIsNotLarge && (
+              <CurrencyLogo currency={token1.currency} size="20px" style={{ marginRight: '8px' }} />
+            )}
+            {formatNumber({
+              input: token1.tvl,
+              type: NumberType.TokenNonTx,
+            })}
+            &nbsp;
+            {token1.symbol}
+          </PoolBalanceTokenNames>
         </PoolBalanceSymbols>
         {screenIsNotLarge && (
           <Row data-testid="pool-balance-chart">
-            <BalanceChartSide percent={token0.percent} $color={theme.token0} isLeft={true} />
-            <BalanceChartSide percent={token1.percent} $color={theme.token1} isLeft={false} />
+            {token0.color && <BalanceChartSide percent={token0.percent} $color={token0.color} isLeft={true} />}
+            {token1.color && <BalanceChartSide percent={token1.percent} $color={token1.color} isLeft={false} />}
           </Row>
         )}
       </StatItemColumn>
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.test.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.test.tsx
index 0edcdf6efe2..1e9ace4497b 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.test.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.test.tsx
@@ -65,12 +65,22 @@ describe('PoolDetailsStatsButton', () => {
     expect(screen.getByTestId('pool-details-swap-button')).toBeVisible()
   })
 
-  it('clicking swap reveals swap modal', async () => {
+  it('clicking swap goes to correct url', async () => {
     render(<PoolDetailsStatsButtons {...mockProps} />)
 
     await act(() => userEvent.click(screen.getByTestId('pool-details-swap-button')))
-    expect(screen.getByTestId('pool-details-swap-modal')).toBeVisible()
-    expect(screen.getByTestId('pool-details-close-button')).toBeVisible()
+    expect(globalThis.window.location.href).toContain(
+      '/swap?inputCurrency=0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48&outputCurrency=0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2'
+    )
+  })
+
+  it('clicking swap goes to correct url with tokens reversed', async () => {
+    render(<PoolDetailsStatsButtons {...mockPropsTokensReversed} />)
+
+    await act(() => userEvent.click(screen.getByTestId('pool-details-swap-button')))
+    expect(globalThis.window.location.href).toContain(
+      '/swap?inputCurrency=0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2&outputCurrency=0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48'
+    )
   })
 
   it('clicking add liquidity goes to correct url', async () => {
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.tsx
index 3ac48b05c1c..3aaa7404d75 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsStatsButtons.tsx
@@ -2,52 +2,29 @@ import { Trans } from '@lingui/macro'
 import { useWeb3React } from '@web3-react/core'
 import { PositionInfo } from 'components/AccountDrawer/MiniPortfolio/Pools/cache'
 import useMultiChainPositions from 'components/AccountDrawer/MiniPortfolio/Pools/useMultiChainPositions'
-import Column from 'components/Column'
-import { ReverseArrow } from 'components/Icons/ReverseArrow'
+import { ButtonEmphasis, ButtonSize, ThemeButton } from 'components/Button'
 import Row from 'components/Row'
-import { SwapWrapperOuter } from 'components/swap/styled'
 import { LoadingBubble } from 'components/Tokens/loading'
 import { Token } from 'graphql/thegraph/__generated__/types-and-hooks'
 import { useCurrency } from 'hooks/Tokens'
 import { useSwitchChain } from 'hooks/useSwitchChain'
-import { Swap } from 'pages/Swap'
-import { useReducer } from 'react'
-import { ExternalLink, Plus, X } from 'react-feather'
 import { 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'
 import { currencyId } from 'utils/currencyId'
 
 const PoolDetailsStatsButtonsRow = styled(Row)`
   gap: 12px;
-  z-index: 1;
 
   @media (max-width: ${BREAKPOINTS.lg - 1}px) {
     display: none;
   }
 `
 
-const PoolButton = styled.button<{ open?: boolean }>`
-  display: flex;
-  flex-direction: row;
+const PoolButton = styled(ThemeButton)`
   padding: 12px 16px 12px 12px;
-  border: unset;
   border-radius: 900px;
-  width: ${({ open }) => (open ? '100px' : '50%')};
-  gap: 8px;
-  color: ${({ theme, open }) => (open ? theme.neutral1 : theme.accent1)};
-  background-color: ${({ theme, open }) => !open && opacify(12, theme.accent1)};
-  justify-content: center;
-  transition: ${({ theme }) => `width ${theme.transition.duration.medium} ${theme.transition.timing.inOut}`};
-  border: ${({ theme, open }) => open && `1px solid ${theme.surface3}`};
-  ${ClickableStyle}
-`
-
-const SwapIcon = styled(ReverseArrow)`
-  fill: ${({ theme }) => theme.accent1};
-  rotate: 90deg;
+  width: 50%;
 `
 
 const ButtonBubble = styled(LoadingBubble)`
@@ -56,23 +33,6 @@ const ButtonBubble = styled(LoadingBubble)`
   border-radius: 900px;
 `
 
-const SwapModalWrapper = styled.div<{ open?: boolean }>`
-  z-index: 0;
-  max-height: ${({ open }) => (open ? '100vh' : '0')};
-  transition: ${({ theme }) => `max-height ${theme.transition.duration.medium} ${theme.transition.timing.ease}`};
-  padding-bottom: ${({ open }) => (open ? '24px' : '0')};
-
-  ${SwapWrapperOuter} {
-    &:before {
-      background-color: unset;
-    }
-  }
-
-  @media (max-width: ${BREAKPOINTS.lg - 1}px) {
-    display: none;
-  }
-`
-
 interface PoolDetailsStatsButtonsProps {
   chainId?: number
   token0?: Token
@@ -102,14 +62,16 @@ export function PoolDetailsStatsButtons({ chainId, token0, token1, feeTier, load
   const navigate = useNavigate()
   const currency0 = useCurrency(token0?.id, chainId)
   const currency1 = useCurrency(token1?.id, chainId)
-  const handleAddLiquidity = async () => {
+  const handleOnClick = async (toSwap: boolean) => {
     if (currency0 && currency1) {
       if (walletChainId !== chainId && chainId) await switchChain(connector, chainId)
-      navigate(`/add/${currencyId(currency0)}/${currencyId(currency1)}/${feeTier}${tokenId ? `/${tokenId}` : ''}`)
+      navigate(
+        toSwap
+          ? `/swap?inputCurrency=${currencyId(currency0)}&outputCurrency=${currencyId(currency1)}`
+          : `/add/${currencyId(currency0)}/${currencyId(currency1)}/${feeTier}${tokenId ? `/${tokenId}` : ''}`
+      )
     }
   }
-  const [swapModalOpen, toggleSwapModalOpen] = useReducer((state) => !state, false)
-  const [addLiquidityHovered, toggleAddLiquidityHovered] = useReducer((state) => !state, false)
 
   if (loading || !currency0 || !currency1)
     return (
@@ -120,50 +82,23 @@ export function PoolDetailsStatsButtons({ chainId, token0, token1, feeTier, load
     )
 
   return (
-    <Column gap="lg">
-      <PoolDetailsStatsButtonsRow>
-        <PoolButton
-          onClick={toggleSwapModalOpen}
-          open={swapModalOpen}
-          data-testid={`pool-details-${swapModalOpen ? 'close' : 'swap'}-button`}
-        >
-          {swapModalOpen ? (
-            <>
-              <X size={20} />
-              <ThemedText.BodyPrimary fontWeight={535} color="accentActive">
-                <Trans>Close</Trans>
-              </ThemedText.BodyPrimary>
-            </>
-          ) : (
-            <>
-              <SwapIcon />
-              <ThemedText.BodyPrimary fontWeight={535} color="accentActive">
-                <Trans>Swap</Trans>
-              </ThemedText.BodyPrimary>
-            </>
-          )}
-        </PoolButton>
-        <PoolButton
-          onClick={handleAddLiquidity}
-          onMouseEnter={toggleAddLiquidityHovered}
-          onMouseLeave={toggleAddLiquidityHovered}
-          data-testid="pool-details-add-liquidity-button"
-        >
-          {!addLiquidityHovered && <Plus size={20} />}
-          <ThemedText.BodyPrimary fontWeight={535} color="accentActive">
-            <Trans>Add liquidity</Trans>
-          </ThemedText.BodyPrimary>
-          {addLiquidityHovered && <ExternalLink size={20} />}
-        </PoolButton>
-      </PoolDetailsStatsButtonsRow>
-      <SwapModalWrapper open={swapModalOpen} data-testid="pool-details-swap-modal">
-        <Swap
-          chainId={chainId}
-          initialInputCurrency={currency0}
-          initialOutputCurrency={currency1}
-          disableTokenInputs={chainId !== walletChainId}
-        />
-      </SwapModalWrapper>
-    </Column>
+    <PoolDetailsStatsButtonsRow>
+      <PoolButton
+        size={ButtonSize.medium}
+        emphasis={ButtonEmphasis.highSoft}
+        onClick={() => handleOnClick(false)}
+        data-testid="pool-details-add-liquidity-button"
+      >
+        <Trans>Add liquidity</Trans>
+      </PoolButton>
+      <PoolButton
+        size={ButtonSize.medium}
+        emphasis={ButtonEmphasis.highSoft}
+        onClick={() => handleOnClick(true)}
+        data-testid="pool-details-swap-button"
+      >
+        <Trans>Swap</Trans>
+      </PoolButton>
+    </PoolDetailsStatsButtonsRow>
   )
 }
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsTransactionTable.test.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsTransactionTable.test.tsx
index b21fb1ecdfb..c6b54ee43b0 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsTransactionTable.test.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsTransactionTable.test.tsx
@@ -65,7 +65,7 @@ describe('PoolDetailsTransactionsTable', () => {
         amount0: 200,
         amount1: 300,
         amountUSD: '400',
-        type: PoolTransactionType.BUY,
+        type: PoolTransactionType.SWAP,
       },
     ]
     mocked(usePoolTransactions).mockReturnValue({
diff --git a/apps/web/src/components/Pools/PoolDetails/PoolDetailsTransactionsTable.tsx b/apps/web/src/components/Pools/PoolDetails/PoolDetailsTransactionsTable.tsx
index 955683af8b1..8d5566e1dec 100644
--- a/apps/web/src/components/Pools/PoolDetails/PoolDetailsTransactionsTable.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/PoolDetailsTransactionsTable.tsx
@@ -2,16 +2,18 @@ import { Trans } from '@lingui/macro'
 import { createColumnHelper } from '@tanstack/react-table'
 import { Table } from 'components/Table'
 import { Cell } from 'components/Table/Cell'
-import { Filter } from 'components/Table/Filter'
-import { ClickableHeaderRow, FilterHeaderRow, HeaderArrow, TimestampCell } from 'components/Table/styled'
+import { getLocaleTimeString } from 'components/Table/utils'
 import { supportedChainIdFromGQLChain, validateUrlChainParam } from 'graphql/data/util'
+import { Token } from 'graphql/thegraph/__generated__/types-and-hooks'
 import { PoolTransaction, PoolTransactionType, usePoolTransactions } from 'graphql/thegraph/PoolTransactions'
-import { OrderDirection, Token, Transaction_OrderBy } from 'graphql/thegraph/__generated__/types-and-hooks'
 import { useActiveLocalCurrency } from 'hooks/useActiveLocalCurrency'
-import { useCallback, useMemo, useReducer, useState } from 'react'
+import { useActiveLocale } from 'hooks/useActiveLocale'
+import { useMemo } from 'react'
+import { ExternalLink as ExternalLinkIcon } from 'react-feather'
 import { useParams } from 'react-router-dom'
-import styled from 'styled-components'
+import styled, { useTheme } from 'styled-components'
 import { ExternalLink, StyledInternalLink, ThemedText } from 'theme/components'
+import { countSignificantFigures } from 'utils'
 import { shortenAddress } from 'utils/addresses'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
@@ -21,29 +23,6 @@ const StyledExternalLink = styled(ExternalLink)`
   stroke: ${({ theme }) => theme.neutral2};
 `
 
-type PoolTxTableSortState = {
-  sortBy: Transaction_OrderBy
-  sortDirection: OrderDirection
-}
-
-enum PoolTransactionColumn {
-  Timestamp,
-  Type,
-  MakerAddress,
-  FiatValue,
-  InputAmount,
-  OutputAmount,
-}
-
-const PoolTransactionColumnWidth: { [key in PoolTransactionColumn]: number } = {
-  [PoolTransactionColumn.Timestamp]: 164,
-  [PoolTransactionColumn.Type]: 100,
-  [PoolTransactionColumn.MakerAddress]: 100,
-  [PoolTransactionColumn.FiatValue]: 125,
-  [PoolTransactionColumn.InputAmount]: 125,
-  [PoolTransactionColumn.OutputAmount]: 125,
-}
-
 export function PoolDetailsTransactionsTable({
   poolAddress,
   token0,
@@ -55,91 +34,55 @@ export function PoolDetailsTransactionsTable({
 }) {
   const chainName = validateUrlChainParam(useParams<{ chainName?: string }>().chainName)
   const chainId = supportedChainIdFromGQLChain(chainName)
+  const theme = useTheme()
+  const locale = useActiveLocale()
   const activeLocalCurrency = useActiveLocalCurrency()
   const { formatNumber, formatFiatPrice } = useFormatter()
-  const [filterModalIsOpen, toggleFilterModal] = useReducer((s) => !s, false)
-  const [filter, setFilters] = useState<PoolTransactionType[]>([
-    PoolTransactionType.BUY,
-    PoolTransactionType.SELL,
-    PoolTransactionType.BURN,
-    PoolTransactionType.MINT,
-  ])
-
-  const [sortState, setSortMethod] = useState<PoolTxTableSortState>({
-    sortBy: Transaction_OrderBy.Timestamp,
-    sortDirection: OrderDirection.Desc,
-  })
-  const { transactions, loading, loadMore, error } = usePoolTransactions(
-    poolAddress,
-    chainId,
-    sortState.sortBy,
-    sortState.sortDirection,
-    filter,
-    token0
-  )
-
-  const handleHeaderClick = useCallback(
-    (newSortMethod: Transaction_OrderBy) => {
-      if (sortState.sortBy === newSortMethod) {
-        setSortMethod({
-          sortBy: newSortMethod,
-          sortDirection: sortState.sortDirection === OrderDirection.Asc ? OrderDirection.Desc : OrderDirection.Asc,
-        })
-      } else {
-        setSortMethod({
-          sortBy: newSortMethod,
-          sortDirection: OrderDirection.Desc,
-        })
-      }
-    },
-    [sortState.sortBy, sortState.sortDirection]
-  )
+  const { transactions, loading, loadMore, error } = usePoolTransactions(poolAddress, chainId)
 
   const columns = useMemo(() => {
     const columnHelper = createColumnHelper<PoolTransaction>()
     return [
-      columnHelper.accessor((row) => row, {
+      columnHelper.accessor((row) => row.timestamp, {
         id: 'timestamp',
         header: () => (
-          <Cell minWidth={PoolTransactionColumnWidth[PoolTransactionColumn.Timestamp]} justifyContent="flex-start">
-            <ClickableHeaderRow $justify="flex-start" onClick={() => handleHeaderClick(Transaction_OrderBy.Timestamp)}>
-              {sortState.sortBy === Transaction_OrderBy.Timestamp && (
-                <HeaderArrow direction={sortState.sortDirection} />
-              )}
-              <ThemedText.BodySecondary>
-                <Trans>Time</Trans>
-              </ThemedText.BodySecondary>
-            </ClickableHeaderRow>
+          <Cell minWidth={150} justifyContent="flex-start">
+            <ThemedText.BodySecondary>
+              <Trans>Time</Trans>
+            </ThemedText.BodySecondary>
           </Cell>
         ),
-        cell: (row) => (
-          <Cell
-            loading={loading}
-            minWidth={PoolTransactionColumnWidth[PoolTransactionColumn.Timestamp]}
-            justifyContent="flex-start"
-          >
-            <TimestampCell
-              timestamp={Number(row.getValue?.().timestamp)}
-              link={getExplorerLink(chainId, row.getValue?.().transaction, ExplorerDataType.TRANSACTION)}
-            />
+        cell: (timestamp) => (
+          <Cell loading={loading} minWidth={150} justifyContent="flex-start">
+            <ThemedText.BodySecondary>
+              {getLocaleTimeString(Number(timestamp.getValue?.()) * 1000, locale)}
+            </ThemedText.BodySecondary>
           </Cell>
         ),
       }),
       columnHelper.accessor(
         (row) => {
           let color, text
-          if (row.type === PoolTransactionType.BUY) {
-            color = 'success'
-            text = (
+          if (row.type === PoolTransactionType.SWAP) {
+            // Determine which of token0 and token1 is the input and which is the output token
+            const [tokenIn, tokenOut] =
+              row.amount0 > 0 ? [row.pool.token0, row.pool.token1] : [row.pool.token1, row.pool.token0]
+            // Determine if swap is exact in vs exact out based on which amount has fewer sig figs
+            const token0SigFigs = countSignificantFigures(row.amount0)
+            const token1SigFigs = countSignificantFigures(row.amount1)
+            const isExactIn =
+              tokenIn.id.toLowerCase() === token0?.id.toLowerCase()
+                ? token0SigFigs < token1SigFigs
+                : token1SigFigs < token0SigFigs
+            // If swap is exactIn, tx type is Sell tokenIn, otherwise Buy tokenOut
+            color = isExactIn ? 'critical' : 'success'
+            text = isExactIn ? (
               <span>
-                <Trans>Buy</Trans>&nbsp;{token0?.symbol}
+                <Trans>Sell</Trans>&nbsp;{tokenIn.symbol}
               </span>
-            )
-          } else if (row.type === PoolTransactionType.SELL) {
-            color = 'critical'
-            text = (
+            ) : (
               <span>
-                <Trans>Sell</Trans>&nbsp;{token0?.symbol}
+                <Trans>Buy</Trans>&nbsp;{tokenOut.symbol}
               </span>
             )
           } else {
@@ -151,27 +94,14 @@ export function PoolDetailsTransactionsTable({
         {
           id: 'swap-type',
           header: () => (
-            <Cell minWidth={PoolTransactionColumnWidth[PoolTransactionColumn.Type]} justifyContent="flex-start">
-              <FilterHeaderRow modalOpen={filterModalIsOpen} onClick={() => toggleFilterModal()}>
-                <Filter
-                  allFilters={Object.values(PoolTransactionType)}
-                  activeFilter={filter}
-                  setFilters={setFilters}
-                  isOpen={filterModalIsOpen}
-                  toggleFilterModal={toggleFilterModal}
-                />
-                <ThemedText.BodySecondary>
-                  <Trans>Type</Trans>
-                </ThemedText.BodySecondary>
-              </FilterHeaderRow>
+            <Cell minWidth={100} justifyContent="flex-start">
+              <ThemedText.BodySecondary>
+                <Trans>Type</Trans>
+              </ThemedText.BodySecondary>
             </Cell>
           ),
           cell: (poolTransactionType) => (
-            <Cell
-              loading={loading}
-              minWidth={PoolTransactionColumnWidth[PoolTransactionColumn.Type]}
-              justifyContent="flex-start"
-            >
+            <Cell loading={loading} minWidth={100} justifyContent="flex-start">
               {poolTransactionType.getValue?.()}
             </Cell>
           ),
@@ -180,19 +110,14 @@ export function PoolDetailsTransactionsTable({
       columnHelper.accessor((row) => row.amountUSD, {
         id: 'fiat-value',
         header: () => (
-          <Cell minWidth={PoolTransactionColumnWidth[PoolTransactionColumn.FiatValue]} justifyContent="flex-end" grow>
+          <Cell minWidth={125} justifyContent="flex-end" grow>
             <ThemedText.BodySecondary>
               <Trans>{activeLocalCurrency}</Trans>
             </ThemedText.BodySecondary>
           </Cell>
         ),
         cell: (fiat) => (
-          <Cell
-            loading={loading}
-            minWidth={PoolTransactionColumnWidth[PoolTransactionColumn.FiatValue]}
-            justifyContent="flex-end"
-            grow
-          >
+          <Cell loading={loading} minWidth={125} justifyContent="flex-end" grow>
             <ThemedText.BodyPrimary>{formatFiatPrice({ price: fiat.getValue?.() })}</ThemedText.BodyPrimary>
           </Cell>
         ),
@@ -202,24 +127,14 @@ export function PoolDetailsTransactionsTable({
         {
           id: 'input-amount',
           header: () => (
-            <Cell
-              loading={loading}
-              minWidth={PoolTransactionColumnWidth[PoolTransactionColumn.InputAmount]}
-              justifyContent="flex-end"
-              grow
-            >
+            <Cell loading={loading} minWidth={125} justifyContent="flex-end" grow>
               <StyledInternalLink to={`/explore/tokens/${chainName.toLowerCase()}/${token0?.id}`}>
                 <ThemedText.BodySecondary>{token0?.symbol}</ThemedText.BodySecondary>
               </StyledInternalLink>
             </Cell>
           ),
           cell: (inputTokenAmount) => (
-            <Cell
-              loading={loading}
-              minWidth={PoolTransactionColumnWidth[PoolTransactionColumn.InputAmount]}
-              justifyContent="flex-end"
-              grow
-            >
+            <Cell loading={loading} minWidth={125} justifyContent="flex-end" grow>
               <ThemedText.BodyPrimary>
                 {formatNumber({ input: Math.abs(inputTokenAmount.getValue?.() ?? 0), type: NumberType.TokenTx })}
               </ThemedText.BodyPrimary>
@@ -232,24 +147,14 @@ export function PoolDetailsTransactionsTable({
         {
           id: 'output-amount',
           header: () => (
-            <Cell
-              loading={loading}
-              minWidth={PoolTransactionColumnWidth[PoolTransactionColumn.OutputAmount]}
-              justifyContent="flex-end"
-              grow
-            >
+            <Cell loading={loading} minWidth={125} justifyContent="flex-end" grow>
               <StyledInternalLink to={`/explore/tokens/${chainName.toLowerCase()}/${token1?.id}`}>
                 <ThemedText.BodySecondary>{token1?.symbol}</ThemedText.BodySecondary>
               </StyledInternalLink>
             </Cell>
           ),
           cell: (outputTokenAmount) => (
-            <Cell
-              loading={loading}
-              minWidth={PoolTransactionColumnWidth[PoolTransactionColumn.OutputAmount]}
-              justifyContent="flex-end"
-              grow
-            >
+            <Cell loading={loading} minWidth={125} justifyContent="flex-end" grow>
               <ThemedText.BodyPrimary>
                 {formatNumber({ input: Math.abs(outputTokenAmount.getValue?.() ?? 0), type: NumberType.TokenTx })}
               </ThemedText.BodyPrimary>
@@ -260,42 +165,47 @@ export function PoolDetailsTransactionsTable({
       columnHelper.accessor((row) => row.maker, {
         id: 'maker-address',
         header: () => (
-          <Cell
-            minWidth={PoolTransactionColumnWidth[PoolTransactionColumn.MakerAddress]}
-            justifyContent="flex-end"
-            grow
-          >
+          <Cell minWidth={100} justifyContent="flex-end" grow>
             <ThemedText.BodySecondary>
               <Trans>Wallet</Trans>
             </ThemedText.BodySecondary>
           </Cell>
         ),
         cell: (makerAddress) => (
-          <Cell
-            loading={loading}
-            minWidth={PoolTransactionColumnWidth[PoolTransactionColumn.MakerAddress]}
-            justifyContent="flex-end"
-            grow
-          >
+          <Cell loading={loading} minWidth={100} justifyContent="flex-end" grow>
             <StyledExternalLink href={getExplorerLink(chainId, makerAddress.getValue?.(), ExplorerDataType.ADDRESS)}>
               <ThemedText.BodyPrimary>{shortenAddress(makerAddress.getValue?.(), 0)}</ThemedText.BodyPrimary>
             </StyledExternalLink>
           </Cell>
         ),
       }),
+      columnHelper.accessor((row) => getExplorerLink(chainId, row.transaction, ExplorerDataType.TRANSACTION), {
+        id: 'etherscan-link',
+        header: () => (
+          <Cell minWidth={32} justifyContent="flex-end">
+            <ThemedText.BodySecondary>
+              <Trans>Tx</Trans>
+            </ThemedText.BodySecondary>
+          </Cell>
+        ),
+        cell: (explorerLink) => (
+          <Cell loading={loading} minWidth={32} justifyContent="flex-end">
+            <StyledExternalLink href={explorerLink.getValue?.()} data-testid={explorerLink.getValue?.()}>
+              <ExternalLinkIcon size="16px" stroke={theme.neutral1} />
+            </StyledExternalLink>
+          </Cell>
+        ),
+      }),
     ]
   }, [
     activeLocalCurrency,
     chainId,
     chainName,
-    filter,
-    filterModalIsOpen,
     formatFiatPrice,
     formatNumber,
-    handleHeaderClick,
     loading,
-    sortState.sortBy,
-    sortState.sortDirection,
+    locale,
+    theme.neutral1,
     token0?.id,
     token0?.symbol,
     token1?.id,
diff --git a/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsHeader.test.tsx.snap b/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsHeader.test.tsx.snap
index f2d7be42381..0d81c844030 100644
--- a/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsHeader.test.tsx.snap
+++ b/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsHeader.test.tsx.snap
@@ -274,47 +274,19 @@ exports[`PoolDetailsHeader renders header text correctly 1`] = `
 
 .c7 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c9 {
+.c8 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c10 {
+.c9 {
   background: #F9F9F9;
   padding: 2px 6px;
   border-radius: 4px;
 }
 
-.c11 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  fill: #7D7D7D;
-}
-
-.c11:hover {
-  opacity: 0.6;
-}
-
-.c11:active {
-  opacity: 0.4;
-}
-
-.c8 {
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
+.c10 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -322,11 +294,11 @@ exports[`PoolDetailsHeader renders header text correctly 1`] = `
   transition-duration: 125ms;
 }
 
-.c8:hover {
+.c10:hover {
   opacity: 0.6;
 }
 
-.c8:active {
+.c10:active {
   opacity: 0.4;
 }
 
@@ -398,28 +370,16 @@ exports[`PoolDetailsHeader renders header text correctly 1`] = `
       <div
         class="c7 css-1jyz67g"
       >
-        <a
-          class="c8"
-          href="/explore/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
-        >
-          USDC
-        </a>
-         / 
-        <a
-          class="c8"
-          href="/explore/tokens/ethereum/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
-        >
-          WETH
-        </a>
+        USDC / WETH
       </div>
     </div>
     <div
-      class="c9 c10 css-1m65e73"
+      class="c8 c9 css-1m65e73"
     >
       0.05%
     </div>
     <svg
-      class="c11"
+      class="c10"
       data-testid="toggle-tokens-reverse-arrows"
       fill="none"
       height="20"
@@ -428,7 +388,8 @@ exports[`PoolDetailsHeader renders header text correctly 1`] = `
       xmlns="http://www.w3.org/2000/svg"
     >
       <path
-        d="M2.05836 6.27468C2.00086 6.21718 1.95514 6.14789 1.92348 6.07123C1.86014 5.91873 1.86014 5.74623 1.92348 5.59373C1.95514 5.51706 2.00086 5.44798 2.05836 5.39048L5.3917 2.05715C5.63586 1.81298 6.03173 1.81298 6.27589 2.05715C6.52006 2.30132 6.52006 2.69718 6.27589 2.94134L4.00925 5.20799H14.1667C14.5117 5.20799 14.7917 5.48799 14.7917 5.83299C14.7917 6.17799 14.5117 6.45799 14.1667 6.45799H4.00925L6.27589 8.72463C6.52006 8.9688 6.52006 9.36466 6.27589 9.60882C6.15423 9.73049 5.9942 9.79213 5.8342 9.79213C5.6742 9.79213 5.51418 9.73132 5.39251 9.60882L2.05836 6.27468ZM18.0766 13.9271C18.045 13.8504 17.9992 13.7813 17.9417 13.7238L14.6084 10.3905C14.3642 10.1463 13.9684 10.1463 13.7242 10.3905C13.4801 10.6346 13.4801 11.0305 13.7242 11.2747L15.9909 13.5413H5.83339C5.48839 13.5413 5.20839 13.8213 5.20839 14.1663C5.20839 14.5113 5.48839 14.7913 5.83339 14.7913H15.9909L13.7242 17.058C13.4801 17.3021 13.4801 17.698 13.7242 17.9422C13.8459 18.0638 14.0059 18.1255 14.1659 18.1255C14.3259 18.1255 14.4859 18.0647 14.6076 17.9422L17.9409 14.6088C17.9984 14.5513 18.0442 14.4822 18.0758 14.4056C18.14 14.2522 18.14 14.0804 18.0766 13.9271Z"
+        d="M18.125 10V12.5C18.125 14.2233 16.7225 15.625 15 15.625H4.0092L5.4425 17.0583C5.68667 17.3025 5.68667 17.6983 5.4425 17.9425C5.32084 18.0642 5.16081 18.1258 5.00081 18.1258C4.84081 18.1258 4.68079 18.065 4.55912 17.9425L2.05912 15.4425C2.00162 15.385 1.9559 15.3159 1.92424 15.2393C1.8609 15.0868 1.8609 14.9143 1.92424 14.7618C1.9559 14.6851 2.00162 14.6158 2.05912 14.5583L4.55912 12.0583C4.80329 11.8141 5.19915 11.8141 5.44332 12.0583C5.68749 12.3025 5.68749 12.6983 5.44332 12.9425L4.01001 14.3758H15C16.0333 14.3758 16.875 13.535 16.875 12.5008V10.0008C16.875 9.65581 17.155 9.37581 17.5 9.37581C17.845 9.37581 18.125 9.655 18.125 10ZM2.5 10.625C2.845 10.625 3.125 10.345 3.125 10V7.5C3.125 6.46583 3.96667 5.625 5 5.625H15.9908L14.5575 7.05831C14.3133 7.30247 14.3133 7.69834 14.5575 7.9425C14.6792 8.06417 14.8392 8.12581 14.9992 8.12581C15.1592 8.12581 15.3192 8.065 15.4409 7.9425L17.9409 5.4425C17.9984 5.385 18.0441 5.31592 18.0758 5.23926C18.1391 5.08676 18.1391 4.91426 18.0758 4.76176C18.0441 4.68509 17.9984 4.61581 17.9409 4.55831L15.4409 2.05831C15.1967 1.81414 14.8008 1.81414 14.5567 2.05831C14.3125 2.30247 14.3125 2.69834 14.5567 2.9425L15.99 4.37581H5C3.2775 4.37581 1.875 5.77748 1.875 7.50081V10.0008C1.875 10.345 2.155 10.625 2.5 10.625Z"
+        fill="#5E5E5E"
       />
     </svg>
   </div>
diff --git a/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsLink.test.tsx.snap b/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsLink.test.tsx.snap
index 44a09b932cf..343a4a431f1 100644
--- a/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsLink.test.tsx.snap
+++ b/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsLink.test.tsx.snap
@@ -44,10 +44,6 @@ exports[`PoolDetailsHeader renders link for pool address 1`] = `
 
 .c7 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c13 {
@@ -378,10 +374,6 @@ exports[`PoolDetailsHeader renders link for token address 1`] = `
 
 .c7 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c14 {
@@ -403,23 +395,22 @@ exports[`PoolDetailsHeader renders link for token address 1`] = `
   opacity: 0.4;
 }
 
-.c5 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+.c6 {
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
 }
 
-.c6 {
+.c5 {
   width: 20px;
   height: 20px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
@@ -563,7 +554,9 @@ exports[`PoolDetailsHeader renders link for token address 1`] = `
           class="c5"
         >
           <img
+            alt="USDC logo"
             class="c6"
+            loading="lazy"
             src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
           />
         </div>
diff --git a/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsPositionTable.test.tsx.snap b/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsPositionTable.test.tsx.snap
index 4702cff4d32..a257f801593 100644
--- a/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsPositionTable.test.tsx.snap
+++ b/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsPositionTable.test.tsx.snap
@@ -45,25 +45,10 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Closed 1`] = `
 
 .c7 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c12 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c0 {
@@ -155,11 +140,11 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Closed 1`] = `
   color: #7D7D7D;
 }
 
-.c13 {
+.c12 {
   gap: 10px;
 }
 
-.c14 {
+.c13 {
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
@@ -167,7 +152,7 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Closed 1`] = `
 }
 
 @media screen and (max-width:640px) {
-  .c13 {
+  .c12 {
     -webkit-flex-direction: column;
     -ms-flex-direction: column;
     flex-direction: column;
@@ -180,7 +165,7 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Closed 1`] = `
 }
 
 @media screen and (max-width:640px) {
-  .c15 {
+  .c14 {
     display: none;
   }
 }
@@ -223,7 +208,7 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Closed 1`] = `
           class="c3 c10 c11"
         >
           <div
-            class="c12 css-obwv3p"
+            class="css-obwv3p"
           >
             Closed
           </div>
@@ -265,16 +250,16 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Closed 1`] = `
         </div>
       </div>
       <div
-        class="c3 c10 c13"
+        class="c3 c10 c12"
       >
         <div
-          class="c7 c14 css-obwv3p"
+          class="c7 c13 css-obwv3p"
           data-testid="position-min-0"
         >
           Min: 0 WETH per USDC
         </div>
         <svg
-          class="c15"
+          class="c14"
           fill="none"
           height="9"
           viewBox="0 0 14 9"
@@ -287,7 +272,7 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Closed 1`] = `
           />
         </svg>
         <div
-          class="c7 c14 css-obwv3p"
+          class="c7 c13 css-obwv3p"
           data-testid="position-max-1"
         >
           Max: 1.00 WETH per USDC
@@ -343,25 +328,10 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus In Range 1`] = `
 
 .c7 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c12 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c0 {
@@ -453,18 +423,18 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus In Range 1`] = `
   color: #40B66B;
 }
 
-.c14 {
+.c13 {
   gap: 10px;
 }
 
-.c15 {
+.c14 {
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
   white-space: nowrap;
 }
 
-.c13 {
+.c12 {
   width: 8px;
   height: 8px;
   border-radius: 50%;
@@ -472,7 +442,7 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus In Range 1`] = `
 }
 
 @media screen and (max-width:640px) {
-  .c14 {
+  .c13 {
     -webkit-flex-direction: column;
     -ms-flex-direction: column;
     flex-direction: column;
@@ -485,7 +455,7 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus In Range 1`] = `
 }
 
 @media screen and (max-width:640px) {
-  .c16 {
+  .c15 {
     display: none;
   }
 }
@@ -528,26 +498,26 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus In Range 1`] = `
           class="c3 c10 c11"
         >
           <div
-            class="c12 css-obwv3p"
+            class="css-obwv3p"
           >
             In range
           </div>
           <div
-            class="c13"
+            class="c12"
           />
         </div>
       </div>
       <div
-        class="c3 c10 c14"
+        class="c3 c10 c13"
       >
         <div
-          class="c7 c15 css-obwv3p"
+          class="c7 c14 css-obwv3p"
           data-testid="position-min-0"
         >
           Min: 0 WETH per USDC
         </div>
         <svg
-          class="c16"
+          class="c15"
           fill="none"
           height="9"
           viewBox="0 0 14 9"
@@ -560,7 +530,7 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus In Range 1`] = `
           />
         </svg>
         <div
-          class="c7 c15 css-obwv3p"
+          class="c7 c14 css-obwv3p"
           data-testid="position-max-1"
         >
           Max: 1.00 WETH per USDC
@@ -616,25 +586,10 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Out Of Range 1`]
 
 .c7 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c12 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c0 {
@@ -726,11 +681,11 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Out Of Range 1`]
   color: #EEB317;
 }
 
-.c13 {
+.c12 {
   gap: 10px;
 }
 
-.c14 {
+.c13 {
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
@@ -738,7 +693,7 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Out Of Range 1`]
 }
 
 @media screen and (max-width:640px) {
-  .c13 {
+  .c12 {
     -webkit-flex-direction: column;
     -ms-flex-direction: column;
     flex-direction: column;
@@ -751,7 +706,7 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Out Of Range 1`]
 }
 
 @media screen and (max-width:640px) {
-  .c15 {
+  .c14 {
     display: none;
   }
 }
@@ -794,7 +749,7 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Out Of Range 1`]
           class="c3 c10 c11"
         >
           <div
-            class="c12 css-obwv3p"
+            class="css-obwv3p"
           >
             Out of range
           </div>
@@ -828,16 +783,16 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Out Of Range 1`]
         </div>
       </div>
       <div
-        class="c3 c10 c13"
+        class="c3 c10 c12"
       >
         <div
-          class="c7 c14 css-obwv3p"
+          class="c7 c13 css-obwv3p"
           data-testid="position-min-0"
         >
           Min: 0 WETH per USDC
         </div>
         <svg
-          class="c15"
+          class="c14"
           fill="none"
           height="9"
           viewBox="0 0 14 9"
@@ -850,7 +805,7 @@ exports[`PoolDetailsPositionsTable renders with PositionStatus Out Of Range 1`]
           />
         </svg>
         <div
-          class="c7 c14 css-obwv3p"
+          class="c7 c13 css-obwv3p"
           data-testid="position-max-1"
         >
           Max: 1.00 WETH per USDC
diff --git a/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsStats.test.tsx.snap b/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsStats.test.tsx.snap
index d01fd97ee57..3beb3122d49 100644
--- a/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsStats.test.tsx.snap
+++ b/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsStats.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
   min-width: 0;
 }
 
-.c15 {
+.c14 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -35,7 +35,7 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
   justify-content: flex-start;
 }
 
-.c16 {
+.c15 {
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
@@ -57,10 +57,6 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
 
 .c4 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c0 {
@@ -77,23 +73,22 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
   justify-content: flex-start;
 }
 
-.c10 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+.c11 {
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
 }
 
-.c11 {
+.c10 {
   width: 20px;
   height: 20px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
@@ -105,7 +100,7 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
   display: flex;
 }
 
-.c17 {
+.c16 {
   color: #FF5F52;
 }
 
@@ -121,8 +116,6 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
   border-radius: 20px;
   background: #F9F9F9;
   width: 100%;
-  z-index: 1;
-  margin-top: -24px;
 }
 
 .c3 {
@@ -142,7 +135,7 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
 
 .c8 {
   font-weight: 485;
-  font-size: 16px;
+  font-size: 18px;
   line-height: 24px;
   width: -webkit-max-content;
   width: -moz-max-content;
@@ -150,31 +143,6 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
 }
 
 .c12 {
-  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;
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c12:hover {
-  opacity: 0.6;
-}
-
-.c12:active {
-  opacity: 0.4;
-}
-
-.c13 {
   gap: 4px;
   width: 100%;
   -webkit-align-items: flex-end;
@@ -183,7 +151,7 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
   align-items: flex-end;
 }
 
-.c14 {
+.c13 {
   color: #222222;
   font-size: 36px;
   font-weight: 485;
@@ -201,7 +169,7 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
     -webkit-flex-direction: row;
     -ms-flex-direction: row;
     flex-direction: row;
-    background: transparent;
+    background: #FFFFFF;
     -webkit-flex-wrap: wrap;
     -ms-flex-wrap: wrap;
     flex-wrap: wrap;
@@ -210,7 +178,6 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
     -webkit-justify-content: space-between;
     -ms-flex-pack: justify;
     justify-content: space-between;
-    margin-top: 0px;
   }
 }
 
@@ -237,7 +204,7 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
 }
 
 @media (max-width:1023px) {
-  .c13 {
+  .c12 {
     -webkit-flex-direction: column;
     -ms-flex-direction: column;
     flex-direction: column;
@@ -250,7 +217,7 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
 }
 
 @media (max-width:1023px) {
-  .c14 {
+  .c13 {
     font-size: 20px;
     line-height: 28px;
   }
@@ -286,18 +253,14 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
               class="c10"
             >
               <img
+                alt="USDC logo"
                 class="c11"
+                loading="lazy"
                 src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
               />
             </div>
           </div>
-          90.9M 
-          <a
-            class="c12"
-            href="/explore/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
-          >
-            USDC
-          </a>
+          90.93M USDC
         </div>
         <div
           class="c5 c6 c8"
@@ -310,18 +273,14 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
               class="c10"
             >
               <img
+                alt="WETH logo"
                 class="c11"
+                loading="lazy"
                 src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png"
               />
             </div>
           </div>
-          82.5K 
-          <a
-            class="c12"
-            href="/explore/tokens/ethereum/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
-          >
-            WETH
-          </a>
+          82,526.49 WETH
         </div>
       </div>
     </div>
@@ -334,20 +293,20 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
         TVL
       </div>
       <div
-        class="c5 c6 c13"
+        class="c5 c6 c12"
       >
         <div
-          class="c14 css-vurnku"
+          class="c13 css-vurnku"
         >
           $223.2M
         </div>
         <div
-          class="c15 c16"
+          class="c14 c15"
           width="max-content"
         >
           <svg
             aria-label="down"
-            class="c17"
+            class="c16"
             fill="none"
             height="16"
             viewBox="0 0 24 24"
@@ -376,20 +335,20 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
         24H volume
       </div>
       <div
-        class="c5 c6 c13"
+        class="c5 c6 c12"
       >
         <div
-          class="c14 css-vurnku"
+          class="c13 css-vurnku"
         >
           $233.4M
         </div>
         <div
-          class="c15 c16"
+          class="c14 c15"
           width="max-content"
         >
           <svg
             aria-label="down"
-            class="c17"
+            class="c16"
             fill="none"
             height="16"
             viewBox="0 0 24 24"
@@ -418,10 +377,10 @@ exports[`PoolDetailsStats pool balance chart not visible on mobile 1`] = `
         24H fees
       </div>
       <div
-        class="c5 c6 c13"
+        class="c5 c6 c12"
       >
         <div
-          class="c14 css-vurnku"
+          class="c13 css-vurnku"
         >
           $116.7K
         </div>
@@ -439,7 +398,7 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
   min-width: 0;
 }
 
-.c17 {
+.c13 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -466,7 +425,7 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
   justify-content: flex-start;
 }
 
-.c18 {
+.c14 {
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
@@ -488,10 +447,6 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
 
 .c4 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c0 {
@@ -508,35 +463,7 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
   justify-content: flex-start;
 }
 
-.c11 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c12 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c10 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.c19 {
+.c15 {
   color: #FF5F52;
 }
 
@@ -552,8 +479,6 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
   border-radius: 20px;
   background: #F9F9F9;
   width: 100%;
-  z-index: 1;
-  margin-top: -24px;
 }
 
 .c3 {
@@ -573,7 +498,7 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
 
 .c8 {
   font-weight: 485;
-  font-size: 16px;
+  font-size: 18px;
   line-height: 24px;
   width: -webkit-max-content;
   width: -moz-max-content;
@@ -581,49 +506,24 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
 }
 
 .c9 {
-  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;
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c9:hover {
-  opacity: 0.6;
-}
-
-.c9:active {
-  opacity: 0.4;
-}
-
-.c13 {
   height: 8px;
   width: 40.698463777008904%;
-  background: #FC72FF;
+  background: #0066d9;
   border-top-left-radius: 5px;
   border-bottom-left-radius: 5px;
   border-right: 1px solid #F9F9F9;
 }
 
-.c14 {
+.c10 {
   height: 8px;
   width: 59.3015362229911%;
-  background: #4C82FB;
+  background: #FC72FF;
   border-top-right-radius: 5px;
   border-bottom-right-radius: 5px;
   border-left: 1px solid #F9F9F9;
 }
 
-.c15 {
+.c11 {
   gap: 4px;
   width: 100%;
   -webkit-align-items: flex-end;
@@ -632,7 +532,7 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
   align-items: flex-end;
 }
 
-.c16 {
+.c12 {
   color: #222222;
   font-size: 36px;
   font-weight: 485;
@@ -650,7 +550,7 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
     -webkit-flex-direction: row;
     -ms-flex-direction: row;
     flex-direction: row;
-    background: transparent;
+    background: #FFFFFF;
     -webkit-flex-wrap: wrap;
     -ms-flex-wrap: wrap;
     flex-wrap: wrap;
@@ -659,7 +559,6 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
     -webkit-justify-content: space-between;
     -ms-flex-pack: justify;
     justify-content: space-between;
-    margin-top: 0px;
   }
 }
 
@@ -686,7 +585,7 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
 }
 
 @media (max-width:1023px) {
-  .c15 {
+  .c11 {
     -webkit-flex-direction: column;
     -ms-flex-direction: column;
     flex-direction: column;
@@ -699,7 +598,7 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
 }
 
 @media (max-width:1023px) {
-  .c16 {
+  .c12 {
     font-size: 20px;
     line-height: 28px;
   }
@@ -727,50 +626,12 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
         <div
           class="c5 c6 c8"
         >
-          90.9M 
-          <a
-            class="c9"
-            href="/explore/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
-          >
-            <div
-              class="c10"
-              style="height: 16px; width: 16px; margin-right: 4px; margin-left: 4px;"
-            >
-              <div
-                class="c11"
-              >
-                <img
-                  class="c12"
-                  src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
-                />
-              </div>
-            </div>
-            USDC
-          </a>
+          90.93M USDC
         </div>
         <div
           class="c5 c6 c8"
         >
-          82.5K 
-          <a
-            class="c9"
-            href="/explore/tokens/ethereum/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
-          >
-            <div
-              class="c10"
-              style="height: 16px; width: 16px; margin-right: 4px; margin-left: 4px;"
-            >
-              <div
-                class="c11"
-              >
-                <img
-                  class="c12"
-                  src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png"
-                />
-              </div>
-            </div>
-            WETH
-          </a>
+          82,526.49 WETH
         </div>
       </div>
       <div
@@ -778,10 +639,10 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
         data-testid="pool-balance-chart"
       >
         <div
-          class="c13"
+          class="c9"
         />
         <div
-          class="c14"
+          class="c10"
         />
       </div>
     </div>
@@ -794,20 +655,20 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
         TVL
       </div>
       <div
-        class="c5 c6 c15"
+        class="c5 c6 c11"
       >
         <div
-          class="c16 css-vurnku"
+          class="c12 css-vurnku"
         >
           $223.2M
         </div>
         <div
-          class="c17 c18"
+          class="c13 c14"
           width="max-content"
         >
           <svg
             aria-label="down"
-            class="c19"
+            class="c15"
             fill="none"
             height="16"
             viewBox="0 0 24 24"
@@ -836,20 +697,20 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
         24H volume
       </div>
       <div
-        class="c5 c6 c15"
+        class="c5 c6 c11"
       >
         <div
-          class="c16 css-vurnku"
+          class="c12 css-vurnku"
         >
           $233.4M
         </div>
         <div
-          class="c17 c18"
+          class="c13 c14"
           width="max-content"
         >
           <svg
             aria-label="down"
-            class="c19"
+            class="c15"
             fill="none"
             height="16"
             viewBox="0 0 24 24"
@@ -878,10 +739,10 @@ exports[`PoolDetailsStats renders stats text correctly 1`] = `
         24H fees
       </div>
       <div
-        class="c5 c6 c15"
+        class="c5 c6 c11"
       >
         <div
-          class="c16 css-vurnku"
+          class="c12 css-vurnku"
         >
           $116.7K
         </div>
diff --git a/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsStatsButtons.test.tsx.snap b/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsStatsButtons.test.tsx.snap
index b98c783f4ee..a6f743b439f 100644
--- a/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsStatsButtons.test.tsx.snap
+++ b/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsStatsButtons.test.tsx.snap
@@ -42,7 +42,6 @@ exports[`PoolDetailsStatsButton loading skeleton shown correctly 1`] = `
 
 .c2 {
   gap: 12px;
-  z-index: 1;
 }
 
 .c4 {
@@ -73,60 +72,13 @@ exports[`PoolDetailsStatsButton loading skeleton shown correctly 1`] = `
 
 exports[`PoolDetailsStatsButton renders both buttons correctly 1`] = `
 <DocumentFragment>
-  .c1 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c30 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  display: inline-block;
-  text-align: center;
-  line-height: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font-size: inherit;
-  padding-left: 16px;
-  padding-right: 16px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: white;
-  background-color: primary;
-  border: 0;
-  border-radius: 4px;
-}
-
-.c47 {
+  .c0 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  display: inline-block;
-  text-align: center;
-  line-height: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font-size: inherit;
-  padding-left: 16px;
-  padding-right: 16px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: white;
-  background-color: primary;
-  border: 0;
-  border-radius: 4px;
-  font-weight: 535;
 }
 
-.c2 {
+.c1 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -143,216 +95,7 @@ exports[`PoolDetailsStatsButton renders both buttons correctly 1`] = `
   justify-content: flex-start;
 }
 
-.c11 {
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.c13 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-}
-
 .c6 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c26 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c15 {
-  outline: none;
-  border: none;
-  font-size: inherit;
-  padding: 0;
-  margin: 0;
-  background: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  -webkit-transition-timing-function: ease-in-out;
-  transition-timing-function: ease-in-out;
-  -webkit-transition-property: opacity,color,background-color;
-  transition-property: opacity,color,background-color;
-}
-
-.c15:hover {
-  opacity: 0.6;
-}
-
-.c15:focus {
-  -webkit-text-decoration: underline;
-  text-decoration: underline;
-}
-
-.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;
-}
-
-.c45 {
-  display: grid;
-  grid-auto-rows: auto;
-  grid-row-gap: 4px;
-}
-
-.c9 {
-  position: relative;
-  z-index: 1;
-  -webkit-transition: -webkit-transform 250ms ease;
-  -webkit-transition: transform 250ms ease;
-  transition: transform 250ms ease;
-  border-radius: 24px;
-}
-
-.c10 {
-  border-radius: 24px;
-  z-index: -1;
-  padding-top: 12px;
-}
-
-.c43 {
-  border-radius: 12px;
-  height: 40px;
-  width: 40px;
-  position: relative;
-  margin-top: -18px;
-  margin-bottom: -18px;
-  margin-left: auto;
-  margin-right: auto;
-  background-color: #F9F9F9;
-  border: 4px solid;
-  border-color: #FFFFFF;
-  z-index: 2;
-}
-
-.c43:hover {
-  cursor: pointer;
-  opacity: 0.8;
-}
-
-.c23 {
-  background-color: #F9F9F9;
-  border-radius: 16px;
-  color: #7D7D7D;
-  font-size: 14px;
-  font-weight: 500;
-  height: 120px;
-  line-height: 20px;
-  padding: 16px;
-  position: relative;
-}
-
-.c23:before {
-  box-sizing: border-box;
-  background-size: 100%;
-  border-radius: inherit;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  pointer-events: none;
-  content: '';
-  border: 1px solid #F9F9F9;
-}
-
-.c23:hover:before {
-  border-color: #98A1C014;
-}
-
-.c23:focus-within:before {
-  border-color: #B8C0DC3d;
-}
-
-.c46 {
-  border-bottom: 1px solid #FFFFFF;
-}
-
-.c44 {
-  display: -webkit-inline-box;
-  display: -webkit-inline-flex;
-  display: -ms-inline-flexbox;
-  display: inline-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;
-  width: 100%;
-  height: 100%;
-}
-
-.c16 {
-  color: #222222;
-  background-color: #F9F9F9;
-  padding: 8px 16px;
-  border-radius: 20px;
-  gap: 4px;
-  font-weight: 485;
-}
-
-.c16:focus {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c16:active {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c18 {
-  color: #7D7D7D;
-  padding: 8px 16px;
-  border-radius: 20px;
-  gap: 4px;
-  font-weight: 485;
-}
-
-.c18:focus {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c18:active {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c42 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-}
-
-.c50 {
   background-color: transparent;
   bottom: 0;
   border-radius: inherit;
@@ -366,864 +109,103 @@ exports[`PoolDetailsStatsButton renders both buttons correctly 1`] = `
   width: 100%;
 }
 
-.c31 {
-  padding: 16px;
-  width: 100%;
-  line-height: 24px;
-  font-weight: 535;
-  text-align: center;
-  border-radius: 16px;
-  outline: none;
-  border: 1px solid transparent;
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-flex-wrap: nowrap;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
+.c3 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-  will-change: transform;
-  -webkit-transition: -webkit-transform 450ms ease;
-  -webkit-transition: transform 450ms ease;
-  transition: transform 450ms ease;
-  -webkit-transform: perspective(1px) translateZ(0);
-  -ms-transform: perspective(1px) translateZ(0);
-  transform: perspective(1px) translateZ(0);
-}
-
-.c31:disabled {
-  opacity: 50%;
-  cursor: auto;
-  pointer-events: none;
-}
-
-.c31 > * {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c31 > a {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c48 {
   background-color: #FFEFFF;
+  border-radius: 16px;
+  border: 0;
   color: #FC72FF;
-  font-size: 20px;
-  font-weight: 535;
-}
-
-.c48:focus {
-  box-shadow: 0 0 0 1pt #FFEFFF;
-  background-color: #FFEFFF;
-}
-
-.c48:hover {
-  background-color: #FFEFFF;
-}
-
-.c48:active {
-  box-shadow: 0 0 0 1pt #FFEFFF;
-  background-color: #FFEFFF;
-}
-
-.c48:hover .c49 {
-  background-color: #98A1C014;
-}
-
-.c48:active .c49 {
-  background-color: #B8C0DC3d;
-}
-
-.c48:disabled {
-  opacity: 0.4;
-}
-
-.c48:disabled:hover {
-  cursor: auto;
-  background-color: transparent;
-  box-shadow: none;
-  border: 1px solid transparent;
-  outline: none;
-}
-
-.c32 {
-  background-color: #FFFFFF;
-  color: #7D7D7D;
-  border: 1px solid #22222212;
-  font-size: 16px;
-  font-weight: 535;
-}
-
-.c32:hover {
-  background-color: #ececec;
-}
-
-.c32:active {
-  background-color: #e0e0e0;
-}
-
-.c36 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c37 {
-  width: 24px;
-  height: 24px;
-  border-radius: 50%;
-}
-
-.c35 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.c17 {
-  display: inline-block;
-  height: inherit;
-}
-
-.c22 {
-  height: 24px;
-  width: 24px;
-}
-
-.c22 > * {
-  fill: #7D7D7D;
-}
-
-.c20 {
-  border: none;
-  background-color: transparent;
-  margin: 0;
-  padding: 0;
   cursor: pointer;
-  outline: none;
-}
-
-.c20:not([disabled]):hover {
-  opacity: 0.7;
-}
-
-.c21 {
-  padding: 6px 12px;
-  border-radius: 16px;
-}
-
-.c19 {
-  position: relative;
-}
-
-.c12 {
-  margin-bottom: 4px;
-  color: #7D7D7D;
-}
-
-.c14 {
-  gap: 16px;
-  padding-bottom: 8px;
-}
-
-.c28 {
-  color: #222222;
-  pointer-events: auto;
-  width: 0;
-  position: relative;
-  font-weight: 485;
-  outline: none;
-  border: none;
-  -webkit-flex: 1 1 auto;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-  background-color: transparent;
-  font-size: 28px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 0px;
-  -webkit-appearance: textfield;
-  text-align: right;
-}
-
-.c28::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-.c28 [type='number'] {
-  -moz-appearance: textfield;
-}
-
-.c28::-webkit-outer-spin-button,
-.c28::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-}
-
-.c28::-webkit-input-placeholder {
-  color: #CECECE;
-}
-
-.c28::-moz-placeholder {
-  color: #CECECE;
-}
-
-.c28:-ms-input-placeholder {
-  color: #CECECE;
-}
-
-.c28::placeholder {
-  color: #CECECE;
-}
-
-.c29 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-  text-align: left;
-  font-size: 36px;
-  font-weight: 485;
-  max-height: 44px;
-}
-
-.c24 {
   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;
+  font-size: 16px;
+  font-weight: 535;
+  gap: 12px;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  line-height: 20px;
+  padding: 10px 12px;
   position: relative;
-  border-radius: 20px;
-  z-index: 1;
-  width: initial;
-  -webkit-transition: height 1s ease;
-  transition: height 1s ease;
-  will-change: height;
-}
-
-.c25 {
-  min-height: 44px;
-  border-radius: 20px;
-  width: initial;
-}
-
-.c33 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #FFFFFF;
-  opacity: 1;
-  color: #222222;
-  cursor: pointer;
-  height: 36px;
-  border-radius: 18px;
-  outline: none;
+  -webkit-transition: 150ms ease opacity;
+  transition: 150ms ease opacity;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
-  border: 1px solid #22222212;
-  font-size: 24px;
-  font-weight: 485;
-  width: initial;
-  padding: 4px 8px 4px 4px;
-  gap: 8px;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  margin-left: 12px;
-  box-shadow: 0px 0px 10px 0px rgba(34,34,34,0.04);
-  visibility: visible;
-  -webkit-animation: none;
-  animation: none;
 }
 
-.c33:hover,
-.c33:active {
-  background-color: #F9F9F9;
-}
-
-.c33:before {
-  background-size: 100%;
-  border-radius: inherit;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  content: '';
-}
-
-.c33:hover:before {
-  background-color: #98A1C014;
-}
-
-.c33:active:before {
+.c3:active .c5 {
   background-color: #B8C0DC3d;
 }
 
-.c27 {
-  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: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.c40 {
-  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;
-  color: #7D7D7D;
-  font-size: 0.75rem;
-  line-height: 1rem;
-}
-
-.c40 span:hover {
-  cursor: pointer;
-  color: #4a4a4a;
-}
-
-.c41 {
-  -webkit-box-pack: end;
-  -webkit-justify-content: flex-end;
-  -ms-flex-pack: end;
-  justify-content: flex-end;
-  min-height: 24px;
-  padding: 8px 0px 0px 0px;
-}
-
-.c34 {
-  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: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  width: 100%;
+.c3:focus .c5 {
+  background-color: #B8C0DC3d;
 }
 
-.c39 {
-  margin: 0 0.25rem 0 0.35rem;
-  height: 35%;
-  margin-left: 8px;
+.c3:hover .c5 {
+  background-color: #98A1C014;
 }
 
-.c39 path {
-  stroke: #222222;
-  stroke-width: 2px;
+.c3:disabled {
+  cursor: default;
+  opacity: 0.6;
 }
 
-.c38 {
-  margin: 0 0.25rem 0 0.25rem;
-  font-size: 20px;
-  font-weight: 535;
+.c3:disabled:active .c5,
+.c3:disabled:focus .c5,
+.c3:disabled:hover .c5 {
+  background-color: transparent;
 }
 
-.c3 {
+.c2 {
   gap: 12px;
-  z-index: 1;
 }
 
 .c4 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
   padding: 12px 16px 12px 12px;
-  border: unset;
   border-radius: 900px;
   width: 50%;
-  gap: 8px;
-  color: #FC72FF;
-  background-color: #FC72FF1f;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-transition: width 250ms ease-in-out;
-  transition: width 250ms ease-in-out;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c4:hover {
-  opacity: 0.6;
-}
-
-.c4:active {
-  opacity: 0.4;
-}
-
-.c5 {
-  fill: #FC72FF;
-  rotate: 90deg;
-}
-
-.c7 {
-  z-index: 0;
-  max-height: 0;
-  -webkit-transition: max-height 250ms ease;
-  transition: max-height 250ms ease;
-  padding-bottom: 0;
-}
-
-.c7 .c8:before {
-  background-color: unset;
 }
 
 @media (max-width:1023px) {
-  .c3 {
-    display: none;
-  }
-}
-
-@media (max-width:1023px) {
-  .c7 {
+  .c2 {
     display: none;
   }
 }
 
 <div
-    class="c0"
+    class="c0 c1 c2"
   >
-    <div
-      class="c1 c2 c3"
+    <button
+      class="c3 c4"
+      data-testid="pool-details-add-liquidity-button"
+      size="1"
     >
-      <button
-        class="c4"
-        data-testid="pool-details-swap-button"
-      >
-        <svg
-          class="c5"
-          fill="none"
-          height="20"
-          viewBox="0 0 20 20"
-          width="20"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M2.05836 6.27468C2.00086 6.21718 1.95514 6.14789 1.92348 6.07123C1.86014 5.91873 1.86014 5.74623 1.92348 5.59373C1.95514 5.51706 2.00086 5.44798 2.05836 5.39048L5.3917 2.05715C5.63586 1.81298 6.03173 1.81298 6.27589 2.05715C6.52006 2.30132 6.52006 2.69718 6.27589 2.94134L4.00925 5.20799H14.1667C14.5117 5.20799 14.7917 5.48799 14.7917 5.83299C14.7917 6.17799 14.5117 6.45799 14.1667 6.45799H4.00925L6.27589 8.72463C6.52006 8.9688 6.52006 9.36466 6.27589 9.60882C6.15423 9.73049 5.9942 9.79213 5.8342 9.79213C5.6742 9.79213 5.51418 9.73132 5.39251 9.60882L2.05836 6.27468ZM18.0766 13.9271C18.045 13.8504 17.9992 13.7813 17.9417 13.7238L14.6084 10.3905C14.3642 10.1463 13.9684 10.1463 13.7242 10.3905C13.4801 10.6346 13.4801 11.0305 13.7242 11.2747L15.9909 13.5413H5.83339C5.48839 13.5413 5.20839 13.8213 5.20839 14.1663C5.20839 14.5113 5.48839 14.7913 5.83339 14.7913H15.9909L13.7242 17.058C13.4801 17.3021 13.4801 17.698 13.7242 17.9422C13.8459 18.0638 14.0059 18.1255 14.1659 18.1255C14.3259 18.1255 14.4859 18.0647 14.6076 17.9422L17.9409 14.6088C17.9984 14.5513 18.0442 14.4822 18.0758 14.4056C18.14 14.2522 18.14 14.0804 18.0766 13.9271Z"
-          />
-        </svg>
-        <div
-          class="c6 css-1guhfcl"
-        >
-          Swap
-        </div>
-      </button>
-      <button
-        class="c4"
-        data-testid="pool-details-add-liquidity-button"
-      >
-        <svg
-          fill="none"
-          height="20"
-          stroke="currentColor"
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          stroke-width="2"
-          viewBox="0 0 24 24"
-          width="20"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <line
-            x1="12"
-            x2="12"
-            y1="5"
-            y2="19"
-          />
-          <line
-            x1="5"
-            x2="19"
-            y1="12"
-            y2="12"
-          />
-        </svg>
-        <div
-          class="c6 css-1guhfcl"
-        >
-          Add liquidity
-        </div>
-      </button>
-    </div>
-    <div
-      class="c7"
-      data-testid="pool-details-swap-modal"
+      <div
+        class="c5 c6"
+      />
+      Add liquidity
+    </button>
+    <button
+      class="c3 c4"
+      data-testid="pool-details-swap-button"
+      size="1"
     >
-      <main
-        class="c8 c9"
-        id="swap-page"
-      >
-        <div
-          class="c10"
-        >
-          <div
-            class="c1 c2 c11 c12"
-          >
-            <div
-              class="c1 c2 c13 c14"
-            >
-              <h1
-                class="c15 c16"
-                role="button"
-                tabindex="0"
-              >
-                Swap
-              </h1>
-              <div
-                class="c17"
-              >
-                <div>
-                  <button
-                    class="c15 c18"
-                    data-testid="buy-fiat-button"
-                  >
-                    Buy
-                  </button>
-                </div>
-              </div>
-            </div>
-            <div
-              class="c1 c2 c13"
-            >
-              <div
-                class="c19"
-              >
-                <button
-                  aria-label="Transaction Settings"
-                  class="c20"
-                  data-testid="open-settings-dialog-button"
-                  id="open-settings-dialog-button"
-                >
-                  <div
-                    class="c1 c2 c21"
-                  >
-                    <svg
-                      class="c22"
-                      fill="none"
-                      height="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>
-                  </div>
-                </button>
-              </div>
-            </div>
-          </div>
-          <div
-            style="display: relative;"
-          >
-            <div
-              class="c23"
-            >
-              <div
-                class="c24"
-                id="swap-currency-input"
-              >
-                <div
-                  class="c25"
-                >
-                  <div
-                    class="c26 css-142zc9n"
-                    style="user-select: none;"
-                  >
-                    You pay
-                  </div>
-                  <div
-                    class="c27"
-                  >
-                    <div
-                      style="display: flex; flex-grow: 1;"
-                    >
-                      <input
-                        autocomplete="off"
-                        autocorrect="off"
-                        class="c28 c29 token-amount-input"
-                        id="swap-currency-input"
-                        inputmode="decimal"
-                        maxlength="79"
-                        minlength="1"
-                        pattern="^[0-9]*[.,]?[0-9]*$"
-                        placeholder="0"
-                        spellcheck="false"
-                        type="text"
-                        value=""
-                      />
-                    </div>
-                    <div>
-                      <div
-                        class="c17"
-                      >
-                        <button
-                          class="c30 c31 c32 c33 open-currency-select-button"
-                        >
-                          <span
-                            class="c34"
-                          >
-                            <div
-                              class="c1 c2 c13"
-                            >
-                              <div
-                                class="c35"
-                                style="height: 24px; width: 24px; margin-right: 2px;"
-                              >
-                                <div
-                                  class="c36"
-                                >
-                                  <img
-                                    class="c37"
-                                    src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
-                                  />
-                                </div>
-                              </div>
-                              <span
-                                class="c38 token-symbol-container"
-                              >
-                                USDC
-                              </span>
-                            </div>
-                            <svg
-                              class="c39"
-                            >
-                              dropdown.svg
-                            </svg>
-                          </span>
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-                  <div
-                    class="c40 c41"
-                  >
-                    <div
-                      class="c1 c2 c11"
-                    >
-                      <div
-                        class="c42"
-                      />
-                      <span />
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div
-              class="c43"
-            >
-              <div
-                class="c44"
-                color="#222222"
-                data-testid="swap-currency-button"
-              >
-                <svg
-                  fill="none"
-                  height="16"
-                  stroke="#222222"
-                  stroke-linecap="round"
-                  stroke-linejoin="round"
-                  stroke-width="2"
-                  viewBox="0 0 24 24"
-                  width="16"
-                  xmlns="http://www.w3.org/2000/svg"
-                >
-                  <line
-                    x1="12"
-                    x2="12"
-                    y1="5"
-                    y2="19"
-                  />
-                  <polyline
-                    points="19 12 12 19 5 12"
-                  />
-                </svg>
-              </div>
-            </div>
-          </div>
-          <div
-            class="c45"
-          >
-            <div>
-              <div
-                class="c23 c46"
-              >
-                <div
-                  class="c24"
-                  id="swap-currency-output"
-                >
-                  <div
-                    class="c25"
-                  >
-                    <div
-                      class="c26 css-142zc9n"
-                      style="user-select: none;"
-                    >
-                      You receive
-                    </div>
-                    <div
-                      class="c27"
-                    >
-                      <div
-                        style="display: flex; flex-grow: 1;"
-                      >
-                        <input
-                          autocomplete="off"
-                          autocorrect="off"
-                          class="c28 c29 token-amount-input"
-                          id="swap-currency-output"
-                          inputmode="decimal"
-                          maxlength="79"
-                          minlength="1"
-                          pattern="^[0-9]*[.,]?[0-9]*$"
-                          placeholder="0"
-                          spellcheck="false"
-                          type="text"
-                          value=""
-                        />
-                      </div>
-                      <div>
-                        <div
-                          class="c17"
-                        >
-                          <button
-                            class="c30 c31 c32 c33 open-currency-select-button"
-                          >
-                            <span
-                              class="c34"
-                            >
-                              <div
-                                class="c1 c2 c13"
-                              >
-                                <div
-                                  class="c35"
-                                  style="height: 24px; width: 24px; margin-right: 2px;"
-                                >
-                                  <div
-                                    class="c36"
-                                  >
-                                    <img
-                                      class="c37"
-                                      src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png"
-                                    />
-                                  </div>
-                                </div>
-                                <span
-                                  class="c38 token-symbol-container"
-                                >
-                                  WETH
-                                </span>
-                              </div>
-                              <svg
-                                class="c39"
-                              >
-                                dropdown.svg
-                              </svg>
-                            </span>
-                          </button>
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="c40 c41"
-                    >
-                      <div
-                        class="c1 c2 c11"
-                      >
-                        <div
-                          class="c42"
-                        />
-                        <span />
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div>
-              <button
-                class="c47 c31 c48"
-                font-weight="535"
-              >
-                <div
-                  class="c49 c50"
-                />
-                Connect wallet
-              </button>
-            </div>
-          </div>
-        </div>
-      </main>
-    </div>
+      <div
+        class="c5 c6"
+      />
+      Swap
+    </button>
   </div>
 </DocumentFragment>
 `;
diff --git a/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsTransactionTable.test.tsx.snap b/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsTransactionTable.test.tsx.snap
index 13bb96cb2b1..3e39f7ad5e3 100644
--- a/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsTransactionTable.test.tsx.snap
+++ b/apps/web/src/components/Pools/PoolDetails/__snapshots__/PoolDetailsTransactionTable.test.tsx.snap
@@ -25,31 +25,19 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
   justify-content: flex-start;
 }
 
-.c11 {
+.c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c27 {
+.c17 {
   color: #40B66B;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c28 {
+.c18 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c16 {
+.c12 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -60,15 +48,15 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
   font-weight: 500;
 }
 
-.c16:hover {
+.c12:hover {
   opacity: 0.6;
 }
 
-.c16:active {
+.c12:active {
   opacity: 0.4;
 }
 
-.c20 {
+.c19 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -79,26 +67,26 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
   font-weight: 500;
 }
 
-.c20:hover {
+.c19:hover {
   opacity: 0.6;
 }
 
-.c20:active {
+.c19:active {
   opacity: 0.4;
 }
 
-.c32 {
+.c23 {
   height: 16px;
   width: 16px;
 }
 
-.c32 path {
+.c23 path {
   stroke: #FC72FF;
   background: #7D7D7D;
   fill: none;
 }
 
-.c33 {
+.c24 {
   -webkit-animation: 2s fvtopB linear infinite;
   animation: 2s fvtopB linear infinite;
 }
@@ -117,11 +105,6 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
   justify-content: flex-start;
 }
 
-.c24 {
-  display: inline-block;
-  height: inherit;
-}
-
 .c1 {
   max-width: 1200px;
   max-height: 600px;
@@ -154,7 +137,7 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
   background: #FFFFFF;
 }
 
-.c18 {
+.c15 {
   width: 100%;
   position: relative;
   overflow-x: auto;
@@ -171,11 +154,11 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
   scrollbar-width: none;
 }
 
-.c18::-webkit-scrollbar {
+.c15::-webkit-scrollbar {
   display: none;
 }
 
-.c30 {
+.c21 {
   position: -webkit-sticky;
   position: sticky;
   -webkit-box-pack: center;
@@ -186,7 +169,7 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
   visibility: hidden;
 }
 
-.c31 {
+.c22 {
   background: #FFEFFF;
   border-radius: 8px;
   width: -webkit-fit-content;
@@ -202,7 +185,7 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
 }
 
 .c5 {
-  padding: 0px 12px;
+  padding: 0px 20px;
   width: -webkit-fit-content;
   width: -moz-fit-content;
   width: fit-content;
@@ -214,7 +197,7 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
   min-height: 64px;
 }
 
-.c19:hover {
+.c16:hover {
   background: #22222212;
 }
 
@@ -256,115 +239,10 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
   justify-content: flex-end;
 }
 
-.c7:first-child {
-  -webkit-box-flex: 0;
-  -webkit-flex-grow: 0;
-  -ms-flex-positive: 0;
-  flex-grow: 0;
-}
-
-.c22 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #222222;
-}
-
-.c22:hover {
-  opacity: 0.6;
-}
-
-.c22:active {
-  opacity: 0.4;
-}
-
-.c9 {
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  cursor: pointer;
-  width: 100%;
-  gap: 4px;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c9:hover {
-  opacity: 0.6;
-}
-
-.c9:active {
-  opacity: 0.4;
-}
-
-.c10 {
-  height: 16px;
-  width: 16px;
-  color: #7D7D7D;
-  -webkit-transform: rotate(0deg);
-  -ms-transform: rotate(0deg);
-  transform: rotate(0deg);
-}
-
-.c13 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  cursor: pointer;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  gap: 4px;
-}
-
-.c13:hover {
-  opacity: 0.6;
-}
-
-.c13:active {
-  opacity: 0.4;
-}
-
-.c23 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -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;
-  gap: 8px;
-  width: 100%;
-}
-
-.c26 {
-  display: none;
-  height: 16px;
-  width: 16px;
-  color: #7D7D7D;
-}
-
-.c21:hover .c25 {
-  display: block;
-}
-
 .c8 {
-  min-width: 164px;
+  width: undefinedpx;
+  min-width: 150px;
+  min-width: undefinedpx;
   -webkit-flex: 0;
   -ms-flex: 0;
   flex: 0;
@@ -380,13 +258,15 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c12 {
+.c10 {
+  width: undefinedpx;
   min-width: 100px;
+  min-width: undefinedpx;
   -webkit-flex: 0;
   -ms-flex: 0;
   flex: 0;
@@ -402,13 +282,15 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c15 {
+.c11 {
+  width: undefinedpx;
   min-width: 125px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -424,13 +306,15 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c17 {
+.c13 {
+  width: undefinedpx;
   min-width: 100px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -446,16 +330,36 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
 .c14 {
-  position: relative;
+  width: undefinedpx;
+  min-width: 32px;
+  min-width: undefinedpx;
+  -webkit-flex: 0;
+  -ms-flex: 0;
+  flex: 0;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: end;
+  -webkit-justify-content: flex-end;
+  -ms-flex-pack: end;
+  justify-content: flex-end;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  font-variant-numeric: tabular-nums;
+  overflow: hidden;
+  padding: 12px 8px;
 }
 
-.c29 {
+.c20 {
   color: #7D7D7D;
   stroke: #7D7D7D;
 }
@@ -480,36 +384,9 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c3 c4 c9"
+                  class="c9 css-1urox24"
                 >
-                  <svg
-                    class="c10"
-                    direction="desc"
-                    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="12"
-                      x2="12"
-                      y1="5"
-                      y2="19"
-                    />
-                    <polyline
-                      points="19 12 12 19 5 12"
-                    />
-                  </svg>
-                  <div
-                    class="c11 css-1urox24"
-                  >
-                    Time
-                  </div>
+                  Time
                 </div>
               </div>
             </div>
@@ -517,33 +394,12 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c10"
               >
                 <div
-                  class="c3 c4 c13"
+                  class="c9 css-1urox24"
                 >
-                  <svg
-                    class="c14"
-                    fill="none"
-                    height="17"
-                    viewBox="0 0 16 17"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M7.99954 13.1667C7.82887 13.1667 7.65818 13.1014 7.52818 12.9714L4.86152 10.3047C4.60085 10.044 4.60085 9.62267 4.86152 9.362C5.12218 9.10134 5.54356 9.10134 5.80422 9.362L7.99954 11.5573L10.1948 9.362C10.4555 9.10134 10.8769 9.10134 11.1376 9.362C11.3982 9.62267 11.3982 10.044 11.1376 10.3047L8.47089 12.9714C8.34089 13.1014 8.1702 13.1667 7.99954 13.1667Z"
-                      fill="#9B9B9B"
-                    />
-                    <path
-                      d="M10.6662 7.83336C10.4955 7.83336 10.3248 7.76805 10.1948 7.63805L7.99954 5.44274L5.80422 7.63805C5.54356 7.89872 5.12218 7.89872 4.86152 7.63805C4.60085 7.37738 4.60085 6.95601 4.86152 6.69534L7.52818 4.02868C7.78885 3.76801 8.21022 3.76801 8.47089 4.02868L11.1376 6.69534C11.3982 6.95601 11.3982 7.37738 11.1376 7.63805C11.0076 7.76805 10.8369 7.83336 10.6662 7.83336Z"
-                      fill="#9B9B9B"
-                    />
-                  </svg>
-                  <div
-                    class="c11 css-1urox24"
-                  >
-                    Type
-                  </div>
+                  Type
                 </div>
               </div>
             </div>
@@ -551,10 +407,10 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c11 css-1urox24"
+                  class="c9 css-1urox24"
                 >
                   USD
                 </div>
@@ -564,14 +420,14 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <a
-                  class="c16"
+                  class="c12"
                   href="/explore/tokens/ethereum/undefined"
                 >
                   <div
-                    class="c11 css-1urox24"
+                    class="c9 css-1urox24"
                   />
                 </a>
               </div>
@@ -580,14 +436,14 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <a
-                  class="c16"
+                  class="c12"
                   href="/explore/tokens/ethereum/undefined"
                 >
                   <div
-                    class="c11 css-1urox24"
+                    class="c9 css-1urox24"
                   />
                 </a>
               </div>
@@ -596,22 +452,35 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
               class="c7"
             >
               <div
-                class="c17"
+                class="c13"
               >
                 <div
-                  class="c11 css-1urox24"
+                  class="c9 css-1urox24"
                 >
                   Wallet
                 </div>
               </div>
             </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c14"
+              >
+                <div
+                  class="c9 css-1urox24"
+                >
+                  Tx
+                </div>
+              </div>
+            </div>
           </div>
         </div>
         <div
-          class="c0 c18"
+          class="c0 c15"
         >
           <div
-            class="c3 c4 c5 c19"
+            class="c3 c4 c5 c16"
           >
             <div
               class="c7"
@@ -619,62 +488,24 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
               <div
                 class="c8"
               >
-                <a
-                  class="c20 c21 c22 c23"
-                  href="https://etherscan.io/tx/0x123"
-                  rel="noopener noreferrer"
-                  target="_blank"
+                <div
+                  class="c9 css-1urox24"
                 >
-                  <div
-                    class="c24"
-                  >
-                    <div>
-                      <div
-                        class="c11 css-1urox24"
-                      >
-                        01/12, 05:46am
-                      </div>
-                    </div>
-                  </div>
-                  <svg
-                    class="c25 c26"
-                    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"
-                  >
-                    <path
-                      d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"
-                    />
-                    <polyline
-                      points="15 3 21 3 21 9"
-                    />
-                    <line
-                      x1="10"
-                      x2="21"
-                      y1="14"
-                      y2="3"
-                    />
-                  </svg>
-                </a>
+                  01/12, 05:46am
+                </div>
               </div>
             </div>
             <div
               class="c7"
             >
               <div
-                class="c12"
+                class="c10"
               >
                 <div
-                  class="c27 css-1urox24"
+                  class="c17 css-1urox24"
                 >
                   <span>
-                    Buy 
+                    Buy Token1
                   </span>
                 </div>
               </div>
@@ -683,10 +514,10 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c28 css-1urox24"
+                  class="c18 css-1urox24"
                 >
                   $400.00
                 </div>
@@ -696,10 +527,10 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c28 css-1urox24"
+                  class="c18 css-1urox24"
                 >
                   300
                 </div>
@@ -709,10 +540,10 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c28 css-1urox24"
+                  class="c18 css-1urox24"
                 >
                   200
                 </div>
@@ -722,30 +553,70 @@ exports[`PoolDetailsTransactionsTable renders data filled state 1`] = `
               class="c7"
             >
               <div
-                class="c17"
+                class="c13"
               >
                 <a
-                  class="c20 c29"
+                  class="c19 c20"
                   href="https://etherscan.io/address/0xabc"
                   rel="noopener noreferrer"
                   target="_blank"
                 >
                   <div
-                    class="c28 css-1urox24"
+                    class="c18 css-1urox24"
                   />
                 </a>
               </div>
             </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c14"
+              >
+                <a
+                  class="c19 c20"
+                  data-testid="https://etherscan.io/tx/0x123"
+                  href="https://etherscan.io/tx/0x123"
+                  rel="noopener noreferrer"
+                  target="_blank"
+                >
+                  <svg
+                    fill="none"
+                    height="16px"
+                    stroke="#222222"
+                    stroke-linecap="round"
+                    stroke-linejoin="round"
+                    stroke-width="2"
+                    viewBox="0 0 24 24"
+                    width="16px"
+                    xmlns="http://www.w3.org/2000/svg"
+                  >
+                    <path
+                      d="M18 13v6a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8a2 2 0 0 1 2-2h6"
+                    />
+                    <polyline
+                      points="15 3 21 3 21 9"
+                    />
+                    <line
+                      x1="10"
+                      x2="21"
+                      y1="14"
+                      y2="3"
+                    />
+                  </svg>
+                </a>
+              </div>
+            </div>
           </div>
         </div>
         <div
-          class="c3 c4 c30"
+          class="c3 c4 c21"
         >
           <div
-            class="c3 c4 c31"
+            class="c3 c4 c22"
           >
             <svg
-              class="c32 c33"
+              class="c23 c24"
               fill="none"
               stroke="#FC72FF"
               viewBox="0 0 24 24"
@@ -798,26 +669,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
   justify-content: flex-start;
 }
 
-.c11 {
+.c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c23 {
+.c20 {
   height: 16px;
   width: 16px;
 }
 
-.c23 path {
+.c20 path {
   stroke: #FC72FF;
   background: #7D7D7D;
   fill: none;
 }
 
-.c24 {
+.c21 {
   -webkit-animation: 2s fvtopB linear infinite;
   animation: 2s fvtopB linear infinite;
 }
@@ -868,7 +735,7 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
   background: #FFFFFF;
 }
 
-.c19 {
+.c16 {
   width: 100%;
   position: relative;
   overflow-x: auto;
@@ -885,11 +752,11 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
   scrollbar-width: none;
 }
 
-.c19::-webkit-scrollbar {
+.c16::-webkit-scrollbar {
   display: none;
 }
 
-.c21 {
+.c18 {
   position: -webkit-sticky;
   position: sticky;
   -webkit-box-pack: center;
@@ -900,7 +767,7 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
   visibility: hidden;
 }
 
-.c22 {
+.c19 {
   background: #FFEFFF;
   border-radius: 8px;
   width: -webkit-fit-content;
@@ -916,7 +783,7 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
 }
 
 .c5 {
-  padding: 0px 12px;
+  padding: 0px 20px;
   width: -webkit-fit-content;
   width: -moz-fit-content;
   width: fit-content;
@@ -928,7 +795,7 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
   min-height: 64px;
 }
 
-.c20:hover {
+.c17:hover {
   background: #22222212;
 }
 
@@ -970,68 +837,7 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
   justify-content: flex-end;
 }
 
-.c7:first-child {
-  -webkit-box-flex: 0;
-  -webkit-flex-grow: 0;
-  -ms-flex-positive: 0;
-  flex-grow: 0;
-}
-
-.c9 {
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  cursor: pointer;
-  width: 100%;
-  gap: 4px;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c9:hover {
-  opacity: 0.6;
-}
-
-.c9:active {
-  opacity: 0.4;
-}
-
-.c10 {
-  height: 16px;
-  width: 16px;
-  color: #7D7D7D;
-  -webkit-transform: rotate(0deg);
-  -ms-transform: rotate(0deg);
-  transform: rotate(0deg);
-}
-
-.c13 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  cursor: pointer;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  gap: 4px;
-}
-
-.c13:hover {
-  opacity: 0.6;
-}
-
-.c13:active {
-  opacity: 0.4;
-}
-
-.c16 {
+.c12 {
   border-radius: 12px;
   border-radius: 12px;
   height: 24px;
@@ -1047,7 +853,9 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
 }
 
 .c8 {
-  min-width: 164px;
+  width: undefinedpx;
+  min-width: 150px;
+  min-width: undefinedpx;
   -webkit-flex: 0;
   -ms-flex: 0;
   flex: 0;
@@ -1063,13 +871,15 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c12 {
+.c10 {
+  width: undefinedpx;
   min-width: 100px;
+  min-width: undefinedpx;
   -webkit-flex: 0;
   -ms-flex: 0;
   flex: 0;
@@ -1085,13 +895,15 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c15 {
+.c11 {
+  width: undefinedpx;
   min-width: 125px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -1107,13 +919,15 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c18 {
+.c14 {
+  width: undefinedpx;
   min-width: 100px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -1129,18 +943,38 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c17 {
-  width: 75%;
-  height: 16px;
+.c15 {
+  width: undefinedpx;
+  min-width: 32px;
+  min-width: undefinedpx;
+  -webkit-flex: 0;
+  -ms-flex: 0;
+  flex: 0;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: end;
+  -webkit-justify-content: flex-end;
+  -ms-flex-pack: end;
+  justify-content: flex-end;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  font-variant-numeric: tabular-nums;
+  overflow: hidden;
+  padding: 12px 8px;
 }
 
-.c14 {
-  position: relative;
+.c13 {
+  width: 75%;
+  height: 16px;
 }
 
 <div
@@ -1163,36 +997,9 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c3 c4 c9"
+                  class="c9 css-1urox24"
                 >
-                  <svg
-                    class="c10"
-                    direction="desc"
-                    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="12"
-                      x2="12"
-                      y1="5"
-                      y2="19"
-                    />
-                    <polyline
-                      points="19 12 12 19 5 12"
-                    />
-                  </svg>
-                  <div
-                    class="c11 css-1urox24"
-                  >
-                    Time
-                  </div>
+                  Time
                 </div>
               </div>
             </div>
@@ -1200,57 +1007,370 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c10"
               >
                 <div
-                  class="c3 c4 c13"
+                  class="c9 css-1urox24"
                 >
-                  <svg
-                    class="c14"
-                    fill="none"
-                    height="17"
-                    viewBox="0 0 16 17"
-                    width="16"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M7.99954 13.1667C7.82887 13.1667 7.65818 13.1014 7.52818 12.9714L4.86152 10.3047C4.60085 10.044 4.60085 9.62267 4.86152 9.362C5.12218 9.10134 5.54356 9.10134 5.80422 9.362L7.99954 11.5573L10.1948 9.362C10.4555 9.10134 10.8769 9.10134 11.1376 9.362C11.3982 9.62267 11.3982 10.044 11.1376 10.3047L8.47089 12.9714C8.34089 13.1014 8.1702 13.1667 7.99954 13.1667Z"
-                      fill="#9B9B9B"
-                    />
-                    <path
-                      d="M10.6662 7.83336C10.4955 7.83336 10.3248 7.76805 10.1948 7.63805L7.99954 5.44274L5.80422 7.63805C5.54356 7.89872 5.12218 7.89872 4.86152 7.63805C4.60085 7.37738 4.60085 6.95601 4.86152 6.69534L7.52818 4.02868C7.78885 3.76801 8.21022 3.76801 8.47089 4.02868L11.1376 6.69534C11.3982 6.95601 11.3982 7.37738 11.1376 7.63805C11.0076 7.76805 10.8369 7.83336 10.6662 7.83336Z"
-                      fill="#9B9B9B"
-                    />
-                  </svg>
-                  <div
-                    class="c11 css-1urox24"
-                  >
-                    Type
-                  </div>
+                  Type
+                </div>
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c11"
+              >
+                <div
+                  class="c9 css-1urox24"
+                >
+                  USD
+                </div>
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c11"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c11"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c14"
+              >
+                <div
+                  class="c9 css-1urox24"
+                >
+                  Wallet
+                </div>
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c15"
+              >
+                <div
+                  class="c9 css-1urox24"
+                >
+                  Tx
                 </div>
               </div>
             </div>
+          </div>
+        </div>
+        <div
+          class="c0 c16"
+        >
+          <div
+            class="c3 c4 c5 c17"
+          >
+            <div
+              class="c7"
+            >
+              <div
+                class="c8"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c10"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c11"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c11"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c11"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c14"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c15"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
+            <div
+              class="c7"
+            >
+              <div
+                class="c8"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c10"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c11"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c11"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c11"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c14"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c15"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
+            <div
+              class="c7"
+            >
+              <div
+                class="c8"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c10"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c11"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c11"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c11"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c14"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+            <div
+              class="c7"
+            >
+              <div
+                class="c15"
+              >
+                <div
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
+              </div>
+            </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c15"
+                class="c8"
               >
                 <div
-                  class="c11 css-1urox24"
-                >
-                  USD
-                </div>
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
               </div>
             </div>
             <div
               class="c7"
             >
               <div
-                class="c15"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1259,10 +1379,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1271,31 +1391,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c11"
               >
                 <div
-                  class="c11 css-1urox24"
-                >
-                  Wallet
-                </div>
+                  class="c12 c13"
+                  data-testid="cell-loading-bubble"
+                />
               </div>
             </div>
-          </div>
-        </div>
-        <div
-          class="c0 c19"
-        >
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1304,10 +1415,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1319,19 +1430,23 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c15"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1340,10 +1455,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1352,26 +1467,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1380,10 +1491,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1392,10 +1503,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1407,19 +1518,23 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c15"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1428,26 +1543,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1456,10 +1567,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1468,10 +1579,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1480,10 +1591,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1495,35 +1606,35 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c18"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1532,10 +1643,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1544,10 +1655,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1556,10 +1667,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1568,10 +1679,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1580,17 +1691,17 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c20"
+            class="c3 c4 c5 c17"
           >
             <div
               class="c7"
@@ -1599,7 +1710,7 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1608,10 +1719,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1620,10 +1731,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1632,10 +1743,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1644,10 +1755,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1656,38 +1767,38 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c12"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1696,10 +1807,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1708,10 +1819,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1720,10 +1831,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1732,26 +1843,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1760,22 +1867,26 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c15"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1784,10 +1895,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1796,10 +1907,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1808,26 +1919,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1836,10 +1943,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1851,19 +1958,23 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c15"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1872,10 +1983,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1884,26 +1995,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1912,10 +2019,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1924,10 +2031,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1939,19 +2046,23 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c15"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1960,26 +2071,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1988,10 +2095,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2000,10 +2107,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2012,10 +2119,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2027,35 +2134,35 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c18"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2064,10 +2171,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2076,10 +2183,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2088,10 +2195,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2100,10 +2207,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2112,17 +2219,17 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c20"
+            class="c3 c4 c5 c17"
           >
             <div
               class="c7"
@@ -2131,7 +2238,7 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2140,10 +2247,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2152,10 +2259,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2164,10 +2271,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2176,10 +2283,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2188,38 +2295,38 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c12"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2228,10 +2335,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2240,10 +2347,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2252,10 +2359,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2264,26 +2371,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2292,22 +2395,26 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c15"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2316,10 +2423,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2328,10 +2435,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2340,26 +2447,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2368,10 +2471,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2383,19 +2486,23 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c15"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2404,10 +2511,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2416,26 +2523,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2444,10 +2547,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2456,10 +2559,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2471,19 +2574,23 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c15"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2492,26 +2599,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2520,10 +2623,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2532,10 +2635,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2544,10 +2647,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2559,35 +2662,35 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c18"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2596,10 +2699,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2608,10 +2711,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2620,10 +2723,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2632,10 +2735,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2644,17 +2747,17 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c20"
+            class="c3 c4 c5 c17"
           >
             <div
               class="c7"
@@ -2663,7 +2766,7 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2672,10 +2775,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2684,10 +2787,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2696,10 +2799,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2708,10 +2811,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2720,38 +2823,38 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c12"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2760,10 +2863,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2772,10 +2875,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2784,10 +2887,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2796,26 +2899,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2824,22 +2923,26 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c15"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2848,10 +2951,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2860,10 +2963,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2872,26 +2975,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2900,10 +2999,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2915,19 +3014,23 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c15"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2936,10 +3039,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2948,26 +3051,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2976,10 +3075,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2988,10 +3087,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3003,19 +3102,23 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c15"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3024,26 +3127,22 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3052,10 +3151,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3064,10 +3163,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3076,10 +3175,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3091,35 +3190,35 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
                 class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
+          </div>
+          <div
+            class="c3 c4 c5 c17"
+          >
             <div
               class="c7"
             >
               <div
-                class="c18"
+                class="c8"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
-          </div>
-          <div
-            class="c3 c4 c5 c20"
-          >
             <div
               class="c7"
             >
               <div
-                class="c8"
+                class="c10"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3128,10 +3227,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c12"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3140,10 +3239,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3152,10 +3251,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c11"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3164,10 +3263,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c15"
+                class="c14"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3176,10 +3275,10 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c18"
+                class="c15"
               >
                 <div
-                  class="c16 c17"
+                  class="c12 c13"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3187,13 +3286,13 @@ exports[`PoolDetailsTransactionsTable renders loading state 1`] = `
           </div>
         </div>
         <div
-          class="c3 c4 c21"
+          class="c3 c4 c18"
         >
           <div
-            class="c3 c4 c22"
+            class="c3 c4 c19"
           >
             <svg
-              class="c23 c24"
+              class="c20 c21"
               fill="none"
               stroke="#FC72FF"
               viewBox="0 0 24 24"
diff --git a/apps/web/src/components/Pools/PoolDetails/icons.tsx b/apps/web/src/components/Pools/PoolDetails/icons.tsx
index 75dabd06146..ed809369fad 100644
--- a/apps/web/src/components/Pools/PoolDetails/icons.tsx
+++ b/apps/web/src/components/Pools/PoolDetails/icons.tsx
@@ -5,6 +5,15 @@ type SVGProps = React.SVGProps<SVGSVGElement> & {
   gradientId?: string
 }
 
+export const ReversedArrowsIcon = (props: SVGProps) => (
+  <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg" {...props}>
+    <path
+      d="M18.125 10V12.5C18.125 14.2233 16.7225 15.625 15 15.625H4.0092L5.4425 17.0583C5.68667 17.3025 5.68667 17.6983 5.4425 17.9425C5.32084 18.0642 5.16081 18.1258 5.00081 18.1258C4.84081 18.1258 4.68079 18.065 4.55912 17.9425L2.05912 15.4425C2.00162 15.385 1.9559 15.3159 1.92424 15.2393C1.8609 15.0868 1.8609 14.9143 1.92424 14.7618C1.9559 14.6851 2.00162 14.6158 2.05912 14.5583L4.55912 12.0583C4.80329 11.8141 5.19915 11.8141 5.44332 12.0583C5.68749 12.3025 5.68749 12.6983 5.44332 12.9425L4.01001 14.3758H15C16.0333 14.3758 16.875 13.535 16.875 12.5008V10.0008C16.875 9.65581 17.155 9.37581 17.5 9.37581C17.845 9.37581 18.125 9.655 18.125 10ZM2.5 10.625C2.845 10.625 3.125 10.345 3.125 10V7.5C3.125 6.46583 3.96667 5.625 5 5.625H15.9908L14.5575 7.05831C14.3133 7.30247 14.3133 7.69834 14.5575 7.9425C14.6792 8.06417 14.8392 8.12581 14.9992 8.12581C15.1592 8.12581 15.3192 8.065 15.4409 7.9425L17.9409 5.4425C17.9984 5.385 18.0441 5.31592 18.0758 5.23926C18.1391 5.08676 18.1391 4.91426 18.0758 4.76176C18.0441 4.68509 17.9984 4.61581 17.9409 4.55831L15.4409 2.05831C15.1967 1.81414 14.8008 1.81414 14.5567 2.05831C14.3125 2.30247 14.3125 2.69834 14.5567 2.9425L15.99 4.37581H5C3.2775 4.37581 1.875 5.77748 1.875 7.50081V10.0008C1.875 10.345 2.155 10.625 2.5 10.625Z"
+      fill="#5E5E5E"
+    />
+  </svg>
+)
+
 export const ClosedCircle = (props: SVGProps) => (
   <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12" fill="none" {...props}>
     <g clipPath="url(#clip0_2958_135280)">
diff --git a/apps/web/src/components/Pools/PoolTable/PoolTable.test.tsx b/apps/web/src/components/Pools/PoolTable/PoolTable.test.tsx
index 2cbae71512e..ea69832e35e 100644
--- a/apps/web/src/components/Pools/PoolTable/PoolTable.test.tsx
+++ b/apps/web/src/components/Pools/PoolTable/PoolTable.test.tsx
@@ -1,15 +1,13 @@
 import { ApolloError } from '@apollo/client'
-import { Percent } from '@uniswap/sdk-core'
-import { ProtocolVersion } from 'graphql/data/__generated__/types-and-hooks'
-import { useTopPools } from 'graphql/data/pools/useTopPools'
+import { useTopPools } from 'graphql/thegraph/TopPools'
 import Router from 'react-router-dom'
 import { mocked } from 'test-utils/mocked'
-import { validBEPoolToken0, validBEPoolToken1, validParams } from 'test-utils/pools/fixtures'
+import { validParams, validPoolToken0, validPoolToken1 } from 'test-utils/pools/fixtures'
 import { render, screen } from 'test-utils/render'
 
 import { TopPoolTable } from './PoolTable'
 
-jest.mock('graphql/data/pools/useTopPools')
+jest.mock('graphql/thegraph/TopPools')
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useParams: jest.fn(),
@@ -47,16 +45,15 @@ describe('PoolTable', () => {
   it('renders data filled state', () => {
     const mockData = [
       {
-        token0: validBEPoolToken0,
-        token1: validBEPoolToken1,
+        token0: validPoolToken0,
+        token1: validPoolToken1,
         feeTier: 10000,
         hash: '0x123',
         txCount: 200,
         tvl: 300,
         volume24h: 400,
         volumeWeek: 500,
-        turnover: new Percent(6, 100),
-        protocolVersion: ProtocolVersion.V3,
+        turnover: 600,
       },
     ]
     mocked(useTopPools).mockReturnValue({
diff --git a/apps/web/src/components/Pools/PoolTable/PoolTable.tsx b/apps/web/src/components/Pools/PoolTable/PoolTable.tsx
index d6d4fb2b696..24becfef278 100644
--- a/apps/web/src/components/Pools/PoolTable/PoolTable.tsx
+++ b/apps/web/src/components/Pools/PoolTable/PoolTable.tsx
@@ -1,25 +1,19 @@
 import { Trans } from '@lingui/macro'
 import { ColumnDef, createColumnHelper } from '@tanstack/react-table'
-import { ChainId, Percent } from '@uniswap/sdk-core'
+import { ChainId } from '@uniswap/sdk-core'
 import Row from 'components/Row'
 import { Table } from 'components/Table'
 import { Cell } from 'components/Table/Cell'
-import { ClickableHeaderRow, HeaderArrow } from 'components/Table/styled'
 import { MAX_WIDTH_MEDIA_BREAKPOINT } from 'components/Tokens/constants'
 import { BIPS_BASE } from 'constants/misc'
-import { ProtocolVersion, Token } from 'graphql/data/__generated__/types-and-hooks'
-import { PoolSortFields, PoolTableSortState, TablePool, useTopPools } from 'graphql/data/pools/useTopPools'
-import {
-  OrderDirection,
-  chainIdToBackendName,
-  supportedChainIdFromGQLChain,
-  validateUrlChainParam,
-} from 'graphql/data/util'
+import { chainIdToBackendName, supportedChainIdFromGQLChain, validateUrlChainParam } from 'graphql/data/util'
+import { Token } from 'graphql/thegraph/__generated__/types-and-hooks'
+import { TablePool, useTopPools } from 'graphql/thegraph/TopPools'
 import { useCurrency } from 'hooks/Tokens'
-import { ReactElement, useCallback, useMemo, useState } from 'react'
-import { useParams } from 'react-router-dom'
+import { ReactElement, useMemo } from 'react'
+import { useNavigate, useParams } from 'react-router-dom'
 import styled from 'styled-components'
-import { ThemedText } from 'theme/components'
+import { ClickableStyle, ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
 import { DoubleCurrencyAndChainLogo } from '../PoolDetails/PoolDetailsHeader'
@@ -29,10 +23,15 @@ const TableWrapper = styled.div`
   max-width: ${MAX_WIDTH_MEDIA_BREAKPOINT};
 `
 
-const Badge = styled(ThemedText.LabelMicro)`
+const PoolDescriptionCell = styled(Row)`
+  gap: 8px;
+  cursor: pointer;
+  ${ClickableStyle}
+`
+
+const FeeTier = styled(ThemedText.LabelMicro)`
   padding: 2px 6px;
   background: ${({ theme }) => theme.surface2};
-  border-radius: 5px;
 `
 
 interface PoolTableValues {
@@ -42,8 +41,7 @@ interface PoolTableValues {
   tvl: number
   volume24h: number
   volumeWeek: number
-  turnover: Percent
-  link: string
+  turnover: number
 }
 
 export enum PoolTableColumns {
@@ -61,52 +59,32 @@ function PoolDescription({
   token1,
   feeTier,
   chainId,
-  protocolVersion = ProtocolVersion.V3,
+  poolAddress,
 }: {
   token0: Token
   token1: Token
   feeTier: number
   chainId: ChainId
-  protocolVersion: ProtocolVersion
+  poolAddress: string
 }) {
-  const currencies = [useCurrency(token0.address, chainId), useCurrency(token1.address, chainId)]
+  const currencies = [useCurrency(token0.id, chainId), useCurrency(token1.id, chainId)]
+  const navigate = useNavigate()
+  const chainName = chainIdToBackendName(chainId).toLowerCase()
   return (
-    <Row gap="sm">
+    <PoolDescriptionCell onClick={() => navigate(`/explore/pools/${chainName}/${poolAddress}`)}>
       <DoubleCurrencyAndChainLogo chainId={chainId} currencies={currencies} size={28} />
       <ThemedText.BodyPrimary>
         {token0.symbol}/{token1.symbol}
       </ThemedText.BodyPrimary>
-      {protocolVersion === ProtocolVersion.V2 && <Badge>{protocolVersion.toLowerCase()}</Badge>}
-      <Badge>{feeTier / BIPS_BASE}%</Badge>
-    </Row>
+      <FeeTier>{feeTier / BIPS_BASE}%</FeeTier>
+    </PoolDescriptionCell>
   )
 }
 
 export function TopPoolTable() {
   const chainName = validateUrlChainParam(useParams<{ chainName?: string }>().chainName)
   const chainId = supportedChainIdFromGQLChain(chainName)
-  const [sortState, setSortMethod] = useState<PoolTableSortState>({
-    sortBy: PoolSortFields.TVL,
-    sortDirection: OrderDirection.Desc,
-  })
-  const { topPools, loading, error } = useTopPools(sortState, chainId)
-
-  const handleHeaderClick = useCallback(
-    (newSortMethod: PoolSortFields) => {
-      if (sortState.sortBy === newSortMethod) {
-        setSortMethod({
-          sortBy: newSortMethod,
-          sortDirection: sortState.sortDirection === OrderDirection.Asc ? OrderDirection.Desc : OrderDirection.Asc,
-        })
-      } else {
-        setSortMethod({
-          sortBy: newSortMethod,
-          sortDirection: OrderDirection.Desc,
-        })
-      }
-    },
-    [sortState.sortBy, sortState.sortDirection]
-  )
+  const { topPools, loading, error } = useTopPools(chainId)
 
   if (error) {
     return (
@@ -120,13 +98,7 @@ export function TopPoolTable() {
 
   return (
     <TableWrapper data-testid="top-pools-explore-table">
-      <PoolsTable
-        pools={topPools}
-        loading={loading}
-        chainId={chainId}
-        sortState={sortState}
-        handleHeaderClick={handleHeaderClick}
-      />
+      <PoolsTable pools={topPools} loading={loading} chainId={chainId} />
     </TableWrapper>
   )
 }
@@ -136,8 +108,6 @@ export function PoolsTable({
   loading,
   loadMore,
   chainId,
-  sortState,
-  handleHeaderClick,
   maxHeight,
   hiddenColumns,
 }: {
@@ -145,12 +115,10 @@ export function PoolsTable({
   loading: boolean
   loadMore?: ({ onComplete }: { onComplete?: () => void }) => void
   chainId: ChainId
-  sortState: PoolTableSortState
-  handleHeaderClick: (newSortMethod: PoolSortFields) => void
   maxHeight?: number
   hiddenColumns?: PoolTableColumns[]
 }) {
-  const { formatNumber, formatPercent } = useFormatter()
+  const { formatNumber } = useFormatter()
   const poolTableValues: PoolTableValues[] | undefined = useMemo(
     () =>
       pools?.map((pool, index) => {
@@ -162,7 +130,7 @@ export function PoolsTable({
               token1={pool.token1}
               feeTier={pool.feeTier}
               chainId={chainId}
-              protocolVersion={pool.protocolVersion}
+              poolAddress={pool.hash}
             />
           ),
           txCount: pool.txCount,
@@ -170,12 +138,11 @@ export function PoolsTable({
           volume24h: pool.volume24h,
           volumeWeek: pool.volumeWeek,
           turnover: pool.turnover,
-          link: `/explore/pools/${chainIdToBackendName(chainId).toLowerCase()}/${pool.hash}`,
         }
       }) ?? [],
     [chainId, pools]
   )
-  // TODO(WEB-3236): once GQL BE Pool query add 1 day, 7 day, turnover sort support
+
   const columns = useMemo(() => {
     const columnHelper = createColumnHelper<PoolTableValues>()
     return [
@@ -183,12 +150,12 @@ export function PoolsTable({
         ? columnHelper.accessor((row) => row.index, {
             id: 'index',
             header: () => (
-              <Cell justifyContent="center" minWidth={44}>
+              <Cell justifyContent="flex-start" minWidth={48}>
                 <ThemedText.BodySecondary>#</ThemedText.BodySecondary>
               </Cell>
             ),
             cell: (index) => (
-              <Cell justifyContent="center" loading={loading} minWidth={44}>
+              <Cell justifyContent="flex-start" loading={loading} minWidth={48}>
                 <ThemedText.BodySecondary>{index.getValue?.()}</ThemedText.BodySecondary>
               </Cell>
             ),
@@ -216,12 +183,9 @@ export function PoolsTable({
             id: 'transactions',
             header: () => (
               <Cell justifyContent="flex-end" minWidth={120} grow>
-                <ClickableHeaderRow $justify="flex-end" onClick={() => handleHeaderClick(PoolSortFields.TxCount)}>
-                  {sortState.sortBy === PoolSortFields.TxCount && <HeaderArrow direction={sortState.sortDirection} />}
-                  <ThemedText.BodySecondary>
-                    <Trans>Transactions</Trans>
-                  </ThemedText.BodySecondary>
-                </ClickableHeaderRow>
+                <ThemedText.BodySecondary>
+                  <Trans>Transactions</Trans>
+                </ThemedText.BodySecondary>
               </Cell>
             ),
             cell: (txCount) => (
@@ -238,12 +202,9 @@ export function PoolsTable({
             id: 'tvl',
             header: () => (
               <Cell minWidth={120} grow>
-                <ClickableHeaderRow $justify="flex-end" onClick={() => handleHeaderClick(PoolSortFields.TVL)}>
-                  {sortState.sortBy === PoolSortFields.TVL && <HeaderArrow direction={sortState.sortDirection} />}
-                  <ThemedText.BodySecondary>
-                    <Trans>TVL</Trans>
-                  </ThemedText.BodySecondary>
-                </ClickableHeaderRow>
+                <ThemedText.BodySecondary>
+                  <Trans>TVL</Trans>
+                </ThemedText.BodySecondary>
               </Cell>
             ),
             cell: (tvl) => (
@@ -260,12 +221,9 @@ export function PoolsTable({
             id: 'volume24h',
             header: () => (
               <Cell minWidth={120} grow>
-                <ClickableHeaderRow $justify="flex-end" onClick={() => handleHeaderClick(PoolSortFields.Volume24h)}>
-                  {sortState.sortBy === PoolSortFields.Volume24h && <HeaderArrow direction={sortState.sortDirection} />}
-                  <ThemedText.BodySecondary>
-                    <Trans>1 day volume</Trans>
-                  </ThemedText.BodySecondary>
-                </ClickableHeaderRow>
+                <ThemedText.BodySecondary>
+                  <Trans>1 day volume</Trans>
+                </ThemedText.BodySecondary>
               </Cell>
             ),
             cell: (volume24h) => (
@@ -282,14 +240,9 @@ export function PoolsTable({
             id: 'volumeWeek',
             header: () => (
               <Cell minWidth={120} grow>
-                <ClickableHeaderRow $justify="flex-end" onClick={() => handleHeaderClick(PoolSortFields.VolumeWeek)}>
-                  {sortState.sortBy === PoolSortFields.VolumeWeek && (
-                    <HeaderArrow direction={sortState.sortDirection} />
-                  )}
-                  <ThemedText.BodySecondary>
-                    <Trans>7 day volume</Trans>
-                  </ThemedText.BodySecondary>
-                </ClickableHeaderRow>
+                <ThemedText.BodySecondary>
+                  <Trans>7 day volume</Trans>
+                </ThemedText.BodySecondary>
               </Cell>
             ),
             cell: (volumeWeek) => (
@@ -306,32 +259,21 @@ export function PoolsTable({
             id: 'turnover',
             header: () => (
               <Cell minWidth={100} grow>
-                <ClickableHeaderRow $justify="flex-end" onClick={() => handleHeaderClick(PoolSortFields.Turnover)}>
-                  {sortState.sortBy === PoolSortFields.Turnover && <HeaderArrow direction={sortState.sortDirection} />}
-                  <ThemedText.BodySecondary>
-                    <Trans>Turnover</Trans>
-                  </ThemedText.BodySecondary>
-                </ClickableHeaderRow>
+                <ThemedText.BodySecondary>
+                  <Trans>Turnover</Trans>
+                </ThemedText.BodySecondary>
               </Cell>
             ),
             cell: (turnover) => (
               <Cell minWidth={100} loading={loading} grow>
-                <ThemedText.BodySecondary>{formatPercent(turnover.getValue?.())}</ThemedText.BodySecondary>
+                <ThemedText.BodySecondary>{formatNumber({ input: turnover.getValue?.() })}</ThemedText.BodySecondary>
               </Cell>
             ),
           })
         : null,
       // Filter out null values
     ].filter(Boolean) as ColumnDef<PoolTableValues, any>[]
-  }, [
-    formatNumber,
-    formatPercent,
-    handleHeaderClick,
-    hiddenColumns,
-    loading,
-    sortState.sortBy,
-    sortState.sortDirection,
-  ])
+  }, [formatNumber, hiddenColumns, loading])
 
   return <Table columns={columns} data={poolTableValues} loading={loading} loadMore={loadMore} maxHeight={maxHeight} />
 }
diff --git a/apps/web/src/components/Pools/PoolTable/__snapshots__/PoolTable.test.tsx.snap b/apps/web/src/components/Pools/PoolTable/__snapshots__/PoolTable.test.tsx.snap
index d78b35ad7b1..178f439200c 100644
--- a/apps/web/src/components/Pools/PoolTable/__snapshots__/PoolTable.test.tsx.snap
+++ b/apps/web/src/components/Pools/PoolTable/__snapshots__/PoolTable.test.tsx.snap
@@ -25,52 +25,26 @@ exports[`PoolTable renders data filled state 1`] = `
   justify-content: flex-start;
 }
 
-.c19 {
-  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: 8px;
-}
-
 .c10 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c23 {
+.c20 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c27 {
+.c24 {
   height: 16px;
   width: 16px;
 }
 
-.c27 path {
+.c24 path {
   stroke: #FC72FF;
   background: #7D7D7D;
   fill: none;
 }
 
-.c28 {
+.c25 {
   -webkit-animation: 2s fvtopB linear infinite;
   animation: 2s fvtopB linear infinite;
 }
@@ -126,7 +100,7 @@ exports[`PoolTable renders data filled state 1`] = `
   background: #FFFFFF;
 }
 
-.c16 {
+.c14 {
   width: 100%;
   position: relative;
   overflow-x: auto;
@@ -143,11 +117,11 @@ exports[`PoolTable renders data filled state 1`] = `
   scrollbar-width: none;
 }
 
-.c16::-webkit-scrollbar {
+.c14::-webkit-scrollbar {
   display: none;
 }
 
-.c25 {
+.c22 {
   position: -webkit-sticky;
   position: sticky;
   -webkit-box-pack: center;
@@ -158,7 +132,7 @@ exports[`PoolTable renders data filled state 1`] = `
   visibility: hidden;
 }
 
-.c26 {
+.c23 {
   background: #FFEFFF;
   border-radius: 8px;
   width: -webkit-fit-content;
@@ -174,7 +148,7 @@ exports[`PoolTable renders data filled state 1`] = `
 }
 
 .c6 {
-  padding: 0px 12px;
+  padding: 0px 20px;
   width: -webkit-fit-content;
   width: -moz-fit-content;
   width: fit-content;
@@ -186,7 +160,7 @@ exports[`PoolTable renders data filled state 1`] = `
   min-height: 64px;
 }
 
-.c18:hover {
+.c15:hover {
   background: #22222212;
 }
 
@@ -228,54 +202,10 @@ exports[`PoolTable renders data filled state 1`] = `
   justify-content: flex-end;
 }
 
-.c8:first-child {
-  -webkit-box-flex: 0;
-  -webkit-flex-grow: 0;
-  -ms-flex-positive: 0;
-  flex-grow: 0;
-}
-
-.c17 {
-  color: none;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-}
-
-.c13 {
-  -webkit-box-pack: end;
-  -webkit-justify-content: flex-end;
-  -ms-flex-pack: end;
-  justify-content: flex-end;
-  cursor: pointer;
-  width: 100%;
-  gap: 4px;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c13:hover {
-  opacity: 0.6;
-}
-
-.c13:active {
-  opacity: 0.4;
-}
-
-.c14 {
-  height: 16px;
-  width: 16px;
-  color: #7D7D7D;
-  -webkit-transform: rotate(0deg);
-  -ms-transform: rotate(0deg);
-  transform: rotate(0deg);
-}
-
 .c9 {
-  min-width: 44px;
+  width: undefinedpx;
+  min-width: 48px;
+  min-width: undefinedpx;
   -webkit-flex: 0;
   -ms-flex: 0;
   flex: 0;
@@ -283,21 +213,23 @@ exports[`PoolTable renders data filled state 1`] = `
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
 .c11 {
+  width: undefinedpx;
   min-width: 240px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -313,13 +245,15 @@ exports[`PoolTable renders data filled state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
 .c12 {
+  width: undefinedpx;
   min-width: 120px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -335,13 +269,15 @@ exports[`PoolTable renders data filled state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c15 {
+.c13 {
+  width: undefinedpx;
   min-width: 100px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -357,18 +293,18 @@ exports[`PoolTable renders data filled state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c20 {
+.c17 {
   position: relative;
   top: 0;
   left: 0;
 }
 
-.c21 {
+.c18 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -379,23 +315,23 @@ exports[`PoolTable renders data filled state 1`] = `
   left: 0;
 }
 
-.c21 img {
+.c18 img {
   width: 14px;
   height: 28px;
   object-fit: cover;
 }
 
-.c21 img:first-child {
+.c18 img:first-child {
   border-radius: 14px 0 0 14px;
   object-position: 0 0;
 }
 
-.c21 img:last-child {
+.c18 img:last-child {
   border-radius: 0 14px 14px 0;
   object-position: 100% 0;
 }
 
-.c22 {
+.c19 {
   width: 14px;
   height: 28px;
   border-radius: 50%;
@@ -406,10 +342,27 @@ exports[`PoolTable renders data filled state 1`] = `
   max-width: 1200px;
 }
 
-.c24 {
+.c16 {
+  gap: 8px;
+  cursor: pointer;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  cursor: pointer;
+  -webkit-transition-duration: 125ms;
+  transition-duration: 125ms;
+}
+
+.c16:hover {
+  opacity: 0.6;
+}
+
+.c16:active {
+  opacity: 0.4;
+}
+
+.c21 {
   padding: 2px 6px;
   background: #F9F9F9;
-  border-radius: 5px;
 }
 
 <div
@@ -459,13 +412,9 @@ exports[`PoolTable renders data filled state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c4 c5 c13"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    Transactions
-                  </div>
+                  Transactions
                 </div>
               </div>
             </div>
@@ -476,36 +425,9 @@ exports[`PoolTable renders data filled state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c4 c5 c13"
+                  class="c10 css-1urox24"
                 >
-                  <svg
-                    class="c14"
-                    direction="desc"
-                    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="12"
-                      x2="12"
-                      y1="5"
-                      y2="19"
-                    />
-                    <polyline
-                      points="19 12 12 19 5 12"
-                    />
-                  </svg>
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    TVL
-                  </div>
+                  TVL
                 </div>
               </div>
             </div>
@@ -516,13 +438,9 @@ exports[`PoolTable renders data filled state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c4 c5 c13"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    1 day volume
-                  </div>
+                  1 day volume
                 </div>
               </div>
             </div>
@@ -533,13 +451,9 @@ exports[`PoolTable renders data filled state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c4 c5 c13"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    7 day volume
-                  </div>
+                  7 day volume
                 </div>
               </div>
             </div>
@@ -547,161 +461,152 @@ exports[`PoolTable renders data filled state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c4 c5 c13"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    Turnover
-                  </div>
+                  Turnover
                 </div>
               </div>
             </div>
           </div>
         </div>
         <div
-          class="c1 c16"
+          class="c1 c14"
         >
-          <a
-            class="c17"
-            href="/explore/pools/ethereum/0x123"
+          <div
+            class="c4 c5 c6 c15"
           >
             <div
-              class="c4 c5 c6 c18"
+              class="c8"
             >
               <div
-                class="c8"
+                class="c9"
               >
                 <div
-                  class="c9"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    1
-                  </div>
+                  1
                 </div>
               </div>
+            </div>
+            <div
+              class="c8"
+            >
               <div
-                class="c8"
+                class="c11"
               >
                 <div
-                  class="c11"
+                  class="c4 c5 c16"
                 >
                   <div
-                    class="c4 c19"
+                    class="c17"
                   >
                     <div
-                      class="c20"
+                      class="c18"
+                      size="28"
                     >
-                      <div
-                        class="c21"
+                      <img
+                        class="c19"
                         size="28"
-                      >
-                        <img
-                          class="c22"
-                          size="28"
-                          src="blank_token.svg"
-                        />
-                        <img
-                          class="c22"
-                          size="28"
-                          src="blank_token.svg"
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="c23 css-1urox24"
-                    >
-                      USDC/WETH
-                    </div>
-                    <div
-                      class="c10 c24 css-1m65e73"
-                    >
-                      1%
+                        src="blank_token.svg"
+                      />
+                      <img
+                        class="c19"
+                        size="28"
+                        src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png"
+                      />
                     </div>
                   </div>
+                  <div
+                    class="c20 css-1urox24"
+                  >
+                    USDC/WETH
+                  </div>
+                  <div
+                    class="c10 c21 css-1m65e73"
+                  >
+                    1%
+                  </div>
                 </div>
               </div>
+            </div>
+            <div
+              class="c8"
+            >
               <div
-                class="c8"
+                class="c12"
               >
                 <div
-                  class="c12"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    200
-                  </div>
+                  200
                 </div>
               </div>
+            </div>
+            <div
+              class="c8"
+            >
               <div
-                class="c8"
+                class="c12"
               >
                 <div
-                  class="c12"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    $300.00
-                  </div>
+                  $300.00
                 </div>
               </div>
+            </div>
+            <div
+              class="c8"
+            >
               <div
-                class="c8"
+                class="c12"
               >
                 <div
-                  class="c12"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    $400.00
-                  </div>
+                  $400.00
                 </div>
               </div>
+            </div>
+            <div
+              class="c8"
+            >
               <div
-                class="c8"
+                class="c12"
               >
                 <div
-                  class="c12"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    $500.00
-                  </div>
+                  $500.00
                 </div>
               </div>
+            </div>
+            <div
+              class="c8"
+            >
               <div
-                class="c8"
+                class="c13"
               >
                 <div
-                  class="c15"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    6%
-                  </div>
+                  600.00
                 </div>
               </div>
             </div>
-          </a>
+          </div>
         </div>
         <div
-          class="c4 c5 c25"
+          class="c4 c5 c22"
         >
           <div
-            class="c4 c5 c26"
+            class="c4 c5 c23"
           >
             <svg
-              class="c27 c28"
+              class="c24 c25"
               fill="none"
               stroke="#FC72FF"
               viewBox="0 0 24 24"
@@ -727,10 +632,6 @@ exports[`PoolTable renders error state 1`] = `
 <DocumentFragment>
   .c1 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c0 {
@@ -777,24 +678,20 @@ exports[`PoolTable renders loading state 1`] = `
 
 .c10 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c22 {
+.c20 {
   height: 16px;
   width: 16px;
 }
 
-.c22 path {
+.c20 path {
   stroke: #FC72FF;
   background: #7D7D7D;
   fill: none;
 }
 
-.c23 {
+.c21 {
   -webkit-animation: 2s fvtopB linear infinite;
   animation: 2s fvtopB linear infinite;
 }
@@ -850,7 +747,7 @@ exports[`PoolTable renders loading state 1`] = `
   background: #FFFFFF;
 }
 
-.c16 {
+.c14 {
   width: 100%;
   position: relative;
   overflow-x: auto;
@@ -867,11 +764,11 @@ exports[`PoolTable renders loading state 1`] = `
   scrollbar-width: none;
 }
 
-.c16::-webkit-scrollbar {
+.c14::-webkit-scrollbar {
   display: none;
 }
 
-.c20 {
+.c18 {
   position: -webkit-sticky;
   position: sticky;
   -webkit-box-pack: center;
@@ -882,7 +779,7 @@ exports[`PoolTable renders loading state 1`] = `
   visibility: hidden;
 }
 
-.c21 {
+.c19 {
   background: #FFEFFF;
   border-radius: 8px;
   width: -webkit-fit-content;
@@ -898,7 +795,7 @@ exports[`PoolTable renders loading state 1`] = `
 }
 
 .c6 {
-  padding: 0px 12px;
+  padding: 0px 20px;
   width: -webkit-fit-content;
   width: -moz-fit-content;
   width: fit-content;
@@ -910,7 +807,7 @@ exports[`PoolTable renders loading state 1`] = `
   min-height: 64px;
 }
 
-.c17:hover {
+.c15:hover {
   background: #22222212;
 }
 
@@ -952,46 +849,7 @@ exports[`PoolTable renders loading state 1`] = `
   justify-content: flex-end;
 }
 
-.c8:first-child {
-  -webkit-box-flex: 0;
-  -webkit-flex-grow: 0;
-  -ms-flex-positive: 0;
-  flex-grow: 0;
-}
-
-.c13 {
-  -webkit-box-pack: end;
-  -webkit-justify-content: flex-end;
-  -ms-flex-pack: end;
-  justify-content: flex-end;
-  cursor: pointer;
-  width: 100%;
-  gap: 4px;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c13:hover {
-  opacity: 0.6;
-}
-
-.c13:active {
-  opacity: 0.4;
-}
-
-.c14 {
-  height: 16px;
-  width: 16px;
-  color: #7D7D7D;
-  -webkit-transform: rotate(0deg);
-  -ms-transform: rotate(0deg);
-  transform: rotate(0deg);
-}
-
-.c18 {
+.c16 {
   border-radius: 12px;
   border-radius: 12px;
   height: 24px;
@@ -1007,7 +865,9 @@ exports[`PoolTable renders loading state 1`] = `
 }
 
 .c9 {
-  min-width: 44px;
+  width: undefinedpx;
+  min-width: 48px;
+  min-width: undefinedpx;
   -webkit-flex: 0;
   -ms-flex: 0;
   flex: 0;
@@ -1015,21 +875,23 @@ exports[`PoolTable renders loading state 1`] = `
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
 .c11 {
+  width: undefinedpx;
   min-width: 240px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -1045,13 +907,15 @@ exports[`PoolTable renders loading state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
 .c12 {
+  width: undefinedpx;
   min-width: 120px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -1067,13 +931,15 @@ exports[`PoolTable renders loading state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c15 {
+.c13 {
+  width: undefinedpx;
   min-width: 100px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -1089,12 +955,12 @@ exports[`PoolTable renders loading state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c19 {
+.c17 {
   width: 75%;
   height: 16px;
 }
@@ -1151,13 +1017,9 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c4 c5 c13"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    Transactions
-                  </div>
+                  Transactions
                 </div>
               </div>
             </div>
@@ -1168,36 +1030,9 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c4 c5 c13"
+                  class="c10 css-1urox24"
                 >
-                  <svg
-                    class="c14"
-                    direction="desc"
-                    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="12"
-                      x2="12"
-                      y1="5"
-                      y2="19"
-                    />
-                    <polyline
-                      points="19 12 12 19 5 12"
-                    />
-                  </svg>
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    TVL
-                  </div>
+                  TVL
                 </div>
               </div>
             </div>
@@ -1208,13 +1043,9 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c4 c5 c13"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    1 day volume
-                  </div>
+                  1 day volume
                 </div>
               </div>
             </div>
@@ -1225,13 +1056,9 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c4 c5 c13"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    7 day volume
-                  </div>
+                  7 day volume
                 </div>
               </div>
             </div>
@@ -1239,26 +1066,22 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c4 c5 c13"
+                  class="c10 css-1urox24"
                 >
-                  <div
-                    class="c10 css-1urox24"
-                  >
-                    Turnover
-                  </div>
+                  Turnover
                 </div>
               </div>
             </div>
           </div>
         </div>
         <div
-          class="c1 c16"
+          class="c1 c14"
         >
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -1267,7 +1090,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1279,7 +1102,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1291,7 +1114,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1303,7 +1126,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1315,7 +1138,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1327,7 +1150,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1336,17 +1159,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -1355,7 +1178,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1367,7 +1190,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1379,7 +1202,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1391,7 +1214,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1403,7 +1226,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1415,7 +1238,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1424,17 +1247,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -1443,7 +1266,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1455,7 +1278,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1467,7 +1290,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1479,7 +1302,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1491,7 +1314,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1503,7 +1326,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1512,17 +1335,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -1531,7 +1354,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1543,7 +1366,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1555,7 +1378,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1567,7 +1390,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1579,7 +1402,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1591,7 +1414,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1600,17 +1423,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -1619,7 +1442,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1631,7 +1454,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1643,7 +1466,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1655,7 +1478,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1667,7 +1490,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1679,7 +1502,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1688,17 +1511,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -1707,7 +1530,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1719,7 +1542,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1731,7 +1554,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1743,7 +1566,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1755,7 +1578,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1767,7 +1590,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1776,17 +1599,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -1795,7 +1618,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1807,7 +1630,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1819,7 +1642,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1831,7 +1654,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1843,7 +1666,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1855,7 +1678,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1864,17 +1687,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -1883,7 +1706,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1895,7 +1718,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1907,7 +1730,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1919,7 +1742,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1931,7 +1754,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1943,7 +1766,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1952,17 +1775,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -1971,7 +1794,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1983,7 +1806,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1995,7 +1818,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2007,7 +1830,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2019,7 +1842,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2031,7 +1854,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2040,17 +1863,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -2059,7 +1882,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2071,7 +1894,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2083,7 +1906,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2095,7 +1918,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2107,7 +1930,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2119,7 +1942,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2128,17 +1951,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -2147,7 +1970,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2159,7 +1982,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2171,7 +1994,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2183,7 +2006,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2195,7 +2018,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2207,7 +2030,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2216,17 +2039,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -2235,7 +2058,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2247,7 +2070,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2259,7 +2082,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2271,7 +2094,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2283,7 +2106,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2295,7 +2118,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2304,17 +2127,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -2323,7 +2146,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2335,7 +2158,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2347,7 +2170,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2359,7 +2182,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2371,7 +2194,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2383,7 +2206,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2392,17 +2215,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -2411,7 +2234,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2423,7 +2246,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2435,7 +2258,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2447,7 +2270,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2459,7 +2282,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2471,7 +2294,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2480,17 +2303,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -2499,7 +2322,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2511,7 +2334,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2523,7 +2346,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2535,7 +2358,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2547,7 +2370,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2559,7 +2382,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2568,17 +2391,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -2587,7 +2410,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2599,7 +2422,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2611,7 +2434,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2623,7 +2446,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2635,7 +2458,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2647,7 +2470,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2656,17 +2479,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -2675,7 +2498,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2687,7 +2510,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2699,7 +2522,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2711,7 +2534,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2723,7 +2546,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2735,7 +2558,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2744,17 +2567,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -2763,7 +2586,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2775,7 +2598,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2787,7 +2610,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2799,7 +2622,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2811,7 +2634,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2823,7 +2646,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2832,17 +2655,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -2851,7 +2674,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2863,7 +2686,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2875,7 +2698,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2887,7 +2710,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2899,7 +2722,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2911,7 +2734,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2920,17 +2743,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -2939,7 +2762,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2951,7 +2774,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2963,7 +2786,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2975,7 +2798,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2987,7 +2810,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2999,7 +2822,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3008,17 +2831,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -3027,7 +2850,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3039,7 +2862,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3051,7 +2874,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3063,7 +2886,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3075,7 +2898,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3087,7 +2910,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3096,17 +2919,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -3115,7 +2938,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3127,7 +2950,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3139,7 +2962,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3151,7 +2974,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3163,7 +2986,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3175,7 +2998,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3184,17 +3007,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -3203,7 +3026,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3215,7 +3038,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3227,7 +3050,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3239,7 +3062,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3251,7 +3074,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3263,7 +3086,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3272,17 +3095,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -3291,7 +3114,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3303,7 +3126,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3315,7 +3138,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3327,7 +3150,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3339,7 +3162,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3351,7 +3174,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3360,17 +3183,17 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c4 c5 c6 c17"
+            class="c4 c5 c6 c15"
           >
             <div
               class="c8"
@@ -3379,7 +3202,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c9"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3391,7 +3214,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3403,7 +3226,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3415,7 +3238,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3427,7 +3250,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3439,7 +3262,7 @@ exports[`PoolTable renders loading state 1`] = `
                 class="c12"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3448,10 +3271,10 @@ exports[`PoolTable renders loading state 1`] = `
               class="c8"
             >
               <div
-                class="c15"
+                class="c13"
               >
                 <div
-                  class="c18 c19"
+                  class="c16 c17"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3459,13 +3282,13 @@ exports[`PoolTable renders loading state 1`] = `
           </div>
         </div>
         <div
-          class="c4 c5 c20"
+          class="c4 c5 c18"
         >
           <div
-            class="c4 c5 c21"
+            class="c4 c5 c19"
           >
             <svg
-              class="c22 c23"
+              class="c20 c21"
               fill="none"
               stroke="#FC72FF"
               viewBox="0 0 24 24"
diff --git a/apps/web/src/components/PositionCard/Sushi.tsx b/apps/web/src/components/PositionCard/Sushi.tsx
index 22f47f7e767..5e6eec35658 100644
--- a/apps/web/src/components/PositionCard/Sushi.tsx
+++ b/apps/web/src/components/PositionCard/Sushi.tsx
@@ -6,7 +6,6 @@ import { Link } from 'react-router-dom'
 import { Text } from 'rebass'
 import styled from 'styled-components'
 
-import { FixedHeightRow } from '.'
 import { useColor } from '../../hooks/useColor'
 import { unwrappedToken } from '../../utils/unwrappedToken'
 import { ButtonEmpty } from '../Button'
@@ -16,6 +15,7 @@ import DoubleCurrencyLogo from '../DoubleLogo'
 import { CardNoise } from '../earn/styled'
 import { AutoRow, RowFixed } from '../Row'
 import { Dots } from '../swap/styled'
+import { FixedHeightRow } from '.'
 
 const StyledPositionCard = styled(LightCard)<{ bgColor: any }>`
   border: none;
diff --git a/apps/web/src/components/PositionCard/V2.tsx b/apps/web/src/components/PositionCard/V2.tsx
index 3ae8caf02e6..207f7b9344a 100644
--- a/apps/web/src/components/PositionCard/V2.tsx
+++ b/apps/web/src/components/PositionCard/V2.tsx
@@ -10,7 +10,6 @@ import { Link } from 'react-router-dom'
 import { Text } from 'rebass'
 import styled from 'styled-components'
 
-import { FixedHeightRow } from '.'
 import { BIG_INT_ZERO } from '../../constants/misc'
 import { useColor } from '../../hooks/useColor'
 import { useTotalSupply } from '../../hooks/useTotalSupply'
@@ -25,6 +24,7 @@ import { CardNoise } from '../earn/styled'
 import CurrencyLogo from '../Logo/CurrencyLogo'
 import { AutoRow, RowBetween, RowFixed } from '../Row'
 import { Dots } from '../swap/styled'
+import { FixedHeightRow } from '.'
 
 const StyledPositionCard = styled(LightCard)<{ bgColor: any }>`
   border: none;
diff --git a/apps/web/src/components/PositionListItem/PositionListItem.test.tsx b/apps/web/src/components/PositionListItem/PositionListItem.test.tsx
index 6f2b0b88b62..470be7fbbf2 100644
--- a/apps/web/src/components/PositionListItem/PositionListItem.test.tsx
+++ b/apps/web/src/components/PositionListItem/PositionListItem.test.tsx
@@ -3,7 +3,8 @@ import { ChainId, Token, WETH9 } from '@uniswap/sdk-core'
 import { FeeAmount, Pool } from '@uniswap/v3-sdk'
 import { USDC_MAINNET } from 'constants/tokens'
 import { useToken } from 'hooks/Tokens'
-import { PoolState, usePool } from 'hooks/usePools'
+import { PoolState } from 'hooks/usePools'
+import { usePool } from 'hooks/usePools'
 import { mocked } from 'test-utils/mocked'
 import { render } from 'test-utils/render'
 
diff --git a/apps/web/src/components/RouterLabel/RouterLabel.test.tsx b/apps/web/src/components/RouterLabel/RouterLabel.test.tsx
index 5f961ada5e9..f43a33e36be 100644
--- a/apps/web/src/components/RouterLabel/RouterLabel.test.tsx
+++ b/apps/web/src/components/RouterLabel/RouterLabel.test.tsx
@@ -1,10 +1,12 @@
-import RouterLabel from '.'
+import React from 'react'
+
 import {
   TEST_DUTCH_TRADE_ETH_INPUT,
   TEST_TRADE_EXACT_INPUT,
   TEST_TRADE_EXACT_INPUT_API,
 } from '../../test-utils/constants'
 import { render, screen } from '../../test-utils/render'
+import RouterLabel from '.'
 
 describe('RouterLabel', () => {
   it('renders correct label for UniswapX trade', () => {
diff --git a/apps/web/src/components/RoutingDiagram/__snapshots__/RoutingDiagram.test.tsx.snap b/apps/web/src/components/RoutingDiagram/__snapshots__/RoutingDiagram.test.tsx.snap
index 1553225f0d0..221c3a59caf 100644
--- a/apps/web/src/components/RoutingDiagram/__snapshots__/RoutingDiagram.test.tsx.snap
+++ b/apps/web/src/components/RoutingDiagram/__snapshots__/RoutingDiagram.test.tsx.snap
@@ -63,18 +63,10 @@ exports[`renders multi route 1`] = `
 
 .c10 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c12 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -334,18 +326,10 @@ exports[`renders single route 1`] = `
 
 .c10 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c12 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
diff --git a/apps/web/src/components/SearchModal/CurrencyList/index.test.tsx b/apps/web/src/components/SearchModal/CurrencyList/index.test.tsx
index fb178bf4565..9ab4656d734 100644
--- a/apps/web/src/components/SearchModal/CurrencyList/index.test.tsx
+++ b/apps/web/src/components/SearchModal/CurrencyList/index.test.tsx
@@ -6,7 +6,7 @@ import * as mockJSBI from 'jsbi'
 import { mocked } from 'test-utils/mocked'
 import { render } from 'test-utils/render'
 
-import CurrencyList, { CurrencyListRow } from '.'
+import CurrencyList from '.'
 
 const noOp = function () {
   // do nothing
@@ -55,7 +55,7 @@ it('renders currency rows correctly when currencies list is non-empty', () => {
   render(
     <CurrencyList
       height={10}
-      currencies={[DAI, USDC_MAINNET, WBTC].map((token) => new CurrencyListRow(token, false))}
+      currencies={[DAI, USDC_MAINNET, WBTC]}
       onCurrencySelect={noOp}
       isLoading={false}
       searchQuery=""
@@ -76,7 +76,7 @@ it('renders currency rows correctly with balances', () => {
   render(
     <CurrencyList
       height={10}
-      currencies={[DAI, USDC_MAINNET, WBTC].map((token) => new CurrencyListRow(token, false))}
+      currencies={[DAI, USDC_MAINNET, WBTC]}
       onCurrencySelect={noOp}
       isLoading={false}
       searchQuery=""
diff --git a/apps/web/src/components/SearchModal/CurrencyList/index.tsx b/apps/web/src/components/SearchModal/CurrencyList/index.tsx
index df6b47fe7fc..7d7d9c4a01a 100644
--- a/apps/web/src/components/SearchModal/CurrencyList/index.tsx
+++ b/apps/web/src/components/SearchModal/CurrencyList/index.tsx
@@ -20,20 +20,15 @@ import { TokenFromList } from '../../../state/lists/tokenFromList'
 import Column, { AutoColumn } from '../../Column'
 import CurrencyLogo from '../../Logo/CurrencyLogo'
 import Row, { RowFixed } from '../../Row'
-import { MouseoverTooltip, TooltipSize } from '../../Tooltip'
+import { MouseoverTooltip } from '../../Tooltip'
 import { LoadingRows, MenuItem } from '../styled'
 import { scrollbarStyle } from './index.css'
 
-function currencyKey(data: Currency | CurrencyListRow): string {
-  if (data instanceof CurrencyListSectionTitle) {
-    return data.label
+function currencyKey(currency: Currency | CurrencyListSectionTitle): string {
+  if (currency instanceof CurrencyListSectionTitle) {
+    return currency.label
   }
-
-  if (data instanceof CurrencyListRow) {
-    return data.currency?.isToken ? data.currency.address : 'ETHER'
-  }
-
-  return data.isToken ? data.address : 'ETHER'
+  return currency.isToken ? currency.address : 'ETHER'
 }
 
 const ROW_ITEM_SIZE = 56
@@ -131,8 +126,6 @@ export function CurrencyRow({
   showCurrencyAmount,
   eventProperties,
   balance,
-  disabled,
-  tooltip,
 }: {
   currency: Currency
   onSelect: (hasWarning: boolean) => void
@@ -142,8 +135,6 @@ export function CurrencyRow({
   showCurrencyAmount?: boolean
   eventProperties: Record<string, unknown>
   balance?: CurrencyAmount<Currency>
-  disabled?: boolean
-  tooltip?: string
 }) {
   const { account } = useWeb3React()
   const key = currencyKey(currency)
@@ -154,8 +145,6 @@ export function CurrencyRow({
   const { data } = useCachedPortfolioBalancesQuery({ account })
   const portfolioBalanceUsd = data?.portfolios?.[0].tokensTotalDenominatedValue?.value
 
-  const Wrapper = tooltip ? MouseoverTooltip : Row
-
   // only show add or remove buttons if not on selected list
   return (
     <TraceEvent
@@ -164,54 +153,48 @@ export function CurrencyRow({
       properties={{ is_imported_by_user: customAdded, ...eventProperties, total_balances_usd: portfolioBalanceUsd }}
       element={InterfaceElementName.TOKEN_SELECTOR_ROW}
     >
-      <Wrapper
+      <MenuItem
+        tabIndex={0}
         style={style}
-        text={<ThemedText.Caption textAlign="center">{tooltip}</ThemedText.Caption>}
-        size={TooltipSize.ExtraSmall}
+        className={`token-item-${key}`}
+        onKeyPress={(e) => (e.key === 'Enter' ? onSelect(!!warning) : null)}
+        onClick={() => onSelect(!!warning)}
+        selected={otherSelected || isSelected}
+        dim={isBlockedToken}
       >
-        <MenuItem
-          tabIndex={0}
-          className={`token-item-${key}`}
-          onKeyPress={(e) => (e.key === 'Enter' ? onSelect(!!warning) : null)}
-          onClick={() => onSelect(!!warning)}
-          selected={otherSelected || isSelected}
-          dim={isBlockedToken}
-          disabled={disabled}
-        >
-          <Column>
-            <CurrencyLogo
-              currency={currency}
-              size="36px"
-              style={{ opacity: isBlockedToken ? blockedTokenOpacity : '1' }}
-            />
-          </Column>
-          <AutoColumn style={{ opacity: isBlockedToken ? blockedTokenOpacity : '1' }}>
-            <Row>
-              <CurrencyName title={currency.name}>{currency.name}</CurrencyName>
-              <WarningContainer>
-                <TokenSafetyIcon warning={warning} />
-              </WarningContainer>
-            </Row>
-            <ThemedText.LabelMicro ml="0px">{currency.symbol}</ThemedText.LabelMicro>
-          </AutoColumn>
-          <Column>
-            <RowFixed style={{ justifySelf: 'flex-end' }}>
-              <TokenTags currency={currency} />
-            </RowFixed>
-          </Column>
-          {showCurrencyAmount && (
-            <RowFixed style={{ justifySelf: 'flex-end' }}>
-              {account ? balance ? <Balance balance={balance} /> : <Loader /> : null}
-            </RowFixed>
-          )}
-        </MenuItem>
-      </Wrapper>
+        <Column>
+          <CurrencyLogo
+            currency={currency}
+            size="36px"
+            style={{ opacity: isBlockedToken ? blockedTokenOpacity : '1' }}
+          />
+        </Column>
+        <AutoColumn style={{ opacity: isBlockedToken ? blockedTokenOpacity : '1' }}>
+          <Row>
+            <CurrencyName title={currency.name}>{currency.name}</CurrencyName>
+            <WarningContainer>
+              <TokenSafetyIcon warning={warning} />
+            </WarningContainer>
+          </Row>
+          <ThemedText.LabelMicro ml="0px">{currency.symbol}</ThemedText.LabelMicro>
+        </AutoColumn>
+        <Column>
+          <RowFixed style={{ justifySelf: 'flex-end' }}>
+            <TokenTags currency={currency} />
+          </RowFixed>
+        </Column>
+        {showCurrencyAmount && (
+          <RowFixed style={{ justifySelf: 'flex-end' }}>
+            {account ? balance ? <Balance balance={balance} /> : <Loader /> : null}
+          </RowFixed>
+        )}
+      </MenuItem>
     </TraceEvent>
   )
 }
 
 interface TokenRowProps {
-  data: Array<CurrencyListRow>
+  data: Array<Currency>
   index: number
   style: CSSProperties
 }
@@ -243,24 +226,18 @@ const LoadingRow = () => (
   </LoadingRows>
 )
 
-/**
- * This is used to display disabled currencies in the list.
- */
-export class CurrencyListRow {
-  constructor(
-    public readonly currency: Currency | undefined,
-    public readonly disabled: boolean,
-    public readonly tooltip?: string
-  ) {}
-}
-
 /**
  * This is used to intersperse section titles into the list without needing to break up the data array
  * and render multiple lists.
  */
-export class CurrencyListSectionTitle extends CurrencyListRow {
-  constructor(public readonly label: string) {
-    super(undefined, false)
+export class CurrencyListSectionTitle {
+  private _label: string
+  constructor(label: string) {
+    this._label = label
+  }
+
+  get label(): string {
+    return this._label
   }
 }
 
@@ -278,7 +255,7 @@ export default function CurrencyList({
   balances,
 }: {
   height: number
-  currencies: Array<CurrencyListRow>
+  currencies: Array<Currency | CurrencyListSectionTitle>
   selectedCurrency?: Currency | null
   onCurrencySelect: (currency: Currency, hasWarning?: boolean) => void
   otherCurrency?: Currency | null
@@ -288,26 +265,20 @@ export default function CurrencyList({
   searchQuery: string
   isAddressSearch: string | false
   balances: TokenBalances
-  disabled?: boolean
 }) {
   const Row = useCallback(
     function TokenRow({ data, index, style }: TokenRowProps) {
-      const row: CurrencyListRow = data[index]
+      const row: Currency = data[index]
+      const currency = row
 
-      if (row instanceof CurrencyListSectionTitle) {
+      if (currency instanceof CurrencyListSectionTitle) {
         return (
           <LabelContainer style={style}>
-            <ThemedText.BodySecondary>{row.label}</ThemedText.BodySecondary>
+            <ThemedText.BodySecondary>{currency.label}</ThemedText.BodySecondary>
           </LabelContainer>
         )
       }
 
-      if (!row.currency) {
-        return null
-      }
-
-      const currency: Currency = row.currency
-
       const balance =
         tryParseCurrencyAmount(
           String(balances[currency.isNative ? 'ETH' : currency.address?.toLowerCase()]?.balance ?? 0),
@@ -333,8 +304,6 @@ export default function CurrencyList({
             showCurrencyAmount={showCurrencyAmount && balance.greaterThan(0)}
             eventProperties={formatAnalyticsEventProperties(token, index, data, searchQuery, isAddressSearch)}
             balance={balance}
-            disabled={row.disabled}
-            tooltip={row.tooltip}
           />
         )
       } else {
diff --git a/apps/web/src/components/SearchModal/CurrencySearch.tsx b/apps/web/src/components/SearchModal/CurrencySearch.tsx
index 9cce9fa0de9..065ed714116 100644
--- a/apps/web/src/components/SearchModal/CurrencySearch.tsx
+++ b/apps/web/src/components/SearchModal/CurrencySearch.tsx
@@ -4,7 +4,6 @@ import { InterfaceEventName, InterfaceModalName } from '@uniswap/analytics-event
 import { Currency, CurrencyAmount, Token } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
 import { Trace } from 'analytics'
-import { ChainSelector } from 'components/NavBar/ChainSelector'
 import useDebounce from 'hooks/useDebounce'
 import { useOnClickOutside } from 'hooks/useOnClickOutside'
 import useToggle from 'hooks/useToggle'
@@ -21,17 +20,13 @@ import styled, { useTheme } from 'styled-components'
 import { CloseIcon, ThemedText } from 'theme/components'
 import { UserAddedToken } from 'types/tokens'
 
-import { useDefaultActiveTokens, useDefaultListTokens, useSearchInactiveTokenLists, useToken } from '../../hooks/Tokens'
+import { useDefaultActiveTokens, useSearchInactiveTokenLists, useToken } from '../../hooks/Tokens'
 import { isAddress } from '../../utils'
 import Column from '../Column'
 import Row, { RowBetween } from '../Row'
 import CommonBases from './CommonBases'
-import CurrencyList, {
-  CurrencyListRow,
-  CurrencyListSectionTitle,
-  CurrencyRow,
-  formatAnalyticsEventProperties,
-} from './CurrencyList'
+import { CurrencyListSectionTitle, CurrencyRow, formatAnalyticsEventProperties } from './CurrencyList'
+import CurrencyList from './CurrencyList'
 import { PaddedColumn, SearchInput, Separator } from './styled'
 
 const ContentWrapper = styled(Column)`
@@ -43,55 +38,29 @@ const ContentWrapper = styled(Column)`
   border-radius: 20px;
 `
 
-const ChainSelectorWrapper = styled.div`
-  background-color: ${({ theme }) => theme.surface2};
-  border-radius: 12px;
-`
-
-export interface CurrencySearchFilters {
-  showCommonBases?: boolean
-  disableNonToken?: boolean
-  onlyShowCurrenciesWithBalance?: boolean
-  onlyShowDefaultList?: boolean
-  onlyShowDefaultListReason?: string
-}
-
-const DEFAULT_CURRENCY_SEARCH_FILTERS: CurrencySearchFilters = {
-  showCommonBases: true,
-  disableNonToken: false,
-  onlyShowCurrenciesWithBalance: false,
-  onlyShowDefaultList: false,
-}
-
 interface CurrencySearchProps {
   isOpen: boolean
   onDismiss: () => void
   selectedCurrency?: Currency | null
   onCurrencySelect: (currency: Currency, hasWarning?: boolean) => void
   otherSelectedCurrency?: Currency | null
+  showCommonBases?: boolean
   showCurrencyAmount?: boolean
-  filters?: CurrencySearchFilters
+  disableNonToken?: boolean
+  onlyShowCurrenciesWithBalance?: boolean
 }
 
 export function CurrencySearch({
   selectedCurrency,
   onCurrencySelect,
   otherSelectedCurrency,
+  showCommonBases,
   showCurrencyAmount,
+  disableNonToken,
   onDismiss,
   isOpen,
-  filters,
+  onlyShowCurrenciesWithBalance,
 }: CurrencySearchProps) {
-  const {
-    showCommonBases,
-    disableNonToken,
-    onlyShowCurrenciesWithBalance,
-    onlyShowDefaultList,
-    onlyShowDefaultListReason,
-  } = {
-    ...DEFAULT_CURRENCY_SEARCH_FILTERS,
-    ...filters,
-  }
   const { chainId } = useWeb3React()
   const theme = useTheme()
 
@@ -105,12 +74,10 @@ export function CurrencySearch({
   const isAddressSearch = isAddress(debouncedQuery)
   const searchToken = useToken(debouncedQuery)
 
-  const defaultAndUserAddedTokens = useDefaultActiveTokens(chainId)
-  const defaultTokens = useDefaultListTokens(chainId)
+  const defaultTokens = useDefaultActiveTokens(chainId)
   const { balanceMap, balanceList, loading: balancesAreLoading } = useTokenBalances()
-
   const { sortedCombinedTokens, portfolioTokens, sortedTokensWithoutPortfolio } = useMemo(() => {
-    const filteredListTokens = Object.values(defaultAndUserAddedTokens)
+    const filteredListTokens = Object.values(defaultTokens)
       // Filter out tokens with balances so they aren't duplicated when we merge below.
       .filter((token) => !(token.address?.toLowerCase() in balanceMap))
 
@@ -133,10 +100,6 @@ export function CurrencySearch({
 
     const tokenFilter = (token: Token) => {
       if (onlyShowCurrenciesWithBalance) {
-        if (token.isNative && token.symbol) {
-          return balanceMap[token.symbol]?.usdValue > 0
-        }
-
         return balanceMap[token.address?.toLowerCase()]?.usdValue > 0
       }
 
@@ -163,7 +126,7 @@ export function CurrencySearch({
       portfolioTokens: portfolioTokens.filter(tokenFilter),
     }
   }, [
-    defaultAndUserAddedTokens,
+    defaultTokens,
     balancesAreLoading,
     balanceList,
     balanceMap,
@@ -228,41 +191,27 @@ export function CurrencySearch({
 
   // if no results on main list, show option to expand into inactive
   const filteredInactiveTokens = useSearchInactiveTokenLists(
-    !onlyShowCurrenciesWithBalance && sortedCombinedTokens.length === 0 ? debouncedQuery : undefined
+    !onlyShowCurrenciesWithBalance &&
+      (sortedCombinedTokens.length === 0 || (debouncedQuery.length > 2 && !isAddressSearch))
+      ? debouncedQuery
+      : undefined
   )
 
   const finalCurrencyList = useMemo(() => {
-    const disabledMapper = (token: Token) => {
-      const disabled = token.isNative ? false : (onlyShowDefaultList && !(token.address in defaultTokens)) ?? false
-      return new CurrencyListRow(token, disabled, disabled ? onlyShowDefaultListReason ?? t`Not available` : undefined)
-    }
-    if (debouncedQuery || portfolioTokens.length === 0) {
-      return [
-        new CurrencyListSectionTitle(debouncedQuery ? t`Search Results` : t`Popular tokens`),
-        ...sortedCombinedTokens.map(disabledMapper),
-        ...filteredInactiveTokens.map(disabledMapper),
-      ]
-    } else if (sortedTokensWithoutPortfolio.length === 0 && filteredInactiveTokens.length === 0) {
-      return [new CurrencyListSectionTitle(t`Your tokens`), ...portfolioTokens.map(disabledMapper)]
-    } else {
-      return [
-        new CurrencyListSectionTitle(t`Your tokens`),
-        ...portfolioTokens.map(disabledMapper),
-        new CurrencyListSectionTitle(t`Popular tokens`),
-        ...sortedTokensWithoutPortfolio.map(disabledMapper),
-        ...filteredInactiveTokens.map(disabledMapper),
-      ]
-    }
-  }, [
-    debouncedQuery,
-    defaultTokens,
-    filteredInactiveTokens,
-    onlyShowDefaultList,
-    onlyShowDefaultListReason,
-    portfolioTokens,
-    sortedCombinedTokens,
-    sortedTokensWithoutPortfolio,
-  ])
+    return debouncedQuery || portfolioTokens.length === 0
+      ? [
+          new CurrencyListSectionTitle(debouncedQuery ? t`Search Results` : t`Popular tokens`),
+          ...sortedCombinedTokens,
+          ...filteredInactiveTokens,
+        ]
+      : [
+          new CurrencyListSectionTitle(t`Your tokens`),
+          ...portfolioTokens,
+          new CurrencyListSectionTitle(t`Popular tokens`),
+          ...sortedTokensWithoutPortfolio,
+          ...filteredInactiveTokens,
+        ]
+  }, [debouncedQuery, filteredInactiveTokens, portfolioTokens, sortedCombinedTokens, sortedTokensWithoutPortfolio])
 
   // Timeout token loader after 3 seconds to avoid hanging in a loading state.
   useEffect(() => {
@@ -286,7 +235,7 @@ export function CurrencySearch({
             </Text>
             <CloseIcon onClick={onDismiss} />
           </RowBetween>
-          <Row gap="4px">
+          <Row>
             <SearchInput
               type="text"
               id="token-search-input"
@@ -298,9 +247,6 @@ export function CurrencySearch({
               onChange={handleInput}
               onKeyDown={handleEnter}
             />
-            <ChainSelectorWrapper>
-              <ChainSelector />
-            </ChainSelectorWrapper>
           </Row>
           {showCommonBases && (
             <CommonBases
diff --git a/apps/web/src/components/SearchModal/CurrencySearchModal.tsx b/apps/web/src/components/SearchModal/CurrencySearchModal.tsx
index 88857c8ba12..0d91ade9787 100644
--- a/apps/web/src/components/SearchModal/CurrencySearchModal.tsx
+++ b/apps/web/src/components/SearchModal/CurrencySearchModal.tsx
@@ -6,7 +6,7 @@ import { useUserAddedTokens } from 'state/user/hooks'
 import useLast from '../../hooks/useLast'
 import { useWindowSize } from '../../hooks/useWindowSize'
 import Modal from '../Modal'
-import { CurrencySearch, CurrencySearchFilters } from './CurrencySearch'
+import { CurrencySearch } from './CurrencySearch'
 
 interface CurrencySearchModalProps {
   isOpen: boolean
@@ -14,8 +14,10 @@ interface CurrencySearchModalProps {
   selectedCurrency?: Currency | null
   onCurrencySelect: (currency: Currency) => void
   otherSelectedCurrency?: Currency | null
+  showCommonBases?: boolean
   showCurrencyAmount?: boolean
-  currencySearchFilters?: CurrencySearchFilters
+  disableNonToken?: boolean
+  onlyShowCurrenciesWithBalance?: boolean
 }
 
 enum CurrencyModalView {
@@ -30,8 +32,10 @@ export default memo(function CurrencySearchModal({
   onCurrencySelect,
   selectedCurrency,
   otherSelectedCurrency,
+  showCommonBases = false,
   showCurrencyAmount = true,
-  currencySearchFilters,
+  disableNonToken = false,
+  onlyShowCurrenciesWithBalance = false,
 }: CurrencySearchModalProps) {
   const [modalView, setModalView] = useState<CurrencyModalView>(CurrencyModalView.search)
   const lastOpen = useLast(isOpen)
@@ -79,8 +83,10 @@ export default memo(function CurrencySearchModal({
           onCurrencySelect={handleCurrencySelect}
           selectedCurrency={selectedCurrency}
           otherSelectedCurrency={otherSelectedCurrency}
+          showCommonBases={showCommonBases}
           showCurrencyAmount={showCurrencyAmount}
-          filters={currencySearchFilters}
+          disableNonToken={disableNonToken}
+          onlyShowCurrenciesWithBalance={onlyShowCurrenciesWithBalance}
         />
       )
       break
diff --git a/apps/web/src/components/SearchModal/__snapshots__/CommonBases.test.tsx.snap b/apps/web/src/components/SearchModal/__snapshots__/CommonBases.test.tsx.snap
index 3f72a6ffd0b..14c274dc6fc 100644
--- a/apps/web/src/components/SearchModal/__snapshots__/CommonBases.test.tsx.snap
+++ b/apps/web/src/components/SearchModal/__snapshots__/CommonBases.test.tsx.snap
@@ -36,23 +36,22 @@ exports[`CommonBases renders without crashing 1`] = `
   margin: 4px !important;
 }
 
-.c5 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+.c6 {
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
 }
 
-.c6 {
+.c5 {
   width: 24px;
   height: 24px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
@@ -104,7 +103,9 @@ exports[`CommonBases renders without crashing 1`] = `
           class="c5"
         >
           <img
+            alt="ETH logo"
             class="c6"
+            loading="lazy"
             src="ethereum-logo.png"
           />
         </div>
@@ -128,7 +129,9 @@ exports[`CommonBases renders without crashing 1`] = `
           class="c5"
         >
           <img
+            alt="DAI logo"
             class="c6"
+            loading="lazy"
             src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
           />
         </div>
@@ -152,7 +155,9 @@ exports[`CommonBases renders without crashing 1`] = `
           class="c5"
         >
           <img
+            alt="USDC logo"
             class="c6"
+            loading="lazy"
             src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
           />
         </div>
@@ -176,7 +181,9 @@ exports[`CommonBases renders without crashing 1`] = `
           class="c5"
         >
           <img
+            alt="USDT logo"
             class="c6"
+            loading="lazy"
             src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xdAC17F958D2ee523a2206206994597C13D831ec7/logo.png"
           />
         </div>
@@ -200,7 +207,9 @@ exports[`CommonBases renders without crashing 1`] = `
           class="c5"
         >
           <img
+            alt="WBTC logo"
             class="c6"
+            loading="lazy"
             src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png"
           />
         </div>
@@ -224,7 +233,9 @@ exports[`CommonBases renders without crashing 1`] = `
           class="c5"
         >
           <img
+            alt="WETH logo"
             class="c6"
+            loading="lazy"
             src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png"
           />
         </div>
diff --git a/apps/web/src/components/Settings/MaxSlippageSettings/index.tsx b/apps/web/src/components/Settings/MaxSlippageSettings/index.tsx
index 127b88dffd6..e9c8f9786b9 100644
--- a/apps/web/src/components/Settings/MaxSlippageSettings/index.tsx
+++ b/apps/web/src/components/Settings/MaxSlippageSettings/index.tsx
@@ -3,7 +3,7 @@ import { Percent } from '@uniswap/sdk-core'
 import Expand from 'components/Expand'
 import QuestionHelper from 'components/QuestionHelper'
 import Row, { RowBetween } from 'components/Row'
-import { useState } from 'react'
+import React, { useState } from 'react'
 import { useUserSlippageTolerance } from 'state/user/hooks'
 import { SlippageTolerance } from 'state/user/types'
 import styled from 'styled-components'
diff --git a/apps/web/src/components/Settings/TransactionDeadlineSettings/index.tsx b/apps/web/src/components/Settings/TransactionDeadlineSettings/index.tsx
index 317e57d3445..2ea9b658baf 100644
--- a/apps/web/src/components/Settings/TransactionDeadlineSettings/index.tsx
+++ b/apps/web/src/components/Settings/TransactionDeadlineSettings/index.tsx
@@ -5,7 +5,7 @@ import Row from 'components/Row'
 import { Input, InputContainer } from 'components/Settings/Input'
 import { DEFAULT_DEADLINE_FROM_NOW } from 'constants/misc'
 import ms from 'ms'
-import { useState } from 'react'
+import React, { useState } from 'react'
 import { useUserTransactionTTL } from 'state/user/hooks'
 import { ThemedText } from 'theme/components'
 
diff --git a/apps/web/src/components/Suspense/SuspendConditionally.tsx b/apps/web/src/components/Suspense/SuspendConditionally.tsx
index 598958496b0..297c5120209 100644
--- a/apps/web/src/components/Suspense/SuspendConditionally.tsx
+++ b/apps/web/src/components/Suspense/SuspendConditionally.tsx
@@ -1,4 +1,5 @@
-import React, { useState } from 'react'
+import React from 'react'
+import { useState } from 'react'
 
 export const SuspendConditionally = (props: { if: boolean; children: React.ReactNode }) => {
   useSuspendIf(props.if)
diff --git a/apps/web/src/components/Table/Cell.tsx b/apps/web/src/components/Table/Cell.tsx
index 1c7f845d819..852090eb36a 100644
--- a/apps/web/src/components/Table/Cell.tsx
+++ b/apps/web/src/components/Table/Cell.tsx
@@ -9,14 +9,14 @@ const Container = styled.div<{
   $justifyContent?: string
   $grow?: boolean
 }>`
-  ${({ $width }) => $width && `width: ${$width}px`};
-  ${({ $minWidth }) => $minWidth && `min-width: ${$minWidth}px`};
-  ${({ $maxWidth }) => $maxWidth && `max-width: ${$maxWidth}px`};
+  ${({ $width }) => `width: ${$width}px`};
+  ${({ $minWidth }) => `min-width: ${$minWidth}px`};
+  ${({ $maxWidth }) => `min-width: ${$maxWidth}px`};
   flex: ${({ $grow }) => ($grow ? '1' : '0')};
   display: flex;
   justify-content: ${({ $justifyContent }) => $justifyContent ?? 'flex-end'};
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 `
diff --git a/apps/web/src/components/Table/Filter.tsx b/apps/web/src/components/Table/Filter.tsx
deleted file mode 100644
index b1cd778b5a3..00000000000
--- a/apps/web/src/components/Table/Filter.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-import Column from 'components/Column'
-import Row from 'components/Row'
-import { DropdownIcon } from 'components/Table/icons'
-import { useOnClickOutside } from 'hooks/useOnClickOutside'
-import { useScreenSize } from 'hooks/useScreenSize'
-import { Portal } from 'nft/components/common/Portal'
-import { Checkbox } from 'nft/components/layout/Checkbox'
-import { useCallback, useMemo, useRef, useState } from 'react'
-import styled from 'styled-components'
-import { ThemedText } from 'theme/components'
-import { Z_INDEX } from 'theme/zIndex'
-
-const StyledDropdownIcon = styled(DropdownIcon)`
-  position: relative;
-`
-const FilterDropdown = styled(Column)<{ isSticky?: boolean }>`
-  position: absolute;
-  top: ${({ isSticky }) => (isSticky ? 64 : 42)}px;
-  padding: 8px;
-  border-radius: 12px;
-  background: ${({ theme }) => theme.surface2};
-  gap: 8px;
-  width: 240px;
-  border-radius: 12px;
-  border: ${({ theme }) => `1px solid ${theme.surface3}`};
-  box-shadow: ${({ theme }) => theme.deprecated_deepShadow};
-  opacity: 1 !important;
-  z-index: ${Z_INDEX.modal};
-
-  @media only screen and (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    top: unset;
-    width: 100vw;
-  }
-`
-
-const FilterRow = styled(Row)`
-  padding: 10px 8px;
-  justify-content: space-between;
-  border-radius: 8px;
-  &:hover {
-    background: ${({ theme }) => theme.surface3};
-  }
-`
-
-interface FilterProps<T extends string> {
-  allFilters: T[]
-  activeFilter: T[]
-  setFilters: (filter: T[]) => void
-  isOpen: boolean
-  toggleFilterModal: () => void
-  isSticky?: boolean
-}
-
-export function Filter<T extends string>({
-  allFilters,
-  activeFilter,
-  setFilters,
-  isOpen,
-  toggleFilterModal,
-  isSticky,
-}: FilterProps<T>) {
-  const [hoveredRow, setHoveredRow] = useState(-1)
-  const isScreenSize = useScreenSize()
-  const isMobile = !isScreenSize['sm']
-  const filterModalRef = useRef<HTMLDivElement>(null)
-  useOnClickOutside(filterModalRef, isOpen ? toggleFilterModal : undefined)
-
-  const handleFilterOptionClick = useCallback(
-    (filter: T) => {
-      if (activeFilter.includes(filter)) {
-        setFilters(activeFilter.filter((f) => f !== filter))
-      } else {
-        setFilters([...activeFilter, filter])
-      }
-    },
-    [activeFilter, setFilters]
-  )
-
-  const Modal = useMemo(
-    () => (
-      <FilterDropdown isSticky={isSticky} ref={filterModalRef}>
-        {allFilters.map((filter, index) => (
-          <FilterRow
-            key={filter}
-            onClick={(e) => {
-              e.stopPropagation()
-              e.preventDefault()
-              handleFilterOptionClick(filter)
-            }}
-            onMouseEnter={() => setHoveredRow(index)}
-            onMouseLeave={() => setHoveredRow(-1)}
-          >
-            <ThemedText.BodySecondary>{filter}</ThemedText.BodySecondary>
-            <Checkbox checked={activeFilter.includes(filter)} hovered={index === hoveredRow} size={20} />
-          </FilterRow>
-        ))}
-      </FilterDropdown>
-    ),
-    [activeFilter, allFilters, handleFilterOptionClick, hoveredRow, isSticky]
-  )
-
-  return (
-    <>
-      <StyledDropdownIcon />
-      {/* Need to put the modal in a Portal when on mobile to show over promo banner */}
-      {isOpen && (isMobile ? <Portal>{Modal}</Portal> : <>{Modal}</>)}
-    </>
-  )
-}
diff --git a/apps/web/src/components/Table/__snapshots__/styled.test.tsx.snap b/apps/web/src/components/Table/__snapshots__/styled.test.tsx.snap
deleted file mode 100644
index 3e4d9f42c11..00000000000
--- a/apps/web/src/components/Table/__snapshots__/styled.test.tsx.snap
+++ /dev/null
@@ -1,427 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`TokenLinkCell renders known token on a different chain 1`] = `
-<DocumentFragment>
-  .c4 {
-  --size: 16px;
-  border-radius: 100px;
-  color: #222222;
-  background-color: #22222212;
-  font-size: calc(var(--size) / 3);
-  font-weight: 535;
-  height: 16px;
-  line-height: 16px;
-  text-align: center;
-  width: 16px;
-  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;
-}
-
-.c1 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  max-width: 68px;
-}
-
-.c2 {
-  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;
-}
-
-.c6 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c3 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c5 {
-  position: absolute;
-  border-radius: 4px;
-  left: 65%;
-  top: 65%;
-  outline: 1.5px solid #FFFFFF;
-  width: 40%;
-  height: 40%;
-  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;
-}
-
-.c0 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #222222;
-}
-
-.c0:hover {
-  opacity: 0.6;
-}
-
-.c0:active {
-  opacity: 0.4;
-}
-
-.c7 {
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-<a
-    class="c0"
-    href="/explore/tokens/polygon/NATIVE"
-  >
-    <div
-      class="c1 c2"
-    >
-      <div
-        class="c3"
-      >
-        <div
-          class="c4"
-        >
-          USD
-        </div>
-        <div
-          class="c5"
-        >
-          <svg
-            aria-labelledby="titleID"
-            height="100%"
-            style="width: 100%; height: 100%;"
-            width="100%"
-          >
-            <title
-              id="titleID"
-            >
-              Polygon logo
-            </title>
-            <rect
-              fill="#F9F9F9"
-              height="100%"
-              rx="2"
-              width="100%"
-            />
-            <rect
-              fill="#9558FF33"
-              height="100%"
-              rx="2"
-              width="100%"
-            />
-            <svg
-              height="100%"
-              width="100%"
-            >
-              polygon.svg
-            </svg>
-          </svg>
-        </div>
-      </div>
-      <div
-        class="c6 c7 css-1urox24"
-      >
-        USDC
-      </div>
-    </div>
-  </a>
-</DocumentFragment>
-`;
-
-exports[`TokenLinkCell renders known token on mainnet 1`] = `
-<DocumentFragment>
-  .c4 {
-  --size: 16px;
-  border-radius: 100px;
-  color: #222222;
-  background-color: #22222212;
-  font-size: calc(var(--size) / 3);
-  font-weight: 535;
-  height: 16px;
-  line-height: 16px;
-  text-align: center;
-  width: 16px;
-  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;
-}
-
-.c1 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  max-width: 68px;
-}
-
-.c2 {
-  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;
-}
-
-.c5 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c3 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c0 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #222222;
-}
-
-.c0:hover {
-  opacity: 0.6;
-}
-
-.c0:active {
-  opacity: 0.4;
-}
-
-.c6 {
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-<a
-    class="c0"
-    href="/explore/tokens/ethereum/NATIVE"
-  >
-    <div
-      class="c1 c2"
-    >
-      <div
-        class="c3"
-      >
-        <div
-          class="c4"
-        >
-          USD
-        </div>
-      </div>
-      <div
-        class="c5 c6 css-1urox24"
-      >
-        USDC
-      </div>
-    </div>
-  </a>
-</DocumentFragment>
-`;
-
-exports[`TokenLinkCell renders unknown token 1`] = `
-<DocumentFragment>
-  .c4 {
-  --size: 16px;
-  border-radius: 100px;
-  color: #222222;
-  background-color: #22222212;
-  font-size: calc(var(--size) / 3);
-  font-weight: 535;
-  height: 16px;
-  line-height: 16px;
-  text-align: center;
-  width: 16px;
-  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;
-}
-
-.c1 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  max-width: 68px;
-}
-
-.c2 {
-  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;
-}
-
-.c5 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c3 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c0 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #222222;
-}
-
-.c0:hover {
-  opacity: 0.6;
-}
-
-.c0:active {
-  opacity: 0.4;
-}
-
-.c6 {
-  white-space: nowrap;
-  overflow: hidden;
-}
-
-<a
-    class="c0"
-    href="/explore/tokens/ethereum/unknown"
-  >
-    <div
-      class="c1 c2"
-    >
-      <div
-        class="c3"
-      >
-        <div
-          class="c4"
-        />
-      </div>
-      <div
-        class="c5 c6 css-1urox24"
-      >
-        UNKNOWN
-      </div>
-    </div>
-  </a>
-</DocumentFragment>
-`;
diff --git a/apps/web/src/components/Table/icons.tsx b/apps/web/src/components/Table/icons.tsx
deleted file mode 100644
index 5427cf7b4ee..00000000000
--- a/apps/web/src/components/Table/icons.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-type SVGProps = React.SVGProps<SVGSVGElement> & {
-  fill?: string
-  height?: string | number
-  width?: string | number
-  gradientId?: string
-}
-
-export const DropdownIcon = (props: SVGProps) => (
-  <svg width="16" height="17" viewBox="0 0 16 17" fill="none" xmlns="http://www.w3.org/2000/svg" {...props}>
-    <path
-      d="M7.99954 13.1667C7.82887 13.1667 7.65818 13.1014 7.52818 12.9714L4.86152 10.3047C4.60085 10.044 4.60085 9.62267 4.86152 9.362C5.12218 9.10134 5.54356 9.10134 5.80422 9.362L7.99954 11.5573L10.1948 9.362C10.4555 9.10134 10.8769 9.10134 11.1376 9.362C11.3982 9.62267 11.3982 10.044 11.1376 10.3047L8.47089 12.9714C8.34089 13.1014 8.1702 13.1667 7.99954 13.1667Z"
-      fill="#9B9B9B"
-    />
-    <path
-      d="M10.6662 7.83336C10.4955 7.83336 10.3248 7.76805 10.1948 7.63805L7.99954 5.44274L5.80422 7.63805C5.54356 7.89872 5.12218 7.89872 4.86152 7.63805C4.60085 7.37738 4.60085 6.95601 4.86152 6.69534L7.52818 4.02868C7.78885 3.76801 8.21022 3.76801 8.47089 4.02868L11.1376 6.69534C11.3982 6.95601 11.3982 7.37738 11.1376 7.63805C11.0076 7.76805 10.8369 7.83336 10.6662 7.83336Z"
-      fill="#9B9B9B"
-    />
-  </svg>
-)
diff --git a/apps/web/src/components/Table/index.tsx b/apps/web/src/components/Table/index.tsx
index 2bb623a2704..96f565d990a 100644
--- a/apps/web/src/components/Table/index.tsx
+++ b/apps/web/src/components/Table/index.tsx
@@ -2,7 +2,8 @@ import { Trans } from '@lingui/macro'
 import { CellContext, ColumnDef, flexRender, getCoreRowModel, RowData, useReactTable } from '@tanstack/react-table'
 import Loader from 'components/Icons/LoadingSpinner'
 import useDebounce from 'hooks/useDebounce'
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useRef } from 'react'
+import { useState } from 'react'
 import { ScrollSync, ScrollSyncPane } from 'react-scroll-sync'
 import { FadePresence } from 'theme/components/FadePresence'
 
@@ -20,7 +21,6 @@ import {
   TableBody,
   TableContainer,
   TableHead,
-  TableRowLink,
 } from './styled'
 
 export function Table<Data extends RowData>({
@@ -142,24 +142,15 @@ export function Table<Data extends RowData>({
                       ))}
                     </DataRow>
                   ))
-                : table.getRowModel().rows.map((row) => {
-                    const cells = row
-                      .getVisibleCells()
-                      .map((cell) => (
+                : table.getRowModel().rows.map((row) => (
+                    <DataRow key={row.id}>
+                      {row.getVisibleCells().map((cell) => (
                         <CellContainer key={cell.id}>
                           {flexRender(cell.column.columnDef.cell, cell.getContext())}
                         </CellContainer>
-                      ))
-                    const rowOriginal = row.original as any
-                    const linkState = rowOriginal.linkState // optional data passed to linked page, accessible via useLocation().state
-                    return 'link' in rowOriginal && typeof rowOriginal.link === 'string' ? (
-                      <TableRowLink to={rowOriginal.link} key={row.id} state={linkState}>
-                        <DataRow>{cells}</DataRow>
-                      </TableRowLink>
-                    ) : (
-                      <DataRow key={row.id}>{cells}</DataRow>
-                    )
-                  })}
+                      ))}
+                    </DataRow>
+                  ))}
             </TableBody>
           </ScrollSyncPane>
           <LoadingIndicatorContainer show={loadingMore}>
diff --git a/apps/web/src/components/Table/styled.test.tsx b/apps/web/src/components/Table/styled.test.tsx
deleted file mode 100644
index 4e9cf414728..00000000000
--- a/apps/web/src/components/Table/styled.test.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { ChainId, Currency } from '@uniswap/sdk-core'
-import { TokenLinkCell } from 'components/Table/styled'
-import { useCurrency } from 'hooks/Tokens'
-import { mocked } from 'test-utils/mocked'
-import { validUSDCCurrency } from 'test-utils/pools/fixtures'
-import { render, screen } from 'test-utils/render'
-
-jest.mock('hooks/Tokens')
-
-describe('TokenLinkCell', () => {
-  it('renders unknown token', () => {
-    mocked(useCurrency).mockReturnValue({ ...validUSDCCurrency, symbol: undefined } as unknown as Currency)
-    const { asFragment } = render(<TokenLinkCell tokenAddress="unknown" chainId={ChainId.MAINNET} />)
-    expect(screen.getByText('UNKNOWN')).toBeDefined()
-    expect(asFragment()).toMatchSnapshot()
-  })
-
-  it('renders known token on mainnet', () => {
-    mocked(useCurrency).mockReturnValue(validUSDCCurrency)
-    const { asFragment } = render(
-      <TokenLinkCell tokenAddress={validUSDCCurrency.wrapped.address} chainId={ChainId.MAINNET} />
-    )
-    expect(screen.getByText('USDC')).toBeDefined()
-    expect(asFragment()).toMatchSnapshot()
-  })
-
-  it('renders known token on a different chain', () => {
-    mocked(useCurrency).mockReturnValue({ ...validUSDCCurrency, chainId: ChainId.POLYGON } as unknown as Currency)
-    const { asFragment } = render(
-      <TokenLinkCell tokenAddress={validUSDCCurrency.wrapped.address} chainId={ChainId.POLYGON} />
-    )
-    expect(screen.getByText('Polygon logo')).toBeDefined()
-    expect(asFragment()).toMatchSnapshot()
-  })
-})
diff --git a/apps/web/src/components/Table/styled.tsx b/apps/web/src/components/Table/styled.tsx
index 2c0cbe94447..425c0c4d4aa 100644
--- a/apps/web/src/components/Table/styled.tsx
+++ b/apps/web/src/components/Table/styled.tsx
@@ -1,21 +1,12 @@
-import { Trans } from '@lingui/macro'
-import { ChainId } from '@uniswap/sdk-core'
-import { PortfolioLogo } from 'components/AccountDrawer/MiniPortfolio/PortfolioLogo'
 import { ButtonLight } from 'components/Button'
 import Column from 'components/Column'
 import { HideScrollBarStyles } from 'components/Common'
 import Row from 'components/Row'
-import { getLocaleTimeString } from 'components/Table/utils'
 import { MAX_WIDTH_MEDIA_BREAKPOINT } from 'components/Tokens/constants'
-import { MouseoverTooltip, TooltipSize } from 'components/Tooltip'
-import { OrderDirection, chainIdToBackendName, getTokenDetailsURL } from 'graphql/data/util'
-import { OrderDirection as TheGraphOrderDirection } from 'graphql/thegraph/__generated__/types-and-hooks'
-import { useCurrency } from 'hooks/Tokens'
-import { useActiveLocale } from 'hooks/useActiveLocale'
-import { ArrowDown, CornerLeftUp, ExternalLink as ExternalLinkIcon } from 'react-feather'
+import { CornerLeftUp } from 'react-feather'
 import { Link } from 'react-router-dom'
 import styled, { css } from 'styled-components'
-import { ClickableStyle, ExternalLink, ThemedText } from 'theme/components'
+import { ClickableStyle, ExternalLink } from 'theme/components'
 import { Z_INDEX } from 'theme/zIndex'
 
 export const SHOW_RETURN_TO_TOP_OFFSET = 500
@@ -93,9 +84,8 @@ export const LoadingIndicator = styled(Row)`
   height: 34px;
   z-index: ${Z_INDEX.under_dropdown};
 `
-
 const TableRow = styled(Row)`
-  padding: 0px 12px;
+  padding: 0px 20px;
   width: fit-content;
   min-width: 100%;
   display: flex;
@@ -124,120 +114,14 @@ export const CellContainer = styled.div`
   &:last-child {
     justify-content: flex-end;
   }
-
-  &:first-child {
-    flex-grow: 0;
-  }
 `
 export const StyledExternalLink = styled(ExternalLink)`
   text-decoration: none;
   ${ClickableStyle}
   color: ${({ theme }) => theme.neutral1}
 `
-const StyledInternalLink = styled(Link)`
+export const StyledInternalLink = styled(Link)`
   text-decoration: none;
   ${ClickableStyle}
   color: ${({ theme }) => theme.neutral1}
 `
-
-export const TableRowLink = styled(Link)`
-  color: none;
-  text-decoration: none;
-  cursor: pointer;
-`
-
-export const ClickableHeaderRow = styled(Row)<{ $justify?: string }>`
-  justify-content: ${({ $justify }) => $justify ?? 'flex-end'};
-  cursor: pointer;
-  width: 100%;
-  gap: 4px;
-  ${ClickableStyle}
-`
-export const HeaderArrow = styled(ArrowDown)<{ direction: OrderDirection | TheGraphOrderDirection }>`
-  height: 16px;
-  width: 16px;
-  color: ${({ theme }) => theme.neutral2};
-  transform: ${({ direction }) => (direction === 'asc' ? 'rotate(180deg)' : 'rotate(0deg)')};
-`
-export const FilterHeaderRow = styled(Row)<{ modalOpen?: boolean }>`
-  ${({ modalOpen }) => !modalOpen && ClickableStyle}
-  cursor: pointer;
-  user-select: none;
-  gap: 4px;
-`
-const StyledTimestampRow = styled(StyledExternalLink)`
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  gap: 8px;
-  width: 100%;
-`
-const StyledExternalLinkIcon = styled(ExternalLinkIcon)`
-  display: none;
-  height: 16px;
-  width: 16px;
-  color: ${({ theme }) => theme.neutral2};
-  ${StyledTimestampRow}:hover & {
-    display: block;
-  }
-`
-
-/**
- * Converts the given timestamp to an abbreviated format (s,m,h) for timestamps younger than 1 day
- * and a full discreet format for timestamps older than 1 day (e.g. DD/MM HH:MMam/pm).
- * Hovering on the timestamp will display the full discreet format. (e.g. DD/MM/YYYY HH:MMam/pm)
- * Clicking on the timestamp will open the given link in a new tab
- * @param timestamp: unix timestamp in SECONDS
- * @param link: link to open on click
- * @returns JSX.Element containing the formatted timestamp
- */
-export const TimestampCell = ({ timestamp, link }: { timestamp: number; link: string }) => {
-  const locale = useActiveLocale()
-  const options: Intl.DateTimeFormatOptions = {
-    year: '2-digit',
-    month: '2-digit',
-    day: '2-digit',
-    hour: '2-digit',
-    minute: '2-digit',
-  }
-  const fullDate = new Date(timestamp * 1000)
-    .toLocaleString(locale, options)
-    .toLocaleLowerCase(locale)
-    .replace(/\s(am|pm)/, '$1')
-  return (
-    <StyledTimestampRow href={link}>
-      <MouseoverTooltip text={fullDate} placement="top" size={TooltipSize.Max}>
-        <ThemedText.BodySecondary>{getLocaleTimeString(timestamp * 1000, locale)}</ThemedText.BodySecondary>
-      </MouseoverTooltip>
-      <StyledExternalLinkIcon />
-    </StyledTimestampRow>
-  )
-}
-
-const TokenSymbolText = styled(ThemedText.BodyPrimary)`
-  white-space: nowrap;
-  overflow: hidden;
-`
-/**
- * Given a token address and chain displays the Token's Logo and Symbol with a link to its TDP
- * @param tokenAddress: token address
- * @param chainId: chainId of the token
- * @returns JSX.Element showing the Token's Logo, Chain logo if non-mainnet, and Token Symbol
- */
-export const TokenLinkCell = ({ tokenAddress, chainId }: { tokenAddress: string; chainId: ChainId }) => {
-  const currency = useCurrency(tokenAddress, chainId)
-  return (
-    <StyledInternalLink
-      to={getTokenDetailsURL({
-        address: tokenAddress,
-        chain: chainIdToBackendName(chainId),
-        isInfoExplorePageEnabled: true,
-      })}
-    >
-      <Row gap="4px" maxWidth="68px">
-        <PortfolioLogo currencies={[currency]} chainId={chainId} size="16px" />
-        <TokenSymbolText>{currency?.symbol ?? <Trans>UNKNOWN</Trans>}</TokenSymbolText>
-      </Row>
-    </StyledInternalLink>
-  )
-}
diff --git a/apps/web/src/components/Table/utils.ts b/apps/web/src/components/Table/utils.ts
index 4671cf365c7..7dcc87e1f81 100644
--- a/apps/web/src/components/Table/utils.ts
+++ b/apps/web/src/components/Table/utils.ts
@@ -1,5 +1,4 @@
 import { t } from '@lingui/macro'
-import { DEFAULT_LOCALE } from 'constants/locales'
 
 /**
  * Displays the time as a human-readable string.
@@ -8,7 +7,7 @@ import { DEFAULT_LOCALE } from 'constants/locales'
  * @param {number} locale - BCP 47 language tag (e.g. en-US).
  * @returns {string} Message to display.
  */
-export function getLocaleTimeString(timestamp: number, locale = DEFAULT_LOCALE) {
+export function getLocaleTimeString(timestamp: number, locale = 'en-US') {
   const now = Date.now()
   const timeSince = now - timestamp
   const secondsPassed = Math.floor(timeSince / 1000)
@@ -27,11 +26,13 @@ export function getLocaleTimeString(timestamp: number, locale = DEFAULT_LOCALE)
       .toLocaleString(locale, options)
       .toLocaleLowerCase(locale)
       .replace(/\s(am|pm)/, '$1')
-  } else if (hoursPassed > 0) {
-    return t`${hoursPassed}h ago`
-  } else if (minutesPassed > 0) {
-    return t`${minutesPassed}m ago`
+  } else if (hoursPassed == 24) {
+    return t`1 day ago`
+  } else if (minutesPassed >= 60) {
+    return `${hoursPassed} ${hoursPassed === 1 ? t`hour ago` : t`hours ago`}`
+  } else if (secondsPassed >= 60) {
+    return `${minutesPassed} ${minutesPassed === 1 ? t`minute ago` : t`minutes ago`}`
   } else {
-    return t`${secondsPassed}s ago`
+    return `${secondsPassed} ${secondsPassed === 1 ? t`second ago` : t`seconds ago`}`
   }
 }
diff --git a/apps/web/src/components/TextInput/index.tsx b/apps/web/src/components/TextInput/index.tsx
index 3b8d6cec891..231f8385a55 100644
--- a/apps/web/src/components/TextInput/index.tsx
+++ b/apps/web/src/components/TextInput/index.tsx
@@ -1,4 +1,4 @@
-import { ChangeEvent, memo, useCallback, useRef } from 'react'
+import React, { ChangeEvent, memo, useCallback, useRef } from 'react'
 import styled from 'styled-components'
 
 const Input = styled.input<{ error?: boolean; fontSize?: string }>`
diff --git a/apps/web/src/components/Toggle/PillMultiToggle.tsx b/apps/web/src/components/Toggle/PillMultiToggle.tsx
index 75866d56b02..4ea2bf7db1b 100644
--- a/apps/web/src/components/Toggle/PillMultiToggle.tsx
+++ b/apps/web/src/components/Toggle/PillMultiToggle.tsx
@@ -54,19 +54,12 @@ interface PillMultiToggleOption {
   display?: JSX.Element // Optional custom display element
 }
 
-function getPillMultiToggleOption(option: PillMultiToggleOption | string): PillMultiToggleOption {
-  if (typeof option === 'string') {
-    return { value: option }
-  }
-  return option
-}
-
 export default function PillMultiToggle({
   options,
   currentSelected,
   onSelectOption,
 }: {
-  options: readonly (PillMultiToggleOption | string)[]
+  options: PillMultiToggleOption[]
   currentSelected: string
   onSelectOption: (option: string) => void
 }) {
@@ -77,9 +70,7 @@ export default function PillMultiToggle({
   useLayoutEffect(() => {
     const sizeMap = buttonRefs.reduce((acc, ref, index) => {
       const current = ref.current
-      const { value } = getPillMultiToggleOption(options[index])
-
-      acc[value] = { width: (current?.offsetWidth ?? 0) + 'px', left: (current?.offsetLeft ?? 0) + 'px' }
+      acc[options[index].value] = { width: (current?.offsetWidth ?? 0) + 'px', left: (current?.offsetLeft ?? 0) + 'px' }
       return acc
     }, {} as { [option: string]: ActivePillStyle })
     setButtonSizing(sizeMap)
@@ -89,7 +80,7 @@ export default function PillMultiToggle({
     <OptionsSelector>
       <ActivePill style={buttonSizing[currentSelected]} />
       {options.map((option, i) => {
-        const { value, display } = getPillMultiToggleOption(option)
+        const { value, display } = option
         const ref = buttonRefs[i]
         return (
           <OptionButton ref={ref} key={value} active={currentSelected === value} onClick={() => onSelectOption(value)}>
diff --git a/apps/web/src/components/TokenSafety/TokenSafetyModal.tsx b/apps/web/src/components/TokenSafety/TokenSafetyModal.tsx
index e3e2d36d585..b71f01fdf3a 100644
--- a/apps/web/src/components/TokenSafety/TokenSafetyModal.tsx
+++ b/apps/web/src/components/TokenSafety/TokenSafetyModal.tsx
@@ -1,5 +1,5 @@
-import TokenSafety, { TokenSafetyProps } from '.'
 import Modal from '../Modal'
+import TokenSafety, { TokenSafetyProps } from '.'
 
 interface TokenSafetyModalProps extends TokenSafetyProps {
   isOpen: boolean
diff --git a/apps/web/src/components/Tokens/TokenDetails/About.tsx b/apps/web/src/components/Tokens/TokenDetails/About.tsx
index cb4a439238a..9901b09044e 100644
--- a/apps/web/src/components/Tokens/TokenDetails/About.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/About.tsx
@@ -7,7 +7,7 @@ import { ThemedText } from 'theme/components'
 import { textFadeIn } from 'theme/styles'
 
 import Resource from './Resource'
-import { NoInfoAvailable, TRUNCATE_CHARACTER_COUNT, TruncateDescriptionButton, truncateDescription } from './shared'
+import { NoInfoAvailable, TRUNCATE_CHARACTER_COUNT, truncateDescription, TruncateDescriptionButton } from './shared'
 
 const TokenDescriptionContainer = styled.div`
   overflow: hidden;
diff --git a/apps/web/src/components/Tokens/TokenDetails/ActivitySection.tsx b/apps/web/src/components/Tokens/TokenDetails/ActivitySection.tsx
index 84ca6e9eb44..bcecd87a16c 100644
--- a/apps/web/src/components/Tokens/TokenDetails/ActivitySection.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/ActivitySection.tsx
@@ -3,8 +3,9 @@ import { ChainId, Token } from '@uniswap/sdk-core'
 import Row from 'components/Row'
 import { TokenDetailsPoolsTable } from 'components/Tokens/TokenDetails/tables/TokenDetailsPoolsTable'
 import { useState } from 'react'
+import { Text } from 'rebass'
 import styled from 'styled-components'
-import { ClickableStyle, ThemedText } from 'theme/components'
+import { ClickableStyle } from 'theme/components'
 
 import { TransactionsTable } from './tables/TransactionsTable'
 
@@ -13,8 +14,10 @@ const Container = styled.div`
   display: flex;
   flex-direction: column;
 `
-const Tab = styled(ThemedText.HeadlineMedium)<{ isActive?: boolean }>`
+const Tab = styled(Text)<{ isActive?: boolean }>`
   cursor: pointer;
+  font-size: 24px !important;
+  line-height: 32px !important;
   color: ${({ isActive, theme }) => (isActive ? theme.neutral1 : theme.neutral2)};
   ${ClickableStyle};
 `
diff --git a/apps/web/src/components/Tokens/TokenDetails/ChartSection.tsx b/apps/web/src/components/Tokens/TokenDetails/ChartSection.tsx
index 9e7e750bdf7..2fc35857a2a 100644
--- a/apps/web/src/components/Tokens/TokenDetails/ChartSection.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/ChartSection.tsx
@@ -42,10 +42,10 @@ const TimePeriodSelectorContainer = styled.div`
   }
 `
 
-export function usePriceHistory(tokenPriceData: TokenPriceQuery | undefined): PricePoint[] | undefined {
+function usePriceHistory(tokenPriceData: TokenPriceQuery): PricePoint[] | undefined {
   // Appends the current price to the end of the priceHistory array
   const priceHistory = useMemo(() => {
-    const market = tokenPriceData?.token?.market
+    const market = tokenPriceData.token?.market
     const priceHistory = market?.priceHistory?.filter(isPricePoint)
     const currentPrice = market?.price?.value
     if (Array.isArray(priceHistory) && currentPrice !== undefined) {
@@ -64,12 +64,14 @@ export default function ChartSection({
   timePeriod,
   onChangeTimePeriod,
   tokenPriceQuery,
+  extractedColor,
 }: {
   chartType: ChartType
   priceChartType: PriceChartType
   timePeriod: TimePeriod
   onChangeTimePeriod: (t: TimePeriod) => void
   tokenPriceQuery?: TokenPriceQuery
+  extractedColor: string
 }) {
   const isInfoTDPEnabled = useInfoTDPEnabled()
 
@@ -85,6 +87,7 @@ export default function ChartSection({
           priceChartType={priceChartType}
           timePeriod={timePeriod}
           tokenPriceQuery={tokenPriceQuery}
+          extractedColor={extractedColor}
         />
         {isInfoTDPEnabled ? (
           <TimePeriodSelectorContainer>
@@ -103,11 +106,13 @@ function Chart({
   priceChartType,
   timePeriod,
   tokenPriceQuery,
+  extractedColor,
 }: {
   chartType: ChartType
   priceChartType: PriceChartType
   timePeriod: TimePeriod
   tokenPriceQuery: TokenPriceQuery
+  extractedColor: string
 }) {
   const prices = usePriceHistory(tokenPriceQuery)
 
@@ -126,7 +131,9 @@ function Chart({
     case ChartType.PRICE:
       return <PriceChart prices={prices} height={TDP_CHART_HEIGHT_PX} type={priceChartType} />
     case ChartType.VOLUME:
-      return <VolumeChart volumes={prices} height={TDP_CHART_HEIGHT_PX} timePeriod={timePeriod} />
+      return (
+        <VolumeChart volumes={prices} height={TDP_CHART_HEIGHT_PX} color={extractedColor} timePeriod={timePeriod} />
+      )
     case ChartType.TVL:
       return <StackedLineChart height={TDP_CHART_HEIGHT_PX} />
     default:
diff --git a/apps/web/src/components/Tokens/TokenDetails/ChartTypeSelectors/ChartTypeSelector.tsx b/apps/web/src/components/Tokens/TokenDetails/ChartTypeSelectors/ChartTypeSelector.tsx
index 5bcf36456fa..da78f181f5a 100644
--- a/apps/web/src/components/Tokens/TokenDetails/ChartTypeSelectors/ChartTypeSelector.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/ChartTypeSelectors/ChartTypeSelector.tsx
@@ -18,15 +18,15 @@ const StyledMenuFlyout = css`
   border-radius: 16px;
   right: 20px;
 `
-function ChartTypeDropdown<T extends ChartType>({
+const ChartTypeDropdown = ({
   options,
   currentChartType,
   onSelectOption,
 }: {
-  options: readonly T[]
-  currentChartType: T
-  onSelectOption: (option: T) => void
-}) {
+  options: { value: ChartType }[]
+  currentChartType: ChartType
+  onSelectOption: (option: ChartType) => void
+}) => {
   const theme = useTheme()
   const toggleMenu = useToggleModal(ApplicationModal.TDP_CHART_TYPE_SELECTOR)
 
@@ -36,7 +36,7 @@ function ChartTypeDropdown<T extends ChartType>({
       menuLabel={<>{currentChartType}</>}
       internalMenuItems={
         <>
-          {options.map((chartType) => {
+          {options.map(({ value: chartType }) => {
             return (
               <InternalMenuItem
                 key={chartType}
@@ -58,17 +58,16 @@ function ChartTypeDropdown<T extends ChartType>({
   )
 }
 
-export default function ChartTypeSelector<T extends ChartType>({
+export default function ChartTypeSelector({
   options,
   currentChartType,
   onChartTypeChange,
 }: {
-  options: readonly T[]
-  currentChartType: T
-  onChartTypeChange: (c: T) => void
+  options: { value: ChartType }[]
+  currentChartType: ChartType
+  onChartTypeChange: (c: ChartType) => void
 }) {
   const screenSize = useScreenSize()
-
   if (!screenSize['sm']) {
     return (
       <ChartTypeDropdown options={options} currentChartType={currentChartType} onSelectOption={onChartTypeChange} />
diff --git a/apps/web/src/components/Tokens/TokenDetails/Skeleton.tsx b/apps/web/src/components/Tokens/TokenDetails/Skeleton.tsx
index f9af0d4f60a..5604d6dba12 100644
--- a/apps/web/src/components/Tokens/TokenDetails/Skeleton.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/Skeleton.tsx
@@ -30,35 +30,31 @@ export const TokenDetailsLayout = styled.div`
   padding: 0 16px 52px;
   justify-content: center;
   width: 100%;
-  gap: 40px;
 
+  @media screen and (min-width: ${({ theme }) => theme.breakpoint.sm}px) {
+    gap: 16px;
+  }
   @media screen and (min-width: ${({ theme }) => theme.breakpoint.md}px) {
+    gap: 40px;
     padding: 48px 20px;
   }
-  @media screen and (max-width: ${({ theme }) => theme.breakpoint.lg}px) {
-    flex-direction: column;
-    align-items: center;
-  }
   @media screen and (min-width: ${({ theme }) => theme.breakpoint.xl}px) {
     gap: 60px;
   }
 `
-
 export const LeftPanel = styled.div`
   flex: 1;
   max-width: 780px;
   overflow: hidden;
-  width: 100%;
 `
 export const RightPanel = styled.div<{ isInfoTDPEnabled?: boolean }>`
-  display: flex;
+  display: none;
   flex-direction: column;
   gap: ${({ isInfoTDPEnabled }) => (isInfoTDPEnabled ? 40 : 20)}px;
   width: ${SWAP_COMPONENT_WIDTH}px;
 
-  @media screen and (max-width: ${({ theme }) => theme.breakpoint.lg}px) {
-    width: 100%;
-    max-width: 780px;
+  @media screen and (min-width: ${({ theme }) => theme.breakpoint.lg}px) {
+    display: flex;
   }
 `
 const LoadingChartContainer = styled.div<{ isInfoTDPEnabled?: boolean }>`
diff --git a/apps/web/src/components/Tokens/TokenDetails/TokenDescription.tsx b/apps/web/src/components/Tokens/TokenDetails/TokenDescription.tsx
index 78383f6338f..a6ffbfb9eb3 100644
--- a/apps/web/src/components/Tokens/TokenDetails/TokenDescription.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/TokenDescription.tsx
@@ -15,6 +15,7 @@ import { useSwapTaxes } from 'hooks/useSwapTaxes'
 import { useCallback, useReducer } from 'react'
 import { Copy } from 'react-feather'
 import styled, { useTheme } from 'styled-components'
+import { BREAKPOINTS } from 'theme'
 import { ClickableStyle, EllipsisStyle, ExternalLink, ThemedText } from 'theme/components'
 import { opacify } from 'theme/utils'
 import { shortenAddress } from 'utils'
@@ -26,15 +27,8 @@ const TokenInfoSection = styled(Column)`
   gap: 16px;
   width: 100%;
 
-  @media screen and (max-width: ${({ theme }) => theme.breakpoint.lg}px) {
-    gap: 24px;
-  }
-`
-
-const InfoSectionHeader = styled(ThemedText.HeadlineSmall)`
-  @media screen and (max-width: ${({ theme }) => theme.breakpoint.lg}px) {
-    font-size: 28px !important;
-    line-height: 36px !important;
+  @media (max-width: ${BREAKPOINTS.lg - 1}px) and (min-width: ${BREAKPOINTS.sm}px) {
+    max-width: 45%;
   }
 `
 
@@ -122,9 +116,9 @@ export function TokenDescription({
 
   return (
     <TokenInfoSection>
-      <InfoSectionHeader>
+      <ThemedText.HeadlineSmall>
         <Trans>Info</Trans>
-      </InfoSectionHeader>
+      </ThemedText.HeadlineSmall>
       <TokenButtonRow>
         {!isNative && (
           <TokenInfoButton tokenColor={color} onClick={copy}>
diff --git a/apps/web/src/components/Tokens/TokenDetails/__snapshots__/Skeleton.test.tsx.snap b/apps/web/src/components/Tokens/TokenDetails/__snapshots__/Skeleton.test.tsx.snap
index 4230c803ccd..1c1b963f95c 100644
--- a/apps/web/src/components/Tokens/TokenDetails/__snapshots__/Skeleton.test.tsx.snap
+++ b/apps/web/src/components/Tokens/TokenDetails/__snapshots__/Skeleton.test.tsx.snap
@@ -4,10 +4,6 @@ exports[`TDP Skeleton should render correctly 1`] = `
 <DocumentFragment>
   .c11 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c2 {
@@ -267,7 +263,6 @@ exports[`TDP Skeleton should render correctly 1`] = `
   -ms-flex-pack: center;
   justify-content: center;
   width: 100%;
-  gap: 40px;
 }
 
 .c1 {
@@ -276,14 +271,10 @@ exports[`TDP Skeleton should render correctly 1`] = `
   flex: 1;
   max-width: 780px;
   overflow: hidden;
-  width: 100%;
 }
 
 .c32 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
+  display: none;
   -webkit-flex-direction: column;
   -ms-flex-direction: column;
   flex-direction: column;
@@ -435,21 +426,16 @@ exports[`TDP Skeleton should render correctly 1`] = `
   }
 }
 
-@media screen and (min-width:768px) {
+@media screen and (min-width:640px) {
   .c0 {
-    padding: 48px 20px;
+    gap: 16px;
   }
 }
 
-@media screen and (max-width:1024px) {
+@media screen and (min-width:768px) {
   .c0 {
-    -webkit-flex-direction: column;
-    -ms-flex-direction: column;
-    flex-direction: column;
-    -webkit-align-items: center;
-    -webkit-box-align: center;
-    -ms-flex-align: center;
-    align-items: center;
+    gap: 40px;
+    padding: 48px 20px;
   }
 }
 
@@ -459,10 +445,12 @@ exports[`TDP Skeleton should render correctly 1`] = `
   }
 }
 
-@media screen and (max-width:1024px) {
+@media screen and (min-width:1024px) {
   .c32 {
-    width: 100%;
-    max-width: 780px;
+    display: -webkit-box;
+    display: -webkit-flex;
+    display: -ms-flexbox;
+    display: flex;
   }
 }
 
diff --git a/apps/web/src/components/Tokens/TokenDetails/__snapshots__/TokenDescription.test.tsx.snap b/apps/web/src/components/Tokens/TokenDetails/__snapshots__/TokenDescription.test.tsx.snap
index b84f4c73535..8265eb734a2 100644
--- a/apps/web/src/components/Tokens/TokenDetails/__snapshots__/TokenDescription.test.tsx.snap
+++ b/apps/web/src/components/Tokens/TokenDetails/__snapshots__/TokenDescription.test.tsx.snap
@@ -2,13 +2,13 @@
 
 exports[`TokenDescription no description or social buttons shown when not available 1`] = `
 <DocumentFragment>
-  .c4 {
+  .c3 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
 }
 
-.c5 {
+.c4 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -27,13 +27,9 @@ exports[`TokenDescription no description or social buttons shown when not availa
 
 .c2 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c9 {
+.c8 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -44,11 +40,11 @@ exports[`TokenDescription no description or social buttons shown when not availa
   font-weight: 500;
 }
 
-.c9:hover {
+.c8:hover {
   opacity: 0.6;
 }
 
-.c9:active {
+.c8:active {
   opacity: 0.4;
 }
 
@@ -66,7 +62,7 @@ exports[`TokenDescription no description or social buttons shown when not availa
   justify-content: flex-start;
 }
 
-.c11 {
+.c10 {
   color: #CECECE;
   font-weight: 485;
   font-size: 16px;
@@ -77,18 +73,18 @@ exports[`TokenDescription no description or social buttons shown when not availa
   width: 100%;
 }
 
-.c6 {
+.c5 {
   gap: 8px;
   width: 100%;
 }
 
-.c7 {
+.c6 {
   -webkit-flex-wrap: wrap;
   -ms-flex-wrap: wrap;
   flex-wrap: wrap;
 }
 
-.c8 {
+.c7 {
   gap: 8px;
   padding: 8px 12px;
   border-radius: 20px;
@@ -107,15 +103,15 @@ exports[`TokenDescription no description or social buttons shown when not availa
   transition-duration: 125ms;
 }
 
-.c8:hover {
+.c7:hover {
   opacity: 0.6;
 }
 
-.c8:active {
+.c7:active {
   opacity: 0.4;
 }
 
-.c10 {
+.c9 {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -124,16 +120,9 @@ exports[`TokenDescription no description or social buttons shown when not availa
   white-space: pre-wrap;
 }
 
-@media screen and (max-width:1024px) {
+@media (max-width:1023px) and (min-width:640px) {
   .c1 {
-    gap: 24px;
-  }
-}
-
-@media screen and (max-width:1024px) {
-  .c3 {
-    font-size: 28px !important;
-    line-height: 36px !important;
+    max-width: 45%;
   }
 }
 
@@ -141,15 +130,15 @@ exports[`TokenDescription no description or social buttons shown when not availa
     class="c0 c1"
   >
     <div
-      class="c2 c3 css-1jyz67g"
+      class="c2 css-1jyz67g"
     >
       Info
     </div>
     <div
-      class="c4 c5 c6 c7"
+      class="c3 c4 c5 c6"
     >
       <div
-        class="c4 c5 c8"
+        class="c3 c4 c7"
       >
         <svg
           fill="none"
@@ -177,13 +166,13 @@ exports[`TokenDescription no description or social buttons shown when not availa
         0xA0b8...eB48
       </div>
       <a
-        class="c9"
+        class="c8"
         href="https://etherscan.io/token/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
         rel="noopener noreferrer"
         target="_blank"
       >
         <div
-          class="c4 c5 c8"
+          class="c3 c4 c7"
         >
           <svg
             fill="#222222"
@@ -207,10 +196,10 @@ exports[`TokenDescription no description or social buttons shown when not availa
       </a>
     </div>
     <div
-      class="c2 c10 css-1urox24"
+      class="c2 c9 css-1urox24"
     >
       <p
-        class="c11"
+        class="c10"
       >
         No token information available
       </p>
@@ -221,13 +210,13 @@ exports[`TokenDescription no description or social buttons shown when not availa
 
 exports[`TokenDescription renders token information correctly with defaults 1`] = `
 <DocumentFragment>
-  .c4 {
+  .c3 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
 }
 
-.c5 {
+.c4 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -246,13 +235,9 @@ exports[`TokenDescription renders token information correctly with defaults 1`]
 
 .c2 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c9 {
+.c8 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -263,11 +248,11 @@ exports[`TokenDescription renders token information correctly with defaults 1`]
   font-weight: 500;
 }
 
-.c9:hover {
+.c8:hover {
   opacity: 0.6;
 }
 
-.c9:active {
+.c8:active {
   opacity: 0.4;
 }
 
@@ -285,15 +270,15 @@ exports[`TokenDescription renders token information correctly with defaults 1`]
   justify-content: flex-start;
 }
 
-.c13 {
+.c12 {
   color: #7D7D7D;
   font-weight: 485;
   font-size: 0.85em;
   padding-top: 0.5em;
 }
 
-.c13:hover,
-.c13:focus {
+.c12:hover,
+.c12:focus {
   color: #636363;
   cursor: pointer;
 }
@@ -303,18 +288,18 @@ exports[`TokenDescription renders token information correctly with defaults 1`]
   width: 100%;
 }
 
-.c6 {
+.c5 {
   gap: 8px;
   width: 100%;
 }
 
-.c7 {
+.c6 {
   -webkit-flex-wrap: wrap;
   -ms-flex-wrap: wrap;
   flex-wrap: wrap;
 }
 
-.c8 {
+.c7 {
   gap: 8px;
   padding: 8px 12px;
   border-radius: 20px;
@@ -333,15 +318,15 @@ exports[`TokenDescription renders token information correctly with defaults 1`]
   transition-duration: 125ms;
 }
 
-.c8:hover {
+.c7:hover {
   opacity: 0.6;
 }
 
-.c8:active {
+.c7:active {
   opacity: 0.4;
 }
 
-.c10 {
+.c9 {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -350,24 +335,17 @@ exports[`TokenDescription renders token information correctly with defaults 1`]
   white-space: pre-wrap;
 }
 
-.c11 {
+.c10 {
   display: none;
 }
 
-.c12 {
+.c11 {
   display: inline;
 }
 
-@media screen and (max-width:1024px) {
+@media (max-width:1023px) and (min-width:640px) {
   .c1 {
-    gap: 24px;
-  }
-}
-
-@media screen and (max-width:1024px) {
-  .c3 {
-    font-size: 28px !important;
-    line-height: 36px !important;
+    max-width: 45%;
   }
 }
 
@@ -375,15 +353,15 @@ exports[`TokenDescription renders token information correctly with defaults 1`]
     class="c0 c1"
   >
     <div
-      class="c2 c3 css-1jyz67g"
+      class="c2 css-1jyz67g"
     >
       Info
     </div>
     <div
-      class="c4 c5 c6 c7"
+      class="c3 c4 c5 c6"
     >
       <div
-        class="c4 c5 c8"
+        class="c3 c4 c7"
       >
         <svg
           fill="none"
@@ -411,13 +389,13 @@ exports[`TokenDescription renders token information correctly with defaults 1`]
         0xA0b8...eB48
       </div>
       <a
-        class="c9"
+        class="c8"
         href="https://etherscan.io/token/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
         rel="noopener noreferrer"
         target="_blank"
       >
         <div
-          class="c4 c5 c8"
+          class="c3 c4 c7"
         >
           <svg
             fill="#222222"
@@ -440,13 +418,13 @@ exports[`TokenDescription renders token information correctly with defaults 1`]
         </div>
       </a>
       <a
-        class="c9"
+        class="c8"
         href="https://www.circle.com/en/usdc"
         rel="noopener noreferrer"
         target="_blank"
       >
         <div
-          class="c4 c5 c8"
+          class="c3 c4 c7"
         >
           <svg
             fill="#222222"
@@ -465,13 +443,13 @@ exports[`TokenDescription renders token information correctly with defaults 1`]
         </div>
       </a>
       <a
-        class="c9"
+        class="c8"
         href="https://x.com/circle"
         rel="noopener noreferrer"
         target="_blank"
       >
         <div
-          class="c4 c5 c8"
+          class="c3 c4 c7"
         >
           <svg
             fill="#222222"
@@ -491,22 +469,22 @@ exports[`TokenDescription renders token information correctly with defaults 1`]
       </a>
     </div>
     <div
-      class="c2 c10 css-1urox24"
+      class="c2 c9 css-1urox24"
     >
       <p
-        class="c11"
+        class="c10"
         data-testid="token-description-full"
       >
         USDC is a fully collateralized US dollar stablecoin. USDC is the bridge between dollars and trading on cryptocurrency exchanges. The technology behind CENTRE makes it possible to exchange value between people, businesses and financial institutions just like email between mail services and texts between SMS providers. We believe by removing artificial economic borders, we can create a more inclusive global economy.
       </p>
       <p
-        class="c12"
+        class="c11"
         data-testid="token-description-truncated"
       >
         USDC is a fully collateralized US dollar stablecoin. USDC is the bridge...
       </p>
       <div
-        class="c13"
+        class="c12"
         data-testid="token-description-show-more-button"
       >
         Show more
@@ -518,13 +496,13 @@ exports[`TokenDescription renders token information correctly with defaults 1`]
 
 exports[`TokenDescription truncates description and shows more 1`] = `
 <DocumentFragment>
-  .c4 {
+  .c3 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
 }
 
-.c5 {
+.c4 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -543,13 +521,9 @@ exports[`TokenDescription truncates description and shows more 1`] = `
 
 .c2 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c9 {
+.c8 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -560,11 +534,11 @@ exports[`TokenDescription truncates description and shows more 1`] = `
   font-weight: 500;
 }
 
-.c9:hover {
+.c8:hover {
   opacity: 0.6;
 }
 
-.c9:active {
+.c8:active {
   opacity: 0.4;
 }
 
@@ -582,15 +556,15 @@ exports[`TokenDescription truncates description and shows more 1`] = `
   justify-content: flex-start;
 }
 
-.c13 {
+.c12 {
   color: #7D7D7D;
   font-weight: 485;
   font-size: 0.85em;
   padding-top: 0.5em;
 }
 
-.c13:hover,
-.c13:focus {
+.c12:hover,
+.c12:focus {
   color: #636363;
   cursor: pointer;
 }
@@ -600,18 +574,18 @@ exports[`TokenDescription truncates description and shows more 1`] = `
   width: 100%;
 }
 
-.c6 {
+.c5 {
   gap: 8px;
   width: 100%;
 }
 
-.c7 {
+.c6 {
   -webkit-flex-wrap: wrap;
   -ms-flex-wrap: wrap;
   flex-wrap: wrap;
 }
 
-.c8 {
+.c7 {
   gap: 8px;
   padding: 8px 12px;
   border-radius: 20px;
@@ -630,15 +604,15 @@ exports[`TokenDescription truncates description and shows more 1`] = `
   transition-duration: 125ms;
 }
 
-.c8:hover {
+.c7:hover {
   opacity: 0.6;
 }
 
-.c8:active {
+.c7:active {
   opacity: 0.4;
 }
 
-.c10 {
+.c9 {
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
@@ -647,24 +621,17 @@ exports[`TokenDescription truncates description and shows more 1`] = `
   white-space: pre-wrap;
 }
 
-.c11 {
+.c10 {
   display: none;
 }
 
-.c12 {
+.c11 {
   display: inline;
 }
 
-@media screen and (max-width:1024px) {
+@media (max-width:1023px) and (min-width:640px) {
   .c1 {
-    gap: 24px;
-  }
-}
-
-@media screen and (max-width:1024px) {
-  .c3 {
-    font-size: 28px !important;
-    line-height: 36px !important;
+    max-width: 45%;
   }
 }
 
@@ -672,15 +639,15 @@ exports[`TokenDescription truncates description and shows more 1`] = `
     class="c0 c1"
   >
     <div
-      class="c2 c3 css-1jyz67g"
+      class="c2 css-1jyz67g"
     >
       Info
     </div>
     <div
-      class="c4 c5 c6 c7"
+      class="c3 c4 c5 c6"
     >
       <div
-        class="c4 c5 c8"
+        class="c3 c4 c7"
       >
         <svg
           fill="none"
@@ -708,13 +675,13 @@ exports[`TokenDescription truncates description and shows more 1`] = `
         0xA0b8...eB48
       </div>
       <a
-        class="c9"
+        class="c8"
         href="https://etherscan.io/token/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
         rel="noopener noreferrer"
         target="_blank"
       >
         <div
-          class="c4 c5 c8"
+          class="c3 c4 c7"
         >
           <svg
             fill="#222222"
@@ -737,13 +704,13 @@ exports[`TokenDescription truncates description and shows more 1`] = `
         </div>
       </a>
       <a
-        class="c9"
+        class="c8"
         href="https://www.circle.com/en/usdc"
         rel="noopener noreferrer"
         target="_blank"
       >
         <div
-          class="c4 c5 c8"
+          class="c3 c4 c7"
         >
           <svg
             fill="#222222"
@@ -762,13 +729,13 @@ exports[`TokenDescription truncates description and shows more 1`] = `
         </div>
       </a>
       <a
-        class="c9"
+        class="c8"
         href="https://x.com/circle"
         rel="noopener noreferrer"
         target="_blank"
       >
         <div
-          class="c4 c5 c8"
+          class="c3 c4 c7"
         >
           <svg
             fill="#222222"
@@ -788,22 +755,22 @@ exports[`TokenDescription truncates description and shows more 1`] = `
       </a>
     </div>
     <div
-      class="c2 c10 css-1urox24"
+      class="c2 c9 css-1urox24"
     >
       <p
-        class="c11"
+        class="c10"
         data-testid="token-description-full"
       >
         USDC is a fully collateralized US dollar stablecoin. USDC is the bridge between dollars and trading on cryptocurrency exchanges. The technology behind CENTRE makes it possible to exchange value between people, businesses and financial institutions just like email between mail services and texts between SMS providers. We believe by removing artificial economic borders, we can create a more inclusive global economy.
       </p>
       <p
-        class="c12"
+        class="c11"
         data-testid="token-description-truncated"
       >
         USDC is a fully collateralized US dollar stablecoin. USDC is the bridge...
       </p>
       <div
-        class="c13"
+        class="c12"
         data-testid="token-description-show-more-button"
       >
         Show more
diff --git a/apps/web/src/components/Tokens/TokenDetails/index.tsx b/apps/web/src/components/Tokens/TokenDetails/index.tsx
index 6e78f07ec40..e106699aee1 100644
--- a/apps/web/src/components/Tokens/TokenDetails/index.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/index.tsx
@@ -40,16 +40,15 @@ import {
   TimePeriod,
 } from 'graphql/data/util'
 import { useCurrency } from 'hooks/Tokens'
-import { getInitialUrl } from 'hooks/useAssetLogoSource'
+import { useColor } from 'hooks/useColor'
 import { useOnGlobalChainSwitch } from 'hooks/useGlobalChainSwitch'
-import { useScreenSize } from 'hooks/useScreenSize'
 import { UNKNOWN_TOKEN_SYMBOL, useTokenFromActiveNetwork } from 'lib/hooks/useCurrency'
 import { Swap } from 'pages/Swap'
 import { useCallback, useMemo, useState, useTransition } from 'react'
 import { ArrowLeft, ChevronRight } from 'react-feather'
 import { useNavigate } from 'react-router-dom'
 import { CurrencyState } from 'state/swap/SwapContext'
-import styled, { css } from 'styled-components'
+import styled, { css, useTheme } from 'styled-components'
 import { EllipsisStyle } from 'theme/components'
 import { isAddress } from 'utils'
 import { addressesAreEquivalent } from 'utils/addressesAreEquivalent'
@@ -104,8 +103,7 @@ const DividerLine = styled(Hr)`
   margin-top: 40px;
   margin-bottom: 40px;
   @media screen and (max-width: ${({ theme }) => theme.breakpoint.sm}px) {
-    opacity: 0;
-    margin-bottom: 0;
+    display: none;
   }
 `
 
@@ -208,8 +206,8 @@ export default function TokenDetails({
   const isBlockedToken = tokenWarning?.canProceed === false
   const navigate = useNavigate()
 
-  const screenSize = useScreenSize()
-  const isLargeScreenSize = screenSize['lg']
+  const theme = useTheme()
+  const extractedColor = useColor(detailedToken ?? undefined, theme.surface2, theme.darkMode)
 
   const isInfoExplorePageEnabled = useInfoExplorePageEnabled()
   const isInfoTDPEnabled = useInfoTDPEnabled()
@@ -250,25 +248,22 @@ export default function TokenDetails({
       }
 
       const newDefaultToken = tokens.outputCurrency ?? tokens.inputCurrency
-
       if (!newDefaultToken) return
 
-      const preloadedLogoSrc = getInitialUrl(
-        newDefaultToken.wrapped.address,
-        newDefaultToken.chainId,
-        newDefaultToken.isNative
+      startTokenTransition(() =>
+        navigate(
+          getTokenDetailsURL({
+            // The function falls back to "NATIVE" if the address is null
+            address: newDefaultToken.isNative ? null : newDefaultToken.address,
+            chain,
+            inputAddress:
+              // If only one token was selected before we navigate, then it was the default token and it's being replaced.
+              // On the new page, the *new* default token becomes the output, and we don't have another option to set as the input token.
+              tokens.inputCurrency && tokens.inputCurrency !== newDefaultToken ? inputCurrencyURLAddress : null,
+            isInfoExplorePageEnabled,
+          })
+        )
       )
-      const url = getTokenDetailsURL({
-        // The function falls back to "NATIVE" if the address is null
-        address: newDefaultToken.isNative ? null : newDefaultToken.address,
-        chain,
-        inputAddress:
-          // If only one token was selected before we navigate, then it was the default token and it's being replaced.
-          // On the new page, the *new* default token becomes the output, and we don't have another option to set as the input token.
-          tokens.inputCurrency && tokens.inputCurrency !== newDefaultToken ? inputCurrencyURLAddress : null,
-        isInfoExplorePageEnabled,
-      })
-      startTokenTransition(() => navigate(url, { state: { preloadedLogoSrc } }))
     },
     [address, chain, isInfoExplorePageEnabled, navigate]
   )
@@ -350,7 +345,7 @@ export default function TokenDetails({
                     )}
 
                     <ChartTypeSelector
-                      options={[ChartType.PRICE, ChartType.VOLUME, ChartType.TVL]}
+                      options={[{ value: ChartType.PRICE }, { value: ChartType.VOLUME }, { value: ChartType.TVL }]}
                       currentChartType={chartType}
                       onChartTypeChange={(c: ChartType) => {
                         setChartType(c)
@@ -369,6 +364,7 @@ export default function TokenDetails({
               timePeriod={timePeriod}
               onChangeTimePeriod={onChangeTimePeriod}
               tokenPriceQuery={tokenPriceQuery}
+              extractedColor={extractedColor}
             />
 
             <StatsSection chainId={pageChainId} address={address} tokenQueryData={tokenQueryData} />
@@ -395,22 +391,19 @@ export default function TokenDetails({
         ) : (
           <TokenDetailsSkeleton />
         )}
+
         <RightPanel isInfoTDPEnabled={isInfoTDPEnabled} onClick={() => isBlockedToken && setOpenTokenSafetyModal(true)}>
-          {isLargeScreenSize && (
-            <>
-              <div style={{ pointerEvents: isBlockedToken ? 'none' : 'auto' }}>
-                <Swap
-                  chainId={pageChainId}
-                  initialInputCurrency={inputCurrency}
-                  initialOutputCurrency={outputCurrency}
-                  onCurrencyChange={handleCurrencyChange}
-                  disableTokenInputs={pageChainId !== connectedChainId}
-                />
-              </div>
-              {tokenWarning && <TokenSafetyMessage tokenAddress={address} warning={tokenWarning} />}
-              {detailedToken && <BalanceSummary currency={detailedToken} chain={chain} multiChainMap={multiChainMap} />}
-            </>
-          )}
+          <div style={{ pointerEvents: isBlockedToken ? 'none' : 'auto' }}>
+            <Swap
+              chainId={pageChainId}
+              initialInputCurrency={inputCurrency}
+              initialOutputCurrency={outputCurrency}
+              onCurrencyChange={handleCurrencyChange}
+              disableTokenInputs={pageChainId !== connectedChainId}
+            />
+          </div>
+          {tokenWarning && <TokenSafetyMessage tokenAddress={address} warning={tokenWarning} />}
+          {detailedToken && <BalanceSummary currency={detailedToken} chain={chain} multiChainMap={multiChainMap} />}
           {isInfoTDPEnabled && (
             <TokenDescription
               tokenAddress={address}
diff --git a/apps/web/src/components/Tokens/TokenDetails/tables/TokenDetailsPoolsTable.test.tsx b/apps/web/src/components/Tokens/TokenDetails/tables/TokenDetailsPoolsTable.test.tsx
index 18fe751ce72..bc8b8a2e136 100644
--- a/apps/web/src/components/Tokens/TokenDetails/tables/TokenDetailsPoolsTable.test.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/tables/TokenDetailsPoolsTable.test.tsx
@@ -1,14 +1,13 @@
 import { ApolloError } from '@apollo/client'
-import { ChainId, Percent, Token } from '@uniswap/sdk-core'
+import { ChainId, Token } from '@uniswap/sdk-core'
 import { TokenDetailsPoolsTable } from 'components/Tokens/TokenDetails/tables/TokenDetailsPoolsTable'
-import { ProtocolVersion } from 'graphql/data/__generated__/types-and-hooks'
-import { usePoolsFromTokenAddress } from 'graphql/data/pools/usePoolsFromTokenAddress'
+import { usePoolsFromTokenAddress } from 'graphql/thegraph/PoolsFromTokenAddress'
 import Router from 'react-router-dom'
 import { mocked } from 'test-utils/mocked'
-import { validBEPoolToken0, validBEPoolToken1, validParams, validPoolToken0 } from 'test-utils/pools/fixtures'
+import { validParams, validPoolToken0, validPoolToken1 } from 'test-utils/pools/fixtures'
 import { render, screen } from 'test-utils/render'
 
-jest.mock('graphql/data/pools/usePoolsFromTokenAddress')
+jest.mock('graphql/thegraph/PoolsFromTokenAddress')
 jest.mock('react-router-dom', () => ({
   ...jest.requireActual('react-router-dom'),
   useParams: jest.fn(),
@@ -50,16 +49,15 @@ describe('TDPPoolTable', () => {
   it('renders data filled state', () => {
     const mockData = [
       {
-        token0: validBEPoolToken0,
-        token1: validBEPoolToken1,
+        token0: validPoolToken0,
+        token1: validPoolToken1,
         feeTier: 10000,
         hash: '0x123',
         txCount: 200,
         tvl: 300,
         volume24h: 400,
         volumeWeek: 500,
-        turnover: new Percent(6, 100),
-        protocolVersion: ProtocolVersion.V3,
+        turnover: 600,
       },
     ]
     mocked(usePoolsFromTokenAddress).mockReturnValue({
diff --git a/apps/web/src/components/Tokens/TokenDetails/tables/TokenDetailsPoolsTable.tsx b/apps/web/src/components/Tokens/TokenDetails/tables/TokenDetailsPoolsTable.tsx
index 555810b37b2..9c327708063 100644
--- a/apps/web/src/components/Tokens/TokenDetails/tables/TokenDetailsPoolsTable.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/tables/TokenDetailsPoolsTable.tsx
@@ -1,37 +1,13 @@
 import { Trans } from '@lingui/macro'
 import { ChainId, Token } from '@uniswap/sdk-core'
-import { PoolTableColumns, PoolsTable } from 'components/Pools/PoolTable/PoolTable'
-import { usePoolsFromTokenAddress } from 'graphql/data/pools/usePoolsFromTokenAddress'
-import { PoolSortFields, PoolTableSortState } from 'graphql/data/pools/useTopPools'
-import { OrderDirection } from 'graphql/data/util'
-import { useCallback, useState } from 'react'
+import { PoolsTable, PoolTableColumns } from 'components/Pools/PoolTable/PoolTable'
+import { usePoolsFromTokenAddress } from 'graphql/thegraph/PoolsFromTokenAddress'
 import { ThemedText } from 'theme/components'
 
 const HIDDEN_COLUMNS = [PoolTableColumns.Transactions]
 
 export function TokenDetailsPoolsTable({ chainId, referenceToken }: { chainId: ChainId; referenceToken: Token }) {
-  const [sortState, setSortMethod] = useState<PoolTableSortState>({
-    sortBy: PoolSortFields.TVL,
-    sortDirection: OrderDirection.Desc,
-  })
-  const { pools, loading, error, loadMore } = usePoolsFromTokenAddress(referenceToken.address, sortState, chainId)
-
-  const handleHeaderClick = useCallback(
-    (newSortMethod: PoolSortFields) => {
-      if (sortState.sortBy === newSortMethod) {
-        setSortMethod({
-          sortBy: newSortMethod,
-          sortDirection: sortState.sortDirection === OrderDirection.Asc ? OrderDirection.Desc : OrderDirection.Asc,
-        })
-      } else {
-        setSortMethod({
-          sortBy: newSortMethod,
-          sortDirection: OrderDirection.Desc,
-        })
-      }
-    },
-    [sortState.sortBy, sortState.sortDirection]
-  )
+  const { pools, loading, error, loadMore } = usePoolsFromTokenAddress(referenceToken.address, chainId)
 
   if (error) {
     return (
@@ -50,8 +26,6 @@ export function TokenDetailsPoolsTable({ chainId, referenceToken }: { chainId: C
         maxHeight={600}
         hiddenColumns={HIDDEN_COLUMNS}
         loadMore={loadMore}
-        sortState={sortState}
-        handleHeaderClick={handleHeaderClick}
       />
     </div>
   )
diff --git a/apps/web/src/components/Tokens/TokenDetails/tables/TransactionsTable.tsx b/apps/web/src/components/Tokens/TokenDetails/tables/TransactionsTable.tsx
index cdcc35b16cf..d92a6697ea3 100644
--- a/apps/web/src/components/Tokens/TokenDetails/tables/TransactionsTable.tsx
+++ b/apps/web/src/components/Tokens/TokenDetails/tables/TransactionsTable.tsx
@@ -1,22 +1,17 @@
 import { Trans } from '@lingui/macro'
 import { createColumnHelper } from '@tanstack/react-table'
 import { ChainId, Token } from '@uniswap/sdk-core'
-import Row from 'components/Row'
 import { Table } from 'components/Table'
 import { Cell } from 'components/Table/Cell'
-import { Filter } from 'components/Table/Filter'
-import {
-  ClickableHeaderRow,
-  FilterHeaderRow,
-  HeaderArrow,
-  StyledExternalLink,
-  TimestampCell,
-  TokenLinkCell,
-} from 'components/Table/styled'
-import { TokenTransactionType, useTokenTransactions } from 'graphql/thegraph/TokenTransactions'
-import { OrderDirection, Swap_OrderBy } from 'graphql/thegraph/__generated__/types-and-hooks'
+import { StyledExternalLink, StyledInternalLink } from 'components/Table/styled'
+import { getLocaleTimeString } from 'components/Table/utils'
+import { DEFAULT_LOCALE } from 'constants/locales'
+import { validateUrlChainParam } from 'graphql/data/util'
+import { useTokenTransactions } from 'graphql/thegraph/TokenTransactions'
 import { useActiveLocalCurrency } from 'hooks/useActiveLocalCurrency'
-import { useCallback, useMemo, useReducer, useState } from 'react'
+import { useActiveLocale } from 'hooks/useActiveLocale'
+import { useMemo } from 'react'
+import { useParams } from 'react-router-dom'
 import styled from 'styled-components'
 import { EllipsisStyle, ThemedText } from 'theme/components'
 import { shortenAddress } from 'utils/addresses'
@@ -26,7 +21,7 @@ import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
 const StyledSwapAmount = styled(ThemedText.BodyPrimary)`
   display: inline-block;
   ${EllipsisStyle}
-  max-width: 75px;
+  max-width: 125px;
 `
 interface SwapTransaction {
   hash: string
@@ -43,44 +38,12 @@ interface SwapLeg {
   amount: number
 }
 
-type TokenTxTableSortState = {
-  sortBy: Swap_OrderBy
-  sortDirection: OrderDirection
-}
-
 export function TransactionsTable({ chainId, referenceToken }: { chainId: ChainId; referenceToken: Token }) {
+  const locale = useActiveLocale()
   const activeLocalCurrency = useActiveLocalCurrency()
   const { formatNumber, formatFiatPrice } = useFormatter()
-  const [filterModalIsOpen, toggleFilterModal] = useReducer((s) => !s, false)
-  const [filter, setFilters] = useState<TokenTransactionType[]>([TokenTransactionType.BUY, TokenTransactionType.SELL])
-  const [sortState, setSortMethod] = useState<TokenTxTableSortState>({
-    sortBy: Swap_OrderBy.Timestamp,
-    sortDirection: OrderDirection.Desc,
-  })
-  const { transactions, loading, loadMore, error } = useTokenTransactions(
-    referenceToken.address,
-    chainId,
-    sortState.sortBy,
-    sortState.sortDirection,
-    filter
-  )
-
-  const handleHeaderClick = useCallback(
-    (newSortMethod: Swap_OrderBy) => {
-      if (sortState.sortBy === newSortMethod) {
-        setSortMethod({
-          sortBy: newSortMethod,
-          sortDirection: sortState.sortDirection === OrderDirection.Asc ? OrderDirection.Desc : OrderDirection.Asc,
-        })
-      } else {
-        setSortMethod({
-          sortBy: newSortMethod,
-          sortDirection: OrderDirection.Desc,
-        })
-      }
-    },
-    [sortState.sortBy, sortState.sortDirection]
-  )
+  const chainName = validateUrlChainParam(useParams<{ chainName?: string }>().chainName)
+  const { transactions, loading, loadMore } = useTokenTransactions(referenceToken.address, chainId)
 
   const data = useMemo(
     () =>
@@ -96,7 +59,7 @@ export function TransactionsTable({ chainId, referenceToken }: { chainId: ChainI
           amount: transaction.amount1,
         }
         let input, output
-        if (swapLeg0.amount > 0) {
+        if (swapLeg0.amount < 0) {
           input = swapLeg0
           output = swapLeg1
         } else {
@@ -114,51 +77,38 @@ export function TransactionsTable({ chainId, referenceToken }: { chainId: ChainI
       }),
     [transactions]
   )
-  // TODO(WEB-3236): once GQL BE Transaction query is supported add usd, token0 amount, and token1 amount sort support
+
   const columns = useMemo(() => {
     const columnHelper = createColumnHelper<SwapTransaction>()
     return [
-      columnHelper.accessor((row) => row, {
+      columnHelper.accessor((row) => row.timestamp, {
         id: 'timestamp',
         header: () => (
-          <Cell minWidth={164} justifyContent="flex-start" grow>
-            <ClickableHeaderRow $justify="flex-start" onClick={() => handleHeaderClick(Swap_OrderBy.Timestamp)}>
-              {sortState.sortBy === Swap_OrderBy.Timestamp && <HeaderArrow direction={sortState.sortDirection} />}
-              <ThemedText.BodySecondary>
-                <Trans>Time</Trans>
-              </ThemedText.BodySecondary>
-            </ClickableHeaderRow>
+          <Cell minWidth={150} justifyContent="flex-start" grow>
+            <ThemedText.BodySecondary>
+              <Trans>Time</Trans>
+            </ThemedText.BodySecondary>
           </Cell>
         ),
-        cell: (row) => (
-          <Cell loading={loading} minWidth={164} justifyContent="flex-start" grow>
-            <TimestampCell
-              timestamp={Number(row.getValue?.().timestamp)}
-              link={getExplorerLink(chainId, row.getValue?.().hash, ExplorerDataType.TRANSACTION)}
-            />
+        cell: (timestamp) => (
+          <Cell loading={loading} minWidth={150} justifyContent="flex-start" grow>
+            <ThemedText.BodySecondary>
+              {getLocaleTimeString(Number(timestamp.getValue?.()) * 1000, locale ?? DEFAULT_LOCALE)}
+            </ThemedText.BodySecondary>
           </Cell>
         ),
       }),
       columnHelper.accessor((row) => row.output.address, {
         id: 'swap-type',
         header: () => (
-          <Cell minWidth={75} justifyContent="flex-start" grow>
-            <FilterHeaderRow modalOpen={filterModalIsOpen} onClick={toggleFilterModal}>
-              <Filter
-                allFilters={Object.values(TokenTransactionType)}
-                activeFilter={filter}
-                setFilters={setFilters}
-                isOpen={filterModalIsOpen}
-                toggleFilterModal={toggleFilterModal}
-              />
-              <ThemedText.BodySecondary>
-                <Trans>Type</Trans>
-              </ThemedText.BodySecondary>
-            </FilterHeaderRow>
+          <Cell minWidth={50} justifyContent="flex-start" grow>
+            <ThemedText.BodySecondary>
+              <Trans>Type</Trans>
+            </ThemedText.BodySecondary>
           </Cell>
         ),
         cell: (outputTokenAddress) => (
-          <Cell loading={loading} minWidth={75} justifyContent="flex-start" grow>
+          <Cell loading={loading} minWidth={50} justifyContent="flex-start" grow>
             <ThemedText.BodyPrimary>
               {String(outputTokenAddress.getValue?.()).toLowerCase() === referenceToken.address.toLowerCase() ? (
                 <Trans>Buy</Trans>
@@ -177,12 +127,12 @@ export function TransactionsTable({ chainId, referenceToken }: { chainId: ChainI
         {
           id: 'reference-amount',
           header: () => (
-            <Cell minWidth={100} justifyContent="flex-end">
+            <Cell minWidth={150} justifyContent="flex-end">
               <ThemedText.BodySecondary>${referenceToken.symbol}</ThemedText.BodySecondary>
             </Cell>
           ),
           cell: (inputTokenAmount) => (
-            <Cell loading={loading} minWidth={100} justifyContent="flex-end">
+            <Cell loading={loading} minWidth={150} justifyContent="flex-end">
               <ThemedText.BodyPrimary>
                 {formatNumber({
                   input: Math.abs(inputTokenAmount.getValue?.()) || 0,
@@ -197,27 +147,27 @@ export function TransactionsTable({ chainId, referenceToken }: { chainId: ChainI
           const nonReferenceSwapLeg =
             row.input.address.toLowerCase() === referenceToken.address.toLowerCase() ? row.output : row.input
           return (
-            <Row gap="8px" justify="flex-end">
-              <StyledSwapAmount>
-                {formatNumber({
-                  input: Math.abs(nonReferenceSwapLeg.amount) || 0,
-                })}
-              </StyledSwapAmount>
-              <TokenLinkCell chainId={chainId} tokenAddress={nonReferenceSwapLeg.address} />
-            </Row>
+            <StyledSwapAmount>
+              {formatNumber({
+                input: Math.abs(nonReferenceSwapLeg.amount) || 0,
+              })}{' '}
+              <StyledInternalLink to={`/explore/tokens/${chainName.toLowerCase()}/${nonReferenceSwapLeg.address}`}>
+                {nonReferenceSwapLeg.symbol}
+              </StyledInternalLink>
+            </StyledSwapAmount>
           )
         },
         {
           id: 'non-reference-amount',
           header: () => (
-            <Cell minWidth={160} justifyContent="flex-end">
+            <Cell minWidth={150} justifyContent="flex-end">
               <ThemedText.BodySecondary>
                 <Trans>For</Trans>
               </ThemedText.BodySecondary>
             </Cell>
           ),
           cell: (swapOutput) => (
-            <Cell loading={loading} minWidth={160} justifyContent="flex-end">
+            <Cell loading={loading} minWidth={150} justifyContent="flex-end">
               {swapOutput.getValue?.()}
             </Cell>
           ),
@@ -227,10 +177,7 @@ export function TransactionsTable({ chainId, referenceToken }: { chainId: ChainI
         id: 'fiat-value',
         header: () => (
           <Cell minWidth={125} justifyContent="flex-end">
-            <ClickableHeaderRow $justify="flex-end" onClick={() => handleHeaderClick(Swap_OrderBy.AmountUsd)}>
-              {sortState.sortBy === Swap_OrderBy.AmountUsd && <HeaderArrow direction={sortState.sortDirection} />}
-              <ThemedText.BodySecondary>{activeLocalCurrency}</ThemedText.BodySecondary>
-            </ClickableHeaderRow>
+            <ThemedText.BodySecondary>{activeLocalCurrency}</ThemedText.BodySecondary>
           </Cell>
         ),
         cell: (fiat) => (
@@ -244,7 +191,7 @@ export function TransactionsTable({ chainId, referenceToken }: { chainId: ChainI
         header: () => (
           <Cell minWidth={100} justifyContent="flex-end">
             <ThemedText.BodySecondary>
-              <Trans>Wallet</Trans>
+              <Trans>Maker</Trans>
             </ThemedText.BodySecondary>
           </Cell>
         ),
@@ -260,25 +207,14 @@ export function TransactionsTable({ chainId, referenceToken }: { chainId: ChainI
   }, [
     activeLocalCurrency,
     chainId,
-    filter,
-    filterModalIsOpen,
+    chainName,
     formatFiatPrice,
     formatNumber,
-    handleHeaderClick,
     loading,
+    locale,
     referenceToken.address,
     referenceToken.symbol,
-    sortState.sortBy,
-    sortState.sortDirection,
   ])
 
-  if (error) {
-    return (
-      <ThemedText.BodyPrimary>
-        <Trans>Error loading Transactions</Trans>
-      </ThemedText.BodyPrimary>
-    )
-  }
-
   return <Table columns={columns} data={data} loading={loading} loadMore={loadMore} maxHeight={600} />
 }
diff --git a/apps/web/src/components/Tokens/TokenDetails/tables/__snapshots__/TokenDetailsPoolsTable.test.tsx.snap b/apps/web/src/components/Tokens/TokenDetails/tables/__snapshots__/TokenDetailsPoolsTable.test.tsx.snap
index c70b93a2c0e..f625f1560ea 100644
--- a/apps/web/src/components/Tokens/TokenDetails/tables/__snapshots__/TokenDetailsPoolsTable.test.tsx.snap
+++ b/apps/web/src/components/Tokens/TokenDetails/tables/__snapshots__/TokenDetailsPoolsTable.test.tsx.snap
@@ -25,54 +25,28 @@ exports[`TDPPoolTable renders data filled state 1`] = `
   justify-content: flex-start;
 }
 
-.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: 8px;
-}
-
-.c26 {
+.c23 {
   height: 16px;
   width: 16px;
 }
 
-.c26 path {
+.c23 path {
   stroke: #FC72FF;
   background: #7D7D7D;
   fill: none;
 }
 
-.c27 {
+.c24 {
   -webkit-animation: 2s fvtopB linear infinite;
   animation: 2s fvtopB linear infinite;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c22 {
+.c19 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c0 {
@@ -121,7 +95,7 @@ exports[`TDPPoolTable renders data filled state 1`] = `
   background: #FFFFFF;
 }
 
-.c15 {
+.c13 {
   width: 100%;
   position: relative;
   overflow-x: auto;
@@ -138,11 +112,11 @@ exports[`TDPPoolTable renders data filled state 1`] = `
   scrollbar-width: none;
 }
 
-.c15::-webkit-scrollbar {
+.c13::-webkit-scrollbar {
   display: none;
 }
 
-.c24 {
+.c21 {
   position: -webkit-sticky;
   position: sticky;
   -webkit-box-pack: center;
@@ -153,7 +127,7 @@ exports[`TDPPoolTable renders data filled state 1`] = `
   visibility: hidden;
 }
 
-.c25 {
+.c22 {
   background: #FFEFFF;
   border-radius: 8px;
   width: -webkit-fit-content;
@@ -169,7 +143,7 @@ exports[`TDPPoolTable renders data filled state 1`] = `
 }
 
 .c5 {
-  padding: 0px 12px;
+  padding: 0px 20px;
   width: -webkit-fit-content;
   width: -moz-fit-content;
   width: fit-content;
@@ -181,7 +155,7 @@ exports[`TDPPoolTable renders data filled state 1`] = `
   min-height: 64px;
 }
 
-.c17:hover {
+.c14:hover {
   background: #22222212;
 }
 
@@ -223,54 +197,10 @@ exports[`TDPPoolTable renders data filled state 1`] = `
   justify-content: flex-end;
 }
 
-.c7:first-child {
-  -webkit-box-flex: 0;
-  -webkit-flex-grow: 0;
-  -ms-flex-positive: 0;
-  flex-grow: 0;
-}
-
-.c16 {
-  color: none;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-}
-
-.c12 {
-  -webkit-box-pack: end;
-  -webkit-justify-content: flex-end;
-  -ms-flex-pack: end;
-  justify-content: flex-end;
-  cursor: pointer;
-  width: 100%;
-  gap: 4px;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c12:hover {
-  opacity: 0.6;
-}
-
-.c12:active {
-  opacity: 0.4;
-}
-
-.c13 {
-  height: 16px;
-  width: 16px;
-  color: #7D7D7D;
-  -webkit-transform: rotate(0deg);
-  -ms-transform: rotate(0deg);
-  transform: rotate(0deg);
-}
-
 .c8 {
-  min-width: 44px;
+  width: undefinedpx;
+  min-width: 48px;
+  min-width: undefinedpx;
   -webkit-flex: 0;
   -ms-flex: 0;
   flex: 0;
@@ -278,21 +208,23 @@ exports[`TDPPoolTable renders data filled state 1`] = `
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
 .c10 {
+  width: undefinedpx;
   min-width: 240px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -308,13 +240,15 @@ exports[`TDPPoolTable renders data filled state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
 .c11 {
+  width: undefinedpx;
   min-width: 120px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -330,13 +264,15 @@ exports[`TDPPoolTable renders data filled state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c14 {
+.c12 {
+  width: undefinedpx;
   min-width: 100px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -352,18 +288,18 @@ exports[`TDPPoolTable renders data filled state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c19 {
+.c16 {
   position: relative;
   top: 0;
   left: 0;
 }
 
-.c20 {
+.c17 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -374,32 +310,49 @@ exports[`TDPPoolTable renders data filled state 1`] = `
   left: 0;
 }
 
-.c20 img {
+.c17 img {
   width: 14px;
   height: 28px;
   object-fit: cover;
 }
 
-.c20 img:first-child {
+.c17 img:first-child {
   border-radius: 14px 0 0 14px;
   object-position: 0 0;
 }
 
-.c20 img:last-child {
+.c17 img:last-child {
   border-radius: 0 14px 14px 0;
   object-position: 100% 0;
 }
 
-.c21 {
+.c18 {
   width: 14px;
   height: 28px;
   border-radius: 50%;
 }
 
-.c23 {
+.c15 {
+  gap: 8px;
+  cursor: pointer;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  cursor: pointer;
+  -webkit-transition-duration: 125ms;
+  transition-duration: 125ms;
+}
+
+.c15:hover {
+  opacity: 0.6;
+}
+
+.c15:active {
+  opacity: 0.4;
+}
+
+.c20 {
   padding: 2px 6px;
   background: #F9F9F9;
-  border-radius: 5px;
 }
 
 <div
@@ -448,36 +401,9 @@ exports[`TDPPoolTable renders data filled state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c3 c4 c12"
+                  class="c9 css-1urox24"
                 >
-                  <svg
-                    class="c13"
-                    direction="desc"
-                    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="12"
-                      x2="12"
-                      y1="5"
-                      y2="19"
-                    />
-                    <polyline
-                      points="19 12 12 19 5 12"
-                    />
-                  </svg>
-                  <div
-                    class="c9 css-1urox24"
-                  >
-                    TVL
-                  </div>
+                  TVL
                 </div>
               </div>
             </div>
@@ -488,13 +414,9 @@ exports[`TDPPoolTable renders data filled state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c3 c4 c12"
+                  class="c9 css-1urox24"
                 >
-                  <div
-                    class="c9 css-1urox24"
-                  >
-                    1 day volume
-                  </div>
+                  1 day volume
                 </div>
               </div>
             </div>
@@ -505,13 +427,9 @@ exports[`TDPPoolTable renders data filled state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c3 c4 c12"
+                  class="c9 css-1urox24"
                 >
-                  <div
-                    class="c9 css-1urox24"
-                  >
-                    7 day volume
-                  </div>
+                  7 day volume
                 </div>
               </div>
             </div>
@@ -519,148 +437,139 @@ exports[`TDPPoolTable renders data filled state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c3 c4 c12"
+                  class="c9 css-1urox24"
                 >
-                  <div
-                    class="c9 css-1urox24"
-                  >
-                    Turnover
-                  </div>
+                  Turnover
                 </div>
               </div>
             </div>
           </div>
         </div>
         <div
-          class="c0 c15"
+          class="c0 c13"
         >
-          <a
-            class="c16"
-            href="/explore/pools/ethereum/0x123"
+          <div
+            class="c3 c4 c5 c14"
           >
             <div
-              class="c3 c4 c5 c17"
+              class="c7"
             >
               <div
-                class="c7"
+                class="c8"
               >
                 <div
-                  class="c8"
+                  class="c9 css-1urox24"
                 >
-                  <div
-                    class="c9 css-1urox24"
-                  >
-                    1
-                  </div>
+                  1
                 </div>
               </div>
+            </div>
+            <div
+              class="c7"
+            >
               <div
-                class="c7"
+                class="c10"
               >
                 <div
-                  class="c10"
+                  class="c3 c4 c15"
                 >
                   <div
-                    class="c3 c18"
+                    class="c16"
                   >
                     <div
-                      class="c19"
+                      class="c17"
+                      size="28"
                     >
-                      <div
-                        class="c20"
+                      <img
+                        class="c18"
                         size="28"
-                      >
-                        <img
-                          class="c21"
-                          size="28"
-                          src="blank_token.svg"
-                        />
-                        <img
-                          class="c21"
-                          size="28"
-                          src="blank_token.svg"
-                        />
-                      </div>
-                    </div>
-                    <div
-                      class="c22 css-1urox24"
-                    >
-                      USDC/WETH
-                    </div>
-                    <div
-                      class="c9 c23 css-1m65e73"
-                    >
-                      1%
+                        src="blank_token.svg"
+                      />
+                      <img
+                        class="c18"
+                        size="28"
+                        src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png"
+                      />
                     </div>
                   </div>
+                  <div
+                    class="c19 css-1urox24"
+                  >
+                    USDC/WETH
+                  </div>
+                  <div
+                    class="c9 c20 css-1m65e73"
+                  >
+                    1%
+                  </div>
                 </div>
               </div>
+            </div>
+            <div
+              class="c7"
+            >
               <div
-                class="c7"
+                class="c11"
               >
                 <div
-                  class="c11"
+                  class="c9 css-1urox24"
                 >
-                  <div
-                    class="c9 css-1urox24"
-                  >
-                    $300.00
-                  </div>
+                  $300.00
                 </div>
               </div>
+            </div>
+            <div
+              class="c7"
+            >
               <div
-                class="c7"
+                class="c11"
               >
                 <div
-                  class="c11"
+                  class="c9 css-1urox24"
                 >
-                  <div
-                    class="c9 css-1urox24"
-                  >
-                    $400.00
-                  </div>
+                  $400.00
                 </div>
               </div>
+            </div>
+            <div
+              class="c7"
+            >
               <div
-                class="c7"
+                class="c11"
               >
                 <div
-                  class="c11"
+                  class="c9 css-1urox24"
                 >
-                  <div
-                    class="c9 css-1urox24"
-                  >
-                    $500.00
-                  </div>
+                  $500.00
                 </div>
               </div>
+            </div>
+            <div
+              class="c7"
+            >
               <div
-                class="c7"
+                class="c12"
               >
                 <div
-                  class="c14"
+                  class="c9 css-1urox24"
                 >
-                  <div
-                    class="c9 css-1urox24"
-                  >
-                    6%
-                  </div>
+                  600.00
                 </div>
               </div>
             </div>
-          </a>
+          </div>
         </div>
         <div
-          class="c3 c4 c24"
+          class="c3 c4 c21"
         >
           <div
-            class="c3 c4 c25"
+            class="c3 c4 c22"
           >
             <svg
-              class="c26 c27"
+              class="c23 c24"
               fill="none"
               stroke="#FC72FF"
               viewBox="0 0 24 24"
@@ -686,10 +595,6 @@ exports[`TDPPoolTable renders error state 1`] = `
 <DocumentFragment>
   .c0 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 <div
@@ -725,28 +630,24 @@ exports[`TDPPoolTable renders loading state 1`] = `
   justify-content: flex-start;
 }
 
-.c21 {
+.c19 {
   height: 16px;
   width: 16px;
 }
 
-.c21 path {
+.c19 path {
   stroke: #FC72FF;
   background: #7D7D7D;
   fill: none;
 }
 
-.c22 {
+.c20 {
   -webkit-animation: 2s fvtopB linear infinite;
   animation: 2s fvtopB linear infinite;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c0 {
@@ -795,7 +696,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
   background: #FFFFFF;
 }
 
-.c15 {
+.c13 {
   width: 100%;
   position: relative;
   overflow-x: auto;
@@ -812,11 +713,11 @@ exports[`TDPPoolTable renders loading state 1`] = `
   scrollbar-width: none;
 }
 
-.c15::-webkit-scrollbar {
+.c13::-webkit-scrollbar {
   display: none;
 }
 
-.c19 {
+.c17 {
   position: -webkit-sticky;
   position: sticky;
   -webkit-box-pack: center;
@@ -827,7 +728,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
   visibility: hidden;
 }
 
-.c20 {
+.c18 {
   background: #FFEFFF;
   border-radius: 8px;
   width: -webkit-fit-content;
@@ -843,7 +744,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
 }
 
 .c5 {
-  padding: 0px 12px;
+  padding: 0px 20px;
   width: -webkit-fit-content;
   width: -moz-fit-content;
   width: fit-content;
@@ -855,7 +756,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
   min-height: 64px;
 }
 
-.c16:hover {
+.c14:hover {
   background: #22222212;
 }
 
@@ -897,46 +798,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
   justify-content: flex-end;
 }
 
-.c7:first-child {
-  -webkit-box-flex: 0;
-  -webkit-flex-grow: 0;
-  -ms-flex-positive: 0;
-  flex-grow: 0;
-}
-
-.c12 {
-  -webkit-box-pack: end;
-  -webkit-justify-content: flex-end;
-  -ms-flex-pack: end;
-  justify-content: flex-end;
-  cursor: pointer;
-  width: 100%;
-  gap: 4px;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c12:hover {
-  opacity: 0.6;
-}
-
-.c12:active {
-  opacity: 0.4;
-}
-
-.c13 {
-  height: 16px;
-  width: 16px;
-  color: #7D7D7D;
-  -webkit-transform: rotate(0deg);
-  -ms-transform: rotate(0deg);
-  transform: rotate(0deg);
-}
-
-.c17 {
+.c15 {
   border-radius: 12px;
   border-radius: 12px;
   height: 24px;
@@ -952,7 +814,9 @@ exports[`TDPPoolTable renders loading state 1`] = `
 }
 
 .c8 {
-  min-width: 44px;
+  width: undefinedpx;
+  min-width: 48px;
+  min-width: undefinedpx;
   -webkit-flex: 0;
   -ms-flex: 0;
   flex: 0;
@@ -960,21 +824,23 @@ exports[`TDPPoolTable renders loading state 1`] = `
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
+  -webkit-box-pack: start;
+  -webkit-justify-content: flex-start;
+  -ms-flex-pack: start;
+  justify-content: flex-start;
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
 .c10 {
+  width: undefinedpx;
   min-width: 240px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -990,13 +856,15 @@ exports[`TDPPoolTable renders loading state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
 .c11 {
+  width: undefinedpx;
   min-width: 120px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -1012,13 +880,15 @@ exports[`TDPPoolTable renders loading state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c14 {
+.c12 {
+  width: undefinedpx;
   min-width: 100px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -1034,12 +904,12 @@ exports[`TDPPoolTable renders loading state 1`] = `
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c18 {
+.c16 {
   width: 75%;
   height: 16px;
 }
@@ -1090,36 +960,9 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c3 c4 c12"
+                  class="c9 css-1urox24"
                 >
-                  <svg
-                    class="c13"
-                    direction="desc"
-                    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="12"
-                      x2="12"
-                      y1="5"
-                      y2="19"
-                    />
-                    <polyline
-                      points="19 12 12 19 5 12"
-                    />
-                  </svg>
-                  <div
-                    class="c9 css-1urox24"
-                  >
-                    TVL
-                  </div>
+                  TVL
                 </div>
               </div>
             </div>
@@ -1130,13 +973,9 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c3 c4 c12"
+                  class="c9 css-1urox24"
                 >
-                  <div
-                    class="c9 css-1urox24"
-                  >
-                    1 day volume
-                  </div>
+                  1 day volume
                 </div>
               </div>
             </div>
@@ -1147,13 +986,9 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c3 c4 c12"
+                  class="c9 css-1urox24"
                 >
-                  <div
-                    class="c9 css-1urox24"
-                  >
-                    7 day volume
-                  </div>
+                  7 day volume
                 </div>
               </div>
             </div>
@@ -1161,26 +996,22 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c3 c4 c12"
+                  class="c9 css-1urox24"
                 >
-                  <div
-                    class="c9 css-1urox24"
-                  >
-                    Turnover
-                  </div>
+                  Turnover
                 </div>
               </div>
             </div>
           </div>
         </div>
         <div
-          class="c0 c15"
+          class="c0 c13"
         >
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -1189,7 +1020,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1201,7 +1032,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1213,7 +1044,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1225,7 +1056,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1237,7 +1068,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1246,17 +1077,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -1265,7 +1096,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1277,7 +1108,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1289,7 +1120,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1301,7 +1132,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1313,7 +1144,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1322,17 +1153,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -1341,7 +1172,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1353,7 +1184,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1365,7 +1196,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1377,7 +1208,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1389,7 +1220,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1398,17 +1229,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -1417,7 +1248,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1429,7 +1260,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1441,7 +1272,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1453,7 +1284,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1465,7 +1296,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1474,17 +1305,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -1493,7 +1324,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1505,7 +1336,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1517,7 +1348,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1529,7 +1360,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1541,7 +1372,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1550,17 +1381,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -1569,7 +1400,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1581,7 +1412,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1593,7 +1424,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1605,7 +1436,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1617,7 +1448,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1626,17 +1457,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -1645,7 +1476,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1657,7 +1488,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1669,7 +1500,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1681,7 +1512,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1693,7 +1524,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1702,17 +1533,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -1721,7 +1552,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1733,7 +1564,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1745,7 +1576,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1757,7 +1588,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1769,7 +1600,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1778,17 +1609,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -1797,7 +1628,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1809,7 +1640,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1821,7 +1652,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1833,7 +1664,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1845,7 +1676,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1854,17 +1685,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -1873,7 +1704,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1885,7 +1716,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1897,7 +1728,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1909,7 +1740,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1921,7 +1752,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1930,17 +1761,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -1949,7 +1780,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1961,7 +1792,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1973,7 +1804,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1985,7 +1816,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -1997,7 +1828,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2006,17 +1837,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -2025,7 +1856,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2037,7 +1868,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2049,7 +1880,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2061,7 +1892,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2073,7 +1904,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2082,17 +1913,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -2101,7 +1932,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2113,7 +1944,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2125,7 +1956,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2137,7 +1968,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2149,7 +1980,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2158,17 +1989,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -2177,7 +2008,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2189,7 +2020,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2201,7 +2032,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2213,7 +2044,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2225,7 +2056,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2234,17 +2065,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -2253,7 +2084,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2265,7 +2096,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2277,7 +2108,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2289,7 +2120,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2301,7 +2132,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2310,17 +2141,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -2329,7 +2160,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2341,7 +2172,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2353,7 +2184,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2365,7 +2196,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2377,7 +2208,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2386,17 +2217,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -2405,7 +2236,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2417,7 +2248,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2429,7 +2260,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2441,7 +2272,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2453,7 +2284,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2462,17 +2293,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -2481,7 +2312,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2493,7 +2324,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2505,7 +2336,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2517,7 +2348,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2529,7 +2360,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2538,17 +2369,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -2557,7 +2388,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2569,7 +2400,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2581,7 +2412,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2593,7 +2424,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2605,7 +2436,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2614,17 +2445,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -2633,7 +2464,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2645,7 +2476,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2657,7 +2488,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2669,7 +2500,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2681,7 +2512,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2690,17 +2521,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -2709,7 +2540,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2721,7 +2552,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2733,7 +2564,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2745,7 +2576,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2757,7 +2588,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2766,17 +2597,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -2785,7 +2616,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2797,7 +2628,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2809,7 +2640,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2821,7 +2652,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2833,7 +2664,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2842,17 +2673,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -2861,7 +2692,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2873,7 +2704,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2885,7 +2716,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2897,7 +2728,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2909,7 +2740,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2918,17 +2749,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -2937,7 +2768,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2949,7 +2780,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2961,7 +2792,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2973,7 +2804,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2985,7 +2816,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -2994,17 +2825,17 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
             </div>
           </div>
           <div
-            class="c3 c4 c5 c16"
+            class="c3 c4 c5 c14"
           >
             <div
               class="c7"
@@ -3013,7 +2844,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c8"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3025,7 +2856,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c10"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3037,7 +2868,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3049,7 +2880,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3061,7 +2892,7 @@ exports[`TDPPoolTable renders loading state 1`] = `
                 class="c11"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3070,10 +2901,10 @@ exports[`TDPPoolTable renders loading state 1`] = `
               class="c7"
             >
               <div
-                class="c14"
+                class="c12"
               >
                 <div
-                  class="c17 c18"
+                  class="c15 c16"
                   data-testid="cell-loading-bubble"
                 />
               </div>
@@ -3081,13 +2912,13 @@ exports[`TDPPoolTable renders loading state 1`] = `
           </div>
         </div>
         <div
-          class="c3 c4 c19"
+          class="c3 c4 c17"
         >
           <div
-            class="c3 c4 c20"
+            class="c3 c4 c18"
           >
             <svg
-              class="c21 c22"
+              class="c19 c20"
               fill="none"
               stroke="#FC72FF"
               viewBox="0 0 24 24"
diff --git a/apps/web/src/components/Tokens/TokenTable/SearchBar.tsx b/apps/web/src/components/Tokens/TokenTable/SearchBar.tsx
index d75e1e1945f..fb9e5358720 100644
--- a/apps/web/src/components/Tokens/TokenTable/SearchBar.tsx
+++ b/apps/web/src/components/Tokens/TokenTable/SearchBar.tsx
@@ -10,7 +10,7 @@ import { useEffect, useState } from 'react'
 import styled from 'styled-components'
 
 import { MEDIUM_MEDIA_BREAKPOINT } from '../constants'
-import { exploreSearchStringAtom } from '../state'
+import { filterStringAtom } from '../state'
 const ICON_SIZE = '20px'
 
 const SearchBarContainer = styled.div<{ isInfoExplorePageEnabled: boolean }>`
@@ -68,17 +68,16 @@ const SearchInput = styled.input<{ isInfoExplorePageEnabled: boolean; isOpen?: b
 `
 
 export default function SearchBar({ tab }: { tab?: string }) {
-  const currentString = useAtomValue(exploreSearchStringAtom)
+  const currentString = useAtomValue(filterStringAtom)
   const [localFilterString, setLocalFilterString] = useState(currentString)
-  const setFilterString = useUpdateAtom(exploreSearchStringAtom)
+  const setFilterString = useUpdateAtom(filterStringAtom)
   const debouncedLocalFilterString = useDebounce(localFilterString, 300)
   const isInfoExplorePageEnabled = useInfoExplorePageEnabled()
   const [isOpen, setIsOpen] = useState(false)
 
   useEffect(() => {
     setLocalFilterString(currentString)
-    if (currentString && isInfoExplorePageEnabled) setIsOpen(true)
-  }, [currentString, isInfoExplorePageEnabled])
+  }, [currentString])
 
   useEffect(() => {
     setFilterString(debouncedLocalFilterString)
diff --git a/apps/web/src/components/Tokens/TokenTable/TokenRow.tsx b/apps/web/src/components/Tokens/TokenTable/TokenRow.tsx
index aef1c86ad7e..098f999869e 100644
--- a/apps/web/src/components/Tokens/TokenTable/TokenRow.tsx
+++ b/apps/web/src/components/Tokens/TokenTable/TokenRow.tsx
@@ -12,7 +12,8 @@ import { useInfoExplorePageEnabled } from 'featureFlags/flags/infoExplore'
 import { SparklineMap, TopToken } from 'graphql/data/TopTokens'
 import { getTokenDetailsURL, supportedChainIdFromGQLChain, validateUrlChainParam } from 'graphql/data/util'
 import { useAtomValue } from 'jotai/utils'
-import { CSSProperties, ForwardedRef, forwardRef, ReactNode } from 'react'
+import { ForwardedRef, forwardRef } from 'react'
+import { CSSProperties, ReactNode } from 'react'
 import { Link, useParams } from 'react-router-dom'
 import styled, { css, useTheme } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
@@ -27,7 +28,7 @@ import {
 } from '../constants'
 import { LoadingBubble } from '../loading'
 import {
-  exploreSearchStringAtom,
+  filterStringAtom,
   filterTimeAtom,
   sortAscendingAtom,
   sortMethodAtom,
@@ -450,7 +451,7 @@ export const LoadedRow = forwardRef((props: LoadedRowProps, ref: ForwardedRef<HT
   const { formatFiatPrice, formatNumber, formatDelta } = useFormatter()
 
   const { tokenListIndex, tokenListLength, token, sortRank } = props
-  const filterString = useAtomValue(exploreSearchStringAtom)
+  const filterString = useAtomValue(filterStringAtom)
 
   const filterNetwork = validateUrlChainParam(useParams<{ chainName?: string }>().chainName?.toUpperCase())
   const chainId = supportedChainIdFromGQLChain(filterNetwork)
diff --git a/apps/web/src/components/Tokens/TokenTable/OldTokenTable.tsx b/apps/web/src/components/Tokens/TokenTable/TokenTable.tsx
similarity index 98%
rename from apps/web/src/components/Tokens/TokenTable/OldTokenTable.tsx
rename to apps/web/src/components/Tokens/TokenTable/TokenTable.tsx
index b9f65ab9c83..8f4f000cc0c 100644
--- a/apps/web/src/components/Tokens/TokenTable/OldTokenTable.tsx
+++ b/apps/web/src/components/Tokens/TokenTable/TokenTable.tsx
@@ -74,7 +74,7 @@ function LoadingTokenTable({ rowCount = PAGE_SIZE }: { rowCount?: number }) {
   )
 }
 
-export default function OldTokenTable() {
+export default function TokenTable() {
   const chainName = validateUrlChainParam(useParams<{ chainName?: string }>().chainName)
   const { tokens, tokenSortRank, loadingTokens, sparklines } = useTopTokens(chainName)
 
diff --git a/apps/web/src/components/Tokens/TokenTable/index.tsx b/apps/web/src/components/Tokens/TokenTable/index.tsx
deleted file mode 100644
index 8874a13f5a5..00000000000
--- a/apps/web/src/components/Tokens/TokenTable/index.tsx
+++ /dev/null
@@ -1,288 +0,0 @@
-import { Trans } from '@lingui/macro'
-import { createColumnHelper } from '@tanstack/react-table'
-import { ChainId } from '@uniswap/sdk-core'
-import { ParentSize } from '@visx/responsive'
-import SparklineChart from 'components/Charts/SparklineChart'
-import QueryTokenLogo from 'components/Logo/QueryTokenLogo'
-import Row from 'components/Row'
-import { Table } from 'components/Table'
-import { Cell } from 'components/Table/Cell'
-import { MAX_WIDTH_MEDIA_BREAKPOINT } from 'components/Tokens/constants'
-import { SparklineMap, TopToken, useTopTokens } from 'graphql/data/TopTokens'
-import {
-  chainIdToBackendName,
-  getTokenDetailsURL,
-  supportedChainIdFromGQLChain,
-  validateUrlChainParam,
-} from 'graphql/data/util'
-import { ReactElement, useMemo } from 'react'
-import { useParams } from 'react-router-dom'
-import styled from 'styled-components'
-import { EllipsisStyle, ThemedText } from 'theme/components'
-import { NumberType, useFormatter } from 'utils/formatNumbers'
-
-import { DeltaArrow, DeltaText } from '../TokenDetails/Delta'
-
-const TableWrapper = styled.div`
-  margin: 0 auto;
-  max-width: ${MAX_WIDTH_MEDIA_BREAKPOINT};
-`
-
-const TokenName = styled(ThemedText.BodyPrimary)`
-  ${EllipsisStyle}
-`
-
-const SparklineContainer = styled.div`
-  width: 124px;
-  height: 40px;
-`
-
-interface TokenTableValues {
-  index: number
-  tokenDescription: ReactElement
-  price: number
-  percentChange1hr: ReactElement
-  percentChange1d: ReactElement
-  fdv: number
-  volume: number
-  sparkline: ReactElement
-  link: string
-  /** Used for pre-loading TDP with logo to extract color from */
-  linkState: { preloadedLogoSrc?: string }
-}
-
-function TokenDescription({ token }: { token: TopToken }) {
-  return (
-    <Row gap="sm">
-      <QueryTokenLogo token={token} size="28px" />
-      <TokenName>{token.name}</TokenName>
-      <ThemedText.BodySecondary>{token.symbol}</ThemedText.BodySecondary>
-    </Row>
-  )
-}
-
-export function TopTokensTable() {
-  const chainName = validateUrlChainParam(useParams<{ chainName?: string }>().chainName)
-  const chainId = supportedChainIdFromGQLChain(chainName)
-  const { tokens, tokenSortRank, loadingTokens, sparklines, error } = useTopTokens(chainName)
-
-  if (error) {
-    return (
-      <TableWrapper>
-        <ThemedText.BodyPrimary>
-          <Trans>Error loading Top Tokens</Trans>
-        </ThemedText.BodyPrimary>
-      </TableWrapper>
-    )
-  }
-
-  return (
-    <TableWrapper data-testid="top-tokens-explore-table">
-      <TokenTable
-        tokens={tokens}
-        tokenSortRank={tokenSortRank}
-        sparklines={sparklines}
-        loading={loadingTokens}
-        chainId={chainId}
-      />
-    </TableWrapper>
-  )
-}
-
-function TokenTable({
-  tokens,
-  tokenSortRank,
-  sparklines,
-  loading,
-  loadMore,
-  chainId,
-}: {
-  tokens?: readonly TopToken[]
-  tokenSortRank: Record<string, number>
-  sparklines: SparklineMap
-  loading: boolean
-  loadMore?: ({ onComplete }: { onComplete?: () => void }) => void
-  chainId: ChainId
-}) {
-  const { formatFiatPrice, formatNumber, formatDelta } = useFormatter()
-
-  const tokenTableValues: TokenTableValues[] | undefined = useMemo(
-    () =>
-      tokens?.map((token) => {
-        const delta1hr = token.market?.pricePercentChange1Hour?.value
-        const delta1d = token.market?.pricePercentChange1Day?.value
-        return {
-          index: tokenSortRank[token.address ?? 'NATIVE'],
-          tokenDescription: <TokenDescription token={token} />,
-          price: token.market?.price?.value ?? 0,
-          percentChange1hr: (
-            <>
-              <DeltaArrow delta={delta1hr} />
-              <DeltaText delta={delta1hr}>{formatDelta(delta1hr)}</DeltaText>
-            </>
-          ),
-          percentChange1d: (
-            <>
-              <DeltaArrow delta={delta1d} />
-              <DeltaText delta={delta1d}>{formatDelta(delta1d)}</DeltaText>
-            </>
-          ),
-          fdv: token?.project?.markets?.[0]?.fullyDilutedValuation?.value ?? 0,
-          volume: token.market?.volume?.value ?? 0,
-          sparkline: (
-            <SparklineContainer>
-              <ParentSize>
-                {({ width, height }) =>
-                  sparklines && (
-                    <SparklineChart
-                      width={width}
-                      height={height}
-                      tokenData={token}
-                      pricePercentChange={token.market?.pricePercentChange?.value}
-                      sparklineMap={sparklines}
-                    />
-                  )
-                }
-              </ParentSize>
-            </SparklineContainer>
-          ),
-          link: getTokenDetailsURL({
-            address: token.address,
-            chain: chainIdToBackendName(chainId),
-            isInfoExplorePageEnabled: true,
-          }),
-          linkState: { preloadedLogoSrc: token.project?.logoUrl },
-        }
-      }) ?? [],
-    [chainId, formatDelta, sparklines, tokenSortRank, tokens]
-  )
-
-  const columns = useMemo(() => {
-    const columnHelper = createColumnHelper<TokenTableValues>()
-    return [
-      columnHelper.accessor((row) => row.index, {
-        id: 'index',
-        header: () => (
-          <Cell justifyContent="center" minWidth={44}>
-            <ThemedText.BodySecondary>#</ThemedText.BodySecondary>
-          </Cell>
-        ),
-        cell: (index) => (
-          <Cell justifyContent="center" loading={loading} minWidth={44}>
-            <ThemedText.BodySecondary>{index.getValue?.()}</ThemedText.BodySecondary>
-          </Cell>
-        ),
-      }),
-      columnHelper.accessor((row) => row.tokenDescription, {
-        id: 'tokenDescription',
-        header: () => (
-          <Cell justifyContent="flex-start" width={240} grow>
-            <ThemedText.BodySecondary>
-              <Trans>Token name</Trans>
-            </ThemedText.BodySecondary>
-          </Cell>
-        ),
-        cell: (tokenDescription) => (
-          <Cell justifyContent="flex-start" width={240} loading={loading} grow>
-            {tokenDescription.getValue?.()}
-          </Cell>
-        ),
-      }),
-      columnHelper.accessor((row) => row.price, {
-        id: 'price',
-        header: () => (
-          <Cell minWidth={133} grow>
-            <ThemedText.BodySecondary>
-              <Trans>Price</Trans>
-            </ThemedText.BodySecondary>
-          </Cell>
-        ),
-        cell: (price) => (
-          <Cell loading={loading} minWidth={133} grow>
-            <ThemedText.BodySecondary>
-              {/* A simple 0 price indicates the price is not currently available from the api */}
-              {price.getValue?.() === 0
-                ? '-'
-                : formatFiatPrice({ price: price.getValue?.(), type: NumberType.FiatTokenPrice })}
-            </ThemedText.BodySecondary>
-          </Cell>
-        ),
-      }),
-      columnHelper.accessor((row) => row.percentChange1hr, {
-        id: 'percentChange1hr',
-        header: () => (
-          <Cell minWidth={133} grow>
-            <ThemedText.BodySecondary>
-              <Trans>1 hour</Trans>
-            </ThemedText.BodySecondary>
-          </Cell>
-        ),
-        cell: (percentChange1hr) => (
-          <Cell loading={loading} minWidth={133} grow>
-            {percentChange1hr.getValue?.()}
-          </Cell>
-        ),
-      }),
-      columnHelper.accessor((row) => row.percentChange1d, {
-        id: 'percentChange1d',
-        header: () => (
-          <Cell minWidth={133} grow>
-            <ThemedText.BodySecondary>
-              <Trans>1 day</Trans>
-            </ThemedText.BodySecondary>
-          </Cell>
-        ),
-        cell: (percentChange1d) => (
-          <Cell loading={loading} minWidth={133} grow>
-            {percentChange1d.getValue?.()}
-          </Cell>
-        ),
-      }),
-      columnHelper.accessor((row) => row.fdv, {
-        id: 'fdv',
-        header: () => (
-          <Cell minWidth={133} grow>
-            <ThemedText.BodySecondary>
-              <Trans>FDV</Trans>
-            </ThemedText.BodySecondary>
-          </Cell>
-        ),
-        cell: (fdv) => (
-          <Cell loading={loading} minWidth={133} grow>
-            <ThemedText.BodySecondary>
-              {formatNumber({ input: fdv.getValue?.(), type: NumberType.FiatTokenStats })}
-            </ThemedText.BodySecondary>
-          </Cell>
-        ),
-      }),
-      columnHelper.accessor((row) => row.volume, {
-        id: 'volume',
-        header: () => (
-          <Cell minWidth={133} grow>
-            <ThemedText.BodySecondary>
-              <Trans>Volume</Trans>
-            </ThemedText.BodySecondary>
-          </Cell>
-        ),
-        cell: (volume) => (
-          <Cell minWidth={133} loading={loading} grow>
-            <ThemedText.BodySecondary>
-              {formatNumber({ input: volume.getValue?.(), type: NumberType.FiatTokenStats })}
-            </ThemedText.BodySecondary>
-          </Cell>
-        ),
-      }),
-      columnHelper.accessor((row) => row.sparkline, {
-        id: 'sparkline',
-        header: () => <Cell minWidth={172} />,
-        cell: (sparkline) => (
-          <Cell minWidth={172} loading={loading}>
-            {sparkline.getValue?.()}
-          </Cell>
-        ),
-      }),
-    ]
-  }, [formatFiatPrice, formatNumber, loading])
-
-  return <Table columns={columns} data={tokenTableValues} loading={loading} loadMore={loadMore} />
-}
diff --git a/apps/web/src/components/Tokens/state.ts b/apps/web/src/components/Tokens/state.ts
index a3d1ff4edcf..e79f0a88433 100644
--- a/apps/web/src/components/Tokens/state.ts
+++ b/apps/web/src/components/Tokens/state.ts
@@ -11,7 +11,7 @@ export enum TokenSortMethod {
   VOLUME = 'Volume',
 }
 
-export const exploreSearchStringAtom = atomWithReset<string>('')
+export const filterStringAtom = atomWithReset<string>('')
 export const filterTimeAtom = atom<TimePeriod>(TimePeriod.DAY)
 export const sortMethodAtom = atom<TokenSortMethod>(TokenSortMethod.VOLUME)
 export const sortAscendingAtom = atom<boolean>(false)
diff --git a/apps/web/src/components/Tooltip/index.tsx b/apps/web/src/components/Tooltip/index.tsx
index efe7844d028..4b595c0b265 100644
--- a/apps/web/src/components/Tooltip/index.tsx
+++ b/apps/web/src/components/Tooltip/index.tsx
@@ -9,13 +9,11 @@ export enum TooltipSize {
   ExtraSmall = '200px',
   Small = '256px',
   Large = '400px',
-  Max = 'max-content',
 }
 
 const getPaddingForSize = (size: TooltipSize) => {
   switch (size) {
     case TooltipSize.ExtraSmall:
-    case TooltipSize.Max:
       return '8px'
     case TooltipSize.Small:
       return '12px'
diff --git a/apps/web/src/components/TopLevelModals/index.tsx b/apps/web/src/components/TopLevelModals/index.tsx
index 9e4c463f62c..f2909a64a41 100644
--- a/apps/web/src/components/TopLevelModals/index.tsx
+++ b/apps/web/src/components/TopLevelModals/index.tsx
@@ -2,18 +2,15 @@ import { useWeb3React } from '@web3-react/core'
 import { OffchainActivityModal } from 'components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal'
 import UniwalletModal from 'components/AccountDrawer/UniwalletModal'
 import AirdropModal from 'components/AirdropModal'
-import { Banners } from 'components/Banner/shared/Banners'
+import WalletAppPromoBanner from 'components/Banner/MobileAppAnnouncementBanner'
 import AddressClaimModal from 'components/claim/AddressClaimModal'
 import ConnectedAccountBlocked from 'components/ConnectedAccountBlocked'
-import FeatureFlagModal from 'components/FeatureFlagModal/FeatureFlagModal'
 import FiatOnrampModal from 'components/FiatOnrampModal'
 import { UkDisclaimerModal } from 'components/NavBar/UkDisclaimerModal'
-import { PrivacyPolicyModal } from 'components/PrivacyPolicy'
 import DevFlagsBox from 'dev/DevFlagsBox'
 import useAccountRiskCheck from 'hooks/useAccountRiskCheck'
 import Bag from 'nft/components/bag/Bag'
 import TransactionCompleteModal from 'nft/components/collection/TransactionCompleteModal'
-import { GetTheAppModal } from 'pages/Landing/components/DownloadApp/GetTheAppModal'
 import { useModalIsOpen, useToggleModal } from 'state/application/hooks'
 import { ApplicationModal } from 'state/application/reducer'
 import { isDevelopmentEnv, isStagingEnv } from 'utils/env'
@@ -33,17 +30,12 @@ export default function TopLevelModals() {
       <ConnectedAccountBlocked account={account} isOpen={accountBlocked} />
       <Bag />
       <UniwalletModal />
-
-      <Banners />
-
+      <WalletAppPromoBanner />
       <OffchainActivityModal />
       <TransactionCompleteModal />
       <AirdropModal />
       <FiatOnrampModal />
       <UkDisclaimerModal />
-      <GetTheAppModal />
-      <PrivacyPolicyModal />
-      <FeatureFlagModal />
       {shouldShowDevFlags && <DevFlagsBox />}
     </>
   )
diff --git a/apps/web/src/components/TransactionConfirmationModal/index.tsx b/apps/web/src/components/TransactionConfirmationModal/index.tsx
index 4f735797033..80410226c36 100644
--- a/apps/web/src/components/TransactionConfirmationModal/index.tsx
+++ b/apps/web/src/components/TransactionConfirmationModal/index.tsx
@@ -10,7 +10,8 @@ import { ReactNode, useCallback, useState } from 'react'
 import { AlertCircle, ArrowUpCircle, CheckCircle } from 'react-feather'
 import { useIsTransactionConfirmed, useTransaction } from 'state/transactions/hooks'
 import styled, { useTheme } from 'styled-components'
-import { CloseIcon, CustomLightSpinner, ExternalLink, ThemedText } from 'theme/components'
+import { ExternalLink, ThemedText } from 'theme/components'
+import { CloseIcon, CustomLightSpinner } from 'theme/components'
 import { isL2ChainId } from 'utils/chains'
 import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
 
diff --git a/apps/web/src/components/Web3Provider/index.tsx b/apps/web/src/components/Web3Provider/index.tsx
index 98a7a169420..caba7418bd0 100644
--- a/apps/web/src/components/Web3Provider/index.tsx
+++ b/apps/web/src/components/Web3Provider/index.tsx
@@ -1,7 +1,7 @@
 import { CustomUserProperties, InterfaceEventName, WalletConnectionResult } from '@uniswap/analytics-events'
-import { Web3ReactHooks, Web3ReactProvider, useWeb3React } from '@web3-react/core'
+import { useWeb3React, Web3ReactHooks, Web3ReactProvider } from '@web3-react/core'
 import { Connector } from '@web3-react/types'
-import { sendAnalyticsEvent, useTrace, user } from 'analytics'
+import { sendAnalyticsEvent, user, useTrace } from 'analytics'
 import { connections, getConnection } from 'connection'
 import { isSupportedChain } from 'constants/chains'
 import { DEPRECATED_RPC_PROVIDERS, RPC_PROVIDERS } from 'constants/providers'
diff --git a/apps/web/src/components/Web3Status/index.tsx b/apps/web/src/components/Web3Status/index.tsx
index 39174312550..87250d55af3 100644
--- a/apps/web/src/components/Web3Status/index.tsx
+++ b/apps/web/src/components/Web3Status/index.tsx
@@ -1,7 +1,7 @@
 import { Trans } from '@lingui/macro'
 import { BrowserEvent, InterfaceElementName, InterfaceEventName } from '@uniswap/analytics-events'
 import { useWeb3React } from '@web3-react/core'
-import { TraceEvent, sendAnalyticsEvent } from 'analytics'
+import { sendAnalyticsEvent, TraceEvent } from 'analytics'
 import PortfolioDrawer from 'components/AccountDrawer'
 import { usePendingActivity } from 'components/AccountDrawer/MiniPortfolio/Activity/hooks'
 import { useAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
@@ -104,9 +104,9 @@ const Web3StatusConnecting = styled(Web3StatusConnected)`
   }
 `
 
-const AddressAndChevronContainer = styled.div<{ $loading?: boolean }>`
+const AddressAndChevronContainer = styled.div<{ loading?: boolean }>`
   display: flex;
-  opacity: ${({ $loading, theme }) => $loading && theme.opacity.disabled};
+  opacity: ${({ loading, theme }) => loading && theme.opacity.disabled};
 
   @media only screen and (max-width: ${navSearchInputVisibleSize}px) {
     display: none;
@@ -189,7 +189,7 @@ function Web3StatusInner() {
         <IconWrapper size={24}>
           <LoaderV3 size="24px" />
         </IconWrapper>
-        <AddressAndChevronContainer $loading={true}>
+        <AddressAndChevronContainer loading={true}>
           <Text>{initialConnection.current?.ENSName ?? shortenAddress(initialConnection.current?.address)}</Text>
         </AddressAndChevronContainer>
       </Web3StatusConnecting>
diff --git a/apps/web/src/components/claim/AddressClaimModal.tsx b/apps/web/src/components/claim/AddressClaimModal.tsx
index 2e40dd67028..d725c07d407 100644
--- a/apps/web/src/components/claim/AddressClaimModal.tsx
+++ b/apps/web/src/components/claim/AddressClaimModal.tsx
@@ -17,7 +17,8 @@ import { ExplorerDataType, getExplorerLink } from '../../utils/getExplorerLink'
 import AddressInputPanel from '../AddressInputPanel'
 import { ButtonPrimary } from '../Button'
 import { AutoColumn, ColumnCenter } from '../Column'
-import { Break, CardBGImage, CardBGImageSmaller, CardNoise, CardSection, DataCard } from '../earn/styled'
+import { Break, CardSection, DataCard } from '../earn/styled'
+import { CardBGImage, CardBGImageSmaller, CardNoise } from '../earn/styled'
 import Modal from '../Modal'
 import { RowBetween } from '../Row'
 
diff --git a/apps/web/src/components/swap/ConfirmSwapModal.tsx b/apps/web/src/components/swap/ConfirmSwapModal.tsx
index cd019e96b94..606c56127c6 100644
--- a/apps/web/src/components/swap/ConfirmSwapModal.tsx
+++ b/apps/web/src/components/swap/ConfirmSwapModal.tsx
@@ -23,7 +23,7 @@ import useNativeCurrency from 'lib/hooks/useNativeCurrency'
 import { getPriceUpdateBasisPoints } from 'lib/utils/analytics'
 import { useCallback, useEffect, useState } from 'react'
 import { InterfaceTrade, TradeFillType } from 'state/routing/types'
-import { isLimitTrade, isPreviewTrade } from 'state/routing/utils'
+import { isPreviewTrade } from 'state/routing/utils'
 import { useIsTransactionConfirmed, useSwapTransactionStatus } from 'state/transactions/hooks'
 import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
@@ -429,15 +429,7 @@ export default function ConfirmSwapModal({
           <ErrorModalContent errorType={errorType} onRetry={startSwapFlow} />
         ) : (
           <ConfirmationModalContent
-            title={
-              confirmModalState === ConfirmModalState.REVIEWING ? (
-                isLimitTrade(trade) ? (
-                  <Trans>Confirm limit</Trans>
-                ) : (
-                  <Trans>Review swap</Trans>
-                )
-              ) : undefined
-            }
+            title={confirmModalState === ConfirmModalState.REVIEWING ? <Trans>Review swap</Trans> : undefined}
             onDismiss={onModalDismiss}
             topContent={modalHeader}
             bottomContent={modalBottom}
diff --git a/apps/web/src/components/swap/GasBreakdownTooltip.tsx b/apps/web/src/components/swap/GasBreakdownTooltip.tsx
index 210a8889f87..19859b36d64 100644
--- a/apps/web/src/components/swap/GasBreakdownTooltip.tsx
+++ b/apps/web/src/components/swap/GasBreakdownTooltip.tsx
@@ -37,9 +37,9 @@ const GaslessSwapLabel = () => {
   return <UniswapXRouterLabel>{formatNumber({ input: 0, type: NumberType.FiatGasPrice })}</UniswapXRouterLabel>
 }
 
-type GasBreakdownTooltipProps = { trade: InterfaceTrade }
+type GasBreakdownTooltipProps = { trade: InterfaceTrade; hideUniswapXDescription?: boolean }
 
-export function GasBreakdownTooltip({ trade }: GasBreakdownTooltipProps) {
+export function GasBreakdownTooltip({ trade, hideUniswapXDescription }: GasBreakdownTooltipProps) {
   const isUniswapX = isUniswapXTrade(trade)
   const inputCurrency = trade.inputAmount.currency
   const native = nativeOnChain(inputCurrency.chainId)
@@ -51,7 +51,8 @@ export function GasBreakdownTooltip({ trade }: GasBreakdownTooltipProps) {
   const wrapEstimate = isUniswapX && trade.wrapInfo.needsWrap ? trade.wrapInfo.wrapGasEstimateUSD : undefined
   const showEstimateDetails = Boolean(wrapEstimate || approvalEstimate)
 
-  const description = isUniswapX ? <UniswapXDescription /> : <NetworkCostDescription native={native} />
+  const description =
+    isUniswapX && !hideUniswapXDescription ? <UniswapXDescription /> : <NetworkCostDescription native={native} />
 
   if (!showEstimateDetails) return description
 
diff --git a/apps/web/src/components/swap/GasEstimateTooltip.tsx b/apps/web/src/components/swap/GasEstimateTooltip.tsx
index 7e8a4ca6ce7..f253dd97eb1 100644
--- a/apps/web/src/components/swap/GasEstimateTooltip.tsx
+++ b/apps/web/src/components/swap/GasEstimateTooltip.tsx
@@ -3,7 +3,7 @@ import { useWeb3React } from '@web3-react/core'
 import { sendAnalyticsEvent } from 'analytics'
 import { Gas } from 'components/Icons/Gas'
 import { LoadingOpacityContainer } from 'components/Loader/styled'
-import { UniswapXGradient, UniswapXRouterIcon } from 'components/RouterLabel/UniswapXRouterLabel'
+import { UniswapXRouterIcon } from 'components/RouterLabel/UniswapXRouterLabel'
 import Row, { RowFixed } from 'components/Row'
 import { MouseoverTooltip, TooltipSize } from 'components/Tooltip'
 import { SUPPORTED_GAS_ESTIMATE_CHAIN_IDS } from 'constants/chains'
@@ -20,7 +20,7 @@ const StyledGasIcon = styled(Gas)`
   width: 16px;
   // We apply the following to all children of the SVG in order to override the default color
   & > * {
-    fill: ${({ theme }) => theme.neutral3};
+    fill: ${({ theme }) => theme.neutral2};
   }
 `
 
@@ -47,25 +47,13 @@ export default function GasEstimateTooltip({ trade, loading }: { trade?: Submitt
         <RowFixed gap="xs">
           {isUniswapXTrade(trade) ? <UniswapXRouterIcon testId="gas-estimate-uniswapx-icon" /> : <StyledGasIcon />}
           <ThemedText.BodySmall color="neutral2">
-            <Row gap="sm">
-              {isUniswapXTrade(trade) ? (
-                <UniswapXGradient>
-                  <div style={{ fontWeight: 535 }}>
-                    {formatNumber({
-                      input: trade.totalGasUseEstimateUSD,
-                      type: NumberType.FiatGasPrice,
-                    })}
-                  </div>
-                </UniswapXGradient>
-              ) : (
-                <div>
-                  {formatNumber({
-                    input: trade.totalGasUseEstimateUSD,
-                    type: NumberType.FiatGasPrice,
-                  })}
-                </div>
-              )}
-
+            <Row gap="xs">
+              <div>
+                {formatNumber({
+                  input: trade.totalGasUseEstimateUSD,
+                  type: NumberType.FiatGasPrice,
+                })}
+              </div>
               {isUniswapXTrade(trade) && (
                 <div>
                   <s>
diff --git a/apps/web/src/components/swap/PendingModalContent/PendingModalContent.test.tsx b/apps/web/src/components/swap/PendingModalContent/PendingModalContent.test.tsx
index 0a3edc68cd5..9b1bc5cdb5d 100644
--- a/apps/web/src/components/swap/PendingModalContent/PendingModalContent.test.tsx
+++ b/apps/web/src/components/swap/PendingModalContent/PendingModalContent.test.tsx
@@ -2,12 +2,12 @@ import { BigNumber } from '@ethersproject/bignumber'
 import { TransactionStatus } from 'graphql/data/__generated__/types-and-hooks'
 import { TradeFillType } from 'state/routing/types'
 import { useSwapTransactionStatus } from 'state/transactions/hooks'
-import { LIMIT_ORDER_TRADE, TEST_TRADE_EXACT_INPUT } from 'test-utils/constants'
+import { TEST_TRADE_EXACT_INPUT } from 'test-utils/constants'
 import { mocked } from 'test-utils/mocked'
 import { render, screen } from 'test-utils/render'
 
-import { getTitle, PendingModalContent } from '.'
 import { ConfirmModalState } from '../ConfirmSwapModal'
+import { PendingModalContent } from '.'
 import { ErrorModalContent, PendingModalError } from './ErrorModalContent'
 
 jest.mock('state/transactions/hooks')
@@ -193,20 +193,3 @@ describe('PendingModalContent', () => {
     })
   })
 })
-
-describe('Modal title', () => {
-  it.each([
-    ['limit', false, false, LIMIT_ORDER_TRADE, 'Confirm limit'],
-    ['limit', true, false, LIMIT_ORDER_TRADE, 'Limit submitted'],
-    ['limit', false, true, LIMIT_ORDER_TRADE, 'Limit filled!'],
-    ['classic', false, false, TEST_TRADE_EXACT_INPUT, 'Confirm swap'],
-    ['classic', true, false, TEST_TRADE_EXACT_INPUT, 'Swap submitted'],
-    ['classic', false, true, TEST_TRADE_EXACT_INPUT, 'Swap success!'],
-  ])(
-    'renders %p trade correctly, swapPending %p and swapConfirmed %p',
-    async (type, swapPending, swapConfirmed, trade, expectedTitle) => {
-      const title = getTitle({ trade, swapPending, swapConfirmed })
-      expect(title).toBe(expectedTitle)
-    }
-  )
-})
diff --git a/apps/web/src/components/swap/PendingModalContent/index.tsx b/apps/web/src/components/swap/PendingModalContent/index.tsx
index 3f34cb69a5b..274972228e9 100644
--- a/apps/web/src/components/swap/PendingModalContent/index.tsx
+++ b/apps/web/src/components/swap/PendingModalContent/index.tsx
@@ -2,7 +2,8 @@ import { t, Trans } from '@lingui/macro'
 import { ChainId, Currency } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
 import { OrderContent } from 'components/AccountDrawer/MiniPortfolio/Activity/OffchainActivityModal'
-import Column, { ColumnCenter } from 'components/Column'
+import { ColumnCenter } from 'components/Column'
+import Column from 'components/Column'
 import Row from 'components/Row'
 import { TransactionStatus } from 'graphql/data/__generated__/types-and-hooks'
 import { SwapResult } from 'hooks/useSwapCallback'
@@ -10,7 +11,6 @@ import { useUnmountingAnimation } from 'hooks/useUnmountingAnimation'
 import { UniswapXOrderStatus } from 'lib/hooks/orders/types'
 import { ReactNode, useMemo, useRef } from 'react'
 import { InterfaceTrade, TradeFillType } from 'state/routing/types'
-import { isLimitTrade } from 'state/routing/utils'
 import { useOrder } from 'state/signatures/hooks'
 import { UniswapXOrderDetails } from 'state/signatures/types'
 import { useIsTransactionConfirmed, useSwapTransactionStatus } from 'state/transactions/hooks'
@@ -19,7 +19,8 @@ import { ExternalLink } from 'theme/components'
 import { AnimationType } from 'theme/components/FadePresence'
 import { ThemedText } from 'theme/components/text'
 import { SignatureExpiredError } from 'utils/errors'
-import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
+import { getExplorerLink } from 'utils/getExplorerLink'
+import { ExplorerDataType } from 'utils/getExplorerLink'
 
 import { ConfirmModalState } from '../ConfirmSwapModal'
 import { slideInAnimation, slideOutAnimation } from './animations'
@@ -126,28 +127,6 @@ interface ContentArgs {
   onRetryUniswapXSignature?: () => void
 }
 
-export function getTitle({
-  trade,
-  swapPending,
-  swapConfirmed,
-}: {
-  trade?: InterfaceTrade
-  swapPending: boolean
-  swapConfirmed: boolean
-}): ReactNode {
-  if (isLimitTrade(trade)) {
-    if (swapPending) return t`Limit submitted`
-    if (swapConfirmed) return t`Limit filled!`
-
-    return t`Confirm limit`
-  }
-
-  if (swapPending) return t`Swap submitted`
-  if (swapConfirmed) return t`Swap success!`
-
-  return t`Confirm swap`
-}
-
 function getPendingConfirmationContent({
   swapConfirmed,
   swapPending,
@@ -160,8 +139,8 @@ function getPendingConfirmationContent({
   ContentArgs,
   'swapConfirmed' | 'swapPending' | 'trade' | 'chainId' | 'swapResult' | 'swapError' | 'onRetryUniswapXSignature'
 >): PendingModalStep {
+  const title = swapPending ? t`Swap submitted` : swapConfirmed ? t`Swap success!` : t`Confirm Swap`
   const tradeSummary = trade ? <TradeSummary trade={trade} /> : null
-  const title = getTitle({ trade, swapPending, swapConfirmed })
   if (swapPending && trade?.fillType === TradeFillType.UniswapX) {
     return {
       title,
diff --git a/apps/web/src/components/swap/SwapBuyFiatButton.tsx b/apps/web/src/components/swap/SwapBuyFiatButton.tsx
index edcb5e5c9ad..8aab3552af8 100644
--- a/apps/web/src/components/swap/SwapBuyFiatButton.tsx
+++ b/apps/web/src/components/swap/SwapBuyFiatButton.tsx
@@ -3,14 +3,15 @@ import { BrowserEvent, InterfaceElementName, SharedEventName } from '@uniswap/an
 import { useWeb3React } from '@web3-react/core'
 import { TraceEvent } from 'analytics'
 import { useAccountDrawer, useSetShowMoonpayText } from 'components/AccountDrawer/MiniPortfolio/hooks'
+import { ButtonText } from 'components/Button'
 import { MouseoverTooltip } from 'components/Tooltip'
 import { useCallback, useEffect, useState } from 'react'
+import styled from 'styled-components'
 import { ExternalLink } from 'theme/components'
 import { isPathBlocked } from 'utils/blockedPaths'
 
 import { useFiatOnrampAvailability, useOpenModal } from '../../state/application/hooks'
 import { ApplicationModal } from '../../state/application/reducer'
-import { SwapHeaderTabButton } from './styled'
 
 export const MOONPAY_REGION_AVAILABILITY_ARTICLE =
   'https://support.uniswap.org/hc/en-us/articles/11306664890381-Why-isn-t-MoonPay-available-in-my-region-'
@@ -24,6 +25,24 @@ enum BuyFiatFlowState {
   ACTIVE_NEEDS_ACCOUNT,
 }
 
+const StyledTextButton = styled(ButtonText)`
+  color: ${({ theme }) => theme.neutral2};
+  gap: 4px;
+  font-weight: 485;
+  transition-duration: ${({ theme }) => theme.transition.duration.fast};
+  transition-timing-function: ease-in-out;
+  transition-property: opacity, color, background-color;
+  &:focus {
+    text-decoration: none;
+  }
+  &:active {
+    text-decoration: none;
+  }
+  :hover {
+    opacity: ${({ theme }) => theme.opacity.hover};
+  }
+`
+
 export default function SwapBuyFiatButton() {
   const { account } = useWeb3React()
   const openFiatOnRampModal = useOpenModal(ApplicationModal.FIAT_ONRAMP)
@@ -118,14 +137,9 @@ export default function SwapBuyFiatButton() {
         element={InterfaceElementName.FIAT_ON_RAMP_BUY_BUTTON}
         properties={{ account_connected: !!account }}
       >
-        <SwapHeaderTabButton
-          $isActive={false}
-          onClick={handleBuyCrypto}
-          disabled={buyCryptoButtonDisabled}
-          data-testid="buy-fiat-button"
-        >
+        <StyledTextButton onClick={handleBuyCrypto} disabled={buyCryptoButtonDisabled} data-testid="buy-fiat-button">
           <Trans>Buy</Trans>
-        </SwapHeaderTabButton>
+        </StyledTextButton>
       </TraceEvent>
     </MouseoverTooltip>
   )
diff --git a/apps/web/src/components/swap/SwapDetailsDropdown.tsx b/apps/web/src/components/swap/SwapDetailsDropdown.tsx
index 85e4c9821b3..9a9ea57b565 100644
--- a/apps/web/src/components/swap/SwapDetailsDropdown.tsx
+++ b/apps/web/src/components/swap/SwapDetailsDropdown.tsx
@@ -12,7 +12,7 @@ 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 { Separator, ThemedText } from 'theme/components'
 import { useFormatter } from 'utils/formatNumbers'
 
 import GasEstimateTooltip from './GasEstimateTooltip'
@@ -35,6 +35,7 @@ const SwapDetailsWrapper = styled(Column)`
 `
 
 const Wrapper = styled(Column)`
+  border: 1px solid ${({ theme }) => theme.surface3};
   border-radius: 16px;
   padding: 12px 16px;
 `
@@ -105,12 +106,14 @@ function AdvancedSwapDetails(props: SwapDetailsProps & { open: boolean }) {
   return (
     <AnimatedDropdown open={open}>
       <SwapDetailsWrapper gap="md" data-testid="advanced-swap-details">
+        <Separator />
         <SwapLineItem {...lineItemProps} type={SwapLineItemType.PRICE_IMPACT} />
         <SwapLineItem {...lineItemProps} type={SwapLineItemType.MAX_SLIPPAGE} />
         <SwapLineItem {...lineItemProps} type={SwapLineItemType.INPUT_TOKEN_FEE_ON_TRANSFER} />
         <SwapLineItem {...lineItemProps} type={SwapLineItemType.OUTPUT_TOKEN_FEE_ON_TRANSFER} />
         <SwapLineItem {...lineItemProps} type={SwapLineItemType.SWAP_FEE} />
         <SwapLineItem {...lineItemProps} type={SwapLineItemType.NETWORK_COST} />
+        <Separator />
         <SwapLineItem {...lineItemProps} type={SwapLineItemType.ROUTING_INFO} />
       </SwapDetailsWrapper>
     </AnimatedDropdown>
diff --git a/apps/web/src/components/swap/SwapHeader.tsx b/apps/web/src/components/swap/SwapHeader.tsx
index 58237ed7850..fe9b8db901f 100644
--- a/apps/web/src/components/swap/SwapHeader.tsx
+++ b/apps/web/src/components/swap/SwapHeader.tsx
@@ -1,30 +1,39 @@
 import { Trans } from '@lingui/macro'
 import { ChainId } from '@uniswap/sdk-core'
 import { useLimitsEnabled } from 'featureFlags/flags/limits'
-import { useSendEnabled } from 'featureFlags/flags/send'
 import { useSwapAndLimitContext, useSwapContext } from 'state/swap/SwapContext'
 import styled from 'styled-components'
-import { isIFramed } from 'utils/isIFramed'
+import { ButtonText } from 'theme/components'
 
 import { RowBetween, RowFixed } from '../Row'
 import SettingsTab from '../Settings'
-import SwapBuyFiatButton from './SwapBuyFiatButton'
 import { SwapTab } from './constants'
-import { SwapHeaderTabButton } from './styled'
+import SwapBuyFiatButton from './SwapBuyFiatButton'
 
 const StyledSwapHeader = styled(RowBetween)`
-  margin-bottom: 4px;
+  margin-bottom: 10px;
   color: ${({ theme }) => theme.neutral2};
 `
 
 const HeaderButtonContainer = styled(RowFixed)`
+  padding: 0 12px;
   gap: 16px;
-  padding-bottom: 8px;
+`
+
+const StyledTextButton = styled(ButtonText)<{ $isActive: boolean }>`
+  color: ${({ theme, $isActive }) => ($isActive ? theme.neutral1 : theme.neutral2)};
+  gap: 4px;
+  font-weight: 485;
+  &:focus {
+    text-decoration: none;
+  }
+  &:active {
+    text-decoration: none;
+  }
 `
 
 export default function SwapHeader() {
   const limitsEnabled = useLimitsEnabled()
-  const sendEnabled = useSendEnabled() && !isIFramed()
   const { chainId, currentTab, setCurrentTab } = useSwapAndLimitContext()
   const {
     derivedSwapInfo: { trade, autoSlippage },
@@ -38,7 +47,7 @@ export default function SwapHeader() {
   return (
     <StyledSwapHeader>
       <HeaderButtonContainer>
-        <SwapHeaderTabButton
+        <StyledTextButton
           as="h1"
           role="button"
           tabIndex={0}
@@ -52,18 +61,13 @@ export default function SwapHeader() {
           }}
         >
           <Trans>Swap</Trans>
-        </SwapHeaderTabButton>
+        </StyledTextButton>
+        <SwapBuyFiatButton />
         {limitsEnabled && chainId === ChainId.MAINNET && (
-          <SwapHeaderTabButton $isActive={currentTab === SwapTab.Limit} onClick={() => setCurrentTab(SwapTab.Limit)}>
+          <StyledTextButton $isActive={currentTab === SwapTab.Limit} onClick={() => setCurrentTab(SwapTab.Limit)}>
             <Trans>Limit</Trans>
-          </SwapHeaderTabButton>
+          </StyledTextButton>
         )}
-        {sendEnabled && (
-          <SwapHeaderTabButton $isActive={currentTab === SwapTab.Send} onClick={() => setCurrentTab(SwapTab.Send)}>
-            <Trans>Send</Trans>
-          </SwapHeaderTabButton>
-        )}
-        <SwapBuyFiatButton />
       </HeaderButtonContainer>
       <RowFixed>
         <SettingsTab autoSlippage={autoSlippage} chainId={chainId} trade={trade.trade} />
diff --git a/apps/web/src/components/swap/SwapLineItem.test.tsx b/apps/web/src/components/swap/SwapLineItem.test.tsx
index 49dbc58c2b7..e256eb4ed04 100644
--- a/apps/web/src/components/swap/SwapLineItem.test.tsx
+++ b/apps/web/src/components/swap/SwapLineItem.test.tsx
@@ -1,6 +1,5 @@
 import { InterfaceTrade } from 'state/routing/types'
 import {
-  LIMIT_ORDER_TRADE,
   PREVIEW_EXACT_IN_TRADE,
   TEST_ALLOWED_SLIPPAGE,
   TEST_DUTCH_TRADE_ETH_INPUT,
@@ -10,7 +9,7 @@ import {
   TEST_TRADE_FEE_ON_BUY,
   TEST_TRADE_FEE_ON_SELL,
 } from 'test-utils/constants'
-import { render, screen } from 'test-utils/render'
+import { render } from 'test-utils/render'
 
 jest.mock('../../featureFlags/flags/useFees', () => ({ useFeesEnabled: () => true }))
 
@@ -28,8 +27,6 @@ jest.mock('uuid', () => ({
   v4: () => 'fixed-uuid-value',
 }))
 
-import { Percent } from '@uniswap/sdk-core'
-
 import SwapLineItem, { SwapLineItemType } from './SwapLineItem'
 
 const AllLineItemsTypes = Object.keys(SwapLineItemType).map(Number).filter(Boolean)
@@ -75,17 +72,4 @@ describe('SwapLineItem.tsx', () => {
   it('preview exact in', () => {
     testTradeLineItems(PREVIEW_EXACT_IN_TRADE)
   })
-  it('Expiry', () => {
-    render(
-      <SwapLineItem
-        key={SwapLineItemType.EXPIRY}
-        trade={LIMIT_ORDER_TRADE}
-        type={SwapLineItemType.EXPIRY}
-        syncing={false}
-        allowedSlippage={new Percent(0)}
-      />
-    )
-    // TODO: mock Date Time so we can use a snapshot test here
-    expect(screen.getByText('Expiry')).toBeInTheDocument()
-  })
 })
diff --git a/apps/web/src/components/swap/SwapLineItem.tsx b/apps/web/src/components/swap/SwapLineItem.tsx
index 7549c4aeb46..465b3212264 100644
--- a/apps/web/src/components/swap/SwapLineItem.tsx
+++ b/apps/web/src/components/swap/SwapLineItem.tsx
@@ -1,7 +1,7 @@
 import { t, Trans } from '@lingui/macro'
 import { Currency, CurrencyAmount, Percent, TradeType } from '@uniswap/sdk-core'
-import { formatTimestamp } from 'components/AccountDrawer/MiniPortfolio/formatTimestamp'
 import { LoadingRow } from 'components/Loader/styled'
+import { ChainLogo } from 'components/Logo/ChainLogo'
 import RouterLabel from 'components/RouterLabel'
 import Row from 'components/Row'
 import { TooltipSize } from 'components/Tooltip'
@@ -11,7 +11,7 @@ import { useUSDPrice } from 'hooks/useUSDPrice'
 import React, { useEffect, useState } from 'react'
 import { animated, SpringValue } from 'react-spring'
 import { InterfaceTrade, SubmittableTrade, TradeFillType } from 'state/routing/types'
-import { isLimitTrade, isPreviewTrade, isUniswapXTrade } from 'state/routing/utils'
+import { isPreviewTrade, isUniswapXTrade } from 'state/routing/utils'
 import { useUserSlippageTolerance } from 'state/user/hooks'
 import { SlippageTolerance } from 'state/user/types'
 import styled, { DefaultTheme } from 'styled-components'
@@ -21,7 +21,6 @@ import { getPriceImpactColor } from 'utils/prices'
 
 import { DetailLineItem, LineItemData } from './DetailLineItem'
 import { GasBreakdownTooltip, UniswapXDescription } from './GasBreakdownTooltip'
-import GasEstimateTooltip from './GasEstimateTooltip'
 import { MaxSlippageTooltip } from './MaxSlippageTooltip'
 import { RoutingTooltip, SwapRoute } from './SwapRoute'
 import TradePrice from './TradePrice'
@@ -37,7 +36,6 @@ export enum SwapLineItemType {
   MAXIMUM_INPUT,
   MINIMUM_OUTPUT,
   ROUTING_INFO,
-  EXPIRY,
 }
 
 const ColorWrapper = styled.span<{ textColor?: keyof DefaultTheme }>`
@@ -122,7 +120,7 @@ function FeeRow({ trade: { swapFee, outputAmount } }: { trade: SubmittableTrade
 
 function useLineItem(props: SwapLineItemProps): LineItemData | undefined {
   const { trade, syncing, allowedSlippage, type } = props
-  const { formatPercent } = useFormatter()
+  const { formatNumber, formatPercent } = useFormatter()
   const isAutoSlippage = useUserSlippageTolerance()[0] === SlippageTolerance.Auto
   const feesEnabled = useFeesEnabled()
 
@@ -139,7 +137,7 @@ function useLineItem(props: SwapLineItemProps): LineItemData | undefined {
   switch (type) {
     case SwapLineItemType.EXCHANGE_RATE:
       return {
-        Label: () => (isLimitTrade(trade) ? <Trans>Limit price</Trans> : <Trans>Rate</Trans>),
+        Label: () => <Trans>Rate</Trans>,
         Value: () => <TradePrice price={trade.executionPrice} />,
         TooltipBody: !isPreview ? () => <RoutingTooltip trade={trade} /> : undefined,
         tooltipSize: isUniswapX ? TooltipSize.Small : TooltipSize.Large,
@@ -148,10 +146,15 @@ function useLineItem(props: SwapLineItemProps): LineItemData | undefined {
       if (!SUPPORTED_GAS_ESTIMATE_CHAIN_IDS.includes(chainId)) return
       return {
         Label: () => <Trans>Network cost</Trans>,
-        TooltipBody: () => <GasBreakdownTooltip trade={trade} />,
+        TooltipBody: () => <GasBreakdownTooltip trade={trade} hideUniswapXDescription />,
         Value: () => {
           if (isPreview) return <Loading />
-          return <GasEstimateTooltip trade={trade} loading={!!syncing} />
+          return (
+            <Row gap="4px">
+              <ChainLogo chainId={chainId} />
+              {formatNumber({ input: trade.totalGasUseEstimateUSD, type: NumberType.FiatGasPrice })}
+            </Row>
+          )
         },
       }
     case SwapLineItemType.PRICE_IMPACT:
@@ -165,7 +168,7 @@ function useLineItem(props: SwapLineItemProps): LineItemData | undefined {
     case SwapLineItemType.MAX_SLIPPAGE:
       return {
         Label: () => <Trans>Max. slippage</Trans>,
-        TooltipBody: () => <MaxSlippageTooltip trade={trade} allowedSlippage={allowedSlippage ?? new Percent(0)} />,
+        TooltipBody: () => <MaxSlippageTooltip {...props} />,
         Value: () => (
           <Row gap="8px">
             {isAutoSlippage && <AutoBadge />} {formatPercent(allowedSlippage)}
@@ -195,7 +198,7 @@ function useLineItem(props: SwapLineItemProps): LineItemData | undefined {
             revert.
           </Trans>
         ),
-        Value: () => <CurrencyAmountRow amount={trade.maximumAmountIn(allowedSlippage ?? new Percent(0))} />,
+        Value: () => <CurrencyAmountRow amount={trade.maximumAmountIn(allowedSlippage)} />,
         loaderWidth: 70,
       }
     case SwapLineItemType.MINIMUM_OUTPUT:
@@ -208,7 +211,7 @@ function useLineItem(props: SwapLineItemProps): LineItemData | undefined {
             revert.
           </Trans>
         ),
-        Value: () => <CurrencyAmountRow amount={trade.minimumAmountOut(allowedSlippage ?? new Percent(0))} />,
+        Value: () => <CurrencyAmountRow amount={trade.minimumAmountOut(allowedSlippage)} />,
         loaderWidth: 70,
       }
     case SwapLineItemType.ROUTING_INFO:
@@ -225,12 +228,6 @@ function useLineItem(props: SwapLineItemProps): LineItemData | undefined {
     case SwapLineItemType.INPUT_TOKEN_FEE_ON_TRANSFER:
     case SwapLineItemType.OUTPUT_TOKEN_FEE_ON_TRANSFER:
       return getFOTLineItem(props)
-    case SwapLineItemType.EXPIRY:
-      if (!isLimitTrade(trade)) return
-      return {
-        Label: () => <Trans>Expiry</Trans>,
-        Value: () => <Row>{formatTimestamp(trade.deadline, true)}</Row>,
-      }
   }
 }
 
@@ -249,8 +246,8 @@ function getFOTLineItem({ type, trade }: SwapLineItemProps): LineItemData | unde
 
 export interface SwapLineItemProps {
   trade: InterfaceTrade
-  syncing?: boolean
-  allowedSlippage?: Percent
+  syncing: boolean
+  allowedSlippage: Percent
   type: SwapLineItemType
   animatedOpacity?: SpringValue<number>
 }
diff --git a/apps/web/src/components/swap/SwapModalFooter.test.tsx b/apps/web/src/components/swap/SwapModalFooter.test.tsx
index f9135f7ad5a..bb29a46b47e 100644
--- a/apps/web/src/components/swap/SwapModalFooter.test.tsx
+++ b/apps/web/src/components/swap/SwapModalFooter.test.tsx
@@ -1,9 +1,4 @@
-import {
-  LIMIT_ORDER_TRADE,
-  PREVIEW_EXACT_IN_TRADE,
-  TEST_ALLOWED_SLIPPAGE,
-  TEST_TRADE_EXACT_INPUT,
-} from 'test-utils/constants'
+import { PREVIEW_EXACT_IN_TRADE, TEST_ALLOWED_SLIPPAGE, TEST_TRADE_EXACT_INPUT } from 'test-utils/constants'
 import { render, screen, within } from 'test-utils/render'
 
 import SwapModalFooter from './SwapModalFooter'
@@ -40,6 +35,9 @@ describe('SwapModalFooter.tsx', () => {
         'The minimum amount you are guaranteed to receive. If the price slips any further, your transaction will revert.'
       )
     ).toBeInTheDocument()
+    expect(
+      screen.getByText('Network cost is paid in ETH on the ETHEREUM network in order to transact.')
+    ).toBeInTheDocument()
     expect(screen.getByText('The impact your trade has on the market price of this pool.')).toBeInTheDocument()
   })
 
@@ -97,33 +95,4 @@ describe('SwapModalFooter.tsx', () => {
     expect(asFragment()).toMatchSnapshot()
     expect(screen.getByText('Finalizing quote...')).toBeInTheDocument()
   })
-
-  it('renders a limit trade', () => {
-    render(
-      <SwapModalFooter
-        isLoading
-        trade={LIMIT_ORDER_TRADE}
-        allowedSlippage={TEST_ALLOWED_SLIPPAGE}
-        swapResult={undefined}
-        onConfirm={jest.fn()}
-        swapErrorMessage={undefined}
-        disabledConfirm={false}
-        fiatValueInput={{
-          data: undefined,
-          isLoading: false,
-        }}
-        fiatValueOutput={{
-          data: undefined,
-          isLoading: false,
-        }}
-        showAcceptChanges={false}
-        onAcceptChanges={jest.fn()}
-      />
-    )
-    expect(screen.getByText('Limit price')).toBeInTheDocument()
-    expect(screen.getByText('Expiry')).toBeInTheDocument()
-    expect(screen.getByText('Fee')).toBeInTheDocument()
-    expect(screen.getByText('Network cost')).toBeInTheDocument()
-    expect(screen.getByText('Canceling a limit will require a small network cost')).toBeInTheDocument()
-  })
 })
diff --git a/apps/web/src/components/swap/SwapModalFooter.tsx b/apps/web/src/components/swap/SwapModalFooter.tsx
index 132f8df6cb2..b2f52c6495e 100644
--- a/apps/web/src/components/swap/SwapModalFooter.tsx
+++ b/apps/web/src/components/swap/SwapModalFooter.tsx
@@ -5,6 +5,7 @@ import { TraceEvent } from 'analytics'
 import AnimatedDropdown from 'components/AnimatedDropdown'
 import Column from 'components/Column'
 import SpinningLoader from 'components/Loader/SpinningLoader'
+import { SupportArticleURL } from 'constants/supportArticles'
 import { useNewSwapFlow } from 'featureFlags/flags/progressIndicatorV2'
 import { Allowance, AllowanceState } from 'hooks/usePermit2Allowance'
 import { SwapResult } from 'hooks/useSwapCallback'
@@ -14,24 +15,24 @@ import { ReactNode, useMemo, useState } from 'react'
 import { AlertTriangle } from 'react-feather'
 import { easings, useSpring } from 'react-spring'
 import { Text } from 'rebass'
-import { InterfaceTrade, LimitOrderTrade, RouterPreference } from 'state/routing/types'
-import { isClassicTrade, isLimitTrade } from 'state/routing/utils'
+import { InterfaceTrade, RouterPreference } from 'state/routing/types'
+import { isClassicTrade } 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 getRoutingDiagramEntries from 'utils/getRoutingDiagramEntries'
 import { formatSwapButtonClickEventProperties } from 'utils/loggingFormatters'
 
-import { Info } from 'components/Icons/Info'
 import { ReactComponent as ExpandoIconClosed } from '../../assets/svg/expando-icon-closed.svg'
 import { ReactComponent as ExpandoIconOpened } from '../../assets/svg/expando-icon-opened.svg'
 import { ButtonError, SmallButtonPrimary } from '../Button'
 import Row, { AutoRow, RowBetween, RowFixed } from '../Row'
 import { SwapCallbackError, SwapShowAcceptChanges } from './styled'
-import SwapLineItem, { SwapLineItemProps, SwapLineItemType } from './SwapLineItem'
+import { SwapLineItemProps, SwapLineItemType } from './SwapLineItem'
+import SwapLineItem from './SwapLineItem'
 
 const DetailsContainer = styled(Column)<{ isNewSwapFlowEnabled?: boolean }>`
-  ${({ isNewSwapFlowEnabled }) => (isNewSwapFlowEnabled ? 'padding: 0px 16px 8px 16px' : 'padding-bottom: 8px')};
+  ${({ isNewSwapFlowEnabled }) => (isNewSwapFlowEnabled ? 'padding: 0px 16px 12px 16px' : 'padding-bottom: 8px')};
 `
 
 const StyledAlertTriangle = styled(AlertTriangle)`
@@ -123,7 +124,7 @@ export default function SwapModalFooter({
   fiatValueInput: { data?: number; isLoading: boolean }
   fiatValueOutput: { data?: number; isLoading: boolean }
   showAcceptChanges: boolean
-  onAcceptChanges?: () => void
+  onAcceptChanges: () => void
   isLoading: boolean
 }) {
   const transactionDeadlineSecondsSinceEpoch = useTransactionDeadline()?.toNumber() // in seconds since epoch
@@ -140,32 +141,36 @@ export default function SwapModalFooter({
     if (allowance && allowance.state === AllowanceState.REQUIRED && allowance.needsSetupApproval) {
       return {
         buttonText: t`Approve and swap`,
+        helpLink: {
+          text: t`Why do I have to approve a token?`,
+          url: SupportArticleURL.APPROVALS_EXPLAINER,
+        },
       }
     } else if (allowance && allowance.state === AllowanceState.REQUIRED && allowance.needsPermitSignature) {
       return {
         buttonText: t`Sign and swap`,
+        helpLink: {
+          text: t`Why are signatures required?`,
+          url: SupportArticleURL.APPROVALS_EXPLAINER,
+        },
       }
     } else {
       return {
-        buttonText: isLimitTrade(trade) ? t`Place order` : t`Confirm swap`,
+        buttonText: t`Confirm swap`,
       }
     }
-  }, [allowance, trade])
+  }, [allowance])
 
   return (
     <>
+      <DropdownController open={showMore} onClick={() => setShowMore(!showMore)} />
       <DetailsContainer gap={isNewSwapFlowEnabled ? 'sm' : 'md'} isNewSwapFlowEnabled={isNewSwapFlowEnabled}>
-        {isLimitTrade(trade) ? (
-          <>
-            <Separator />
-            <LimitLineItems trade={trade} />
-          </>
-        ) : (
-          <>
-            <DropdownController open={showMore} onClick={() => setShowMore(!showMore)} />
-            <SwapLineItems showMore={showMore} {...lineItemProps} />
-          </>
-        )}
+        <SwapLineItem {...lineItemProps} type={SwapLineItemType.EXCHANGE_RATE} />
+        <ExpandableLineItems {...lineItemProps} open={showMore} />
+        <SwapLineItem {...lineItemProps} type={SwapLineItemType.INPUT_TOKEN_FEE_ON_TRANSFER} />
+        <SwapLineItem {...lineItemProps} type={SwapLineItemType.OUTPUT_TOKEN_FEE_ON_TRANSFER} />
+        <SwapLineItem {...lineItemProps} type={SwapLineItemType.SWAP_FEE} />
+        <SwapLineItem {...lineItemProps} type={SwapLineItemType.NETWORK_COST} />
       </DetailsContainer>
       {showAcceptChanges ? (
         <SwapShowAcceptChanges data-testid="show-accept-changes">
@@ -217,7 +222,7 @@ export default function SwapModalFooter({
                 <Text fontSize={20}>{callToAction.buttonText}</Text>
               ) : (
                 <ThemedText.HeadlineSmall color="deprecated_accentTextLightPrimary">
-                  {isLimitTrade(trade) ? <Trans>Confirm limit</Trans> : <Trans>Confirm swap</Trans>}
+                  <Trans>Confirm swap</Trans>
                 </ThemedText.HeadlineSmall>
               )}
             </ConfirmButton>
@@ -245,54 +250,6 @@ function AnimatedLineItem(props: SwapLineItemProps & { open: boolean; delay: num
   return <SwapLineItem {...props} {...animatedProps} />
 }
 
-function SwapLineItems({
-  showMore,
-  trade,
-  allowedSlippage,
-  syncing,
-}: {
-  showMore: boolean
-  trade: InterfaceTrade
-  allowedSlippage: Percent
-  syncing: boolean
-}) {
-  return (
-    <>
-      <SwapLineItem
-        trade={trade}
-        allowedSlippage={allowedSlippage}
-        syncing={syncing}
-        type={SwapLineItemType.EXCHANGE_RATE}
-      />
-      <ExpandableLineItems trade={trade} allowedSlippage={allowedSlippage} open={showMore} />
-      <SwapLineItem
-        trade={trade}
-        allowedSlippage={allowedSlippage}
-        syncing={syncing}
-        type={SwapLineItemType.INPUT_TOKEN_FEE_ON_TRANSFER}
-      />
-      <SwapLineItem
-        trade={trade}
-        allowedSlippage={allowedSlippage}
-        syncing={syncing}
-        type={SwapLineItemType.OUTPUT_TOKEN_FEE_ON_TRANSFER}
-      />
-      <SwapLineItem
-        trade={trade}
-        allowedSlippage={allowedSlippage}
-        syncing={syncing}
-        type={SwapLineItemType.SWAP_FEE}
-      />
-      <SwapLineItem
-        trade={trade}
-        allowedSlippage={allowedSlippage}
-        syncing={syncing}
-        type={SwapLineItemType.NETWORK_COST}
-      />
-    </>
-  )
-}
-
 function ExpandableLineItems(props: { trade: InterfaceTrade; allowedSlippage: Percent; open: boolean }) {
   const { open, trade, allowedSlippage } = props
   const isNewSwapFlowEnabled = useNewSwapFlow()
@@ -321,20 +278,3 @@ function ExpandableLineItems(props: { trade: InterfaceTrade; allowedSlippage: Pe
     </AnimatedDropdown>
   )
 }
-
-function LimitLineItems({ trade }: { trade: LimitOrderTrade }) {
-  return (
-    <>
-      <SwapLineItem trade={trade} type={SwapLineItemType.EXCHANGE_RATE} />
-      <SwapLineItem trade={trade} type={SwapLineItemType.EXPIRY} />
-      <SwapLineItem trade={trade} type={SwapLineItemType.SWAP_FEE} />
-      <SwapLineItem trade={trade} type={SwapLineItemType.NETWORK_COST} />
-      <Row gap="xs" justify="center" marginTop="12px">
-        <Info width={16} height={16} />
-        <ThemedText.LabelMicro>
-          <Trans>Canceling a limit will require a small network cost</Trans>
-        </ThemedText.LabelMicro>
-      </Row>
-    </>
-  )
-}
diff --git a/apps/web/src/components/swap/SwapModalHeaderAmount.tsx b/apps/web/src/components/swap/SwapModalHeaderAmount.tsx
index d2cc6d43b52..f166ea7e8bd 100644
--- a/apps/web/src/components/swap/SwapModalHeaderAmount.tsx
+++ b/apps/web/src/components/swap/SwapModalHeaderAmount.tsx
@@ -26,7 +26,11 @@ const ResponsiveHeadline = ({ children, ...textProps }: PropsWithChildren<TextPr
     return <ThemedText.HeadlineMedium {...textProps}>{children}</ThemedText.HeadlineMedium>
   }
 
-  return <ThemedText.HeadlineLarge {...textProps}>{children}</ThemedText.HeadlineLarge>
+  return (
+    <ThemedText.HeadlineLarge fontWeight={535} {...textProps}>
+      {children}
+    </ThemedText.HeadlineLarge>
+  )
 }
 
 interface AmountProps {
diff --git a/apps/web/src/components/swap/UnsupportedCurrencyFooter.test.tsx b/apps/web/src/components/swap/UnsupportedCurrencyFooter.test.tsx
index ec29132c473..bf2ff303ea1 100644
--- a/apps/web/src/components/swap/UnsupportedCurrencyFooter.test.tsx
+++ b/apps/web/src/components/swap/UnsupportedCurrencyFooter.test.tsx
@@ -14,7 +14,6 @@ const unsupportedTokenExplorerLink = 'www.blahblah.com'
 
 jest.mock('../../hooks/Tokens')
 jest.mock('../../utils/getExplorerLink')
-jest.setTimeout(15_000)
 
 describe('UnsupportedCurrencyFooter.tsx with unsupported tokens', () => {
   beforeEach(() => {
diff --git a/apps/web/src/components/swap/__snapshots__/SwapBuyFiatButton.test.tsx.snap b/apps/web/src/components/swap/__snapshots__/SwapBuyFiatButton.test.tsx.snap
index 32848e32002..d43b1cd0eec 100644
--- a/apps/web/src/components/swap/__snapshots__/SwapBuyFiatButton.test.tsx.snap
+++ b/apps/web/src/components/swap/__snapshots__/SwapBuyFiatButton.test.tsx.snap
@@ -3,59 +3,151 @@
 exports[`SwapBuyFiatButton.tsx matches base snapshot 1`] = `
 <DocumentFragment>
   .c1 {
-  outline: none;
-  border: none;
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  display: inline-block;
+  text-align: center;
+  line-height: inherit;
+  -webkit-text-decoration: none;
+  text-decoration: none;
   font-size: inherit;
+  padding-left: 16px;
+  padding-right: 16px;
+  padding-top: 8px;
+  padding-bottom: 8px;
+  color: white;
+  background-color: primary;
+  border: 0;
+  border-radius: 4px;
+}
+
+.c2 {
+  padding: 16px;
+  width: 100%;
+  line-height: 24px;
+  font-weight: 535;
+  text-align: center;
+  border-radius: 16px;
+  outline: none;
+  border: 1px solid transparent;
+  color: #222222;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  -webkit-flex-wrap: nowrap;
+  -ms-flex-wrap: nowrap;
+  flex-wrap: nowrap;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  cursor: pointer;
+  position: relative;
+  z-index: 1;
+  will-change: transform;
+  -webkit-transition: -webkit-transform 450ms ease;
+  -webkit-transition: transform 450ms ease;
+  transition: transform 450ms ease;
+  -webkit-transform: perspective(1px) translateZ(0);
+  -ms-transform: perspective(1px) translateZ(0);
+  transform: perspective(1px) translateZ(0);
+}
+
+.c2:disabled {
+  opacity: 50%;
+  cursor: auto;
+  pointer-events: none;
+}
+
+.c2 > * {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.c2 > a {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c3 {
   padding: 0;
-  margin: 0;
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
   background: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  -webkit-transition-timing-function: ease-in-out;
-  transition-timing-function: ease-in-out;
-  -webkit-transition-property: opacity,color,background-color;
-  transition-property: opacity,color,background-color;
+  -webkit-text-decoration: none;
+  text-decoration: none;
 }
 
-.c1:hover {
-  opacity: 0.6;
+.c3:focus {
+  -webkit-text-decoration: underline;
+  text-decoration: underline;
+}
+
+.c3:hover {
+  opacity: 0.9;
 }
 
-.c1:focus {
+.c3:active {
   -webkit-text-decoration: underline;
   text-decoration: underline;
 }
 
+.c3:disabled {
+  opacity: 50%;
+  cursor: auto;
+}
+
 .c0 {
   display: inline-block;
   height: inherit;
 }
 
-.c2 {
+.c4 {
   color: #7D7D7D;
-  padding: 8px 16px;
-  border-radius: 20px;
   gap: 4px;
   font-weight: 485;
+  -webkit-transition-duration: 125ms;
+  transition-duration: 125ms;
+  -webkit-transition-timing-function: ease-in-out;
+  transition-timing-function: ease-in-out;
+  -webkit-transition-property: opacity,color,background-color;
+  transition-property: opacity,color,background-color;
 }
 
-.c2:focus {
+.c4:focus {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c2:active {
+.c4:active {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
+.c4:hover {
+  opacity: 0.6;
+}
+
 <div
     class="c0"
   >
     <div>
       <button
-        class="c1 c2"
+        class="c1 c2 c3 c4"
         data-testid="buy-fiat-button"
       >
         Buy
diff --git a/apps/web/src/components/swap/__snapshots__/SwapDetailsDropdown.test.tsx.snap b/apps/web/src/components/swap/__snapshots__/SwapDetailsDropdown.test.tsx.snap
index a87dfd981b7..6f0c5c85db3 100644
--- a/apps/web/src/components/swap/__snapshots__/SwapDetailsDropdown.test.tsx.snap
+++ b/apps/web/src/components/swap/__snapshots__/SwapDetailsDropdown.test.tsx.snap
@@ -43,7 +43,7 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
   gap: 4px;
 }
 
-.c15 {
+.c21 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -83,25 +83,16 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
 
 .c9 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c14 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c22 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
+.c18 {
+  width: 100%;
+  height: 1px;
+  background-color: #22222212;
 }
 
 .c0 {
@@ -118,7 +109,7 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
   justify-content: flex-start;
 }
 
-.c17 {
+.c16 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -152,7 +143,7 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
 }
 
 .c13 > * {
-  fill: #CECECE;
+  fill: #7D7D7D;
 }
 
 .c19 {
@@ -197,7 +188,7 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
   user-select: text;
 }
 
-.c21 {
+.c22 {
   background: #22222212;
   border-radius: 8px;
   color: #7D7D7D;
@@ -205,7 +196,7 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
   padding: 0 6px;
 }
 
-.c21::after {
+.c22::after {
   content: 'Auto';
 }
 
@@ -218,7 +209,7 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
   cursor: pointer;
 }
 
-.c16 {
+.c15 {
   -webkit-transform: none;
   -ms-transform: none;
   transform: none;
@@ -227,11 +218,12 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
   transition: transform 0.1s linear;
 }
 
-.c18 {
+.c17 {
   padding-top: 12px;
 }
 
 .c1 {
+  border: 1px solid #22222212;
   border-radius: 16px;
   padding: 12px 16px;
 }
@@ -286,7 +278,7 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
                 >
                   <path
                     clip-rule="evenodd"
-                    d="M15.3078 1.77827C15.7064 1.39599 16.3395 1.40923 16.7217 1.80783L20.9689 6.23633C21.2428 6.47474 21.4729 6.76205 21.6459 7.08464C21.8481 7.43172 22 7.84819 22 8.32698V16.7012C22 18.2484 20.7455 19.5 19.2 19.5C17.6536 19.5 16.4 18.2464 16.4 16.7V14.3999C16.4 13.8476 15.9523 13.3999 15.4 13.3999H14V20.5C14 20.569 13.9965 20.6372 13.9897 20.7045C13.9515 21.08 13.8095 21.4249 13.5927 21.7098C13.2274 22.19 12.6499 22.5 12 22.5H4C3.30964 22.5 2.70098 22.1502 2.34157 21.6182C2.12592 21.299 2.00001 20.9142 2 20.5V5.4999C2 3.84305 3.34315 2.4999 5 2.4999H11C12.6569 2.4999 14 3.84305 14 5.4999V11.3999H15.4C17.0569 11.3999 18.4 12.7431 18.4 14.3999V16.7C18.4 17.1418 18.7582 17.5 19.2 17.5C19.6427 17.5 20 17.1422 20 16.7012V11.3292C19.6872 11.4397 19.3506 11.4999 19 11.4999C17.3431 11.4999 16 10.1568 16 8.4999C16 7.28851 16.718 6.24482 17.7517 5.77117L15.2783 3.19217C14.896 2.79357 14.9092 2.16055 15.3078 1.77827ZM19.6098 7.70731C19.441 7.57725 19.2296 7.4999 19 7.4999C18.4477 7.4999 18 7.94762 18 8.4999C18 9.05219 18.4477 9.4999 19 9.4999C19.5523 9.4999 20 9.05219 20 8.4999C20 8.34084 19.9629 8.19045 19.8968 8.05693C19.8303 7.95164 19.7349 7.83559 19.6098 7.70731ZM5.21572 4.72463C4.66343 4.72463 4.21572 5.17235 4.21572 5.72463V9.72463C4.21572 10.2769 4.66343 10.7246 5.21572 10.7246H10.7157C11.268 10.7246 11.7157 10.2769 11.7157 9.72463V5.72463C11.7157 5.17235 11.268 4.72463 10.7157 4.72463H5.21572Z"
+                    d="M15.3078 0.278393C15.7064 -0.103884 16.3395 -0.0906517 16.7217 0.307949L20.9689 4.73645C21.2428 4.97487 21.4729 5.26217 21.6459 5.58477C21.8481 5.93184 22 6.34831 22 6.8271V17.2013C22 18.7486 20.7455 20.0001 19.2 20.0001C17.6536 20.0001 16.4 18.7465 16.4 17.2001V14.9C16.4 14.3477 15.9523 13.9 15.4 13.9H15V21.0001C15 21.0691 14.9965 21.1374 14.9897 21.2046C14.9515 21.5802 14.8095 21.925 14.5927 22.2099C14.2274 22.6901 13.6499 23.0001 13 23.0001H5C4.30964 23.0001 3.70098 22.6503 3.34157 22.1183C3.12592 21.7991 3.00001 21.4143 3 21.0001V4.00003C3 2.34317 4.34315 1.00003 6 1.00003H12C13.6569 1.00003 15 2.34317 15 4.00003V11.9H15.4C17.0569 11.9 18.4 13.2432 18.4 14.9V17.2001C18.4 17.642 18.7582 18.0001 19.2 18.0001C19.6427 18.0001 20 17.6423 20 17.2013V9.82932C19.6872 9.93987 19.3506 10 19 10C17.3431 10 16 8.65688 16 7.00003C16 5.78863 16.718 4.74494 17.7517 4.27129L15.2783 1.6923C14.896 1.2937 14.9092 0.660671 15.3078 0.278393ZM19.6098 6.20743C19.441 6.07738 19.2296 6.00003 19 6.00003C18.4477 6.00003 18 6.44774 18 7.00003C18 7.55231 18.4477 8.00003 19 8.00003C19.5523 8.00003 20 7.55231 20 7.00003C20 6.84096 19.9629 6.69057 19.8968 6.55705C19.8303 6.45176 19.7349 6.33571 19.6098 6.20743ZM5 11C5 10.4477 5.44772 10 6 10H9H12C12.5523 10 13 10.4477 13 11C13 11.5523 12.5523 12 12 12H6C5.44772 12 5 11.5523 5 11ZM5 15C5 14.4477 5.44772 14 6 14H12C12.5523 14 13 14.4477 13 15C13 15.5523 12.5523 16 12 16H6C5.44772 16 5 15.5523 5 15ZM6 18C5.44772 18 5 18.4477 5 19C5 19.5523 5.44772 20 6 20H12C12.5523 20 13 19.5523 13 19C13 18.4477 12.5523 18 12 18H6Z"
                     fill="currentColor"
                     fill-rule="evenodd"
                   />
@@ -295,7 +287,7 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
                   class="c14 css-142zc9n"
                 >
                   <div
-                    class="c2 c15"
+                    class="c2 c10"
                   >
                     <div>
                       $1.00
@@ -307,7 +299,7 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
           </div>
         </div>
         <svg
-          class="c16"
+          class="c15"
           fill="none"
           height="24"
           stroke="#CECECE"
@@ -329,9 +321,12 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
     >
       <div>
         <div
-          class="c17 c18"
+          class="c16 c17"
           data-testid="advanced-swap-details"
         >
+          <div
+            class="c18"
+          />
           <div>
             <div
               class="c2 c3 c4"
@@ -377,10 +372,10 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
                     class="c9 c20 css-142zc9n"
                   >
                     <div
-                      class="c2 c15"
+                      class="c2 c21"
                     >
                       <div
-                        class="c14 c21 css-1lgneq0"
+                        class="c14 c22 css-1lgneq0"
                       />
                        2%
                     </div>
@@ -430,50 +425,47 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
                     class="c9 c20 css-142zc9n"
                   >
                     <div
-                      class="c12"
+                      class="c2 c10"
                     >
-                      <div>
-                        <div
-                          class="c7"
+                      <svg
+                        aria-labelledby="titleID"
+                        height="16"
+                        width="16"
+                      >
+                        <title
+                          id="titleID"
+                        >
+                          Ethereum logo
+                        </title>
+                        <rect
+                          fill="#F9F9F9"
+                          height="16"
+                          rx="4"
+                          width="16"
+                        />
+                        <rect
+                          fill="#6B8AFF33"
+                          height="16"
+                          rx="4"
+                          width="16"
+                        />
+                        <svg
+                          height="16"
+                          width="16"
                         >
-                          <div
-                            class="c2 c10 c11"
-                          >
-                            <svg
-                              class="c13"
-                              fill="none"
-                              height="24"
-                              viewBox="0 0 24 24"
-                              width="24"
-                              xmlns="http://www.w3.org/2000/svg"
-                            >
-                              <path
-                                clip-rule="evenodd"
-                                d="M15.3078 1.77827C15.7064 1.39599 16.3395 1.40923 16.7217 1.80783L20.9689 6.23633C21.2428 6.47474 21.4729 6.76205 21.6459 7.08464C21.8481 7.43172 22 7.84819 22 8.32698V16.7012C22 18.2484 20.7455 19.5 19.2 19.5C17.6536 19.5 16.4 18.2464 16.4 16.7V14.3999C16.4 13.8476 15.9523 13.3999 15.4 13.3999H14V20.5C14 20.569 13.9965 20.6372 13.9897 20.7045C13.9515 21.08 13.8095 21.4249 13.5927 21.7098C13.2274 22.19 12.6499 22.5 12 22.5H4C3.30964 22.5 2.70098 22.1502 2.34157 21.6182C2.12592 21.299 2.00001 20.9142 2 20.5V5.4999C2 3.84305 3.34315 2.4999 5 2.4999H11C12.6569 2.4999 14 3.84305 14 5.4999V11.3999H15.4C17.0569 11.3999 18.4 12.7431 18.4 14.3999V16.7C18.4 17.1418 18.7582 17.5 19.2 17.5C19.6427 17.5 20 17.1422 20 16.7012V11.3292C19.6872 11.4397 19.3506 11.4999 19 11.4999C17.3431 11.4999 16 10.1568 16 8.4999C16 7.28851 16.718 6.24482 17.7517 5.77117L15.2783 3.19217C14.896 2.79357 14.9092 2.16055 15.3078 1.77827ZM19.6098 7.70731C19.441 7.57725 19.2296 7.4999 19 7.4999C18.4477 7.4999 18 7.94762 18 8.4999C18 9.05219 18.4477 9.4999 19 9.4999C19.5523 9.4999 20 9.05219 20 8.4999C20 8.34084 19.9629 8.19045 19.8968 8.05693C19.8303 7.95164 19.7349 7.83559 19.6098 7.70731ZM5.21572 4.72463C4.66343 4.72463 4.21572 5.17235 4.21572 5.72463V9.72463C4.21572 10.2769 4.66343 10.7246 5.21572 10.7246H10.7157C11.268 10.7246 11.7157 10.2769 11.7157 9.72463V5.72463C11.7157 5.17235 11.268 4.72463 10.7157 4.72463H5.21572Z"
-                                fill="currentColor"
-                                fill-rule="evenodd"
-                              />
-                            </svg>
-                            <div
-                              class="c14 css-142zc9n"
-                            >
-                              <div
-                                class="c2 c15"
-                              >
-                                <div>
-                                  $1.00
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
+                          ethereum.svg
+                        </svg>
+                      </svg>
+                      $1.00
                     </div>
                   </div>
                 </div>
               </div>
             </div>
           </div>
+          <div
+            class="c18"
+          />
           <div>
             <div
               class="c2 c3 c4"
@@ -492,7 +484,7 @@ exports[`SwapDetailsDropdown.tsx renders a trade 1`] = `
                     class="c9 c20 css-142zc9n"
                   >
                     <div
-                      class="c22 css-142zc9n"
+                      class="css-142zc9n"
                     >
                       Uniswap Client
                     </div>
diff --git a/apps/web/src/components/swap/__snapshots__/SwapHeader.test.tsx.snap b/apps/web/src/components/swap/__snapshots__/SwapHeader.test.tsx.snap
index c2f85dc81a9..b4cad60ce71 100644
--- a/apps/web/src/components/swap/__snapshots__/SwapHeader.test.tsx.snap
+++ b/apps/web/src/components/swap/__snapshots__/SwapHeader.test.tsx.snap
@@ -8,6 +8,29 @@ exports[`SwapHeader.tsx matches base snapshot 1`] = `
   min-width: 0;
 }
 
+.c9 {
+  box-sizing: border-box;
+  margin: 0;
+  min-width: 0;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  display: inline-block;
+  text-align: center;
+  line-height: inherit;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  font-size: inherit;
+  padding-left: 16px;
+  padding-right: 16px;
+  padding-top: 8px;
+  padding-bottom: 8px;
+  color: white;
+  background-color: primary;
+  border: 0;
+  border-radius: 4px;
+}
+
 .c1 {
   width: 100%;
   display: -webkit-box;
@@ -63,21 +86,107 @@ exports[`SwapHeader.tsx matches base snapshot 1`] = `
   text-decoration: underline;
 }
 
-.c9 {
+.c10 {
+  padding: 16px;
+  width: 100%;
+  line-height: 24px;
+  font-weight: 535;
+  text-align: center;
+  border-radius: 16px;
+  outline: none;
+  border: 1px solid transparent;
+  color: #222222;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  -webkit-flex-wrap: nowrap;
+  -ms-flex-wrap: nowrap;
+  flex-wrap: nowrap;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  cursor: pointer;
+  position: relative;
+  z-index: 1;
+  will-change: transform;
+  -webkit-transition: -webkit-transform 450ms ease;
+  -webkit-transition: transform 450ms ease;
+  transition: transform 450ms ease;
+  -webkit-transform: perspective(1px) translateZ(0);
+  -ms-transform: perspective(1px) translateZ(0);
+  transform: perspective(1px) translateZ(0);
+}
+
+.c10:disabled {
+  opacity: 50%;
+  cursor: auto;
+  pointer-events: none;
+}
+
+.c10 > * {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+}
+
+.c10 > a {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c11 {
+  padding: 0;
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+  background: none;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c11:focus {
+  -webkit-text-decoration: underline;
+  text-decoration: underline;
+}
+
+.c11:hover {
+  opacity: 0.9;
+}
+
+.c11:active {
+  -webkit-text-decoration: underline;
+  text-decoration: underline;
+}
+
+.c11:disabled {
+  opacity: 50%;
+  cursor: auto;
+}
+
+.c8 {
   display: inline-block;
   height: inherit;
 }
 
-.c13 {
+.c17 {
   height: 24px;
   width: 24px;
 }
 
-.c13 > * {
+.c17 > * {
   fill: #7D7D7D;
 }
 
-.c11 {
+.c15 {
   border: none;
   background-color: transparent;
   margin: 0;
@@ -86,64 +195,85 @@ exports[`SwapHeader.tsx matches base snapshot 1`] = `
   outline: none;
 }
 
-.c11:not([disabled]):hover {
+.c15:not([disabled]):hover {
   opacity: 0.7;
 }
 
-.c12 {
+.c16 {
   padding: 6px 12px;
   border-radius: 16px;
 }
 
-.c10 {
+.c14 {
   position: relative;
 }
 
-.c7 {
-  color: #222222;
-  background-color: #F9F9F9;
-  padding: 8px 16px;
-  border-radius: 20px;
+.c12 {
+  color: #7D7D7D;
   gap: 4px;
   font-weight: 485;
+  -webkit-transition-duration: 125ms;
+  transition-duration: 125ms;
+  -webkit-transition-timing-function: ease-in-out;
+  transition-timing-function: ease-in-out;
+  -webkit-transition-property: opacity,color,background-color;
+  transition-property: opacity,color,background-color;
 }
 
-.c7:focus {
+.c12:focus {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c7:active {
+.c12:active {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c8 {
+.c12:hover {
+  opacity: 0.6;
+}
+
+.c3 {
+  margin-bottom: 10px;
   color: #7D7D7D;
-  padding: 8px 16px;
-  border-radius: 20px;
+}
+
+.c5 {
+  padding: 0 12px;
+  gap: 16px;
+}
+
+.c7 {
+  color: #222222;
   gap: 4px;
   font-weight: 485;
 }
 
-.c8:focus {
+.c7:focus {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c8:active {
+.c7:active {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c3 {
-  margin-bottom: 4px;
+.c13 {
   color: #7D7D7D;
+  gap: 4px;
+  font-weight: 485;
 }
 
-.c5 {
-  gap: 16px;
-  padding-bottom: 8px;
+.c13:focus {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c13:active {
+  -webkit-text-decoration: none;
+  text-decoration: none;
 }
 
 <div
@@ -159,41 +289,41 @@ exports[`SwapHeader.tsx matches base snapshot 1`] = `
       >
         Swap
       </h1>
-      <button
-        class="c6 c8"
-      >
-        Limit
-      </button>
       <div
-        class="c9"
+        class="c8"
       >
         <div>
           <button
-            class="c6 c8"
+            class="c9 c10 c11 c12"
             data-testid="buy-fiat-button"
           >
             Buy
           </button>
         </div>
       </div>
+      <button
+        class="c6 c13"
+      >
+        Limit
+      </button>
     </div>
     <div
       class="c0 c1 c4"
     >
       <div
-        class="c10"
+        class="c14"
       >
         <button
           aria-label="Transaction Settings"
-          class="c11"
+          class="c15"
           data-testid="open-settings-dialog-button"
           id="open-settings-dialog-button"
         >
           <div
-            class="c0 c1 c12"
+            class="c0 c1 c16"
           >
             <svg
-              class="c13"
+              class="c17"
               fill="none"
               height="24"
               viewBox="0 0 24 24"
diff --git a/apps/web/src/components/swap/__snapshots__/SwapLineItem.test.tsx.snap b/apps/web/src/components/swap/__snapshots__/SwapLineItem.test.tsx.snap
index bcabd4b0607..5c816f9d94b 100644
--- a/apps/web/src/components/swap/__snapshots__/SwapLineItem.test.tsx.snap
+++ b/apps/web/src/components/swap/__snapshots__/SwapLineItem.test.tsx.snap
@@ -25,7 +25,7 @@ exports[`SwapLineItem.tsx dutch order eth input 1`] = `
   justify-content: flex-start;
 }
 
-.c8 {
+.c7 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -43,24 +43,6 @@ exports[`SwapLineItem.tsx dutch order eth input 1`] = `
   gap: 4px;
 }
 
-.c11 {
-  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: 8px;
-}
-
 .c2 {
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
@@ -68,30 +50,15 @@ exports[`SwapLineItem.tsx dutch order eth input 1`] = `
   justify-content: space-between;
 }
 
-.c9 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  margin: -xs;
-}
-
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c10 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c16 {
+.c11 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -102,27 +69,15 @@ exports[`SwapLineItem.tsx dutch order eth input 1`] = `
   font-weight: 500;
 }
 
-.c16:hover {
+.c11:hover {
   opacity: 0.6;
 }
 
-.c16:active {
+.c11:active {
   opacity: 0.4;
 }
 
-.c7 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-}
-
-.c12 {
-  color: #4673fa;
-}
-
-.c13 {
+.c8 {
   z-index: 1070;
   pointer-events: none;
   visibility: hidden;
@@ -137,13 +92,13 @@ exports[`SwapLineItem.tsx dutch order eth input 1`] = `
   height: inherit;
 }
 
-.c17 {
+.c12 {
   width: 8px;
   height: 8px;
   z-index: 9998;
 }
 
-.c17::before {
+.c12::before {
   position: absolute;
   width: 8px;
   height: 8px;
@@ -157,43 +112,43 @@ exports[`SwapLineItem.tsx dutch order eth input 1`] = `
   background: #FFFFFF;
 }
 
-.c17.arrow-top {
+.c12.arrow-top {
   bottom: -4px;
 }
 
-.c17.arrow-top::before {
+.c12.arrow-top::before {
   border-top: none;
   border-left: none;
 }
 
-.c17.arrow-bottom {
+.c12.arrow-bottom {
   top: -4px;
 }
 
-.c17.arrow-bottom::before {
+.c12.arrow-bottom::before {
   border-bottom: none;
   border-right: none;
 }
 
-.c17.arrow-left {
+.c12.arrow-left {
   right: -4px;
 }
 
-.c17.arrow-left::before {
+.c12.arrow-left::before {
   border-bottom: none;
   border-left: none;
 }
 
-.c17.arrow-right {
+.c12.arrow-right {
   left: -4px;
 }
 
-.c17.arrow-right::before {
+.c12.arrow-right::before {
   border-right: none;
   border-top: none;
 }
 
-.c14 {
+.c9 {
   max-width: 256px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -220,16 +175,8 @@ exports[`SwapLineItem.tsx dutch order eth input 1`] = `
   overflow-wrap: break-word;
 }
 
-.c15 {
-  display: inline;
-}
-
 @supports (-webkit-background-clip:text) and (-webkit-text-fill-color:transparent) {
-  .c12 {
-    background-image: linear-gradient(91.39deg,#4673fa -101.76%,#9646fa 101.76%);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-  }
+
 }
 
 <div>
@@ -250,128 +197,59 @@ exports[`SwapLineItem.tsx dutch order eth input 1`] = `
             class="c3 c6 css-142zc9n"
           >
             <div
-              class="c5"
-            >
-              <div>
-                <div
-                  class="c7"
-                >
-                  <div
-                    class="c0 c8 c9"
-                  >
-                    <svg
-                      data-testid="gas-estimate-uniswapx-icon"
-                      fill="none"
-                      height="14"
-                      viewBox="0 0 10 14"
-                      width="10"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <defs>
-                        <lineargradient
-                          gradientUnits="userSpaceOnUse"
-                          id="AutoRouterIconGradientfixed-uuid-value"
-                          x1="-10.1807"
-                          x2="10.6573"
-                          y1="-12.0006"
-                          y2="-11.6017"
-                        >
-                          <stop
-                            stop-color="#4673FA"
-                          />
-                          <stop
-                            offset="1"
-                            stop-color="#9646FA"
-                          />
-                        </lineargradient>
-                      </defs>
-                      <path
-                        d="M9.97131 6.19803C9.91798 6.07737 9.79866 6.00003 9.66666 6.00003H6.66666V1.00003C6.66666 0.862034 6.58201 0.738037 6.45267 0.688704C6.32267 0.638704 6.17799 0.674696 6.08532 0.776696L0.0853237 7.44336C-0.00267631 7.54136 -0.0253169 7.68137 0.0286831 7.80204C0.0820164 7.9227 0.20133 8.00003 0.33333 8.00003H3.33333V13C3.33333 13.138 3.41799 13.262 3.54732 13.3114C3.58665 13.326 3.62666 13.3334 3.66666 13.3334C3.75933 13.3334 3.85 13.2947 3.91467 13.2227L9.91467 6.55603C10.0027 6.4587 10.0246 6.31803 9.97131 6.19803Z"
-                        fill="url(#AutoRouterIconGradientfixed-uuid-value)"
-                      />
-                    </svg>
-                    <div
-                      class="c10 css-142zc9n"
-                    >
-                      <div
-                        class="c0 c11"
-                      >
-                        <div
-                          class="c12"
-                        >
-                          <div
-                            style="font-weight: 535;"
-                          >
-                            $0
-                          </div>
-                        </div>
-                        <div>
-                          <s>
-                            $7.87
-                          </s>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div
-              class="c13"
-              style="position: fixed; left: 0px; top: 0px;"
+              class="c0 c7"
             >
-              <div
-                class="c14"
+              <svg
+                aria-labelledby="titleID"
+                height="16"
+                width="16"
               >
-                <div
-                  class="c10 css-obwv3p"
+                <title
+                  id="titleID"
                 >
-                  <div
-                    class="c12 c15"
-                  >
-                    UniswapX
-                  </div>
-                   aggregates liquidity sources for better prices and gas free swaps. 
-                  <a
-                    class="c16"
-                    href="https://support.uniswap.org/hc/en-us/articles/17515415311501"
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    Learn more
-                  </a>
-                </div>
-              </div>
-              <div
-                class="c17 arrow-"
-                style="position: absolute;"
-              />
+                  Ethereum logo
+                </title>
+                <rect
+                  fill="#F9F9F9"
+                  height="16"
+                  rx="4"
+                  width="16"
+                />
+                <rect
+                  fill="#6B8AFF33"
+                  height="16"
+                  rx="4"
+                  width="16"
+                />
+                <svg
+                  height="16"
+                  width="16"
+                >
+                  ethereum.svg
+                </svg>
+              </svg>
+              $0
             </div>
           </div>
         </div>
       </div>
       <div
-        class="c13"
+        class="c8"
         style="position: fixed; left: 0px; top: 0px;"
       >
         <div
-          class="c14"
+          class="c9"
         >
           <div
             class="c10 css-obwv3p"
           >
             <div
-              class="c10 css-obwv3p"
+              class="c10 css-1m65e73"
             >
-              <div
-                class="c12 c15"
-              >
-                UniswapX
-              </div>
-               aggregates liquidity sources for better prices and gas free swaps. 
+              Network cost is paid in ETH on the ETHEREUM network in order to transact. 
               <a
-                class="c16"
-                href="https://support.uniswap.org/hc/en-us/articles/17515415311501"
+                class="c11"
+                href="https://support.uniswap.org/hc/en-us/articles/8370337377805-What-is-a-network-fee-"
                 rel="noopener noreferrer"
                 target="_blank"
               >
@@ -381,7 +259,7 @@ exports[`SwapLineItem.tsx dutch order eth input 1`] = `
           </div>
         </div>
         <div
-          class="c17 arrow-"
+          class="c12 arrow-"
           style="position: absolute;"
         />
       </div>
@@ -437,18 +315,10 @@ exports[`SwapLineItem.tsx dutch order eth input 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c14 {
@@ -716,18 +586,10 @@ exports[`SwapLineItem.tsx dutch order eth input 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c10 {
@@ -932,18 +794,10 @@ exports[`SwapLineItem.tsx dutch order eth input 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -1146,18 +1000,10 @@ exports[`SwapLineItem.tsx dutch order eth input 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c12 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c14 {
@@ -1423,7 +1269,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   justify-content: flex-start;
 }
 
-.c8 {
+.c7 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -1441,24 +1287,6 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   gap: 4px;
 }
 
-.c12 {
-  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: 8px;
-}
-
 .c2 {
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
@@ -1466,30 +1294,15 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   justify-content: space-between;
 }
 
-.c9 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  margin: -xs;
-}
-
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c11 {
+.c10 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c15 {
+.c11 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -1500,23 +1313,15 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   font-weight: 500;
 }
 
-.c15:hover {
+.c11:hover {
   opacity: 0.6;
 }
 
-.c15:active {
+.c11:active {
   opacity: 0.4;
 }
 
-.c7 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-}
-
-.c13 {
+.c8 {
   z-index: 1070;
   pointer-events: none;
   visibility: hidden;
@@ -1531,13 +1336,13 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   height: inherit;
 }
 
-.c16 {
+.c12 {
   width: 8px;
   height: 8px;
   z-index: 9998;
 }
 
-.c16::before {
+.c12::before {
   position: absolute;
   width: 8px;
   height: 8px;
@@ -1551,43 +1356,43 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   background: #FFFFFF;
 }
 
-.c16.arrow-top {
+.c12.arrow-top {
   bottom: -4px;
 }
 
-.c16.arrow-top::before {
+.c12.arrow-top::before {
   border-top: none;
   border-left: none;
 }
 
-.c16.arrow-bottom {
+.c12.arrow-bottom {
   top: -4px;
 }
 
-.c16.arrow-bottom::before {
+.c12.arrow-bottom::before {
   border-bottom: none;
   border-right: none;
 }
 
-.c16.arrow-left {
+.c12.arrow-left {
   right: -4px;
 }
 
-.c16.arrow-left::before {
+.c12.arrow-left::before {
   border-bottom: none;
   border-left: none;
 }
 
-.c16.arrow-right {
+.c12.arrow-right {
   left: -4px;
 }
 
-.c16.arrow-right::before {
+.c12.arrow-right::before {
   border-right: none;
   border-top: none;
 }
 
-.c14 {
+.c9 {
   max-width: 256px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -1614,15 +1419,6 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   overflow-wrap: break-word;
 }
 
-.c10 {
-  height: 16px;
-  width: 16px;
-}
-
-.c10 > * {
-  fill: #CECECE;
-}
-
 <div>
     <div
       class="c0 c1 c2"
@@ -1641,90 +1437,58 @@ exports[`SwapLineItem.tsx exact input 1`] = `
             class="c3 c6 css-142zc9n"
           >
             <div
-              class="c5"
-            >
-              <div>
-                <div
-                  class="c7"
-                >
-                  <div
-                    class="c0 c8 c9"
-                  >
-                    <svg
-                      class="c10"
-                      fill="none"
-                      height="24"
-                      viewBox="0 0 24 24"
-                      width="24"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        clip-rule="evenodd"
-                        d="M15.3078 1.77827C15.7064 1.39599 16.3395 1.40923 16.7217 1.80783L20.9689 6.23633C21.2428 6.47474 21.4729 6.76205 21.6459 7.08464C21.8481 7.43172 22 7.84819 22 8.32698V16.7012C22 18.2484 20.7455 19.5 19.2 19.5C17.6536 19.5 16.4 18.2464 16.4 16.7V14.3999C16.4 13.8476 15.9523 13.3999 15.4 13.3999H14V20.5C14 20.569 13.9965 20.6372 13.9897 20.7045C13.9515 21.08 13.8095 21.4249 13.5927 21.7098C13.2274 22.19 12.6499 22.5 12 22.5H4C3.30964 22.5 2.70098 22.1502 2.34157 21.6182C2.12592 21.299 2.00001 20.9142 2 20.5V5.4999C2 3.84305 3.34315 2.4999 5 2.4999H11C12.6569 2.4999 14 3.84305 14 5.4999V11.3999H15.4C17.0569 11.3999 18.4 12.7431 18.4 14.3999V16.7C18.4 17.1418 18.7582 17.5 19.2 17.5C19.6427 17.5 20 17.1422 20 16.7012V11.3292C19.6872 11.4397 19.3506 11.4999 19 11.4999C17.3431 11.4999 16 10.1568 16 8.4999C16 7.28851 16.718 6.24482 17.7517 5.77117L15.2783 3.19217C14.896 2.79357 14.9092 2.16055 15.3078 1.77827ZM19.6098 7.70731C19.441 7.57725 19.2296 7.4999 19 7.4999C18.4477 7.4999 18 7.94762 18 8.4999C18 9.05219 18.4477 9.4999 19 9.4999C19.5523 9.4999 20 9.05219 20 8.4999C20 8.34084 19.9629 8.19045 19.8968 8.05693C19.8303 7.95164 19.7349 7.83559 19.6098 7.70731ZM5.21572 4.72463C4.66343 4.72463 4.21572 5.17235 4.21572 5.72463V9.72463C4.21572 10.2769 4.66343 10.7246 5.21572 10.7246H10.7157C11.268 10.7246 11.7157 10.2769 11.7157 9.72463V5.72463C11.7157 5.17235 11.268 4.72463 10.7157 4.72463H5.21572Z"
-                        fill="currentColor"
-                        fill-rule="evenodd"
-                      />
-                    </svg>
-                    <div
-                      class="c11 css-142zc9n"
-                    >
-                      <div
-                        class="c0 c12"
-                      >
-                        <div>
-                          $1.00
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div
-              class="c13"
-              style="position: fixed; left: 0px; top: 0px;"
+              class="c0 c7"
             >
-              <div
-                class="c14"
+              <svg
+                aria-labelledby="titleID"
+                height="16"
+                width="16"
               >
-                <div
-                  class="c11 css-1m65e73"
+                <title
+                  id="titleID"
                 >
-                  Network cost is paid in ETH on the ETHEREUM network in order to transact. 
-                  <a
-                    class="c15"
-                    href="https://support.uniswap.org/hc/en-us/articles/8370337377805-What-is-a-network-fee-"
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    Learn more
-                  </a>
-                </div>
-              </div>
-              <div
-                class="c16 arrow-"
-                style="position: absolute;"
-              />
+                  Ethereum logo
+                </title>
+                <rect
+                  fill="#F9F9F9"
+                  height="16"
+                  rx="4"
+                  width="16"
+                />
+                <rect
+                  fill="#6B8AFF33"
+                  height="16"
+                  rx="4"
+                  width="16"
+                />
+                <svg
+                  height="16"
+                  width="16"
+                >
+                  ethereum.svg
+                </svg>
+              </svg>
+              $1.00
             </div>
           </div>
         </div>
       </div>
       <div
-        class="c13"
+        class="c8"
         style="position: fixed; left: 0px; top: 0px;"
       >
         <div
-          class="c14"
+          class="c9"
         >
           <div
-            class="c11 css-obwv3p"
+            class="c10 css-obwv3p"
           >
             <div
-              class="c11 css-1m65e73"
+              class="c10 css-1m65e73"
             >
               Network cost is paid in ETH on the ETHEREUM network in order to transact. 
               <a
-                class="c15"
+                class="c11"
                 href="https://support.uniswap.org/hc/en-us/articles/8370337377805-What-is-a-network-fee-"
                 rel="noopener noreferrer"
                 target="_blank"
@@ -1735,7 +1499,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
           </div>
         </div>
         <div
-          class="c16 arrow-"
+          class="c12 arrow-"
           style="position: absolute;"
         />
       </div>
@@ -1773,18 +1537,10 @@ exports[`SwapLineItem.tsx exact input 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -1980,18 +1736,10 @@ exports[`SwapLineItem.tsx exact input 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c14 {
@@ -2255,18 +2003,10 @@ exports[`SwapLineItem.tsx exact input 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c10 {
@@ -2467,18 +2207,10 @@ exports[`SwapLineItem.tsx exact input 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -2626,7 +2358,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   min-width: 0;
 }
 
-.c24 {
+.c23 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -2650,7 +2382,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   justify-content: flex-start;
 }
 
-.c25 {
+.c24 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -2675,41 +2407,26 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   justify-content: space-between;
 }
 
-.c26 {
+.c25 {
   -webkit-flex-wrap: wrap;
   -ms-flex-wrap: wrap;
   flex-wrap: wrap;
   margin: -1px;
 }
 
-.c26 > * {
+.c25 > * {
   margin: 1px !important;
 }
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c10 {
+.c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c8 {
   z-index: 1070;
   pointer-events: none;
   visibility: hidden;
@@ -2724,13 +2441,13 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   height: inherit;
 }
 
-.c32 {
+.c31 {
   width: 8px;
   height: 8px;
   z-index: 9998;
 }
 
-.c32::before {
+.c31::before {
   position: absolute;
   width: 8px;
   height: 8px;
@@ -2744,43 +2461,43 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   background: #FFFFFF;
 }
 
-.c32.arrow-top {
+.c31.arrow-top {
   bottom: -4px;
 }
 
-.c32.arrow-top::before {
+.c31.arrow-top::before {
   border-top: none;
   border-left: none;
 }
 
-.c32.arrow-bottom {
+.c31.arrow-bottom {
   top: -4px;
 }
 
-.c32.arrow-bottom::before {
+.c31.arrow-bottom::before {
   border-bottom: none;
   border-right: none;
 }
 
-.c32.arrow-left {
+.c31.arrow-left {
   right: -4px;
 }
 
-.c32.arrow-left::before {
+.c31.arrow-left::before {
   border-bottom: none;
   border-left: none;
 }
 
-.c32.arrow-right {
+.c31.arrow-right {
   left: -4px;
 }
 
-.c32.arrow-right::before {
+.c31.arrow-right::before {
   border-right: none;
   border-top: none;
 }
 
-.c9 {
+.c8 {
   max-width: 400px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -2797,7 +2514,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   box-shadow: 0 4px 8px 0 rgba(47,128,237,0.1);
 }
 
-.c31 {
+.c30 {
   max-width: 200px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -2824,7 +2541,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   overflow-wrap: break-word;
 }
 
-.c11 {
+.c10 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -2839,7 +2556,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   gap: 12px;
 }
 
-.c20 {
+.c19 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -2861,26 +2578,25 @@ exports[`SwapLineItem.tsx exact input 1`] = `
 }
 
 .c15 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
 }
 
-.c16 {
+.c14 {
   width: 20px;
   height: 20px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
-.c14 {
+.c13 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -2888,7 +2604,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   display: flex;
 }
 
-.c28 {
+.c27 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -2899,16 +2615,16 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   flex-direction: row;
 }
 
-.c29 {
+.c28 {
   z-index: 1;
 }
 
-.c30 {
+.c29 {
   position: absolute;
   left: -10px !important;
 }
 
-.c12 {
+.c11 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -2916,12 +2632,12 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   width: 100%;
 }
 
-.c13 {
+.c12 {
   display: grid;
   grid-template-columns: 24px 1fr 24px;
 }
 
-.c17 {
+.c16 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -2938,7 +2654,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   position: relative;
 }
 
-.c27 {
+.c26 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -2946,7 +2662,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   padding: 4px 4px;
 }
 
-.c18 {
+.c17 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -2961,11 +2677,11 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   opacity: 0.5;
 }
 
-.c19 path {
+.c18 path {
   stroke: #22222212;
 }
 
-.c21 {
+.c20 {
   background-color: #F9F9F9;
   border-radius: 8px;
   display: grid;
@@ -2979,7 +2695,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   z-index: 1020;
 }
 
-.c22 {
+.c21 {
   background-color: #F9F9F9;
   border-radius: 4px;
   color: #7D7D7D;
@@ -2988,7 +2704,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
   z-index: 1021;
 }
 
-.c23 {
+.c22 {
   word-break: normal;
 }
 
@@ -3010,7 +2726,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
             class="c3 c6 css-142zc9n"
           >
             <div
-              class="c7 css-142zc9n"
+              class="css-142zc9n"
             >
               Uniswap Client
             </div>
@@ -3018,70 +2734,72 @@ exports[`SwapLineItem.tsx exact input 1`] = `
         </div>
       </div>
       <div
-        class="c8"
+        class="c7"
         style="position: fixed; left: 0px; top: 0px;"
       >
         <div
-          class="c9"
+          class="c8"
         >
           <div
-            class="c10 css-obwv3p"
+            class="c9 css-obwv3p"
           >
             <div
-              class="c11"
+              class="c10"
             >
               <div
-                class="c12 css-vurnku"
+                class="c11 css-vurnku"
               >
                 <div
-                  class="c0 c1 c13"
+                  class="c0 c1 c12"
                 >
                   <div
-                    class="c14"
+                    class="c13"
                     style="height: 20px; width: 20px;"
                   >
                     <div
-                      class="c15"
+                      class="c14"
                     >
                       <img
-                        class="c16"
+                        alt="ABC logo"
+                        class="c15"
+                        loading="lazy"
                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
                       />
                     </div>
                   </div>
                   <div
-                    class="c0 c1 c17"
+                    class="c0 c1 c16"
                   >
                     <div
-                      class="c18"
+                      class="c17"
                     >
                       <svg
-                        class="c19"
+                        class="c18"
                       >
                         dot_line.svg
                       </svg>
                     </div>
                     <div
-                      class="c20 c21"
+                      class="c19 c20"
                     >
                       <div
-                        class="c20 c22"
+                        class="c19 c21"
                       >
                         <div
-                          class="c3 c23 css-1m65e73"
+                          class="c3 c22 css-1m65e73"
                         >
                           V3
                         </div>
                       </div>
                       <div
-                        class="c10 c23 css-1m65e73"
+                        class="c9 c22 css-1m65e73"
                         style="min-width: auto;"
                       >
                         100%
                       </div>
                     </div>
                     <div
-                      class="c24 c25 c26"
+                      class="c23 c24 c25"
                       style="justify-content: space-evenly; z-index: 2;"
                       width="100%"
                     >
@@ -3090,43 +2808,47 @@ exports[`SwapLineItem.tsx exact input 1`] = `
                       >
                         <div>
                           <div
-                            class="c20 c27"
+                            class="c19 c26"
                           >
                             <div
                               class="css-mbnpt3"
                             >
                               <div
-                                class="c28"
+                                class="c27"
                               >
                                 <div
-                                  class="c29"
+                                  class="c28"
                                 >
                                   <div
-                                    class="c14"
+                                    class="c13"
                                     style="height: 20px; width: 20px;"
                                   >
                                     <div
-                                      class="c15"
+                                      class="c14"
                                     >
                                       <img
-                                        class="c16"
+                                        alt="DEF logo"
+                                        class="c15"
+                                        loading="lazy"
                                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
                                       />
                                     </div>
                                   </div>
                                 </div>
                                 <div
-                                  class="c30"
+                                  class="c29"
                                 >
                                   <div
-                                    class="c14"
+                                    class="c13"
                                     style="height: 20px; width: 20px;"
                                   >
                                     <div
-                                      class="c15"
+                                      class="c14"
                                     >
                                       <img
-                                        class="c16"
+                                        alt="ABC logo"
+                                        class="c15"
+                                        loading="lazy"
                                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
                                       />
                                     </div>
@@ -3135,7 +2857,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
                               </div>
                             </div>
                             <div
-                              class="c10 c23 css-1m65e73"
+                              class="c9 c22 css-1m65e73"
                             >
                               1%
                             </div>
@@ -3143,30 +2865,32 @@ exports[`SwapLineItem.tsx exact input 1`] = `
                         </div>
                       </div>
                       <div
-                        class="c8"
+                        class="c7"
                         style="position: fixed; left: 0px; top: 0px;"
                       >
                         <div
-                          class="c31"
+                          class="c30"
                         >
                           ABC/DEF 1% pool
                         </div>
                         <div
-                          class="c32 arrow-"
+                          class="c31 arrow-"
                           style="position: absolute;"
                         />
                       </div>
                     </div>
                   </div>
                   <div
-                    class="c14"
+                    class="c13"
                     style="height: 20px; width: 20px;"
                   >
                     <div
-                      class="c15"
+                      class="c14"
                     >
                       <img
-                        class="c16"
+                        alt="DEF logo"
+                        class="c15"
+                        loading="lazy"
                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
                       />
                     </div>
@@ -3174,7 +2898,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
                 </div>
               </div>
               <div
-                class="c10 css-obwv3p"
+                class="c9 css-obwv3p"
               >
                 Best price route costs ~$1.00 in gas. This route optimizes your total output by considering split routes, multiple hops, and the gas cost of each step.
               </div>
@@ -3182,7 +2906,7 @@ exports[`SwapLineItem.tsx exact input 1`] = `
           </div>
         </div>
         <div
-          class="c32 arrow-"
+          class="c31 arrow-"
           style="position: absolute;"
         />
       </div>
@@ -3216,7 +2940,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   justify-content: flex-start;
 }
 
-.c8 {
+.c7 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -3234,24 +2958,6 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   gap: 4px;
 }
 
-.c12 {
-  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: 8px;
-}
-
 .c2 {
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
@@ -3259,30 +2965,15 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   justify-content: space-between;
 }
 
-.c9 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  margin: -xs;
-}
-
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c11 {
+.c10 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c15 {
+.c11 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -3293,23 +2984,15 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   font-weight: 500;
 }
 
-.c15:hover {
+.c11:hover {
   opacity: 0.6;
 }
 
-.c15:active {
+.c11:active {
   opacity: 0.4;
 }
 
-.c7 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-}
-
-.c13 {
+.c8 {
   z-index: 1070;
   pointer-events: none;
   visibility: hidden;
@@ -3324,13 +3007,13 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   height: inherit;
 }
 
-.c16 {
+.c12 {
   width: 8px;
   height: 8px;
   z-index: 9998;
 }
 
-.c16::before {
+.c12::before {
   position: absolute;
   width: 8px;
   height: 8px;
@@ -3344,43 +3027,43 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   background: #FFFFFF;
 }
 
-.c16.arrow-top {
+.c12.arrow-top {
   bottom: -4px;
 }
 
-.c16.arrow-top::before {
+.c12.arrow-top::before {
   border-top: none;
   border-left: none;
 }
 
-.c16.arrow-bottom {
+.c12.arrow-bottom {
   top: -4px;
 }
 
-.c16.arrow-bottom::before {
+.c12.arrow-bottom::before {
   border-bottom: none;
   border-right: none;
 }
 
-.c16.arrow-left {
+.c12.arrow-left {
   right: -4px;
 }
 
-.c16.arrow-left::before {
+.c12.arrow-left::before {
   border-bottom: none;
   border-left: none;
 }
 
-.c16.arrow-right {
+.c12.arrow-right {
   left: -4px;
 }
 
-.c16.arrow-right::before {
+.c12.arrow-right::before {
   border-right: none;
   border-top: none;
 }
 
-.c14 {
+.c9 {
   max-width: 256px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -3407,15 +3090,6 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   overflow-wrap: break-word;
 }
 
-.c10 {
-  height: 16px;
-  width: 16px;
-}
-
-.c10 > * {
-  fill: #CECECE;
-}
-
 <div>
     <div
       class="c0 c1 c2"
@@ -3434,90 +3108,58 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
             class="c3 c6 css-142zc9n"
           >
             <div
-              class="c5"
-            >
-              <div>
-                <div
-                  class="c7"
-                >
-                  <div
-                    class="c0 c8 c9"
-                  >
-                    <svg
-                      class="c10"
-                      fill="none"
-                      height="24"
-                      viewBox="0 0 24 24"
-                      width="24"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        clip-rule="evenodd"
-                        d="M15.3078 1.77827C15.7064 1.39599 16.3395 1.40923 16.7217 1.80783L20.9689 6.23633C21.2428 6.47474 21.4729 6.76205 21.6459 7.08464C21.8481 7.43172 22 7.84819 22 8.32698V16.7012C22 18.2484 20.7455 19.5 19.2 19.5C17.6536 19.5 16.4 18.2464 16.4 16.7V14.3999C16.4 13.8476 15.9523 13.3999 15.4 13.3999H14V20.5C14 20.569 13.9965 20.6372 13.9897 20.7045C13.9515 21.08 13.8095 21.4249 13.5927 21.7098C13.2274 22.19 12.6499 22.5 12 22.5H4C3.30964 22.5 2.70098 22.1502 2.34157 21.6182C2.12592 21.299 2.00001 20.9142 2 20.5V5.4999C2 3.84305 3.34315 2.4999 5 2.4999H11C12.6569 2.4999 14 3.84305 14 5.4999V11.3999H15.4C17.0569 11.3999 18.4 12.7431 18.4 14.3999V16.7C18.4 17.1418 18.7582 17.5 19.2 17.5C19.6427 17.5 20 17.1422 20 16.7012V11.3292C19.6872 11.4397 19.3506 11.4999 19 11.4999C17.3431 11.4999 16 10.1568 16 8.4999C16 7.28851 16.718 6.24482 17.7517 5.77117L15.2783 3.19217C14.896 2.79357 14.9092 2.16055 15.3078 1.77827ZM19.6098 7.70731C19.441 7.57725 19.2296 7.4999 19 7.4999C18.4477 7.4999 18 7.94762 18 8.4999C18 9.05219 18.4477 9.4999 19 9.4999C19.5523 9.4999 20 9.05219 20 8.4999C20 8.34084 19.9629 8.19045 19.8968 8.05693C19.8303 7.95164 19.7349 7.83559 19.6098 7.70731ZM5.21572 4.72463C4.66343 4.72463 4.21572 5.17235 4.21572 5.72463V9.72463C4.21572 10.2769 4.66343 10.7246 5.21572 10.7246H10.7157C11.268 10.7246 11.7157 10.2769 11.7157 9.72463V5.72463C11.7157 5.17235 11.268 4.72463 10.7157 4.72463H5.21572Z"
-                        fill="currentColor"
-                        fill-rule="evenodd"
-                      />
-                    </svg>
-                    <div
-                      class="c11 css-142zc9n"
-                    >
-                      <div
-                        class="c0 c12"
-                      >
-                        <div>
-                          $1.00
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div
-              class="c13"
-              style="position: fixed; left: 0px; top: 0px;"
+              class="c0 c7"
             >
-              <div
-                class="c14"
+              <svg
+                aria-labelledby="titleID"
+                height="16"
+                width="16"
               >
-                <div
-                  class="c11 css-1m65e73"
+                <title
+                  id="titleID"
                 >
-                  Network cost is paid in ETH on the ETHEREUM network in order to transact. 
-                  <a
-                    class="c15"
-                    href="https://support.uniswap.org/hc/en-us/articles/8370337377805-What-is-a-network-fee-"
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    Learn more
-                  </a>
-                </div>
-              </div>
-              <div
-                class="c16 arrow-"
-                style="position: absolute;"
-              />
+                  Ethereum logo
+                </title>
+                <rect
+                  fill="#F9F9F9"
+                  height="16"
+                  rx="4"
+                  width="16"
+                />
+                <rect
+                  fill="#6B8AFF33"
+                  height="16"
+                  rx="4"
+                  width="16"
+                />
+                <svg
+                  height="16"
+                  width="16"
+                >
+                  ethereum.svg
+                </svg>
+              </svg>
+              $1.00
             </div>
           </div>
         </div>
       </div>
       <div
-        class="c13"
+        class="c8"
         style="position: fixed; left: 0px; top: 0px;"
       >
         <div
-          class="c14"
+          class="c9"
         >
           <div
-            class="c11 css-obwv3p"
+            class="c10 css-obwv3p"
           >
             <div
-              class="c11 css-1m65e73"
+              class="c10 css-1m65e73"
             >
               Network cost is paid in ETH on the ETHEREUM network in order to transact. 
               <a
-                class="c15"
+                class="c11"
                 href="https://support.uniswap.org/hc/en-us/articles/8370337377805-What-is-a-network-fee-"
                 rel="noopener noreferrer"
                 target="_blank"
@@ -3528,7 +3170,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
           </div>
         </div>
         <div
-          class="c16 arrow-"
+          class="c12 arrow-"
           style="position: absolute;"
         />
       </div>
@@ -3566,18 +3208,10 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -3773,18 +3407,10 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c14 {
@@ -4048,18 +3674,10 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c10 {
@@ -4260,18 +3878,10 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -4419,7 +4029,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   min-width: 0;
 }
 
-.c24 {
+.c23 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -4443,7 +4053,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   justify-content: flex-start;
 }
 
-.c25 {
+.c24 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -4468,41 +4078,26 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   justify-content: space-between;
 }
 
-.c26 {
+.c25 {
   -webkit-flex-wrap: wrap;
   -ms-flex-wrap: wrap;
   flex-wrap: wrap;
   margin: -1px;
 }
 
-.c26 > * {
+.c25 > * {
   margin: 1px !important;
 }
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c10 {
+.c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c8 {
   z-index: 1070;
   pointer-events: none;
   visibility: hidden;
@@ -4517,13 +4112,13 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   height: inherit;
 }
 
-.c32 {
+.c31 {
   width: 8px;
   height: 8px;
   z-index: 9998;
 }
 
-.c32::before {
+.c31::before {
   position: absolute;
   width: 8px;
   height: 8px;
@@ -4537,43 +4132,43 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   background: #FFFFFF;
 }
 
-.c32.arrow-top {
+.c31.arrow-top {
   bottom: -4px;
 }
 
-.c32.arrow-top::before {
+.c31.arrow-top::before {
   border-top: none;
   border-left: none;
 }
 
-.c32.arrow-bottom {
+.c31.arrow-bottom {
   top: -4px;
 }
 
-.c32.arrow-bottom::before {
+.c31.arrow-bottom::before {
   border-bottom: none;
   border-right: none;
 }
 
-.c32.arrow-left {
+.c31.arrow-left {
   right: -4px;
 }
 
-.c32.arrow-left::before {
+.c31.arrow-left::before {
   border-bottom: none;
   border-left: none;
 }
 
-.c32.arrow-right {
+.c31.arrow-right {
   left: -4px;
 }
 
-.c32.arrow-right::before {
+.c31.arrow-right::before {
   border-right: none;
   border-top: none;
 }
 
-.c9 {
+.c8 {
   max-width: 400px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -4590,7 +4185,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   box-shadow: 0 4px 8px 0 rgba(47,128,237,0.1);
 }
 
-.c31 {
+.c30 {
   max-width: 200px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -4617,7 +4212,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   overflow-wrap: break-word;
 }
 
-.c11 {
+.c10 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -4632,7 +4227,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   gap: 12px;
 }
 
-.c20 {
+.c19 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -4654,26 +4249,25 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
 }
 
 .c15 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
 }
 
-.c16 {
+.c14 {
   width: 20px;
   height: 20px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
-.c14 {
+.c13 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -4681,7 +4275,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   display: flex;
 }
 
-.c28 {
+.c27 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -4692,16 +4286,16 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   flex-direction: row;
 }
 
-.c29 {
+.c28 {
   z-index: 1;
 }
 
-.c30 {
+.c29 {
   position: absolute;
   left: -10px !important;
 }
 
-.c12 {
+.c11 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -4709,12 +4303,12 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   width: 100%;
 }
 
-.c13 {
+.c12 {
   display: grid;
   grid-template-columns: 24px 1fr 24px;
 }
 
-.c17 {
+.c16 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -4731,7 +4325,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   position: relative;
 }
 
-.c27 {
+.c26 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -4739,7 +4333,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   padding: 4px 4px;
 }
 
-.c18 {
+.c17 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -4754,11 +4348,11 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   opacity: 0.5;
 }
 
-.c19 path {
+.c18 path {
   stroke: #22222212;
 }
 
-.c21 {
+.c20 {
   background-color: #F9F9F9;
   border-radius: 8px;
   display: grid;
@@ -4772,7 +4366,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   z-index: 1020;
 }
 
-.c22 {
+.c21 {
   background-color: #F9F9F9;
   border-radius: 4px;
   color: #7D7D7D;
@@ -4781,7 +4375,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
   z-index: 1021;
 }
 
-.c23 {
+.c22 {
   word-break: normal;
 }
 
@@ -4803,7 +4397,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
             class="c3 c6 css-142zc9n"
           >
             <div
-              class="c7 css-142zc9n"
+              class="css-142zc9n"
             >
               Uniswap API
             </div>
@@ -4811,70 +4405,72 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
         </div>
       </div>
       <div
-        class="c8"
+        class="c7"
         style="position: fixed; left: 0px; top: 0px;"
       >
         <div
-          class="c9"
+          class="c8"
         >
           <div
-            class="c10 css-obwv3p"
+            class="c9 css-obwv3p"
           >
             <div
-              class="c11"
+              class="c10"
             >
               <div
-                class="c12 css-vurnku"
+                class="c11 css-vurnku"
               >
                 <div
-                  class="c0 c1 c13"
+                  class="c0 c1 c12"
                 >
                   <div
-                    class="c14"
+                    class="c13"
                     style="height: 20px; width: 20px;"
                   >
                     <div
-                      class="c15"
+                      class="c14"
                     >
                       <img
-                        class="c16"
+                        alt="ABC logo"
+                        class="c15"
+                        loading="lazy"
                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
                       />
                     </div>
                   </div>
                   <div
-                    class="c0 c1 c17"
+                    class="c0 c1 c16"
                   >
                     <div
-                      class="c18"
+                      class="c17"
                     >
                       <svg
-                        class="c19"
+                        class="c18"
                       >
                         dot_line.svg
                       </svg>
                     </div>
                     <div
-                      class="c20 c21"
+                      class="c19 c20"
                     >
                       <div
-                        class="c20 c22"
+                        class="c19 c21"
                       >
                         <div
-                          class="c3 c23 css-1m65e73"
+                          class="c3 c22 css-1m65e73"
                         >
                           V3
                         </div>
                       </div>
                       <div
-                        class="c10 c23 css-1m65e73"
+                        class="c9 c22 css-1m65e73"
                         style="min-width: auto;"
                       >
                         100%
                       </div>
                     </div>
                     <div
-                      class="c24 c25 c26"
+                      class="c23 c24 c25"
                       style="justify-content: space-evenly; z-index: 2;"
                       width="100%"
                     >
@@ -4883,43 +4479,47 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
                       >
                         <div>
                           <div
-                            class="c20 c27"
+                            class="c19 c26"
                           >
                             <div
                               class="css-mbnpt3"
                             >
                               <div
-                                class="c28"
+                                class="c27"
                               >
                                 <div
-                                  class="c29"
+                                  class="c28"
                                 >
                                   <div
-                                    class="c14"
+                                    class="c13"
                                     style="height: 20px; width: 20px;"
                                   >
                                     <div
-                                      class="c15"
+                                      class="c14"
                                     >
                                       <img
-                                        class="c16"
+                                        alt="DEF logo"
+                                        class="c15"
+                                        loading="lazy"
                                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
                                       />
                                     </div>
                                   </div>
                                 </div>
                                 <div
-                                  class="c30"
+                                  class="c29"
                                 >
                                   <div
-                                    class="c14"
+                                    class="c13"
                                     style="height: 20px; width: 20px;"
                                   >
                                     <div
-                                      class="c15"
+                                      class="c14"
                                     >
                                       <img
-                                        class="c16"
+                                        alt="ABC logo"
+                                        class="c15"
+                                        loading="lazy"
                                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
                                       />
                                     </div>
@@ -4928,7 +4528,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
                               </div>
                             </div>
                             <div
-                              class="c10 c23 css-1m65e73"
+                              class="c9 c22 css-1m65e73"
                             >
                               1%
                             </div>
@@ -4936,30 +4536,32 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
                         </div>
                       </div>
                       <div
-                        class="c8"
+                        class="c7"
                         style="position: fixed; left: 0px; top: 0px;"
                       >
                         <div
-                          class="c31"
+                          class="c30"
                         >
                           ABC/DEF 1% pool
                         </div>
                         <div
-                          class="c32 arrow-"
+                          class="c31 arrow-"
                           style="position: absolute;"
                         />
                       </div>
                     </div>
                   </div>
                   <div
-                    class="c14"
+                    class="c13"
                     style="height: 20px; width: 20px;"
                   >
                     <div
-                      class="c15"
+                      class="c14"
                     >
                       <img
-                        class="c16"
+                        alt="DEF logo"
+                        class="c15"
+                        loading="lazy"
                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
                       />
                     </div>
@@ -4967,7 +4569,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
                 </div>
               </div>
               <div
-                class="c10 css-obwv3p"
+                class="c9 css-obwv3p"
               >
                 Best price route costs ~$1.00 in gas. This route optimizes your total output by considering split routes, multiple hops, and the gas cost of each step.
               </div>
@@ -4975,7 +4577,7 @@ exports[`SwapLineItem.tsx exact input api 1`] = `
           </div>
         </div>
         <div
-          class="c32 arrow-"
+          class="c31 arrow-"
           style="position: absolute;"
         />
       </div>
@@ -5009,7 +4611,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   justify-content: flex-start;
 }
 
-.c8 {
+.c7 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -5027,24 +4629,6 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   gap: 4px;
 }
 
-.c12 {
-  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: 8px;
-}
-
 .c2 {
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
@@ -5052,30 +4636,15 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   justify-content: space-between;
 }
 
-.c9 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  margin: -xs;
-}
-
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c11 {
+.c10 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c15 {
+.c11 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -5086,23 +4655,15 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   font-weight: 500;
 }
 
-.c15:hover {
+.c11:hover {
   opacity: 0.6;
 }
 
-.c15:active {
+.c11:active {
   opacity: 0.4;
 }
 
-.c7 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-}
-
-.c13 {
+.c8 {
   z-index: 1070;
   pointer-events: none;
   visibility: hidden;
@@ -5117,13 +4678,13 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   height: inherit;
 }
 
-.c16 {
+.c12 {
   width: 8px;
   height: 8px;
   z-index: 9998;
 }
 
-.c16::before {
+.c12::before {
   position: absolute;
   width: 8px;
   height: 8px;
@@ -5137,43 +4698,43 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   background: #FFFFFF;
 }
 
-.c16.arrow-top {
+.c12.arrow-top {
   bottom: -4px;
 }
 
-.c16.arrow-top::before {
+.c12.arrow-top::before {
   border-top: none;
   border-left: none;
 }
 
-.c16.arrow-bottom {
+.c12.arrow-bottom {
   top: -4px;
 }
 
-.c16.arrow-bottom::before {
+.c12.arrow-bottom::before {
   border-bottom: none;
   border-right: none;
 }
 
-.c16.arrow-left {
+.c12.arrow-left {
   right: -4px;
 }
 
-.c16.arrow-left::before {
+.c12.arrow-left::before {
   border-bottom: none;
   border-left: none;
 }
 
-.c16.arrow-right {
+.c12.arrow-right {
   left: -4px;
 }
 
-.c16.arrow-right::before {
+.c12.arrow-right::before {
   border-right: none;
   border-top: none;
 }
 
-.c14 {
+.c9 {
   max-width: 256px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -5200,15 +4761,6 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   overflow-wrap: break-word;
 }
 
-.c10 {
-  height: 16px;
-  width: 16px;
-}
-
-.c10 > * {
-  fill: #CECECE;
-}
-
 <div>
     <div
       class="c0 c1 c2"
@@ -5227,90 +4779,58 @@ exports[`SwapLineItem.tsx exact output 1`] = `
             class="c3 c6 css-142zc9n"
           >
             <div
-              class="c5"
-            >
-              <div>
-                <div
-                  class="c7"
-                >
-                  <div
-                    class="c0 c8 c9"
-                  >
-                    <svg
-                      class="c10"
-                      fill="none"
-                      height="24"
-                      viewBox="0 0 24 24"
-                      width="24"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        clip-rule="evenodd"
-                        d="M15.3078 1.77827C15.7064 1.39599 16.3395 1.40923 16.7217 1.80783L20.9689 6.23633C21.2428 6.47474 21.4729 6.76205 21.6459 7.08464C21.8481 7.43172 22 7.84819 22 8.32698V16.7012C22 18.2484 20.7455 19.5 19.2 19.5C17.6536 19.5 16.4 18.2464 16.4 16.7V14.3999C16.4 13.8476 15.9523 13.3999 15.4 13.3999H14V20.5C14 20.569 13.9965 20.6372 13.9897 20.7045C13.9515 21.08 13.8095 21.4249 13.5927 21.7098C13.2274 22.19 12.6499 22.5 12 22.5H4C3.30964 22.5 2.70098 22.1502 2.34157 21.6182C2.12592 21.299 2.00001 20.9142 2 20.5V5.4999C2 3.84305 3.34315 2.4999 5 2.4999H11C12.6569 2.4999 14 3.84305 14 5.4999V11.3999H15.4C17.0569 11.3999 18.4 12.7431 18.4 14.3999V16.7C18.4 17.1418 18.7582 17.5 19.2 17.5C19.6427 17.5 20 17.1422 20 16.7012V11.3292C19.6872 11.4397 19.3506 11.4999 19 11.4999C17.3431 11.4999 16 10.1568 16 8.4999C16 7.28851 16.718 6.24482 17.7517 5.77117L15.2783 3.19217C14.896 2.79357 14.9092 2.16055 15.3078 1.77827ZM19.6098 7.70731C19.441 7.57725 19.2296 7.4999 19 7.4999C18.4477 7.4999 18 7.94762 18 8.4999C18 9.05219 18.4477 9.4999 19 9.4999C19.5523 9.4999 20 9.05219 20 8.4999C20 8.34084 19.9629 8.19045 19.8968 8.05693C19.8303 7.95164 19.7349 7.83559 19.6098 7.70731ZM5.21572 4.72463C4.66343 4.72463 4.21572 5.17235 4.21572 5.72463V9.72463C4.21572 10.2769 4.66343 10.7246 5.21572 10.7246H10.7157C11.268 10.7246 11.7157 10.2769 11.7157 9.72463V5.72463C11.7157 5.17235 11.268 4.72463 10.7157 4.72463H5.21572Z"
-                        fill="currentColor"
-                        fill-rule="evenodd"
-                      />
-                    </svg>
-                    <div
-                      class="c11 css-142zc9n"
-                    >
-                      <div
-                        class="c0 c12"
-                      >
-                        <div>
-                          -
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div
-              class="c13"
-              style="position: fixed; left: 0px; top: 0px;"
+              class="c0 c7"
             >
-              <div
-                class="c14"
+              <svg
+                aria-labelledby="titleID"
+                height="16"
+                width="16"
               >
-                <div
-                  class="c11 css-1m65e73"
+                <title
+                  id="titleID"
                 >
-                  Network cost is paid in ETH on the ETHEREUM network in order to transact. 
-                  <a
-                    class="c15"
-                    href="https://support.uniswap.org/hc/en-us/articles/8370337377805-What-is-a-network-fee-"
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    Learn more
-                  </a>
-                </div>
-              </div>
-              <div
-                class="c16 arrow-"
-                style="position: absolute;"
-              />
+                  Ethereum logo
+                </title>
+                <rect
+                  fill="#F9F9F9"
+                  height="16"
+                  rx="4"
+                  width="16"
+                />
+                <rect
+                  fill="#6B8AFF33"
+                  height="16"
+                  rx="4"
+                  width="16"
+                />
+                <svg
+                  height="16"
+                  width="16"
+                >
+                  ethereum.svg
+                </svg>
+              </svg>
+              -
             </div>
           </div>
         </div>
       </div>
       <div
-        class="c13"
+        class="c8"
         style="position: fixed; left: 0px; top: 0px;"
       >
         <div
-          class="c14"
+          class="c9"
         >
           <div
-            class="c11 css-obwv3p"
+            class="c10 css-obwv3p"
           >
             <div
-              class="c11 css-1m65e73"
+              class="c10 css-1m65e73"
             >
               Network cost is paid in ETH on the ETHEREUM network in order to transact. 
               <a
-                class="c15"
+                class="c11"
                 href="https://support.uniswap.org/hc/en-us/articles/8370337377805-What-is-a-network-fee-"
                 rel="noopener noreferrer"
                 target="_blank"
@@ -5321,7 +4841,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
           </div>
         </div>
         <div
-          class="c16 arrow-"
+          class="c12 arrow-"
           style="position: absolute;"
         />
       </div>
@@ -5359,18 +4879,10 @@ exports[`SwapLineItem.tsx exact output 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -5566,18 +5078,10 @@ exports[`SwapLineItem.tsx exact output 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c14 {
@@ -5841,18 +5345,10 @@ exports[`SwapLineItem.tsx exact output 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c10 {
@@ -6053,18 +5549,10 @@ exports[`SwapLineItem.tsx exact output 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -6212,7 +5700,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   min-width: 0;
 }
 
-.c24 {
+.c23 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -6236,7 +5724,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   justify-content: flex-start;
 }
 
-.c25 {
+.c24 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -6261,41 +5749,26 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   justify-content: space-between;
 }
 
-.c26 {
+.c25 {
   -webkit-flex-wrap: wrap;
   -ms-flex-wrap: wrap;
   flex-wrap: wrap;
   margin: -1px;
 }
 
-.c26 > * {
+.c25 > * {
   margin: 1px !important;
 }
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c10 {
+.c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c8 {
   z-index: 1070;
   pointer-events: none;
   visibility: hidden;
@@ -6310,13 +5783,13 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   height: inherit;
 }
 
-.c32 {
+.c31 {
   width: 8px;
   height: 8px;
   z-index: 9998;
 }
 
-.c32::before {
+.c31::before {
   position: absolute;
   width: 8px;
   height: 8px;
@@ -6330,43 +5803,43 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   background: #FFFFFF;
 }
 
-.c32.arrow-top {
+.c31.arrow-top {
   bottom: -4px;
 }
 
-.c32.arrow-top::before {
+.c31.arrow-top::before {
   border-top: none;
   border-left: none;
 }
 
-.c32.arrow-bottom {
+.c31.arrow-bottom {
   top: -4px;
 }
 
-.c32.arrow-bottom::before {
+.c31.arrow-bottom::before {
   border-bottom: none;
   border-right: none;
 }
 
-.c32.arrow-left {
+.c31.arrow-left {
   right: -4px;
 }
 
-.c32.arrow-left::before {
+.c31.arrow-left::before {
   border-bottom: none;
   border-left: none;
 }
 
-.c32.arrow-right {
+.c31.arrow-right {
   left: -4px;
 }
 
-.c32.arrow-right::before {
+.c31.arrow-right::before {
   border-right: none;
   border-top: none;
 }
 
-.c9 {
+.c8 {
   max-width: 400px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -6383,7 +5856,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   box-shadow: 0 4px 8px 0 rgba(47,128,237,0.1);
 }
 
-.c31 {
+.c30 {
   max-width: 200px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -6410,7 +5883,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   overflow-wrap: break-word;
 }
 
-.c11 {
+.c10 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -6425,7 +5898,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   gap: 12px;
 }
 
-.c20 {
+.c19 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -6447,26 +5920,25 @@ exports[`SwapLineItem.tsx exact output 1`] = `
 }
 
 .c15 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
 }
 
-.c16 {
+.c14 {
   width: 20px;
   height: 20px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
-.c14 {
+.c13 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -6474,7 +5946,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   display: flex;
 }
 
-.c28 {
+.c27 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -6485,16 +5957,16 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   flex-direction: row;
 }
 
-.c29 {
+.c28 {
   z-index: 1;
 }
 
-.c30 {
+.c29 {
   position: absolute;
   left: -10px !important;
 }
 
-.c12 {
+.c11 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -6502,12 +5974,12 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   width: 100%;
 }
 
-.c13 {
+.c12 {
   display: grid;
   grid-template-columns: 24px 1fr 24px;
 }
 
-.c17 {
+.c16 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -6524,7 +5996,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   position: relative;
 }
 
-.c27 {
+.c26 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -6532,7 +6004,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   padding: 4px 4px;
 }
 
-.c18 {
+.c17 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -6547,11 +6019,11 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   opacity: 0.5;
 }
 
-.c19 path {
+.c18 path {
   stroke: #22222212;
 }
 
-.c21 {
+.c20 {
   background-color: #F9F9F9;
   border-radius: 8px;
   display: grid;
@@ -6565,7 +6037,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   z-index: 1020;
 }
 
-.c22 {
+.c21 {
   background-color: #F9F9F9;
   border-radius: 4px;
   color: #7D7D7D;
@@ -6574,7 +6046,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
   z-index: 1021;
 }
 
-.c23 {
+.c22 {
   word-break: normal;
 }
 
@@ -6596,7 +6068,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
             class="c3 c6 css-142zc9n"
           >
             <div
-              class="c7 css-142zc9n"
+              class="css-142zc9n"
             >
               Uniswap Client
             </div>
@@ -6604,70 +6076,72 @@ exports[`SwapLineItem.tsx exact output 1`] = `
         </div>
       </div>
       <div
-        class="c8"
+        class="c7"
         style="position: fixed; left: 0px; top: 0px;"
       >
         <div
-          class="c9"
+          class="c8"
         >
           <div
-            class="c10 css-obwv3p"
+            class="c9 css-obwv3p"
           >
             <div
-              class="c11"
+              class="c10"
             >
               <div
-                class="c12 css-vurnku"
+                class="c11 css-vurnku"
               >
                 <div
-                  class="c0 c1 c13"
+                  class="c0 c1 c12"
                 >
                   <div
-                    class="c14"
+                    class="c13"
                     style="height: 20px; width: 20px;"
                   >
                     <div
-                      class="c15"
+                      class="c14"
                     >
                       <img
-                        class="c16"
+                        alt="ABC logo"
+                        class="c15"
+                        loading="lazy"
                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
                       />
                     </div>
                   </div>
                   <div
-                    class="c0 c1 c17"
+                    class="c0 c1 c16"
                   >
                     <div
-                      class="c18"
+                      class="c17"
                     >
                       <svg
-                        class="c19"
+                        class="c18"
                       >
                         dot_line.svg
                       </svg>
                     </div>
                     <div
-                      class="c20 c21"
+                      class="c19 c20"
                     >
                       <div
-                        class="c20 c22"
+                        class="c19 c21"
                       >
                         <div
-                          class="c3 c23 css-1m65e73"
+                          class="c3 c22 css-1m65e73"
                         >
                           V3
                         </div>
                       </div>
                       <div
-                        class="c10 c23 css-1m65e73"
+                        class="c9 c22 css-1m65e73"
                         style="min-width: auto;"
                       >
                         100%
                       </div>
                     </div>
                     <div
-                      class="c24 c25 c26"
+                      class="c23 c24 c25"
                       style="justify-content: space-evenly; z-index: 2;"
                       width="100%"
                     >
@@ -6676,43 +6150,47 @@ exports[`SwapLineItem.tsx exact output 1`] = `
                       >
                         <div>
                           <div
-                            class="c20 c27"
+                            class="c19 c26"
                           >
                             <div
                               class="css-mbnpt3"
                             >
                               <div
-                                class="c28"
+                                class="c27"
                               >
                                 <div
-                                  class="c29"
+                                  class="c28"
                                 >
                                   <div
-                                    class="c14"
+                                    class="c13"
                                     style="height: 20px; width: 20px;"
                                   >
                                     <div
-                                      class="c15"
+                                      class="c14"
                                     >
                                       <img
-                                        class="c16"
+                                        alt="GHI logo"
+                                        class="c15"
+                                        loading="lazy"
                                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000003/logo.png"
                                       />
                                     </div>
                                   </div>
                                 </div>
                                 <div
-                                  class="c30"
+                                  class="c29"
                                 >
                                   <div
-                                    class="c14"
+                                    class="c13"
                                     style="height: 20px; width: 20px;"
                                   >
                                     <div
-                                      class="c15"
+                                      class="c14"
                                     >
                                       <img
-                                        class="c16"
+                                        alt="ABC logo"
+                                        class="c15"
+                                        loading="lazy"
                                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
                                       />
                                     </div>
@@ -6721,7 +6199,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
                               </div>
                             </div>
                             <div
-                              class="c10 c23 css-1m65e73"
+                              class="c9 c22 css-1m65e73"
                             >
                               0.3%
                             </div>
@@ -6729,30 +6207,32 @@ exports[`SwapLineItem.tsx exact output 1`] = `
                         </div>
                       </div>
                       <div
-                        class="c8"
+                        class="c7"
                         style="position: fixed; left: 0px; top: 0px;"
                       >
                         <div
-                          class="c31"
+                          class="c30"
                         >
                           ABC/GHI 0.3% pool
                         </div>
                         <div
-                          class="c32 arrow-"
+                          class="c31 arrow-"
                           style="position: absolute;"
                         />
                       </div>
                     </div>
                   </div>
                   <div
-                    class="c14"
+                    class="c13"
                     style="height: 20px; width: 20px;"
                   >
                     <div
-                      class="c15"
+                      class="c14"
                     >
                       <img
-                        class="c16"
+                        alt="GHI logo"
+                        class="c15"
+                        loading="lazy"
                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000003/logo.png"
                       />
                     </div>
@@ -6760,7 +6240,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
                 </div>
               </div>
               <div
-                class="c10 css-obwv3p"
+                class="c9 css-obwv3p"
               >
                 This route optimizes your total output by considering split routes, multiple hops, and the gas cost of each step.
               </div>
@@ -6768,7 +6248,7 @@ exports[`SwapLineItem.tsx exact output 1`] = `
           </div>
         </div>
         <div
-          class="c32 arrow-"
+          class="c31 arrow-"
           style="position: absolute;"
         />
       </div>
@@ -6802,7 +6282,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   justify-content: flex-start;
 }
 
-.c8 {
+.c7 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -6820,24 +6300,6 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   gap: 4px;
 }
 
-.c12 {
-  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: 8px;
-}
-
 .c2 {
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
@@ -6845,30 +6307,15 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   justify-content: space-between;
 }
 
-.c9 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  margin: -xs;
-}
-
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c11 {
+.c10 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c15 {
+.c11 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -6879,23 +6326,15 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   font-weight: 500;
 }
 
-.c15:hover {
+.c11:hover {
   opacity: 0.6;
 }
 
-.c15:active {
+.c11:active {
   opacity: 0.4;
 }
 
-.c7 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-}
-
-.c13 {
+.c8 {
   z-index: 1070;
   pointer-events: none;
   visibility: hidden;
@@ -6910,13 +6349,13 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   height: inherit;
 }
 
-.c16 {
+.c12 {
   width: 8px;
   height: 8px;
   z-index: 9998;
 }
 
-.c16::before {
+.c12::before {
   position: absolute;
   width: 8px;
   height: 8px;
@@ -6930,43 +6369,43 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   background: #FFFFFF;
 }
 
-.c16.arrow-top {
+.c12.arrow-top {
   bottom: -4px;
 }
 
-.c16.arrow-top::before {
+.c12.arrow-top::before {
   border-top: none;
   border-left: none;
 }
 
-.c16.arrow-bottom {
+.c12.arrow-bottom {
   top: -4px;
 }
 
-.c16.arrow-bottom::before {
+.c12.arrow-bottom::before {
   border-bottom: none;
   border-right: none;
 }
 
-.c16.arrow-left {
+.c12.arrow-left {
   right: -4px;
 }
 
-.c16.arrow-left::before {
+.c12.arrow-left::before {
   border-bottom: none;
   border-left: none;
 }
 
-.c16.arrow-right {
+.c12.arrow-right {
   left: -4px;
 }
 
-.c16.arrow-right::before {
+.c12.arrow-right::before {
   border-right: none;
   border-top: none;
 }
 
-.c14 {
+.c9 {
   max-width: 256px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -6993,15 +6432,6 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   overflow-wrap: break-word;
 }
 
-.c10 {
-  height: 16px;
-  width: 16px;
-}
-
-.c10 > * {
-  fill: #CECECE;
-}
-
 <div>
     <div
       class="c0 c1 c2"
@@ -7010,100 +6440,68 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
         class="c3 c4 css-142zc9n"
         data-testid="swap-li-label"
       >
-        Network cost
-      </div>
-      <div
-        class="c5"
-      >
-        <div>
-          <div
-            class="c3 c6 css-142zc9n"
-          >
-            <div
-              class="c5"
-            >
-              <div>
-                <div
-                  class="c7"
-                >
-                  <div
-                    class="c0 c8 c9"
-                  >
-                    <svg
-                      class="c10"
-                      fill="none"
-                      height="24"
-                      viewBox="0 0 24 24"
-                      width="24"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        clip-rule="evenodd"
-                        d="M15.3078 1.77827C15.7064 1.39599 16.3395 1.40923 16.7217 1.80783L20.9689 6.23633C21.2428 6.47474 21.4729 6.76205 21.6459 7.08464C21.8481 7.43172 22 7.84819 22 8.32698V16.7012C22 18.2484 20.7455 19.5 19.2 19.5C17.6536 19.5 16.4 18.2464 16.4 16.7V14.3999C16.4 13.8476 15.9523 13.3999 15.4 13.3999H14V20.5C14 20.569 13.9965 20.6372 13.9897 20.7045C13.9515 21.08 13.8095 21.4249 13.5927 21.7098C13.2274 22.19 12.6499 22.5 12 22.5H4C3.30964 22.5 2.70098 22.1502 2.34157 21.6182C2.12592 21.299 2.00001 20.9142 2 20.5V5.4999C2 3.84305 3.34315 2.4999 5 2.4999H11C12.6569 2.4999 14 3.84305 14 5.4999V11.3999H15.4C17.0569 11.3999 18.4 12.7431 18.4 14.3999V16.7C18.4 17.1418 18.7582 17.5 19.2 17.5C19.6427 17.5 20 17.1422 20 16.7012V11.3292C19.6872 11.4397 19.3506 11.4999 19 11.4999C17.3431 11.4999 16 10.1568 16 8.4999C16 7.28851 16.718 6.24482 17.7517 5.77117L15.2783 3.19217C14.896 2.79357 14.9092 2.16055 15.3078 1.77827ZM19.6098 7.70731C19.441 7.57725 19.2296 7.4999 19 7.4999C18.4477 7.4999 18 7.94762 18 8.4999C18 9.05219 18.4477 9.4999 19 9.4999C19.5523 9.4999 20 9.05219 20 8.4999C20 8.34084 19.9629 8.19045 19.8968 8.05693C19.8303 7.95164 19.7349 7.83559 19.6098 7.70731ZM5.21572 4.72463C4.66343 4.72463 4.21572 5.17235 4.21572 5.72463V9.72463C4.21572 10.2769 4.66343 10.7246 5.21572 10.7246H10.7157C11.268 10.7246 11.7157 10.2769 11.7157 9.72463V5.72463C11.7157 5.17235 11.268 4.72463 10.7157 4.72463H5.21572Z"
-                        fill="currentColor"
-                        fill-rule="evenodd"
-                      />
-                    </svg>
-                    <div
-                      class="c11 css-142zc9n"
-                    >
-                      <div
-                        class="c0 c12"
-                      >
-                        <div>
-                          $1.00
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
+        Network cost
+      </div>
+      <div
+        class="c5"
+      >
+        <div>
+          <div
+            class="c3 c6 css-142zc9n"
+          >
             <div
-              class="c13"
-              style="position: fixed; left: 0px; top: 0px;"
+              class="c0 c7"
             >
-              <div
-                class="c14"
+              <svg
+                aria-labelledby="titleID"
+                height="16"
+                width="16"
               >
-                <div
-                  class="c11 css-1m65e73"
+                <title
+                  id="titleID"
                 >
-                  Network cost is paid in ETH on the ETHEREUM network in order to transact. 
-                  <a
-                    class="c15"
-                    href="https://support.uniswap.org/hc/en-us/articles/8370337377805-What-is-a-network-fee-"
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    Learn more
-                  </a>
-                </div>
-              </div>
-              <div
-                class="c16 arrow-"
-                style="position: absolute;"
-              />
+                  Ethereum logo
+                </title>
+                <rect
+                  fill="#F9F9F9"
+                  height="16"
+                  rx="4"
+                  width="16"
+                />
+                <rect
+                  fill="#6B8AFF33"
+                  height="16"
+                  rx="4"
+                  width="16"
+                />
+                <svg
+                  height="16"
+                  width="16"
+                >
+                  ethereum.svg
+                </svg>
+              </svg>
+              $1.00
             </div>
           </div>
         </div>
       </div>
       <div
-        class="c13"
+        class="c8"
         style="position: fixed; left: 0px; top: 0px;"
       >
         <div
-          class="c14"
+          class="c9"
         >
           <div
-            class="c11 css-obwv3p"
+            class="c10 css-obwv3p"
           >
             <div
-              class="c11 css-1m65e73"
+              class="c10 css-1m65e73"
             >
               Network cost is paid in ETH on the ETHEREUM network in order to transact. 
               <a
-                class="c15"
+                class="c11"
                 href="https://support.uniswap.org/hc/en-us/articles/8370337377805-What-is-a-network-fee-"
                 rel="noopener noreferrer"
                 target="_blank"
@@ -7114,7 +6512,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
           </div>
         </div>
         <div
-          class="c16 arrow-"
+          class="c12 arrow-"
           style="position: absolute;"
         />
       </div>
@@ -7152,18 +6550,10 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c10 {
@@ -7368,18 +6758,10 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -7575,18 +6957,10 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c14 {
@@ -7850,18 +7224,10 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c10 {
@@ -8062,18 +7428,10 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -8221,7 +7579,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   min-width: 0;
 }
 
-.c24 {
+.c23 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -8245,7 +7603,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   justify-content: flex-start;
 }
 
-.c25 {
+.c24 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -8270,41 +7628,26 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   justify-content: space-between;
 }
 
-.c26 {
+.c25 {
   -webkit-flex-wrap: wrap;
   -ms-flex-wrap: wrap;
   flex-wrap: wrap;
   margin: -1px;
 }
 
-.c26 > * {
+.c25 > * {
   margin: 1px !important;
 }
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c10 {
+.c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c8 {
   z-index: 1070;
   pointer-events: none;
   visibility: hidden;
@@ -8319,13 +7662,13 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   height: inherit;
 }
 
-.c32 {
+.c31 {
   width: 8px;
   height: 8px;
   z-index: 9998;
 }
 
-.c32::before {
+.c31::before {
   position: absolute;
   width: 8px;
   height: 8px;
@@ -8339,43 +7682,43 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   background: #FFFFFF;
 }
 
-.c32.arrow-top {
+.c31.arrow-top {
   bottom: -4px;
 }
 
-.c32.arrow-top::before {
+.c31.arrow-top::before {
   border-top: none;
   border-left: none;
 }
 
-.c32.arrow-bottom {
+.c31.arrow-bottom {
   top: -4px;
 }
 
-.c32.arrow-bottom::before {
+.c31.arrow-bottom::before {
   border-bottom: none;
   border-right: none;
 }
 
-.c32.arrow-left {
+.c31.arrow-left {
   right: -4px;
 }
 
-.c32.arrow-left::before {
+.c31.arrow-left::before {
   border-bottom: none;
   border-left: none;
 }
 
-.c32.arrow-right {
+.c31.arrow-right {
   left: -4px;
 }
 
-.c32.arrow-right::before {
+.c31.arrow-right::before {
   border-right: none;
   border-top: none;
 }
 
-.c9 {
+.c8 {
   max-width: 400px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -8392,7 +7735,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   box-shadow: 0 4px 8px 0 rgba(47,128,237,0.1);
 }
 
-.c31 {
+.c30 {
   max-width: 200px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -8419,7 +7762,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   overflow-wrap: break-word;
 }
 
-.c11 {
+.c10 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -8434,7 +7777,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   gap: 12px;
 }
 
-.c20 {
+.c19 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -8456,26 +7799,25 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
 }
 
 .c15 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
 }
 
-.c16 {
+.c14 {
   width: 20px;
   height: 20px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
-.c14 {
+.c13 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -8483,7 +7825,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   display: flex;
 }
 
-.c28 {
+.c27 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -8494,16 +7836,16 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   flex-direction: row;
 }
 
-.c29 {
+.c28 {
   z-index: 1;
 }
 
-.c30 {
+.c29 {
   position: absolute;
   left: -10px !important;
 }
 
-.c12 {
+.c11 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -8511,12 +7853,12 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   width: 100%;
 }
 
-.c13 {
+.c12 {
   display: grid;
   grid-template-columns: 24px 1fr 24px;
 }
 
-.c17 {
+.c16 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -8533,7 +7875,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   position: relative;
 }
 
-.c27 {
+.c26 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -8541,7 +7883,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   padding: 4px 4px;
 }
 
-.c18 {
+.c17 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -8556,11 +7898,11 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   opacity: 0.5;
 }
 
-.c19 path {
+.c18 path {
   stroke: #22222212;
 }
 
-.c21 {
+.c20 {
   background-color: #F9F9F9;
   border-radius: 8px;
   display: grid;
@@ -8574,7 +7916,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   z-index: 1020;
 }
 
-.c22 {
+.c21 {
   background-color: #F9F9F9;
   border-radius: 4px;
   color: #7D7D7D;
@@ -8583,7 +7925,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
   z-index: 1021;
 }
 
-.c23 {
+.c22 {
   word-break: normal;
 }
 
@@ -8605,7 +7947,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
             class="c3 c6 css-142zc9n"
           >
             <div
-              class="c7 css-142zc9n"
+              class="css-142zc9n"
             >
               Uniswap API
             </div>
@@ -8613,70 +7955,72 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
         </div>
       </div>
       <div
-        class="c8"
+        class="c7"
         style="position: fixed; left: 0px; top: 0px;"
       >
         <div
-          class="c9"
+          class="c8"
         >
           <div
-            class="c10 css-obwv3p"
+            class="c9 css-obwv3p"
           >
             <div
-              class="c11"
+              class="c10"
             >
               <div
-                class="c12 css-vurnku"
+                class="c11 css-vurnku"
               >
                 <div
-                  class="c0 c1 c13"
+                  class="c0 c1 c12"
                 >
                   <div
-                    class="c14"
+                    class="c13"
                     style="height: 20px; width: 20px;"
                   >
                     <div
-                      class="c15"
+                      class="c14"
                     >
                       <img
-                        class="c16"
+                        alt="ABC logo"
+                        class="c15"
+                        loading="lazy"
                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
                       />
                     </div>
                   </div>
                   <div
-                    class="c0 c1 c17"
+                    class="c0 c1 c16"
                   >
                     <div
-                      class="c18"
+                      class="c17"
                     >
                       <svg
-                        class="c19"
+                        class="c18"
                       >
                         dot_line.svg
                       </svg>
                     </div>
                     <div
-                      class="c20 c21"
+                      class="c19 c20"
                     >
                       <div
-                        class="c20 c22"
+                        class="c19 c21"
                       >
                         <div
-                          class="c3 c23 css-1m65e73"
+                          class="c3 c22 css-1m65e73"
                         >
                           V3
                         </div>
                       </div>
                       <div
-                        class="c10 c23 css-1m65e73"
+                        class="c9 c22 css-1m65e73"
                         style="min-width: auto;"
                       >
                         100%
                       </div>
                     </div>
                     <div
-                      class="c24 c25 c26"
+                      class="c23 c24 c25"
                       style="justify-content: space-evenly; z-index: 2;"
                       width="100%"
                     >
@@ -8685,43 +8029,47 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
                       >
                         <div>
                           <div
-                            class="c20 c27"
+                            class="c19 c26"
                           >
                             <div
                               class="css-mbnpt3"
                             >
                               <div
-                                class="c28"
+                                class="c27"
                               >
                                 <div
-                                  class="c29"
+                                  class="c28"
                                 >
                                   <div
-                                    class="c14"
+                                    class="c13"
                                     style="height: 20px; width: 20px;"
                                   >
                                     <div
-                                      class="c15"
+                                      class="c14"
                                     >
                                       <img
-                                        class="c16"
+                                        alt="DEF logo"
+                                        class="c15"
+                                        loading="lazy"
                                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
                                       />
                                     </div>
                                   </div>
                                 </div>
                                 <div
-                                  class="c30"
+                                  class="c29"
                                 >
                                   <div
-                                    class="c14"
+                                    class="c13"
                                     style="height: 20px; width: 20px;"
                                   >
                                     <div
-                                      class="c15"
+                                      class="c14"
                                     >
                                       <img
-                                        class="c16"
+                                        alt="ABC logo"
+                                        class="c15"
+                                        loading="lazy"
                                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
                                       />
                                     </div>
@@ -8730,7 +8078,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
                               </div>
                             </div>
                             <div
-                              class="c10 c23 css-1m65e73"
+                              class="c9 c22 css-1m65e73"
                             >
                               1%
                             </div>
@@ -8738,30 +8086,32 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
                         </div>
                       </div>
                       <div
-                        class="c8"
+                        class="c7"
                         style="position: fixed; left: 0px; top: 0px;"
                       >
                         <div
-                          class="c31"
+                          class="c30"
                         >
                           ABC/DEF 1% pool
                         </div>
                         <div
-                          class="c32 arrow-"
+                          class="c31 arrow-"
                           style="position: absolute;"
                         />
                       </div>
                     </div>
                   </div>
                   <div
-                    class="c14"
+                    class="c13"
                     style="height: 20px; width: 20px;"
                   >
                     <div
-                      class="c15"
+                      class="c14"
                     >
                       <img
-                        class="c16"
+                        alt="DEF logo"
+                        class="c15"
+                        loading="lazy"
                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
                       />
                     </div>
@@ -8769,7 +8119,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
                 </div>
               </div>
               <div
-                class="c10 css-obwv3p"
+                class="c9 css-obwv3p"
               >
                 Best price route costs ~$1.00 in gas. This route optimizes your total output by considering split routes, multiple hops, and the gas cost of each step.
               </div>
@@ -8777,7 +8127,7 @@ exports[`SwapLineItem.tsx fee on buy 1`] = `
           </div>
         </div>
         <div
-          class="c32 arrow-"
+          class="c31 arrow-"
           style="position: absolute;"
         />
       </div>
@@ -8811,7 +8161,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   justify-content: flex-start;
 }
 
-.c8 {
+.c7 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -8829,24 +8179,6 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   gap: 4px;
 }
 
-.c12 {
-  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: 8px;
-}
-
 .c2 {
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
@@ -8854,30 +8186,15 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   justify-content: space-between;
 }
 
-.c9 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  margin: -xs;
-}
-
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c11 {
+.c10 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c15 {
+.c11 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -8888,23 +8205,15 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   font-weight: 500;
 }
 
-.c15:hover {
+.c11:hover {
   opacity: 0.6;
 }
 
-.c15:active {
+.c11:active {
   opacity: 0.4;
 }
 
-.c7 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-}
-
-.c13 {
+.c8 {
   z-index: 1070;
   pointer-events: none;
   visibility: hidden;
@@ -8919,13 +8228,13 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   height: inherit;
 }
 
-.c16 {
+.c12 {
   width: 8px;
   height: 8px;
   z-index: 9998;
 }
 
-.c16::before {
+.c12::before {
   position: absolute;
   width: 8px;
   height: 8px;
@@ -8939,43 +8248,43 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   background: #FFFFFF;
 }
 
-.c16.arrow-top {
+.c12.arrow-top {
   bottom: -4px;
 }
 
-.c16.arrow-top::before {
+.c12.arrow-top::before {
   border-top: none;
   border-left: none;
 }
 
-.c16.arrow-bottom {
+.c12.arrow-bottom {
   top: -4px;
 }
 
-.c16.arrow-bottom::before {
+.c12.arrow-bottom::before {
   border-bottom: none;
   border-right: none;
 }
 
-.c16.arrow-left {
+.c12.arrow-left {
   right: -4px;
 }
 
-.c16.arrow-left::before {
+.c12.arrow-left::before {
   border-bottom: none;
   border-left: none;
 }
 
-.c16.arrow-right {
+.c12.arrow-right {
   left: -4px;
 }
 
-.c16.arrow-right::before {
+.c12.arrow-right::before {
   border-right: none;
   border-top: none;
 }
 
-.c14 {
+.c9 {
   max-width: 256px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -9002,15 +8311,6 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   overflow-wrap: break-word;
 }
 
-.c10 {
-  height: 16px;
-  width: 16px;
-}
-
-.c10 > * {
-  fill: #CECECE;
-}
-
 <div>
     <div
       class="c0 c1 c2"
@@ -9029,90 +8329,58 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
             class="c3 c6 css-142zc9n"
           >
             <div
-              class="c5"
-            >
-              <div>
-                <div
-                  class="c7"
-                >
-                  <div
-                    class="c0 c8 c9"
-                  >
-                    <svg
-                      class="c10"
-                      fill="none"
-                      height="24"
-                      viewBox="0 0 24 24"
-                      width="24"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <path
-                        clip-rule="evenodd"
-                        d="M15.3078 1.77827C15.7064 1.39599 16.3395 1.40923 16.7217 1.80783L20.9689 6.23633C21.2428 6.47474 21.4729 6.76205 21.6459 7.08464C21.8481 7.43172 22 7.84819 22 8.32698V16.7012C22 18.2484 20.7455 19.5 19.2 19.5C17.6536 19.5 16.4 18.2464 16.4 16.7V14.3999C16.4 13.8476 15.9523 13.3999 15.4 13.3999H14V20.5C14 20.569 13.9965 20.6372 13.9897 20.7045C13.9515 21.08 13.8095 21.4249 13.5927 21.7098C13.2274 22.19 12.6499 22.5 12 22.5H4C3.30964 22.5 2.70098 22.1502 2.34157 21.6182C2.12592 21.299 2.00001 20.9142 2 20.5V5.4999C2 3.84305 3.34315 2.4999 5 2.4999H11C12.6569 2.4999 14 3.84305 14 5.4999V11.3999H15.4C17.0569 11.3999 18.4 12.7431 18.4 14.3999V16.7C18.4 17.1418 18.7582 17.5 19.2 17.5C19.6427 17.5 20 17.1422 20 16.7012V11.3292C19.6872 11.4397 19.3506 11.4999 19 11.4999C17.3431 11.4999 16 10.1568 16 8.4999C16 7.28851 16.718 6.24482 17.7517 5.77117L15.2783 3.19217C14.896 2.79357 14.9092 2.16055 15.3078 1.77827ZM19.6098 7.70731C19.441 7.57725 19.2296 7.4999 19 7.4999C18.4477 7.4999 18 7.94762 18 8.4999C18 9.05219 18.4477 9.4999 19 9.4999C19.5523 9.4999 20 9.05219 20 8.4999C20 8.34084 19.9629 8.19045 19.8968 8.05693C19.8303 7.95164 19.7349 7.83559 19.6098 7.70731ZM5.21572 4.72463C4.66343 4.72463 4.21572 5.17235 4.21572 5.72463V9.72463C4.21572 10.2769 4.66343 10.7246 5.21572 10.7246H10.7157C11.268 10.7246 11.7157 10.2769 11.7157 9.72463V5.72463C11.7157 5.17235 11.268 4.72463 10.7157 4.72463H5.21572Z"
-                        fill="currentColor"
-                        fill-rule="evenodd"
-                      />
-                    </svg>
-                    <div
-                      class="c11 css-142zc9n"
-                    >
-                      <div
-                        class="c0 c12"
-                      >
-                        <div>
-                          $1.00
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div
-              class="c13"
-              style="position: fixed; left: 0px; top: 0px;"
+              class="c0 c7"
             >
-              <div
-                class="c14"
+              <svg
+                aria-labelledby="titleID"
+                height="16"
+                width="16"
               >
-                <div
-                  class="c11 css-1m65e73"
+                <title
+                  id="titleID"
                 >
-                  Network cost is paid in ETH on the ETHEREUM network in order to transact. 
-                  <a
-                    class="c15"
-                    href="https://support.uniswap.org/hc/en-us/articles/8370337377805-What-is-a-network-fee-"
-                    rel="noopener noreferrer"
-                    target="_blank"
-                  >
-                    Learn more
-                  </a>
-                </div>
-              </div>
-              <div
-                class="c16 arrow-"
-                style="position: absolute;"
-              />
+                  Ethereum logo
+                </title>
+                <rect
+                  fill="#F9F9F9"
+                  height="16"
+                  rx="4"
+                  width="16"
+                />
+                <rect
+                  fill="#6B8AFF33"
+                  height="16"
+                  rx="4"
+                  width="16"
+                />
+                <svg
+                  height="16"
+                  width="16"
+                >
+                  ethereum.svg
+                </svg>
+              </svg>
+              $1.00
             </div>
           </div>
         </div>
       </div>
       <div
-        class="c13"
+        class="c8"
         style="position: fixed; left: 0px; top: 0px;"
       >
         <div
-          class="c14"
+          class="c9"
         >
           <div
-            class="c11 css-obwv3p"
+            class="c10 css-obwv3p"
           >
             <div
-              class="c11 css-1m65e73"
+              class="c10 css-1m65e73"
             >
               Network cost is paid in ETH on the ETHEREUM network in order to transact. 
               <a
-                class="c15"
+                class="c11"
                 href="https://support.uniswap.org/hc/en-us/articles/8370337377805-What-is-a-network-fee-"
                 rel="noopener noreferrer"
                 target="_blank"
@@ -9123,7 +8391,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
           </div>
         </div>
         <div
-          class="c16 arrow-"
+          class="c12 arrow-"
           style="position: absolute;"
         />
       </div>
@@ -9161,18 +8429,10 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c10 {
@@ -9377,18 +8637,10 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -9584,18 +8836,10 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c14 {
@@ -9859,18 +9103,10 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c10 {
@@ -10071,18 +9307,10 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -10230,7 +9458,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   min-width: 0;
 }
 
-.c24 {
+.c23 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -10254,7 +9482,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   justify-content: flex-start;
 }
 
-.c25 {
+.c24 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -10279,41 +9507,26 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   justify-content: space-between;
 }
 
-.c26 {
+.c25 {
   -webkit-flex-wrap: wrap;
   -ms-flex-wrap: wrap;
   flex-wrap: wrap;
   margin: -1px;
 }
 
-.c26 > * {
+.c25 > * {
   margin: 1px !important;
 }
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c10 {
+.c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c8 {
   z-index: 1070;
   pointer-events: none;
   visibility: hidden;
@@ -10328,13 +9541,13 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   height: inherit;
 }
 
-.c32 {
+.c31 {
   width: 8px;
   height: 8px;
   z-index: 9998;
 }
 
-.c32::before {
+.c31::before {
   position: absolute;
   width: 8px;
   height: 8px;
@@ -10348,43 +9561,43 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   background: #FFFFFF;
 }
 
-.c32.arrow-top {
+.c31.arrow-top {
   bottom: -4px;
 }
 
-.c32.arrow-top::before {
+.c31.arrow-top::before {
   border-top: none;
   border-left: none;
 }
 
-.c32.arrow-bottom {
+.c31.arrow-bottom {
   top: -4px;
 }
 
-.c32.arrow-bottom::before {
+.c31.arrow-bottom::before {
   border-bottom: none;
   border-right: none;
 }
 
-.c32.arrow-left {
+.c31.arrow-left {
   right: -4px;
 }
 
-.c32.arrow-left::before {
+.c31.arrow-left::before {
   border-bottom: none;
   border-left: none;
 }
 
-.c32.arrow-right {
+.c31.arrow-right {
   left: -4px;
 }
 
-.c32.arrow-right::before {
+.c31.arrow-right::before {
   border-right: none;
   border-top: none;
 }
 
-.c9 {
+.c8 {
   max-width: 400px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -10401,7 +9614,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   box-shadow: 0 4px 8px 0 rgba(47,128,237,0.1);
 }
 
-.c31 {
+.c30 {
   max-width: 200px;
   width: calc(100vw - 16px);
   cursor: default;
@@ -10428,7 +9641,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   overflow-wrap: break-word;
 }
 
-.c11 {
+.c10 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -10443,7 +9656,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   gap: 12px;
 }
 
-.c20 {
+.c19 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -10465,26 +9678,25 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
 }
 
 .c15 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
 }
 
-.c16 {
+.c14 {
   width: 20px;
   height: 20px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
-.c14 {
+.c13 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -10492,7 +9704,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   display: flex;
 }
 
-.c28 {
+.c27 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -10503,16 +9715,16 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   flex-direction: row;
 }
 
-.c29 {
+.c28 {
   z-index: 1;
 }
 
-.c30 {
+.c29 {
   position: absolute;
   left: -10px !important;
 }
 
-.c12 {
+.c11 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -10520,12 +9732,12 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   width: 100%;
 }
 
-.c13 {
+.c12 {
   display: grid;
   grid-template-columns: 24px 1fr 24px;
 }
 
-.c17 {
+.c16 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -10542,7 +9754,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   position: relative;
 }
 
-.c27 {
+.c26 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -10550,7 +9762,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   padding: 4px 4px;
 }
 
-.c18 {
+.c17 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -10565,11 +9777,11 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   opacity: 0.5;
 }
 
-.c19 path {
+.c18 path {
   stroke: #22222212;
 }
 
-.c21 {
+.c20 {
   background-color: #F9F9F9;
   border-radius: 8px;
   display: grid;
@@ -10583,7 +9795,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   z-index: 1020;
 }
 
-.c22 {
+.c21 {
   background-color: #F9F9F9;
   border-radius: 4px;
   color: #7D7D7D;
@@ -10592,7 +9804,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
   z-index: 1021;
 }
 
-.c23 {
+.c22 {
   word-break: normal;
 }
 
@@ -10614,7 +9826,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
             class="c3 c6 css-142zc9n"
           >
             <div
-              class="c7 css-142zc9n"
+              class="css-142zc9n"
             >
               Uniswap API
             </div>
@@ -10622,70 +9834,72 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
         </div>
       </div>
       <div
-        class="c8"
+        class="c7"
         style="position: fixed; left: 0px; top: 0px;"
       >
         <div
-          class="c9"
+          class="c8"
         >
           <div
-            class="c10 css-obwv3p"
+            class="c9 css-obwv3p"
           >
             <div
-              class="c11"
+              class="c10"
             >
               <div
-                class="c12 css-vurnku"
+                class="c11 css-vurnku"
               >
                 <div
-                  class="c0 c1 c13"
+                  class="c0 c1 c12"
                 >
                   <div
-                    class="c14"
+                    class="c13"
                     style="height: 20px; width: 20px;"
                   >
                     <div
-                      class="c15"
+                      class="c14"
                     >
                       <img
-                        class="c16"
+                        alt="ABC logo"
+                        class="c15"
+                        loading="lazy"
                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
                       />
                     </div>
                   </div>
                   <div
-                    class="c0 c1 c17"
+                    class="c0 c1 c16"
                   >
                     <div
-                      class="c18"
+                      class="c17"
                     >
                       <svg
-                        class="c19"
+                        class="c18"
                       >
                         dot_line.svg
                       </svg>
                     </div>
                     <div
-                      class="c20 c21"
+                      class="c19 c20"
                     >
                       <div
-                        class="c20 c22"
+                        class="c19 c21"
                       >
                         <div
-                          class="c3 c23 css-1m65e73"
+                          class="c3 c22 css-1m65e73"
                         >
                           V3
                         </div>
                       </div>
                       <div
-                        class="c10 c23 css-1m65e73"
+                        class="c9 c22 css-1m65e73"
                         style="min-width: auto;"
                       >
                         100%
                       </div>
                     </div>
                     <div
-                      class="c24 c25 c26"
+                      class="c23 c24 c25"
                       style="justify-content: space-evenly; z-index: 2;"
                       width="100%"
                     >
@@ -10694,43 +9908,47 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
                       >
                         <div>
                           <div
-                            class="c20 c27"
+                            class="c19 c26"
                           >
                             <div
                               class="css-mbnpt3"
                             >
                               <div
-                                class="c28"
+                                class="c27"
                               >
                                 <div
-                                  class="c29"
+                                  class="c28"
                                 >
                                   <div
-                                    class="c14"
+                                    class="c13"
                                     style="height: 20px; width: 20px;"
                                   >
                                     <div
-                                      class="c15"
+                                      class="c14"
                                     >
                                       <img
-                                        class="c16"
+                                        alt="DEF logo"
+                                        class="c15"
+                                        loading="lazy"
                                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
                                       />
                                     </div>
                                   </div>
                                 </div>
                                 <div
-                                  class="c30"
+                                  class="c29"
                                 >
                                   <div
-                                    class="c14"
+                                    class="c13"
                                     style="height: 20px; width: 20px;"
                                   >
                                     <div
-                                      class="c15"
+                                      class="c14"
                                     >
                                       <img
-                                        class="c16"
+                                        alt="ABC logo"
+                                        class="c15"
+                                        loading="lazy"
                                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
                                       />
                                     </div>
@@ -10739,7 +9957,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
                               </div>
                             </div>
                             <div
-                              class="c10 c23 css-1m65e73"
+                              class="c9 c22 css-1m65e73"
                             >
                               1%
                             </div>
@@ -10747,30 +9965,32 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
                         </div>
                       </div>
                       <div
-                        class="c8"
+                        class="c7"
                         style="position: fixed; left: 0px; top: 0px;"
                       >
                         <div
-                          class="c31"
+                          class="c30"
                         >
                           ABC/DEF 1% pool
                         </div>
                         <div
-                          class="c32 arrow-"
+                          class="c31 arrow-"
                           style="position: absolute;"
                         />
                       </div>
                     </div>
                   </div>
                   <div
-                    class="c14"
+                    class="c13"
                     style="height: 20px; width: 20px;"
                   >
                     <div
-                      class="c15"
+                      class="c14"
                     >
                       <img
-                        class="c16"
+                        alt="DEF logo"
+                        class="c15"
+                        loading="lazy"
                         src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
                       />
                     </div>
@@ -10778,7 +9998,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
                 </div>
               </div>
               <div
-                class="c10 css-obwv3p"
+                class="c9 css-obwv3p"
               >
                 Best price route costs ~$1.00 in gas. This route optimizes your total output by considering split routes, multiple hops, and the gas cost of each step.
               </div>
@@ -10786,7 +10006,7 @@ exports[`SwapLineItem.tsx fee on sell 1`] = `
           </div>
         </div>
         <div
-          class="c32 arrow-"
+          class="c31 arrow-"
           style="position: absolute;"
         />
       </div>
@@ -10829,18 +10049,10 @@ exports[`SwapLineItem.tsx preview exact in 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c10 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c11 {
@@ -11063,18 +10275,10 @@ exports[`SwapLineItem.tsx preview exact in 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c10 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -11284,18 +10488,10 @@ exports[`SwapLineItem.tsx preview exact in 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c14 {
@@ -11559,10 +10755,6 @@ exports[`SwapLineItem.tsx preview exact in 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c6 {
@@ -11642,18 +10834,10 @@ exports[`SwapLineItem.tsx preview exact in 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c7 {
@@ -11827,10 +11011,6 @@ exports[`SwapLineItem.tsx preview exact in 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c6 {
@@ -11915,10 +11095,6 @@ exports[`SwapLineItem.tsx syncing 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c5 {
@@ -11989,10 +11165,6 @@ exports[`SwapLineItem.tsx syncing 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c5 {
@@ -12063,10 +11235,6 @@ exports[`SwapLineItem.tsx syncing 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c5 {
@@ -12137,10 +11305,6 @@ exports[`SwapLineItem.tsx syncing 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c5 {
@@ -12211,10 +11375,6 @@ exports[`SwapLineItem.tsx syncing 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c5 {
@@ -12285,10 +11445,6 @@ exports[`SwapLineItem.tsx syncing 1`] = `
 
 .c3 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c5 {
diff --git a/apps/web/src/components/swap/__snapshots__/SwapModalFooter.test.tsx.snap b/apps/web/src/components/swap/__snapshots__/SwapModalFooter.test.tsx.snap
index 5bd26b18d69..b71fb927b8d 100644
--- a/apps/web/src/components/swap/__snapshots__/SwapModalFooter.test.tsx.snap
+++ b/apps/web/src/components/swap/__snapshots__/SwapModalFooter.test.tsx.snap
@@ -2,13 +2,81 @@
 
 exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] = `
 <DocumentFragment>
-  .c6 {
+  .c3 {
+  color: #7D7D7D;
+}
+
+.c1 {
+  width: 100%;
+  height: 1px;
+  background-color: #22222212;
+}
+
+.c2 {
+  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;
+  margin-right: -6px;
+  padding: 0 16px;
+  min-width: -webkit-fit-content;
+  min-width: -moz-fit-content;
+  min-width: fit-content;
+  white-space: nowrap;
+}
+
+.c0 {
+  padding: 0;
+  margin-top: 16px;
+  height: 28px;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  background: none;
+  border: none;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  cursor: pointer;
+}
+
+<button
+    class="c0"
+  >
+    <div
+      class="c1"
+    />
+    <div
+      class="c2"
+    >
+      <div
+        class="c3 css-142zc9n"
+      >
+        Show more
+      </div>
+      <svg>
+        expando-icon-closed.svg
+      </svg>
+    </div>
+    <div
+      class="c1"
+    />
+  </button>
+  .c2 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
 }
 
-.c7 {
+.c3 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -25,7 +93,7 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
   justify-content: flex-start;
 }
 
-.c14 {
+.c10 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -43,7 +111,7 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
   gap: 8px;
 }
 
-.c17 {
+.c13 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -61,40 +129,19 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
   gap: 4px;
 }
 
-.c8 {
+.c4 {
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
   -ms-flex-pack: justify;
   justify-content: space-between;
 }
 
-.c18 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  margin: -xs;
-}
-
-.c5 {
+.c11 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c9 {
+.c5 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c3 {
-  width: 100%;
-  height: 1px;
-  background-color: #22222212;
 }
 
 .c0 {
@@ -112,39 +159,22 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
   gap: 12px;
 }
 
-.c16 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-}
-
-.c11 {
+.c7 {
   display: inline-block;
   height: inherit;
 }
 
-.c10 {
+.c6 {
   cursor: help;
   color: #7D7D7D;
 }
 
-.c12 {
+.c8 {
   text-align: right;
   overflow-wrap: break-word;
 }
 
-.c19 {
-  height: 16px;
-  width: 16px;
-}
-
-.c19 > * {
-  fill: #CECECE;
-}
-
-.c13 {
+.c9 {
   background-color: transparent;
   border: none;
   cursor: pointer;
@@ -176,7 +206,7 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
   user-select: text;
 }
 
-.c15 {
+.c12 {
   background: #22222212;
   border-radius: 8px;
   color: #7D7D7D;
@@ -184,7 +214,7 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
   padding: 0 6px;
 }
 
-.c15::after {
+.c12::after {
   content: 'Auto';
 }
 
@@ -192,90 +222,32 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
   padding-bottom: 8px;
 }
 
-.c4 {
-  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;
-  margin-right: -6px;
-  padding: 0 16px;
-  min-width: -webkit-fit-content;
-  min-width: -moz-fit-content;
-  min-width: fit-content;
-  white-space: nowrap;
-}
-
-.c2 {
-  padding: 0;
-  margin-top: 16px;
-  height: 28px;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  background: none;
-  border: none;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  cursor: pointer;
-}
-
 <div
     class="c0 c1"
   >
-    <button
-      class="c2"
-    >
-      <div
-        class="c3"
-      />
-      <div
-        class="c4"
-      >
-        <div
-          class="c5 css-142zc9n"
-        >
-          Show more
-        </div>
-        <svg>
-          expando-icon-closed.svg
-        </svg>
-      </div>
-      <div
-        class="c3"
-      />
-    </button>
     <div>
       <div
-        class="c6 c7 c8"
+        class="c2 c3 c4"
       >
         <div
-          class="c9 c10 css-142zc9n"
+          class="c5 c6 css-142zc9n"
           data-testid="swap-li-label"
         >
           Rate
         </div>
         <div
-          class="c11"
+          class="c7"
         >
           <div>
             <div
-              class="c9 c12 css-142zc9n"
+              class="c5 c8 css-142zc9n"
             >
               <button
-                class="c13"
+                class="c9"
                 title="1 DEF = 1.00 ABC "
               >
                 <div
-                  class="c9 css-142zc9n"
+                  class="c5 css-142zc9n"
                 >
                   1 DEF = 1.00 ABC 
                 </div>
@@ -297,20 +269,20 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
             style="opacity: 0;"
           >
             <div
-              class="c6 c7 c8"
+              class="c2 c3 c4"
             >
               <div
-                class="c9 c10 css-142zc9n"
+                class="c5 c6 css-142zc9n"
                 data-testid="swap-li-label"
               >
                 Price impact
               </div>
               <div
-                class="c11"
+                class="c7"
               >
                 <div>
                   <div
-                    class="c9 c12 css-142zc9n"
+                    class="c5 c8 css-142zc9n"
                   >
                     <span
                       class=""
@@ -326,26 +298,26 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
             style="opacity: 0;"
           >
             <div
-              class="c6 c7 c8"
+              class="c2 c3 c4"
             >
               <div
-                class="c9 c10 css-142zc9n"
+                class="c5 c6 css-142zc9n"
                 data-testid="swap-li-label"
               >
                 Max. slippage
               </div>
               <div
-                class="c11"
+                class="c7"
               >
                 <div>
                   <div
-                    class="c9 c12 css-142zc9n"
+                    class="c5 c8 css-142zc9n"
                   >
                     <div
-                      class="c6 c14"
+                      class="c2 c10"
                     >
                       <div
-                        class="c5 c15 css-1lgneq0"
+                        class="c11 c12 css-1lgneq0"
                       />
                        2%
                     </div>
@@ -358,20 +330,20 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
             style="opacity: 0;"
           >
             <div
-              class="c6 c7 c8"
+              class="c2 c3 c4"
             >
               <div
-                class="c9 c10 css-142zc9n"
+                class="c5 c6 css-142zc9n"
                 data-testid="swap-li-label"
               >
                 Receive at least
               </div>
               <div
-                class="c11"
+                class="c7"
               >
                 <div>
                   <div
-                    class="c9 c12 css-142zc9n"
+                    class="c5 c8 css-142zc9n"
                   >
                     0.00000000000000098 DEF
                   </div>
@@ -384,20 +356,20 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
     </div>
     <div>
       <div
-        class="c6 c7 c8"
+        class="c2 c3 c4"
       >
         <div
-          class="c9 c10 css-142zc9n"
+          class="c5 c6 css-142zc9n"
           data-testid="swap-li-label"
         >
           Fee 
         </div>
         <div
-          class="c11"
+          class="c7"
         >
           <div>
             <div
-              class="c9 c12 css-142zc9n"
+              class="c5 c8 css-142zc9n"
             >
               0 DEF
             </div>
@@ -407,60 +379,54 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
     </div>
     <div>
       <div
-        class="c6 c7 c8"
+        class="c2 c3 c4"
       >
         <div
-          class="c9 c10 css-142zc9n"
+          class="c5 c6 css-142zc9n"
           data-testid="swap-li-label"
         >
           Network cost
         </div>
         <div
-          class="c11"
+          class="c7"
         >
           <div>
             <div
-              class="c9 c12 css-142zc9n"
+              class="c5 c8 css-142zc9n"
             >
               <div
-                class="c11"
+                class="c2 c13"
               >
-                <div>
-                  <div
-                    class="c16"
+                <svg
+                  aria-labelledby="titleID"
+                  height="16"
+                  width="16"
+                >
+                  <title
+                    id="titleID"
                   >
-                    <div
-                      class="c6 c17 c18"
-                    >
-                      <svg
-                        class="c19"
-                        fill="none"
-                        height="24"
-                        viewBox="0 0 24 24"
-                        width="24"
-                        xmlns="http://www.w3.org/2000/svg"
-                      >
-                        <path
-                          clip-rule="evenodd"
-                          d="M15.3078 1.77827C15.7064 1.39599 16.3395 1.40923 16.7217 1.80783L20.9689 6.23633C21.2428 6.47474 21.4729 6.76205 21.6459 7.08464C21.8481 7.43172 22 7.84819 22 8.32698V16.7012C22 18.2484 20.7455 19.5 19.2 19.5C17.6536 19.5 16.4 18.2464 16.4 16.7V14.3999C16.4 13.8476 15.9523 13.3999 15.4 13.3999H14V20.5C14 20.569 13.9965 20.6372 13.9897 20.7045C13.9515 21.08 13.8095 21.4249 13.5927 21.7098C13.2274 22.19 12.6499 22.5 12 22.5H4C3.30964 22.5 2.70098 22.1502 2.34157 21.6182C2.12592 21.299 2.00001 20.9142 2 20.5V5.4999C2 3.84305 3.34315 2.4999 5 2.4999H11C12.6569 2.4999 14 3.84305 14 5.4999V11.3999H15.4C17.0569 11.3999 18.4 12.7431 18.4 14.3999V16.7C18.4 17.1418 18.7582 17.5 19.2 17.5C19.6427 17.5 20 17.1422 20 16.7012V11.3292C19.6872 11.4397 19.3506 11.4999 19 11.4999C17.3431 11.4999 16 10.1568 16 8.4999C16 7.28851 16.718 6.24482 17.7517 5.77117L15.2783 3.19217C14.896 2.79357 14.9092 2.16055 15.3078 1.77827ZM19.6098 7.70731C19.441 7.57725 19.2296 7.4999 19 7.4999C18.4477 7.4999 18 7.94762 18 8.4999C18 9.05219 18.4477 9.4999 19 9.4999C19.5523 9.4999 20 9.05219 20 8.4999C20 8.34084 19.9629 8.19045 19.8968 8.05693C19.8303 7.95164 19.7349 7.83559 19.6098 7.70731ZM5.21572 4.72463C4.66343 4.72463 4.21572 5.17235 4.21572 5.72463V9.72463C4.21572 10.2769 4.66343 10.7246 5.21572 10.7246H10.7157C11.268 10.7246 11.7157 10.2769 11.7157 9.72463V5.72463C11.7157 5.17235 11.268 4.72463 10.7157 4.72463H5.21572Z"
-                          fill="currentColor"
-                          fill-rule="evenodd"
-                        />
-                      </svg>
-                      <div
-                        class="c5 css-142zc9n"
-                      >
-                        <div
-                          class="c6 c14"
-                        >
-                          <div>
-                            $1.00
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
+                    Ethereum logo
+                  </title>
+                  <rect
+                    fill="#F9F9F9"
+                    height="16"
+                    rx="4"
+                    width="16"
+                  />
+                  <rect
+                    fill="#6B8AFF33"
+                    height="16"
+                    rx="4"
+                    width="16"
+                  />
+                  <svg
+                    height="16"
+                    width="16"
+                  >
+                    ethereum.svg
+                  </svg>
+                </svg>
+                $1.00
               </div>
             </div>
           </div>
@@ -526,10 +492,6 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
 
 .c7 {
   color: #F5F6FC;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c4 {
@@ -644,13 +606,85 @@ exports[`SwapModalFooter.tsx matches base snapshot, test trade exact input 1`] =
 
 exports[`SwapModalFooter.tsx renders a preview trade while disabling submission 1`] = `
 <DocumentFragment>
-  .c6 {
+  .c3 {
+  color: #7D7D7D;
+}
+
+.c1 {
+  width: 100%;
+  height: 1px;
+  background-color: #22222212;
+}
+
+.c2 {
+  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;
+  margin-right: -6px;
+  padding: 0 16px;
+  min-width: -webkit-fit-content;
+  min-width: -moz-fit-content;
+  min-width: fit-content;
+  white-space: nowrap;
+}
+
+.c0 {
+  padding: 0;
+  margin-top: 16px;
+  height: 28px;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  background: none;
+  border: none;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  cursor: pointer;
+}
+
+@media (max-width:960px) {
+
+}
+
+<button
+    class="c0"
+  >
+    <div
+      class="c1"
+    />
+    <div
+      class="c2"
+    >
+      <div
+        class="c3 css-142zc9n"
+      >
+        Show more
+      </div>
+      <svg>
+        expando-icon-closed.svg
+      </svg>
+    </div>
+    <div
+      class="c1"
+    />
+  </button>
+  .c2 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
 }
 
-.c7 {
+.c3 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -667,7 +701,7 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
   justify-content: flex-start;
 }
 
-.c16 {
+.c12 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -685,33 +719,19 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
   gap: 8px;
 }
 
-.c8 {
+.c4 {
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
   -ms-flex-pack: justify;
   justify-content: space-between;
 }
 
-.c5 {
+.c13 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c9 {
+.c5 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c3 {
-  width: 100%;
-  height: 1px;
-  background-color: #22222212;
 }
 
 .c0 {
@@ -729,7 +749,7 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
   gap: 12px;
 }
 
-.c15 {
+.c11 {
   -webkit-animation: fAQEyV 1.5s infinite;
   animation: fAQEyV 1.5s infinite;
   -webkit-animation-fill-mode: both;
@@ -742,27 +762,27 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
   width: 50px;
 }
 
-.c14 {
+.c10 {
   display: inline-block;
   height: inherit;
 }
 
-.c10 {
+.c6 {
   cursor: auto;
   color: #7D7D7D;
 }
 
-.c13 {
+.c9 {
   cursor: help;
   color: #7D7D7D;
 }
 
-.c11 {
+.c7 {
   text-align: right;
   overflow-wrap: break-word;
 }
 
-.c12 {
+.c8 {
   background-color: transparent;
   border: none;
   cursor: pointer;
@@ -794,7 +814,7 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
   user-select: text;
 }
 
-.c17 {
+.c14 {
   background: #22222212;
   border-radius: 8px;
   color: #7D7D7D;
@@ -802,7 +822,7 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
   padding: 0 6px;
 }
 
-.c17::after {
+.c14::after {
   content: 'Auto';
 }
 
@@ -810,42 +830,6 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
   padding-bottom: 8px;
 }
 
-.c4 {
-  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;
-  margin-right: -6px;
-  padding: 0 16px;
-  min-width: -webkit-fit-content;
-  min-width: -moz-fit-content;
-  min-width: fit-content;
-  white-space: nowrap;
-}
-
-.c2 {
-  padding: 0;
-  margin-top: 16px;
-  height: 28px;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  background: none;
-  border: none;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  cursor: pointer;
-}
-
 @media (max-width:960px) {
 
 }
@@ -853,47 +837,25 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
 <div
     class="c0 c1"
   >
-    <button
-      class="c2"
-    >
-      <div
-        class="c3"
-      />
-      <div
-        class="c4"
-      >
-        <div
-          class="c5 css-142zc9n"
-        >
-          Show more
-        </div>
-        <svg>
-          expando-icon-closed.svg
-        </svg>
-      </div>
-      <div
-        class="c3"
-      />
-    </button>
     <div>
       <div
-        class="c6 c7 c8"
+        class="c2 c3 c4"
       >
         <div
-          class="c9 c10 css-142zc9n"
+          class="c5 c6 css-142zc9n"
           data-testid="swap-li-label"
         >
           Rate
         </div>
         <div
-          class="c9 c11 css-142zc9n"
+          class="c5 c7 css-142zc9n"
         >
           <button
-            class="c12"
+            class="c8"
             title="1 DEF = 1.00 ABC "
           >
             <div
-              class="c9 css-142zc9n"
+              class="c5 css-142zc9n"
             >
               1 DEF = 1.00 ABC 
             </div>
@@ -913,23 +875,23 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
             style="opacity: 0;"
           >
             <div
-              class="c6 c7 c8"
+              class="c2 c3 c4"
             >
               <div
-                class="c9 c13 css-142zc9n"
+                class="c5 c9 css-142zc9n"
                 data-testid="swap-li-label"
               >
                 Price impact
               </div>
               <div
-                class="c14"
+                class="c10"
               >
                 <div>
                   <div
-                    class="c9 c11 css-142zc9n"
+                    class="c5 c7 css-142zc9n"
                   >
                     <div
-                      class="c15"
+                      class="c11"
                       data-testid="loading-row"
                       height="15"
                       width="50"
@@ -943,26 +905,26 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
             style="opacity: 0;"
           >
             <div
-              class="c6 c7 c8"
+              class="c2 c3 c4"
             >
               <div
-                class="c9 c13 css-142zc9n"
+                class="c5 c9 css-142zc9n"
                 data-testid="swap-li-label"
               >
                 Max. slippage
               </div>
               <div
-                class="c14"
+                class="c10"
               >
                 <div>
                   <div
-                    class="c9 c11 css-142zc9n"
+                    class="c5 c7 css-142zc9n"
                   >
                     <div
-                      class="c6 c16"
+                      class="c2 c12"
                     >
                       <div
-                        class="c5 c17 css-1lgneq0"
+                        class="c13 c14 css-1lgneq0"
                       />
                        2%
                     </div>
@@ -975,20 +937,20 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
             style="opacity: 0;"
           >
             <div
-              class="c6 c7 c8"
+              class="c2 c3 c4"
             >
               <div
-                class="c9 c13 css-142zc9n"
+                class="c5 c9 css-142zc9n"
                 data-testid="swap-li-label"
               >
                 Receive at least
               </div>
               <div
-                class="c14"
+                class="c10"
               >
                 <div>
                   <div
-                    class="c9 c11 css-142zc9n"
+                    class="c5 c7 css-142zc9n"
                   >
                     0.00000000000000098 DEF
                   </div>
@@ -1001,19 +963,19 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
     </div>
     <div>
       <div
-        class="c6 c7 c8"
+        class="c2 c3 c4"
       >
         <div
-          class="c9 c10 css-142zc9n"
+          class="c5 c6 css-142zc9n"
           data-testid="swap-li-label"
         >
           Fee
         </div>
         <div
-          class="c9 c11 css-142zc9n"
+          class="c5 c7 css-142zc9n"
         >
           <div
-            class="c15"
+            class="c11"
             data-testid="loading-row"
             height="15"
             width="50"
@@ -1023,23 +985,23 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
     </div>
     <div>
       <div
-        class="c6 c7 c8"
+        class="c2 c3 c4"
       >
         <div
-          class="c9 c13 css-142zc9n"
+          class="c5 c9 css-142zc9n"
           data-testid="swap-li-label"
         >
           Network cost
         </div>
         <div
-          class="c14"
+          class="c10"
         >
           <div>
             <div
-              class="c9 c11 css-142zc9n"
+              class="c5 c7 css-142zc9n"
             >
               <div
-                class="c15"
+                class="c11"
                 data-testid="loading-row"
                 height="15"
                 width="50"
@@ -1108,10 +1070,6 @@ exports[`SwapModalFooter.tsx renders a preview trade while disabling submission
 
 .c7 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
diff --git a/apps/web/src/components/swap/__snapshots__/SwapModalHeader.test.tsx.snap b/apps/web/src/components/swap/__snapshots__/SwapModalHeader.test.tsx.snap
index 3dd5536d4fc..e56c23a6d46 100644
--- a/apps/web/src/components/swap/__snapshots__/SwapModalHeader.test.tsx.snap
+++ b/apps/web/src/components/swap/__snapshots__/SwapModalHeader.test.tsx.snap
@@ -28,25 +28,10 @@ exports[`SwapModalHeader.tsx matches base snapshot, test trade exact input 1`] =
 
 .c6 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c10 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c2 {
@@ -86,26 +71,25 @@ exports[`SwapModalHeader.tsx matches base snapshot, test trade exact input 1`] =
 }
 
 .c12 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 36px;
+  height: 36px;
+  border-radius: 50%;
 }
 
-.c13 {
+.c11 {
   width: 36px;
   height: 36px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
-.c11 {
+.c10 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -123,7 +107,7 @@ exports[`SwapModalHeader.tsx matches base snapshot, test trade exact input 1`] =
   margin-right: 8px;
 }
 
-.c14 {
+.c13 {
   cursor: help;
   color: #7D7D7D;
   margin-right: 8px;
@@ -164,7 +148,7 @@ exports[`SwapModalHeader.tsx matches base snapshot, test trade exact input 1`] =
             class="c5"
           >
             <div
-              class="c10 css-15popx1"
+              class="css-1geukv8"
               data-testid="INPUT-amount"
             >
               &lt;0.00001 ABC
@@ -177,14 +161,16 @@ exports[`SwapModalHeader.tsx matches base snapshot, test trade exact input 1`] =
           </div>
         </div>
         <div
-          class="c11"
+          class="c10"
           style="height: 36px; width: 36px;"
         >
           <div
-            class="c12"
+            class="c11"
           >
             <img
-              class="c13"
+              alt="ABC logo"
+              class="c12"
+              loading="lazy"
               src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
             />
           </div>
@@ -204,7 +190,7 @@ exports[`SwapModalHeader.tsx matches base snapshot, test trade exact input 1`] =
             >
               <div>
                 <div
-                  class="c8 c14 css-142zc9n"
+                  class="c8 c13 css-142zc9n"
                   cursor="help"
                 >
                   You receive
@@ -216,7 +202,7 @@ exports[`SwapModalHeader.tsx matches base snapshot, test trade exact input 1`] =
             class="c5"
           >
             <div
-              class="c10 css-15popx1"
+              class="css-1geukv8"
               data-testid="OUTPUT-amount"
             >
               &lt;0.00001 DEF
@@ -229,14 +215,16 @@ exports[`SwapModalHeader.tsx matches base snapshot, test trade exact input 1`] =
           </div>
         </div>
         <div
-          class="c11"
+          class="c10"
           style="height: 36px; width: 36px;"
         >
           <div
-            class="c12"
+            class="c11"
           >
             <img
-              class="c13"
+              alt="DEF logo"
+              class="c12"
+              loading="lazy"
               src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
             />
           </div>
@@ -275,25 +263,10 @@ exports[`SwapModalHeader.tsx renders ETH input token for an ETH input UniswapX s
 
 .c6 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c10 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c2 {
@@ -333,26 +306,25 @@ exports[`SwapModalHeader.tsx renders ETH input token for an ETH input UniswapX s
 }
 
 .c12 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 36px;
+  height: 36px;
+  border-radius: 50%;
 }
 
-.c13 {
+.c11 {
   width: 36px;
   height: 36px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
-.c11 {
+.c10 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -370,7 +342,7 @@ exports[`SwapModalHeader.tsx renders ETH input token for an ETH input UniswapX s
   margin-right: 8px;
 }
 
-.c14 {
+.c13 {
   cursor: help;
   color: #7D7D7D;
   margin-right: 8px;
@@ -411,7 +383,7 @@ exports[`SwapModalHeader.tsx renders ETH input token for an ETH input UniswapX s
             class="c5"
           >
             <div
-              class="c10 css-15popx1"
+              class="css-1geukv8"
               data-testid="INPUT-amount"
             >
               &lt;0.00001 ETH
@@ -424,14 +396,16 @@ exports[`SwapModalHeader.tsx renders ETH input token for an ETH input UniswapX s
           </div>
         </div>
         <div
-          class="c11"
+          class="c10"
           style="height: 36px; width: 36px;"
         >
           <div
-            class="c12"
+            class="c11"
           >
             <img
-              class="c13"
+              alt="ETH logo"
+              class="c12"
+              loading="lazy"
               src="ethereum-logo.png"
             />
           </div>
@@ -451,7 +425,7 @@ exports[`SwapModalHeader.tsx renders ETH input token for an ETH input UniswapX s
             >
               <div>
                 <div
-                  class="c8 c14 css-142zc9n"
+                  class="c8 c13 css-142zc9n"
                   cursor="help"
                 >
                   You receive
@@ -463,7 +437,7 @@ exports[`SwapModalHeader.tsx renders ETH input token for an ETH input UniswapX s
             class="c5"
           >
             <div
-              class="c10 css-15popx1"
+              class="css-1geukv8"
               data-testid="OUTPUT-amount"
             >
               &lt;0.00001 DEF
@@ -476,14 +450,16 @@ exports[`SwapModalHeader.tsx renders ETH input token for an ETH input UniswapX s
           </div>
         </div>
         <div
-          class="c11"
+          class="c10"
           style="height: 36px; width: 36px;"
         >
           <div
-            class="c12"
+            class="c11"
           >
             <img
-              class="c13"
+              alt="DEF logo"
+              class="c12"
+              loading="lazy"
               src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
             />
           </div>
@@ -522,25 +498,10 @@ exports[`SwapModalHeader.tsx renders preview trades with loading states 1`] = `
 
 .c6 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c10 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c2 {
@@ -580,26 +541,25 @@ exports[`SwapModalHeader.tsx renders preview trades with loading states 1`] = `
 }
 
 .c12 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 36px;
+  height: 36px;
+  border-radius: 50%;
 }
 
-.c13 {
+.c11 {
   width: 36px;
   height: 36px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
-.c11 {
+.c10 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -617,7 +577,7 @@ exports[`SwapModalHeader.tsx renders preview trades with loading states 1`] = `
   margin-right: 8px;
 }
 
-.c14 {
+.c13 {
   cursor: help;
   color: #7D7D7D;
   margin-right: 8px;
@@ -658,7 +618,7 @@ exports[`SwapModalHeader.tsx renders preview trades with loading states 1`] = `
             class="c5"
           >
             <div
-              class="c10 css-15popx1"
+              class="css-1geukv8"
               data-testid="INPUT-amount"
             >
               &lt;0.00001 DEF
@@ -671,14 +631,16 @@ exports[`SwapModalHeader.tsx renders preview trades with loading states 1`] = `
           </div>
         </div>
         <div
-          class="c11"
+          class="c10"
           style="height: 36px; width: 36px;"
         >
           <div
-            class="c12"
+            class="c11"
           >
             <img
-              class="c13"
+              alt="DEF logo"
+              class="c12"
+              loading="lazy"
               src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
             />
           </div>
@@ -698,7 +660,7 @@ exports[`SwapModalHeader.tsx renders preview trades with loading states 1`] = `
             >
               <div>
                 <div
-                  class="c8 c14 css-142zc9n"
+                  class="c8 c13 css-142zc9n"
                   cursor="help"
                 >
                   You receive
@@ -710,7 +672,7 @@ exports[`SwapModalHeader.tsx renders preview trades with loading states 1`] = `
             class="c5"
           >
             <div
-              class="c6 css-15popx1"
+              class="c6 css-1geukv8"
               data-testid="OUTPUT-amount"
             >
               &lt;0.00001 DEF
@@ -723,14 +685,16 @@ exports[`SwapModalHeader.tsx renders preview trades with loading states 1`] = `
           </div>
         </div>
         <div
-          class="c11"
+          class="c10"
           style="height: 36px; width: 36px;"
         >
           <div
-            class="c12"
+            class="c11"
           >
             <img
-              class="c13"
+              alt="DEF logo"
+              class="c12"
+              loading="lazy"
               src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000002/logo.png"
             />
           </div>
@@ -769,25 +733,10 @@ exports[`SwapModalHeader.tsx test trade exact output, no recipient 1`] = `
 
 .c6 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c8 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c10 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c2 {
@@ -827,26 +776,25 @@ exports[`SwapModalHeader.tsx test trade exact output, no recipient 1`] = `
 }
 
 .c12 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 36px;
+  height: 36px;
+  border-radius: 50%;
 }
 
-.c13 {
+.c11 {
   width: 36px;
   height: 36px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
-.c11 {
+.c10 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -864,7 +812,7 @@ exports[`SwapModalHeader.tsx test trade exact output, no recipient 1`] = `
   margin-right: 8px;
 }
 
-.c14 {
+.c13 {
   cursor: help;
   color: #7D7D7D;
   margin-right: 8px;
@@ -905,7 +853,7 @@ exports[`SwapModalHeader.tsx test trade exact output, no recipient 1`] = `
             class="c5"
           >
             <div
-              class="c10 css-15popx1"
+              class="css-1geukv8"
               data-testid="INPUT-amount"
             >
               &lt;0.00001 ABC
@@ -918,14 +866,16 @@ exports[`SwapModalHeader.tsx test trade exact output, no recipient 1`] = `
           </div>
         </div>
         <div
-          class="c11"
+          class="c10"
           style="height: 36px; width: 36px;"
         >
           <div
-            class="c12"
+            class="c11"
           >
             <img
-              class="c13"
+              alt="ABC logo"
+              class="c12"
+              loading="lazy"
               src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000001/logo.png"
             />
           </div>
@@ -945,7 +895,7 @@ exports[`SwapModalHeader.tsx test trade exact output, no recipient 1`] = `
             >
               <div>
                 <div
-                  class="c8 c14 css-142zc9n"
+                  class="c8 c13 css-142zc9n"
                   cursor="help"
                 >
                   You receive
@@ -957,7 +907,7 @@ exports[`SwapModalHeader.tsx test trade exact output, no recipient 1`] = `
             class="c5"
           >
             <div
-              class="c10 css-15popx1"
+              class="css-1geukv8"
               data-testid="OUTPUT-amount"
             >
               &lt;0.00001 GHI
@@ -970,14 +920,16 @@ exports[`SwapModalHeader.tsx test trade exact output, no recipient 1`] = `
           </div>
         </div>
         <div
-          class="c11"
+          class="c10"
           style="height: 36px; width: 36px;"
         >
           <div
-            class="c12"
+            class="c11"
           >
             <img
-              class="c13"
+              alt="GHI logo"
+              class="c12"
+              loading="lazy"
               src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0000000000000000000000000000000000000003/logo.png"
             />
           </div>
diff --git a/apps/web/src/components/swap/__snapshots__/SwapSkeleton.test.tsx.snap b/apps/web/src/components/swap/__snapshots__/SwapSkeleton.test.tsx.snap
index e1cd95e9eee..5cfe09f3bc4 100644
--- a/apps/web/src/components/swap/__snapshots__/SwapSkeleton.test.tsx.snap
+++ b/apps/web/src/components/swap/__snapshots__/SwapSkeleton.test.tsx.snap
@@ -4,10 +4,6 @@ exports[`SwapSkeleton.tsx renders a skeleton 1`] = `
 <DocumentFragment>
   .c2 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
diff --git a/apps/web/src/components/swap/__snapshots__/UnsupportedCurrencyFooter.test.tsx.snap b/apps/web/src/components/swap/__snapshots__/UnsupportedCurrencyFooter.test.tsx.snap
index 2e1463213d2..d58ce885e32 100644
--- a/apps/web/src/components/swap/__snapshots__/UnsupportedCurrencyFooter.test.tsx.snap
+++ b/apps/web/src/components/swap/__snapshots__/UnsupportedCurrencyFooter.test.tsx.snap
@@ -28,10 +28,6 @@ exports[`UnsupportedCurrencyFooter.tsx with unsupported tokens renders 1`] = `
 
 .c5 {
   color: #FC72FF;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c2 {
diff --git a/apps/web/src/components/swap/constants.ts b/apps/web/src/components/swap/constants.ts
index 790917e3700..c5224811725 100644
--- a/apps/web/src/components/swap/constants.ts
+++ b/apps/web/src/components/swap/constants.ts
@@ -7,7 +7,6 @@ export const RESET_APPROVAL_TOKENS = [USDT_MAINNET, LDO, NMR, MNW]
 export enum SwapTab {
   Swap = 'swap',
   Limit = 'limit',
-  Send = 'send',
 }
 
 export enum Field {
diff --git a/apps/web/src/components/swap/styled.tsx b/apps/web/src/components/swap/styled.tsx
index a6b004c9533..da7281ff023 100644
--- a/apps/web/src/components/swap/styled.tsx
+++ b/apps/web/src/components/swap/styled.tsx
@@ -4,7 +4,6 @@ import { AlertTriangle } from 'react-feather'
 import styled, { css } from 'styled-components'
 import { Z_INDEX } from 'theme/zIndex'
 
-import { ButtonText } from 'theme/components'
 import { AutoColumn } from '../Column'
 
 export const PageWrapper = styled.div`
@@ -22,11 +21,27 @@ export const PageWrapper = styled.div`
 `
 
 // Mostly copied from `AppBody` but it was getting too hard to maintain backwards compatibility.
-export const SwapWrapperOuter = styled.main<{ isDark?: boolean }>`
+const SwapWrapperOuter = styled.main<{ isDark?: boolean }>`
   position: relative;
   z-index: ${Z_INDEX.default};
+  border: 1px solid ${({ theme }) => theme.surface3};
   transition: transform 250ms ease;
   border-radius: 24px;
+
+  &:before {
+    content: ' ';
+    display: flex;
+    position: absolute;
+    inset: 0;
+    transform: scale(1.1);
+    filter: blur(50px);
+    background-color: rgba(252, 114, 255, 0.075);
+    z-index: -2;
+  }
+
+  &:hover {
+    border: 1px solid ${({ theme }) => theme.surface3};
+  }
 `
 
 export const SwapWrapper = (props: React.ComponentProps<typeof SwapWrapperOuter>) => {
@@ -39,7 +54,9 @@ export const SwapWrapper = (props: React.ComponentProps<typeof SwapWrapperOuter>
 
 const SwapWrapperInner = styled.div`
   border-radius: 24px;
+  background: ${({ theme }) => theme.surface1};
   z-index: -1;
+  padding: 8px;
   padding-top: 12px;
 `
 
@@ -135,6 +152,7 @@ export const SwapShowAcceptChanges = styled(AutoColumn)`
   color: ${({ theme }) => theme.accent1};
   padding: 12px;
   border-radius: 12px;
+  margin-top: 8px;
 `
 
 export const SwapSection = styled.div`
@@ -179,18 +197,3 @@ export const ArrowContainer = styled.div`
   width: 100%;
   height: 100%;
 `
-
-export const SwapHeaderTabButton = styled(ButtonText)<{ $isActive: boolean }>`
-  color: ${({ theme, $isActive }) => ($isActive ? theme.neutral1 : theme.neutral2)};
-  background-color: ${({ theme, $isActive }) => $isActive && theme.surface2};
-  padding: 8px 16px;
-  border-radius: 20px;
-  gap: 4px;
-  font-weight: 485;
-  &:focus {
-    text-decoration: none;
-  }
-  &:active {
-    text-decoration: none;
-  }
-`
diff --git a/apps/web/src/components/vote/ExecuteModal.tsx b/apps/web/src/components/vote/ExecuteModal.tsx
index 199051b473f..0faf17cf751 100644
--- a/apps/web/src/components/vote/ExecuteModal.tsx
+++ b/apps/web/src/components/vote/ExecuteModal.tsx
@@ -3,7 +3,8 @@ import { useWeb3React } from '@web3-react/core'
 import { useState } from 'react'
 import { ArrowUpCircle, X } from 'react-feather'
 import styled, { useTheme } from 'styled-components'
-import { CustomLightSpinner, ExternalLink, ThemedText } from 'theme/components'
+import { CustomLightSpinner, ThemedText } from 'theme/components'
+import { ExternalLink } from 'theme/components'
 
 import Circle from '../../assets/images/blue-loader.svg'
 import { useExecuteCallback } from '../../state/governance/hooks'
diff --git a/apps/web/src/components/vote/QueueModal.tsx b/apps/web/src/components/vote/QueueModal.tsx
index 2a3cfd5c831..3eb87b8076f 100644
--- a/apps/web/src/components/vote/QueueModal.tsx
+++ b/apps/web/src/components/vote/QueueModal.tsx
@@ -3,7 +3,8 @@ import { useWeb3React } from '@web3-react/core'
 import { useState } from 'react'
 import { ArrowUpCircle, X } from 'react-feather'
 import styled, { useTheme } from 'styled-components'
-import { CustomLightSpinner, ExternalLink, ThemedText } from 'theme/components'
+import { CustomLightSpinner, ThemedText } from 'theme/components'
+import { ExternalLink } from 'theme/components'
 
 import Circle from '../../assets/images/blue-loader.svg'
 import { useQueueCallback } from '../../state/governance/hooks'
diff --git a/apps/web/src/components/vote/VoteModal.tsx b/apps/web/src/components/vote/VoteModal.tsx
index c36eb18cb53..4d5cb14a32a 100644
--- a/apps/web/src/components/vote/VoteModal.tsx
+++ b/apps/web/src/components/vote/VoteModal.tsx
@@ -3,7 +3,8 @@ import { useWeb3React } from '@web3-react/core'
 import { useState } from 'react'
 import { ArrowUpCircle, X } from 'react-feather'
 import styled, { useTheme } from 'styled-components'
-import { CustomLightSpinner, ExternalLink, ThemedText } from 'theme/components'
+import { CustomLightSpinner, ThemedText } from 'theme/components'
+import { ExternalLink } from 'theme/components'
 import { formatCurrencyAmount } from 'utils/formatCurrencyAmount'
 
 import Circle from '../../assets/images/blue-loader.svg'
diff --git a/apps/web/src/connection/activate.ts b/apps/web/src/connection/activate.ts
index c90fc9e3c09..5ccbd8c7e68 100644
--- a/apps/web/src/connection/activate.ts
+++ b/apps/web/src/connection/activate.ts
@@ -26,7 +26,6 @@ const activationStateAtom = atom<ActivationState>(IDLE_ACTIVATION_STATE)
 function useTryActivation() {
   const setActivationState = useUpdateAtom(activationStateAtom)
   const { pathname } = useLocation()
-
   const currentPage = getCurrentPageFromLocation(pathname)
 
   return useCallback(
diff --git a/apps/web/src/constants/networks.ts b/apps/web/src/constants/networks.ts
index cca8835e6f0..d7cbb103fbc 100644
--- a/apps/web/src/constants/networks.ts
+++ b/apps/web/src/constants/networks.ts
@@ -8,10 +8,6 @@ const QUICKNODE_MAINNET_RPC_URL = process.env.REACT_APP_QUICKNODE_MAINNET_RPC_UR
 if (typeof QUICKNODE_MAINNET_RPC_URL === 'undefined') {
   throw new Error(`REACT_APP_QUICKNODE_MAINNET_RPC_URL must be a defined environment variable`)
 }
-const QUICKNODE_ARBITRUM_RPC_URL = process.env.REACT_APP_QUICKNODE_ARBITRUM_RPC_URL
-if (typeof QUICKNODE_ARBITRUM_RPC_URL === 'undefined') {
-  throw new Error(`REACT_APP_QUICKNODE_ARBITRUM_RPC_URL must be a defined environment variable`)
-}
 const QUICKNODE_BNB_RPC_URL = process.env.REACT_APP_BNB_RPC_URL
 if (typeof QUICKNODE_BNB_RPC_URL === 'undefined') {
   throw new Error(`REACT_APP_BNB_RPC_URL must be a defined environment variable`)
@@ -144,7 +140,6 @@ export const RPC_URLS = {
   ],
   [ChainId.ARBITRUM_ONE]: [
     `https://arbitrum-mainnet.infura.io/v3/${INFURA_KEY}`,
-    QUICKNODE_ARBITRUM_RPC_URL,
     ...FALLBACK_URLS[ChainId.ARBITRUM_ONE],
   ],
   [ChainId.ARBITRUM_GOERLI]: [
diff --git a/apps/web/src/constants/providers.ts b/apps/web/src/constants/providers.ts
index 8b4122805ca..5d902e374fa 100644
--- a/apps/web/src/constants/providers.ts
+++ b/apps/web/src/constants/providers.ts
@@ -1,19 +1,19 @@
-import { StaticJsonRpcProvider } from '@ethersproject/providers'
 import { ChainId } from '@uniswap/sdk-core'
-import AppJsonRpcProvider from 'rpc/AppJsonRpcProvider'
+import AppRpcProvider from 'rpc/AppRpcProvider'
+import AppStaticJsonRpcProvider from 'rpc/StaticJsonRpcProvider'
+import StaticJsonRpcProvider from 'rpc/StaticJsonRpcProvider'
 
-import { CHAIN_IDS_TO_NAMES, SupportedInterfaceChain } from './chains'
+import { SupportedInterfaceChain } from './chains'
 import { RPC_URLS } from './networks'
 
 const providerFactory = (chainId: SupportedInterfaceChain, i = 0) =>
-  // Including networkish allows ethers to skip the initial detectNetwork call.
-  new StaticJsonRpcProvider(RPC_URLS[chainId][i], /* networkish= */ { chainId, name: CHAIN_IDS_TO_NAMES[chainId] })
+  new AppStaticJsonRpcProvider(chainId, RPC_URLS[chainId][i])
 
 /**
  * These are the only JsonRpcProviders used directly by the interface.
  */
 export const RPC_PROVIDERS: { [key in SupportedInterfaceChain]: StaticJsonRpcProvider } = {
-  [ChainId.MAINNET]: new AppJsonRpcProvider(ChainId.MAINNET, [
+  [ChainId.MAINNET]: new AppRpcProvider(ChainId.MAINNET, [
     providerFactory(ChainId.MAINNET),
     providerFactory(ChainId.MAINNET, 1),
   ]),
@@ -21,10 +21,7 @@ export const RPC_PROVIDERS: { [key in SupportedInterfaceChain]: StaticJsonRpcPro
   [ChainId.SEPOLIA]: providerFactory(ChainId.SEPOLIA),
   [ChainId.OPTIMISM]: providerFactory(ChainId.OPTIMISM),
   [ChainId.OPTIMISM_GOERLI]: providerFactory(ChainId.OPTIMISM_GOERLI),
-  [ChainId.ARBITRUM_ONE]: new AppJsonRpcProvider(ChainId.ARBITRUM_ONE, [
-    providerFactory(ChainId.ARBITRUM_ONE),
-    providerFactory(ChainId.ARBITRUM_ONE, 1),
-  ]),
+  [ChainId.ARBITRUM_ONE]: providerFactory(ChainId.ARBITRUM_ONE),
   [ChainId.ARBITRUM_GOERLI]: providerFactory(ChainId.ARBITRUM_GOERLI),
   [ChainId.POLYGON]: providerFactory(ChainId.POLYGON),
   [ChainId.POLYGON_MUMBAI]: providerFactory(ChainId.POLYGON_MUMBAI),
@@ -35,7 +32,7 @@ export const RPC_PROVIDERS: { [key in SupportedInterfaceChain]: StaticJsonRpcPro
   [ChainId.BASE]: providerFactory(ChainId.BASE),
 }
 
-export const DEPRECATED_RPC_PROVIDERS: { [key in SupportedInterfaceChain]: StaticJsonRpcProvider } = {
+export const DEPRECATED_RPC_PROVIDERS: { [key in SupportedInterfaceChain]: AppStaticJsonRpcProvider } = {
   [ChainId.MAINNET]: providerFactory(ChainId.MAINNET),
   [ChainId.GOERLI]: providerFactory(ChainId.GOERLI),
   [ChainId.SEPOLIA]: providerFactory(ChainId.SEPOLIA),
diff --git a/apps/web/src/constants/tokenSafety.tsx b/apps/web/src/constants/tokenSafety.tsx
index 13b1100c955..80e0fa98dc4 100644
--- a/apps/web/src/constants/tokenSafety.tsx
+++ b/apps/web/src/constants/tokenSafety.tsx
@@ -1,10 +1,10 @@
 import { Plural, Trans } from '@lingui/macro'
-import { SearchToken } from 'graphql/data/SearchTokens'
 import { TokenStandard } from 'graphql/data/__generated__/types-and-hooks'
+import { SearchToken } from 'graphql/data/SearchTokens'
 
 import { ZERO_ADDRESS } from './misc'
-import tokenSafetyLookup, { TOKEN_LIST_TYPES } from './tokenSafetyLookup'
 import { NATIVE_CHAIN_ID } from './tokens'
+import tokenSafetyLookup, { TOKEN_LIST_TYPES } from './tokenSafetyLookup'
 
 export const TOKEN_SAFETY_ARTICLE = 'https://support.uniswap.org/hc/en-us/articles/8723118437133'
 
diff --git a/apps/web/src/dev/DevFlagsBox.tsx b/apps/web/src/dev/DevFlagsBox.tsx
index fa37c00998f..886fa5dbd13 100644
--- a/apps/web/src/dev/DevFlagsBox.tsx
+++ b/apps/web/src/dev/DevFlagsBox.tsx
@@ -1,5 +1,3 @@
-import { ColumnCenter } from 'components/Column'
-import { RowBetween } from 'components/Row'
 import {
   BaseVariant,
   dynamicConfigSettings as dynamicConfigSettingsAtom,
@@ -9,9 +7,6 @@ import {
 import { DynamicConfigName, useDynamicConfig } from 'featureFlags/dynamicConfig'
 import { useAtomValue } from 'jotai/utils'
 import { useMemo, useState } from 'react'
-import { Flag, Settings } from 'react-feather'
-import { useCloseModal, useToggleModal } from 'state/application/hooks'
-import { ApplicationModal } from 'state/application/reducer'
 import { useGate } from 'statsig-react'
 import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
@@ -23,17 +18,17 @@ const Box = styled.div`
   left: 20px;
   background-color: ${({ theme }) => theme.surface1};
   padding: 10px;
-  border: 1px solid ${({ theme }) => theme.surface3};
-  border-radius: 12px;
-  cursor: pointer;
-  box-shadow: 0px 0px 10px 0px rgba(34, 34, 34, 0.04);
-  user-select: none;
+  border: 1px solid ${({ theme }) => theme.accent1};
   z-index: 1000;
 
   @media only screen and (max-width: ${({ theme }) => `${theme.breakpoint.md}px`}) {
     bottom: 70px;
   }
 `
+const TopBar = styled.div`
+  display: flex;
+  justify-content: space-between;
+`
 const Gate = (flagName: FeatureFlag, featureFlagSettings: Record<string, string>) => {
   const gateResult = useGate(flagName)
   if (gateResult) {
@@ -67,16 +62,6 @@ const Config = (name: DynamicConfigName, savedSettings: Record<string, any>) =>
   return null
 }
 
-const SettingsContainer = styled(ColumnCenter)`
-  width: 30px;
-  height: 30px;
-  justify-content: center;
-  border-radius: 12px;
-  :hover {
-    background: ${({ theme }) => theme.surface2};
-  }
-`
-
 export default function DevFlagsBox() {
   const featureFlagsAtom = useAtomValue(featureFlagSettingsAtom)
   const featureFlags = useMemo(() => Object.values(FeatureFlag), [])
@@ -88,37 +73,20 @@ export default function DevFlagsBox() {
 
   const hasOverrides = overrides.some((g) => g !== null)
 
-  const [isOpen, setIsOpen] = useState(false)
+  const [isOpen, setIsOpen] = useState(true)
   const toggleOpen = () => setIsOpen((open) => !open)
-  const toggleFeatureFlagsModal = useToggleModal(ApplicationModal.FEATURE_FLAGS)
-  const closeFeatureFlagsModal = useCloseModal()
 
   return (
-    <Box
-      onClick={() => {
-        toggleOpen()
-        closeFeatureFlagsModal()
-      }}
-    >
-      {isOpen ? (
-        <RowBetween>
+    <Box>
+      <TopBar onClick={toggleOpen}>
+        {isOpen ? '😺👇' : '😿☝️'}
+        {isOpen && (
           <ThemedText.SubHeader>
-            {isDevelopmentEnv() && 'Local Overrides'}
-            {isStagingEnv() && 'Staging Overrides'}
+            {isStagingEnv() && 'Staging build overrides'}
+            {isDevelopmentEnv() && 'Development build overrides'}
           </ThemedText.SubHeader>
-          <SettingsContainer
-            onClick={(e) => {
-              e.stopPropagation()
-              toggleFeatureFlagsModal()
-            }}
-          >
-            <Settings width={15} height={15} />
-          </SettingsContainer>
-        </RowBetween>
-      ) : (
-        <Flag />
-      )}
-
+        )}
+      </TopBar>
       {isOpen && (hasOverrides ? overrides : <ThemedText.LabelSmall>No overrides</ThemedText.LabelSmall>)}
     </Box>
   )
diff --git a/apps/web/src/featureFlags/flags/debounceSwapQuote.ts b/apps/web/src/featureFlags/flags/debounceSwapQuote.ts
new file mode 100644
index 00000000000..51f778e8492
--- /dev/null
+++ b/apps/web/src/featureFlags/flags/debounceSwapQuote.ts
@@ -0,0 +1,7 @@
+import { BaseVariant, FeatureFlag, useBaseFlag } from '../index'
+
+export function useDebounceSwapQuoteFlag(): BaseVariant {
+  return useBaseFlag(FeatureFlag.debounceSwapQuote)
+}
+
+export { BaseVariant as DebounceSwapQuoteVariant }
diff --git a/apps/web/src/featureFlags/flags/landingPageV2.ts b/apps/web/src/featureFlags/flags/landingPageV2.ts
index b95c8410668..ba1402ccc10 100644
--- a/apps/web/src/featureFlags/flags/landingPageV2.ts
+++ b/apps/web/src/featureFlags/flags/landingPageV2.ts
@@ -7,11 +7,3 @@ export function useLandingPageV2Flag(): BaseVariant {
 export function useNewLandingPage(): boolean {
   return useLandingPageV2Flag() === BaseVariant.Enabled
 }
-
-export function useExitAnimationFlag(): BaseVariant {
-  return useBaseFlag(FeatureFlag.exitAnimation)
-}
-
-export function useExitAnimation(): boolean {
-  return useExitAnimationFlag() === BaseVariant.Enabled
-}
diff --git a/apps/web/src/featureFlags/flags/limitsFees.ts b/apps/web/src/featureFlags/flags/limitsFees.ts
deleted file mode 100644
index 38bc9089d9d..00000000000
--- a/apps/web/src/featureFlags/flags/limitsFees.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BaseVariant, FeatureFlag, useBaseFlag } from '../index'
-
-export function useLimitsFeeesEnabledFlag(): BaseVariant {
-  return useBaseFlag(FeatureFlag.limitsFees)
-}
-
-export function useLimitsFeesEnabled(): boolean {
-  return useLimitsFeeesEnabledFlag() === BaseVariant.Enabled
-}
diff --git a/apps/web/src/featureFlags/flags/outageBanner.ts b/apps/web/src/featureFlags/flags/outageBanner.ts
deleted file mode 100644
index a1292958af5..00000000000
--- a/apps/web/src/featureFlags/flags/outageBanner.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import { ChainId } from '@uniswap/sdk-core'
-import { BaseVariant, FeatureFlag, useBaseFlag } from '../index'
-
-export function useOutageBannerOptimism(): BaseVariant {
-  return useBaseFlag(FeatureFlag.outageBannerOptimism)
-}
-
-function useShowOutageBannerOptimism(): boolean {
-  return useOutageBannerOptimism() === BaseVariant.Enabled
-}
-
-export function useOutageBannerArbitrum(): BaseVariant {
-  return useBaseFlag(FeatureFlag.outageBannerArbitrum)
-}
-
-function useShowOutageBannerArbitrum(): boolean {
-  return useOutageBannerArbitrum() === BaseVariant.Enabled
-}
-
-export function useOutageBannerPolygon(): BaseVariant {
-  return useBaseFlag(FeatureFlag.outageBannerPolygon)
-}
-
-function useShowOutageBannerPolygon(): boolean {
-  return useOutageBannerPolygon() === BaseVariant.Enabled
-}
-
-export function useOutageBanners(): Record<ChainId, boolean> {
-  return {
-    [ChainId.OPTIMISM]: useShowOutageBannerOptimism(),
-    [ChainId.ARBITRUM_ONE]: useShowOutageBannerArbitrum(),
-    [ChainId.POLYGON]: useShowOutageBannerPolygon(),
-
-    [ChainId.MAINNET]: false,
-    [ChainId.GOERLI]: false,
-    [ChainId.SEPOLIA]: false,
-    [ChainId.OPTIMISM_GOERLI]: false,
-    [ChainId.ARBITRUM_GOERLI]: false,
-    [ChainId.POLYGON_MUMBAI]: false,
-    [ChainId.CELO]: false,
-    [ChainId.CELO_ALFAJORES]: false,
-    [ChainId.GNOSIS]: false,
-    [ChainId.MOONBEAM]: false,
-    [ChainId.BNB]: false,
-    [ChainId.AVALANCHE]: false,
-    [ChainId.BASE_GOERLI]: false,
-    [ChainId.BASE]: false,
-  }
-}
diff --git a/apps/web/src/featureFlags/flags/send.ts b/apps/web/src/featureFlags/flags/send.ts
deleted file mode 100644
index 00a26c8efcc..00000000000
--- a/apps/web/src/featureFlags/flags/send.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { BaseVariant, FeatureFlag, useBaseFlag } from '../index'
-
-export function useSendEnabledFlag(): BaseVariant {
-  return useBaseFlag(FeatureFlag.sendEnabled)
-}
-
-export function useSendEnabled(): boolean {
-  return useSendEnabledFlag() === BaseVariant.Enabled
-}
diff --git a/apps/web/src/featureFlags/index.tsx b/apps/web/src/featureFlags/index.tsx
index 141e3369c42..ef48c9617d0 100644
--- a/apps/web/src/featureFlags/index.tsx
+++ b/apps/web/src/featureFlags/index.tsx
@@ -1,5 +1,5 @@
 import { atomWithStorage, useAtomValue, useUpdateAtom } from 'jotai/utils'
-import { ReactNode, createContext, useCallback, useContext } from 'react'
+import { createContext, ReactNode, useCallback, useContext } from 'react'
 import { useGate } from 'statsig-react'
 
 /**
@@ -7,6 +7,7 @@ import { useGate } from 'statsig-react'
  */
 export enum FeatureFlag {
   traceJsonRpc = 'traceJsonRpc',
+  debounceSwapQuote = 'debounce_swap_quote',
   fallbackProvider = 'fallback_provider',
   uniswapXSyntheticQuote = 'uniswapx_synthetic_quote',
   multichainUX = 'multichain_ux',
@@ -21,15 +22,8 @@ export enum FeatureFlag {
   limitsEnabled = 'limits_enabled',
   eip6963Enabled = 'eip6963_enabled',
   gatewayDNSUpdate = 'gateway_dns_update',
-  sendEnabled = 'swap_send',
   gatewayDNSUpdateAll = 'gateway_dns_update_all',
   landingPageV2 = 'landing_page_v2',
-  limitsFees = 'limits_fees',
-  exitAnimation = 'exit_animation',
-  // TODO(WEB-3625): Remove these once we have a generalized system for outage banners.
-  outageBannerOptimism = 'outage_banner_feb_2024_optimism',
-  outageBannerArbitrum = 'outage_banner_feb_2024_arbitrum',
-  outageBannerPolygon = 'outage_banner_feb_2024_polygon',
 }
 
 interface FeatureFlagsContextType {
diff --git a/apps/web/src/graphql/data/LandingPage.graphql b/apps/web/src/graphql/data/LandingPage.graphql
deleted file mode 100644
index c72f001e60b..00000000000
--- a/apps/web/src/graphql/data/LandingPage.graphql
+++ /dev/null
@@ -1,38 +0,0 @@
-query TokenPromo($chain: Chain!, $address: String = null) {
-  token(chain: $chain, address: $address) {
-    id
-    address
-    chain
-    market(currency: USD) {
-      id
-      price {
-        id
-        value
-      }
-      pricePercentChange(duration: DAY) {
-        id
-        value
-      }
-    }
-  }
-}
-
-query CollectionPromo($addresses: [String!]!) {
-  nftCollections(filter: { addresses: $addresses }) {
-    edges {
-      node {
-        markets(currencies: ETH) {
-          floorPricePercentChange(duration: DAY) {
-            value
-          }
-        }
-      }
-    }
-  }
-}
-
-query DailyProtocolVolume($version: ProtocolVersion!) {
-  historicalProtocolVolume(chain: ETHEREUM, version: $version, duration: MONTH) {
-    value
-  }
-}
diff --git a/apps/web/src/graphql/data/RecentTokenTransfers.graphql b/apps/web/src/graphql/data/RecentTokenTransfers.graphql
deleted file mode 100644
index 2c8dc581202..00000000000
--- a/apps/web/src/graphql/data/RecentTokenTransfers.graphql
+++ /dev/null
@@ -1,86 +0,0 @@
-  query RecentTokenTransfers($address: String!) {
-    portfolios(ownerAddresses: [$address], chains: [ETHEREUM, POLYGON, ARBITRUM, OPTIMISM, BASE, BNB]) {
-      id
-      ownerAddress
-      assetActivities(pageSize: 100, page: 1, chains: [ETHEREUM, POLYGON, ARBITRUM, OPTIMISM, BASE, BNB]) {
-        id
-        timestamp
-        chain
-        details {
-          ... on TransactionDetails {
-            to
-            type
-            hash
-            from
-            status
-            assetChanges {
-              __typename
-              ... on TokenTransfer {
-                id
-                asset {
-                  id
-                  symbol
-                  address
-                  decimals
-                  chain
-                  project {
-                    id
-                    isSpam
-                    spamCode
-                  }
-                }
-                tokenStandard
-                quantity
-                sender
-                recipient
-                direction
-                transactedValue {
-                  currency
-                  value
-                }
-              }
-              ... on NftTransfer {
-                id
-                asset {
-                  id
-                  name
-                  isSpam
-                  nftContract {
-                    id
-                    chain
-                    address
-                  }
-                  tokenId
-                  image {
-                    id
-                    url
-                  }
-                  collection {
-                    id
-                    name
-                  }
-                }
-                nftStandard
-                sender
-                recipient
-                direction
-              }
-              ... on TokenApproval {
-                id
-                asset {
-                  id
-                  symbol
-                  decimals
-                  address
-                  chain
-                }
-                tokenStandard
-                approvedAddress
-                quantity
-              }
-            }
-          }
-        }
-      }
-    }
-  }
\ No newline at end of file
diff --git a/apps/web/src/graphql/data/RecentTokenTransfers.ts b/apps/web/src/graphql/data/RecentTokenTransfers.ts
deleted file mode 100644
index 0688b49a4fc..00000000000
--- a/apps/web/src/graphql/data/RecentTokenTransfers.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import {
-  TokenTransfer,
-  TransactionDetails,
-  TransactionType,
-  useRecentTokenTransfersQuery,
-} from 'graphql/data/__generated__/types-and-hooks'
-import { useMemo } from 'react'
-
-export function useRecentTokenTransfers(address?: string) {
-  const { data, loading } = useRecentTokenTransfersQuery({
-    variables: { address: address ?? '' },
-    skip: !address,
-  })
-
-  return useMemo(() => {
-    if (!data?.portfolios?.[0]?.assetActivities) {
-      return {
-        data: undefined,
-        loading,
-      }
-    }
-
-    const recentTransactions = data.portfolios[0].assetActivities
-      .filter(
-        (activity) =>
-          (activity.details as TransactionDetails).type === TransactionType.Send &&
-          (activity.details as TransactionDetails).assetChanges.length === 1 &&
-          (activity.details as TransactionDetails).assetChanges[0].__typename === 'TokenTransfer'
-      )
-      .map((activity) => ((activity.details as TransactionDetails).assetChanges as TokenTransfer[])[0])
-
-    return {
-      data: recentTransactions.length > 0 ? recentTransactions : undefined,
-      loading: false,
-    }
-  }, [data, loading])
-}
diff --git a/apps/web/src/graphql/data/TopTokens.ts b/apps/web/src/graphql/data/TopTokens.ts
index f74cf1a2299..004984e57a4 100644
--- a/apps/web/src/graphql/data/TopTokens.ts
+++ b/apps/web/src/graphql/data/TopTokens.ts
@@ -1,6 +1,5 @@
-import { ApolloError } from '@apollo/client'
 import {
-  exploreSearchStringAtom,
+  filterStringAtom,
   filterTimeAtom,
   sortAscendingAtom,
   sortMethodAtom,
@@ -52,16 +51,6 @@ gql`
           currency
           value
         }
-        pricePercentChange1Hour: pricePercentChange(duration: HOUR) {
-          id
-          currency
-          value
-        }
-        pricePercentChange1Day: pricePercentChange(duration: DAY) {
-          id
-          currency
-          value
-        }
         volume(duration: $duration) {
           id
           value
@@ -71,13 +60,6 @@ gql`
       project {
         id
         logoUrl
-        markets(currencies: [USD]) {
-          fullyDilutedValuation {
-            id
-            value
-            currency
-          }
-        }
       }
     }
   }
@@ -133,7 +115,7 @@ function useSortedTokens(tokens: TopTokens100Query['topTokens']) {
 }
 
 function useFilteredTokens(tokens: TopTokens100Query['topTokens']) {
-  const filterString = useAtomValue(exploreSearchStringAtom)
+  const filterString = useAtomValue(filterStringAtom)
 
   const lowercaseFilterString = useMemo(() => filterString.toLowerCase(), [filterString])
 
@@ -162,7 +144,6 @@ interface UseTopTokensReturnValue {
   tokenSortRank: Record<string, number>
   loadingTokens: boolean
   sparklines: SparklineMap
-  error?: ApolloError
 }
 
 export function useTopTokens(chain: Chain): UseTopTokensReturnValue {
@@ -185,11 +166,7 @@ export function useTopTokens(chain: Chain): UseTopTokensReturnValue {
     return map
   }, [chainId, sparklineQuery?.topTokens])
 
-  const {
-    data,
-    loading: loadingTokens,
-    error,
-  } = usePollQueryWhileMounted(
+  const { data, loading: loadingTokens } = usePollQueryWhileMounted(
     useTopTokens100Query({
       variables: { duration, chain },
     }),
@@ -214,7 +191,7 @@ export function useTopTokens(chain: Chain): UseTopTokensReturnValue {
   )
   const filteredTokens = useFilteredTokens(sortedTokens)
   return useMemo(
-    () => ({ tokens: filteredTokens, tokenSortRank, loadingTokens, sparklines, error }),
-    [filteredTokens, tokenSortRank, loadingTokens, sparklines, error]
+    () => ({ tokens: filteredTokens, tokenSortRank, loadingTokens, sparklines }),
+    [filteredTokens, tokenSortRank, loadingTokens, sparklines]
   )
 }
diff --git a/apps/web/src/graphql/data/pools/topPools.graphql b/apps/web/src/graphql/data/pools/topPools.graphql
deleted file mode 100644
index e6aec3c6694..00000000000
--- a/apps/web/src/graphql/data/pools/topPools.graphql
+++ /dev/null
@@ -1,64 +0,0 @@
-query TopV3Pools($chain: Chain!, $first: Int!, $cursor: Float, $tokenAddress: String) {
-  topV3Pools(first: $first, chain: $chain, tokenFilter: $tokenAddress, tvlCursor: $cursor) {
-    id
-    protocolVersion
-    address
-    totalLiquidity {
-      value
-    }
-    feeTier
-    token0 {
-      id
-      address
-      name
-      symbol
-      chain
-    }
-    token1 {
-      id
-      address
-      name
-      symbol
-      chain
-    }
-    txCount
-    volume24h: cumulativeVolume(duration: DAY) {
-      value
-    }
-    volumeWeek: cumulativeVolume(duration: WEEK) {
-      value
-    }
-  }
-}
-
-query TopV2Pairs($first: Int!, $cursor: Float, $tokenAddress: String) {
-  topV2Pairs(first: $first, chain: ETHEREUM, tokenFilter: $tokenAddress, tvlCursor: $cursor) {
-    id
-    protocolVersion
-    address
-    totalLiquidity {
-      value
-    }
-    token0 {
-      id
-      address
-      name
-      symbol
-      chain
-    }
-    token1 {
-      id
-      address
-      name
-      symbol
-      chain
-    }
-    txCount
-    volume24h: cumulativeVolume(duration: DAY) {
-      value
-    }
-    volumeWeek: cumulativeVolume(duration: WEEK) {
-      value
-    }
-  }
-}
diff --git a/apps/web/src/graphql/data/pools/usePoolsFromTokenAddress.ts b/apps/web/src/graphql/data/pools/usePoolsFromTokenAddress.ts
deleted file mode 100644
index 501ff126598..00000000000
--- a/apps/web/src/graphql/data/pools/usePoolsFromTokenAddress.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { ChainId } from '@uniswap/sdk-core'
-import { useTopV2PairsQuery, useTopV3PoolsQuery } from 'graphql/data/__generated__/types-and-hooks'
-import { PoolTableSortState, TablePool, V2_BIPS, calculateTurnover, sortPools } from 'graphql/data/pools/useTopPools'
-import { chainIdToBackendName } from 'graphql/data/util'
-import { useCallback, useMemo, useRef } from 'react'
-
-const DEFAULT_QUERY_SIZE = 20
-
-export function usePoolsFromTokenAddress(tokenAddress: string, sortState: PoolTableSortState, chainId?: ChainId) {
-  const {
-    loading: loadingV3,
-    error: errorV3,
-    data: dataV3,
-    fetchMore: fetchMoreV3,
-  } = useTopV3PoolsQuery({
-    variables: {
-      first: DEFAULT_QUERY_SIZE,
-      tokenAddress,
-      chain: chainIdToBackendName(chainId),
-    },
-  })
-
-  const {
-    loading: loadingV2,
-    error: errorV2,
-    data: dataV2,
-    fetchMore: fetchMoreV2,
-  } = useTopV2PairsQuery({
-    variables: {
-      first: DEFAULT_QUERY_SIZE,
-      tokenAddress,
-    },
-    skip: chainId !== ChainId.MAINNET,
-  })
-  const loading = loadingV3 || loadingV2
-  const error = errorV3 || errorV2
-
-  const loadingMoreV3 = useRef(false)
-  const loadingMoreV2 = useRef(false)
-  const sizeRef = useRef(DEFAULT_QUERY_SIZE)
-  const loadMore = useCallback(
-    ({ onComplete }: { onComplete?: () => void }) => {
-      if (loadingMoreV3.current || (loadingMoreV2.current && chainId === ChainId.MAINNET)) {
-        return
-      }
-      loadingMoreV3.current = true
-      loadingMoreV2.current = true
-      sizeRef.current += DEFAULT_QUERY_SIZE
-      fetchMoreV3({
-        variables: {
-          cursor: dataV3?.topV3Pools?.[dataV3.topV3Pools.length - 1]?.totalLiquidity?.value,
-        },
-        updateQuery: (prev, { fetchMoreResult }) => {
-          if (!fetchMoreResult || !prev || !Object.keys(prev).length) return prev
-          if (!loadingMoreV2.current || chainId !== ChainId.MAINNET) onComplete?.()
-          const mergedData = {
-            topV3Pools: [...(prev.topV3Pools ?? []).slice(), ...(fetchMoreResult.topV3Pools ?? []).slice()],
-          }
-          loadingMoreV3.current = false
-          return mergedData
-        },
-      })
-      fetchMoreV2({
-        variables: {
-          cursor: dataV2?.topV2Pairs?.[dataV2.topV2Pairs.length - 1]?.totalLiquidity?.value,
-        },
-        updateQuery: (prev, { fetchMoreResult }) => {
-          if (!fetchMoreResult || !prev || !Object.keys(prev).length) return prev
-          !loadingMoreV3.current && onComplete?.()
-          const mergedData = {
-            topV2Pairs: [...(prev.topV2Pairs ?? []).slice(), ...(fetchMoreResult.topV2Pairs ?? []).slice()],
-          }
-          loadingMoreV2.current = false
-          return mergedData
-        },
-      })
-    },
-    [chainId, dataV2?.topV2Pairs, dataV3?.topV3Pools, fetchMoreV2, fetchMoreV3]
-  )
-
-  return useMemo(() => {
-    const topV3Pools: TablePool[] =
-      dataV3?.topV3Pools?.map((pool) => {
-        return {
-          hash: pool.address,
-          token0: pool.token0,
-          token1: pool.token1,
-          txCount: pool.txCount,
-          tvl: pool.totalLiquidity?.value,
-          volume24h: pool.volume24h?.value,
-          volumeWeek: pool.volumeWeek?.value,
-          turnover: calculateTurnover(pool.volume24h?.value, pool.totalLiquidity?.value, pool.feeTier),
-          feeTier: pool.feeTier,
-          protocolVersion: pool.protocolVersion,
-        } as TablePool
-      }) ?? []
-    const topV2Pairs: TablePool[] =
-      dataV2?.topV2Pairs?.map((pool) => {
-        return {
-          hash: pool.address,
-          token0: pool.token0,
-          token1: pool.token1,
-          txCount: pool.txCount,
-          tvl: pool.totalLiquidity?.value,
-          volume24h: pool.volume24h?.value,
-          volumeWeek: pool.volumeWeek?.value,
-          turnover: calculateTurnover(pool.volume24h?.value, pool.totalLiquidity?.value, V2_BIPS),
-          feeTier: V2_BIPS,
-          protocolVersion: pool.protocolVersion,
-        } as TablePool
-      }) ?? []
-
-    const pools = sortPools([...topV3Pools, ...topV2Pairs], sortState).slice(0, sizeRef.current)
-    return { loading, error, pools, loadMore }
-  }, [dataV2?.topV2Pairs, dataV3?.topV3Pools, error, loadMore, loading, sortState])
-}
diff --git a/apps/web/src/graphql/data/pools/useTopPools.ts b/apps/web/src/graphql/data/pools/useTopPools.ts
deleted file mode 100644
index 02dad5c22a6..00000000000
--- a/apps/web/src/graphql/data/pools/useTopPools.ts
+++ /dev/null
@@ -1,160 +0,0 @@
-import { ChainId, Percent } from '@uniswap/sdk-core'
-import { exploreSearchStringAtom } from 'components/Tokens/state'
-import { BIPS_BASE } from 'constants/misc'
-import {
-  ProtocolVersion,
-  Token,
-  useTopV2PairsQuery,
-  useTopV3PoolsQuery,
-} from 'graphql/data/__generated__/types-and-hooks'
-import { OrderDirection, chainIdToBackendName } from 'graphql/data/util'
-import { useAtomValue } from 'jotai/utils'
-import { useMemo } from 'react'
-
-export function sortPools(pools: TablePool[], sortState: PoolTableSortState) {
-  return pools.sort((a, b) => {
-    switch (sortState.sortBy) {
-      case PoolSortFields.TxCount:
-        return sortState.sortDirection === OrderDirection.Desc ? b.txCount - a.txCount : a.txCount - b.txCount
-      case PoolSortFields.Volume24h:
-        return sortState.sortDirection === OrderDirection.Desc ? b.volume24h - a.volume24h : a.volume24h - b.volume24h
-      case PoolSortFields.VolumeWeek:
-        return sortState.sortDirection === OrderDirection.Desc
-          ? b.volumeWeek - a.volumeWeek
-          : a.volumeWeek - b.volumeWeek
-      case PoolSortFields.Turnover:
-        return sortState.sortDirection === OrderDirection.Desc
-          ? b.turnover.greaterThan(a.turnover)
-            ? 1
-            : -1
-          : a.turnover.greaterThan(b.turnover)
-          ? 1
-          : -1
-      default:
-        return sortState.sortDirection === OrderDirection.Desc ? b.tvl - a.tvl : a.tvl - b.tvl
-    }
-  })
-}
-
-/**
- * Calculate the turnover of a pool/pair which is the ratio of 24h fees to TVL expressed as a percent
- * @param volume24h the 24h volume of the pool/pair
- * @param tvl the pool/pair's TVL
- * @param feeTier the feeTier of the pool or 300 for a v2 pair
- * @returns turnover expressed as a percent
- */
-export function calculateTurnover(volume24h?: number, tvl?: number, feeTier?: number): Percent {
-  if (!volume24h || !feeTier || !tvl || !Math.round(tvl)) return new Percent(0)
-  return new Percent(Math.round(volume24h * (feeTier / BIPS_BASE)), Math.round(tvl))
-}
-
-export const V2_BIPS = 300
-
-export interface TablePool {
-  hash: string
-  token0: Token
-  token1: Token
-  txCount: number
-  tvl: number
-  volume24h: number
-  volumeWeek: number
-  turnover: Percent
-  feeTier: number
-  protocolVersion: ProtocolVersion
-}
-
-export enum PoolSortFields {
-  TVL,
-  Volume24h,
-  VolumeWeek,
-  Turnover,
-  TxCount,
-}
-
-export type PoolTableSortState = {
-  sortBy: PoolSortFields
-  sortDirection: OrderDirection
-}
-
-function useFilteredPools(pools: TablePool[]) {
-  const filterString = useAtomValue(exploreSearchStringAtom)
-
-  const lowercaseFilterString = useMemo(() => filterString.toLowerCase(), [filterString])
-
-  return useMemo(
-    () =>
-      pools.filter((pool) => {
-        const addressIncludesFilterString = pool.hash.toLowerCase().includes(lowercaseFilterString)
-        const token0IncludesFilterString = pool.token0?.symbol?.toLowerCase().includes(lowercaseFilterString)
-        const token1IncludesFilterString = pool.token1?.symbol?.toLowerCase().includes(lowercaseFilterString)
-        const token0HashIncludesFilterString = pool.token0?.address?.toLowerCase().includes(lowercaseFilterString)
-        const token1HashIncludesFilterString = pool.token1?.address?.toLowerCase().includes(lowercaseFilterString)
-        return (
-          token0IncludesFilterString ||
-          token1IncludesFilterString ||
-          addressIncludesFilterString ||
-          token0HashIncludesFilterString ||
-          token1HashIncludesFilterString
-        )
-      }),
-    [lowercaseFilterString, pools]
-  )
-}
-
-export function useTopPools(sortState: PoolTableSortState, chainId?: ChainId) {
-  const {
-    loading: loadingV3,
-    error: errorV3,
-    data: dataV3,
-  } = useTopV3PoolsQuery({
-    variables: { first: 100, chain: chainIdToBackendName(chainId) },
-  })
-  const {
-    loading: loadingV2,
-    error: errorV2,
-    data: dataV2,
-  } = useTopV2PairsQuery({
-    variables: { first: 100 },
-    skip: chainId !== ChainId.MAINNET,
-  })
-  const loading = loadingV3 || loadingV2
-  const error = errorV3 || errorV2
-
-  const unfilteredPools = useMemo(() => {
-    const topV3Pools: TablePool[] =
-      dataV3?.topV3Pools?.map((pool) => {
-        return {
-          hash: pool.address,
-          token0: pool.token0,
-          token1: pool.token1,
-          txCount: pool.txCount,
-          tvl: pool.totalLiquidity?.value,
-          volume24h: pool.volume24h?.value,
-          volumeWeek: pool.volumeWeek?.value,
-          turnover: calculateTurnover(pool.volume24h?.value, pool.totalLiquidity?.value, pool.feeTier),
-          feeTier: pool.feeTier,
-          protocolVersion: pool.protocolVersion,
-        } as TablePool
-      }) ?? []
-    const topV2Pairs: TablePool[] =
-      dataV2?.topV2Pairs?.map((pool) => {
-        return {
-          hash: pool.address,
-          token0: pool.token0,
-          token1: pool.token1,
-          txCount: pool.txCount,
-          tvl: pool.totalLiquidity?.value,
-          volume24h: pool.volume24h?.value,
-          volumeWeek: pool.volumeWeek?.value,
-          turnover: calculateTurnover(pool.volume24h?.value, pool.totalLiquidity?.value, V2_BIPS),
-          feeTier: V2_BIPS,
-          protocolVersion: pool.protocolVersion,
-        } as TablePool
-      }) ?? []
-
-    return sortPools([...topV3Pools, ...topV2Pairs], sortState)
-  }, [dataV2?.topV2Pairs, dataV3?.topV3Pools, sortState])
-
-  const filteredPools = useFilteredPools(unfilteredPools).slice(0, 100)
-  return { topPools: filteredPools, loading, error }
-}
diff --git a/apps/web/src/graphql/data/schema.graphql b/apps/web/src/graphql/data/schema.graphql
deleted file mode 100644
index ec6ad7585d0..00000000000
--- a/apps/web/src/graphql/data/schema.graphql
+++ /dev/null
@@ -1,1201 +0,0 @@
-"""This directive allows results to be deferred during execution"""
-directive @defer on FIELD
-
-"""Tells the service which mutation triggers this subscription."""
-directive @aws_subscribe(
-  """
-  List of mutations which will trigger this subscription when they are called.
-  """
-  mutations: [String]
-) on 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.
-"""
-directive @aws_publish(
-  """
-  List of subscriptions which will be published to when this mutation is called.
-  """
-  subscriptions: [String]
-) on FIELD_DEFINITION
-
-"""
-Tells the service this field/object has access authorized by an API key.
-"""
-directive @aws_api_key on OBJECT | FIELD_DEFINITION
-
-"""
-Tells the service this field/object has access authorized by a Cognito User Pools token.
-"""
-directive @aws_cognito_user_pools(
-  """List of cognito user pool groups which have access on this field"""
-  cognito_groups: [String]
-) 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 FIELD_DEFINITION
-
-"""
-Tells the service this field/object has access authorized by an OIDC token.
-"""
-directive @aws_oidc on OBJECT | FIELD_DEFINITION
-
-"""
-Tells the service this field/object has access authorized by sigv4 signing.
-"""
-directive @aws_iam on OBJECT | FIELD_DEFINITION
-
-"""
-Tells the service this field/object has access authorized by a Lambda Authorizer.
-"""
-directive @aws_lambda on OBJECT | FIELD_DEFINITION
-
-"""
-  Types, unions, and inputs (alphabetized):
- These are colocated to highlight the relationship between some types and their inputs.
-"""
-union ActivityDetails = TransactionDetails | SwapOrderDetails
-
-input ActivityDetailsInput {
-  transactionDetails: TransactionDetailsInput
-}
-
-"""
-  Enums (alphabetized):
- deprecated and replaced with TransactionType, please do not use this
-"""
-enum ActivityType {
-  APPROVE
-  CANCEL
-  CLAIM
-  SEND
-  RECEIVE
-  SWAP
-  DEPLOYMENT
-  UNKNOWN
-  money
-  market
-  LEND
-  BORROW
-  REPAY
-  WITHDRAW
-  NFT
-  MINT
-  BURN
-  Staking
-  STAKE
-  UNSTAKE
-  SWAP_ORDER
-}
-
-type Amount implements IAmount {
-  id: ID!
-  currency: Currency
-  value: Float!
-}
-
-type AmountChange {
-  id: ID!
-  percentage: Amount
-  absolute: Amount
-}
-
-input AmountInput {
-  currency: Currency
-  value: Float!
-}
-
-type ApplicationContract implements IContract {
-  id: ID!
-  chain: Chain!
-  address: String!
-  name: String
-  icon: Image
-}
-
-input ApplicationContractInput {
-  chain: Chain!
-  address: String!
-  name: String
-  icon: ImageInput
-}
-
-type AssetActivity {
-  id: ID!
-  timestamp: Int!
-  type: ActivityType! @deprecated(reason: "use type field in details")
-  chain: Chain!
-  gasUsed: Float @deprecated(reason: "not required, remove usage")
-  transaction: Transaction! @deprecated(reason: "use fields from details")
-  assetChanges: [AssetChange]! @deprecated(reason: "use assetChanges field in details")
-  details: ActivityDetails!
-  addresses: [String!]
-}
-
-input AssetActivityInput {
-  timestamp: Int!
-  chain: Chain!
-  details: ActivityDetailsInput!
-}
-
-enum AssetActivitySwitch {
-  ALTERNATE
-  LEGACY
-}
-
-union AssetChange = TokenTransfer | NftTransfer | TokenApproval | NftApproval | NftApproveForAll
-
-input AssetChangeInput {
-  tokenTransfer: TokenTransferInput
-  tokenApproval: TokenApprovalInput
-  nftTransfer: NftTransferInput
-  nftApproval: NftApprovalInput
-  nftApproveForAll: NftApproveForAllInput
-}
-
-"""
-The `AWSJSON` scalar type provided by AWS AppSync, represents a JSON string that
-complies with [RFC 8259](https://tools.ietf.org/html/rfc8259).  Maps like
-"**{\\"upvotes\\": 10}**", lists like "**[1,2,3]**", and scalar values like
-"**\\"AWSJSON example string\\"**", "**1**", and "**true**" are accepted as
-valid JSON and will automatically be parsed and loaded in the resolver mapping
-templates as Maps, Lists, or Scalar values rather than as the literal input
-strings.  Invalid JSON strings like "**{a: 1}**", "**{'a': 1}**" and "**Unquoted
-string**" will throw GraphQL validation errors.
-"""
-scalar AWSJSON
-
-enum Chain {
-  ARBITRUM
-  AVALANCHE
-  ETHEREUM
-  ETHEREUM_GOERLI
-  ETHEREUM_SEPOLIA
-  OPTIMISM
-  POLYGON
-  CELO
-  BNB
-  BASE
-  UNKNOWN_CHAIN
-}
-
-enum CollectionSortableField {
-  VOLUME
-}
-
-input ContractInput {
-  chain: Chain!
-  address: String
-}
-
-enum Currency {
-  AUD
-  BRL
-  CAD
-  CNY
-  ETH
-  EUR
-  GBP
-  HKD
-  IDR
-  INR
-  JPY
-  MATIC
-  NGN
-  PKR
-  RUB
-  SGD
-  THB
-  TRY
-  UAH
-  USD
-  VND
-}
-
-input CurrencyAmountInput {
-  currency: Currency!
-  value: Float!
-}
-
-type DescriptionTranslations {
-  id: ID!
-  descriptionZhHans: String
-  descriptionZhHant: String
-  descriptionNlNl: String
-  descriptionEnUs: String
-  descriptionFrFr: String
-  descriptionHiIn: String
-  descriptionIdId: String
-  descriptionJaJp: String
-  descriptionMsMy: String
-  descriptionPtPt: String
-  descriptionRuRu: String
-  descriptionEsEs: String
-  descriptionEs419: String
-  descriptionEsUs: String
-  descriptionThTh: String
-  descriptionTrTr: String
-  descriptionUkUa: String
-  descriptionUrPk: String
-  descriptionViVn: String
-}
-
-type Dimensions {
-  id: ID!
-  height: Float
-  width: Float
-}
-
-input DimensionsInput {
-  height: Float
-  width: Float
-}
-
-type FeeData {
-  sellFeeBps: String
-  buyFeeBps: String
-}
-
-enum HighLow {
-  HIGH
-  LOW
-}
-
-"""  FIVE_MINUTE is only supported for TokenMarket.pricePercentChange"""
-enum HistoryDuration {
-  FIVE_MINUTE
-  HOUR
-  DAY
-  WEEK
-  MONTH
-  YEAR
-  MAX
-}
-
-"""  Interfaces (alphabetized):"""
-interface IAmount {
-  currency: Currency
-  value: Float!
-}
-
-interface IContract {
-  chain: Chain!
-  address: String
-}
-
-type Image {
-  id: ID!
-  url: String!
-  dimensions: Dimensions
-}
-
-input ImageInput {
-  url: String!
-  dimensions: DimensionsInput
-}
-
-enum MediaType {
-  VIDEO
-  IMAGE
-  RAW
-  AUDIO
-}
-
-type Mutation {
-  assetActivity(input: AssetActivityInput!): AssetActivity!
-  heartbeat(subscriptionId: ID!, type: SubscriptionType!): Status!
-  unsubscribe(subscriptionId: ID!, type: SubscriptionType!): Status!
-}
-
-type NftActivity {
-  id: ID!
-  address: String!
-  tokenId: String
-  asset: NftAsset
-  type: NftActivityType!
-  marketplace: String
-  fromAddress: String!
-  toAddress: String
-  transactionHash: String
-  price: Amount
-  quantity: Int
-  orderStatus: OrderStatus
-  url: String
-  timestamp: Int!
-}
-
-type NftActivityConnection {
-  pageInfo: PageInfo!
-  edges: [NftActivityEdge!]!
-}
-
-type NftActivityEdge {
-  cursor: String!
-  node: NftActivity!
-}
-
-input NftActivityFilterInput {
-  address: String
-  tokenId: String
-  activityTypes: [NftActivityType!]
-}
-
-enum NftActivityType {
-  LISTING
-  SALE
-  CANCEL_LISTING
-  TRANSFER
-}
-
-type NftApproval {
-  id: ID!
-  nftStandard: NftStandard!
-
-  """  can be erc721, erc1155, noncompliant"""
-  asset: NftAsset!
-  approvedAddress: String!
-}
-
-input NftApprovalInput {
-  nftStandard: NftStandard!
-  asset: NftAssetInput!
-  approvedAddress: String!
-}
-
-type NftApproveForAll {
-  id: ID!
-  nftStandard: NftStandard!
-
-  """  can be erc721, erc1155, noncompliant"""
-  asset: NftAsset!
-  operatorAddress: String!
-  approved: Boolean!
-}
-
-input NftApproveForAllInput {
-  nftStandard: NftStandard!
-  asset: NftAssetInput!
-  operatorAddress: String!
-  approved: Boolean!
-}
-
-type NftAsset {
-  id: ID!
-  collection: NftCollection
-  description: String
-  imageUrl: String @deprecated
-  thumbnailUrl: String @deprecated
-  animationUrl: String
-  smallImageUrl: String @deprecated
-  image: Image
-  thumbnail: Image
-  smallImage: Image
-  originalImage: Image
-  name: String
-  nftContract: NftContract
-
-  """  TODO: may need to be array to support erc1155 cases. not needed at the moment so will revisit.
-  """
-  ownerAddress: String
-  tokenId: String!
-  traits: [NftAssetTrait!]
-  rarities: [NftAssetRarity!]
-  listings(chain: Chain, asc: Boolean, first: Int, last: Int, after: String, before: String): NftOrderConnection
-  suspiciousFlag: Boolean
-  flaggedBy: String
-  metadataUrl: String
-  creator: NftProfile
-  mediaType: MediaType
-  isSpam: Boolean
-}
-
-type NftAssetConnection {
-  pageInfo: PageInfo!
-  edges: [NftAssetEdge!]!
-  totalCount: Int
-}
-
-type NftAssetEdge {
-  cursor: String!
-  node: NftAsset!
-}
-
-input NftAssetInput {
-  collection: NftCollectionInput
-  description: String
-  animationUrl: String
-  image: ImageInput
-  thumbnail: ImageInput
-  smallImage: ImageInput
-  name: String
-  nftContract: NftContractInput
-  tokenId: String!
-  mediaType: MediaType
-  isSpam: Boolean
-}
-
-type NftAssetRarity {
-  id: ID!
-  score: Float
-  rank: Int
-  provider: NftRarityProvider
-}
-
-input NftAssetsFilterInput {
-  tokenSearchQuery: String
-  tokenIds: [String!]
-  traits: [NftAssetTraitInput!]
-  listed: Boolean
-  minPrice: String
-  maxPrice: String
-  marketplaces: [NftMarketplace!]
-}
-
-enum NftAssetSortableField {
-  PRICE
-  RARITY
-}
-
-type NftAssetTrait {
-  id: ID!
-  name: String
-  rarity: Float
-  value: String
-}
-
-input NftAssetTraitInput {
-  name: String!
-  values: [String!]!
-}
-
-type NftBalance {
-  id: ID!
-  ownedAsset: NftAsset
-  listedMarketplaces: [NftMarketplace!]
-  lastPrice: TimestampedAmount
-  listingFees: [NftFee]
-  quantity: Int
-}
-
-input NftBalanceAssetInput {
-  address: String!
-  tokenId: String!
-}
-
-type NftBalanceConnection {
-  pageInfo: PageInfo!
-  edges: [NftBalanceEdge!]!
-}
-
-type NftBalanceEdge {
-  cursor: String!
-  node: NftBalance!
-}
-
-input NftBalancesFilterInput {
-  addresses: [String!]
-  assets: [NftBalanceAssetInput!]
-  filterSpam: Boolean
-}
-
-type NftCollection {
-  id: ID!
-  collectionId: String!
-
-  """
-    TODO: support querying for collection assets here
-   assets(page: Int, pageSize: Int, orderBy: NftAssetSortableField): [NftAsset]
-  """
-  bannerImageUrl: String @deprecated
-  bannerImage: Image
-  description: String
-  discordUrl: String
-  homepageUrl: String
-  imageUrl: String @deprecated
-  image: Image
-  instagramName: String
-  markets(currencies: [Currency!]!): [NftCollectionMarket!]
-  name: String
-  nftContracts: [NftContract!]
-  openseaUrl: String @deprecated
-  traits: [NftCollectionTrait!]
-  twitterName: String
-  isVerified: Boolean
-  numAssets: Int
-  creator: NftProfile
-}
-
-type NftCollectionBalance {
-  id: ID!
-  address: String!
-  name: String!
-  logoImage: Image
-  balance: Float!
-}
-
-type NftCollectionBalanceConnection {
-  pageInfo: PageInfo!
-  edges: [NftCollectionBalanceEdge!]!
-}
-
-type NftCollectionBalanceEdge {
-  cursor: String!
-  node: NftCollectionBalance!
-}
-
-type NftCollectionConnection {
-  pageInfo: PageInfo!
-  edges: [NftCollectionEdge!]!
-}
-
-type NftCollectionEdge {
-  cursor: String!
-  node: NftCollection!
-}
-
-input NftCollectionInput {
-  collectionId: String!
-  name: String
-  nftContracts: [NftContractInput!]
-}
-
-type NftCollectionMarket {
-  id: ID!
-  nftContracts: [NftContract!]
-  floorPrice: TimestampedAmount
-  owners: Int
-  volume24h: Amount @deprecated
-  totalVolume: TimestampedAmount
-  volume(duration: HistoryDuration): TimestampedAmount
-  volumePercentChange(duration: HistoryDuration): TimestampedAmount
-  floorPricePercentChange(duration: HistoryDuration): TimestampedAmount
-  sales(duration: HistoryDuration): TimestampedAmount
-  listings: TimestampedAmount
-  marketplaces(marketplaces: [NftMarketplace!]): [NftCollectionMarketplace!]
-  percentUniqueOwners: TimestampedAmount
-  percentListed: TimestampedAmount
-}
-
-type NftCollectionMarketplace {
-  id: ID!
-  marketplace: NftMarketplace
-  listings: Int
-  floorPrice: Float
-}
-
-input NftCollectionsFilterInput {
-  addresses: [String!]
-  nameQuery: String
-}
-
-type NftCollectionTrait {
-  id: ID!
-  name: String
-  values: [String!]
-  stats: [NftCollectionTraitStats!]
-}
-
-type NftCollectionTraitStats {
-  id: ID!
-  name: String
-  value: String
-  assets: Int
-  listings: Int
-}
-
-type NftContract implements IContract {
-  id: ID!
-  address: String!
-  chain: Chain!
-  name: String
-  standard: NftStandard
-  symbol: String
-  totalSupply: Int
-}
-
-input NftContractInput {
-  address: String!
-  chain: Chain!
-  name: String
-  standard: NftStandard
-  symbol: String
-  totalSupply: Int
-}
-
-type NftFee {
-  id: ID!
-  payoutAddress: String!
-  basisPoints: Int!
-}
-
-enum NftMarketplace {
-  OPENSEA
-  LOOKSRARE
-  X2Y2
-  SUDOSWAP
-  NFTX
-  NFT20
-  FOUNDATION
-  CRYPTOPUNKS
-}
-
-type NftOrder {
-  id: ID!
-  address: String!
-  tokenId: String
-  type: OrderType!
-  marketplace: NftMarketplace!
-  marketplaceUrl: String!
-  price: Amount!
-  quantity: Int!
-  orderHash: String
-  status: OrderStatus!
-  createdAt: Float!
-  startAt: Float!
-  endAt: Float
-  maker: String!
-  taker: String
-  auctionType: String
-  protocolParameters: AWSJSON
-  poolPrices: [String!]
-}
-
-type NftOrderConnection {
-  pageInfo: PageInfo!
-  edges: [NftOrderEdge!]!
-}
-
-type NftOrderEdge {
-  cursor: String!
-  node: NftOrder!
-}
-
-type NftProfile {
-  id: ID!
-  address: String!
-  isVerified: Boolean
-  profileImage: Image
-  username: String
-}
-
-enum NftRarityProvider {
-  RARITY_SNIPER
-}
-
-type NftRouteResponse {
-  id: ID!
-  calldata: String!
-  toAddress: String!
-  sendAmount: TokenAmount!
-  route: [NftTrade!]
-}
-
-enum NftStandard {
-  ERC721
-  ERC1155
-  NONCOMPLIANT
-}
-
-type NftTrade {
-  id: ID!
-  contractAddress: String!
-  tokenId: String!
-  tokenType: NftStandard
-  marketplace: NftMarketplace!
-  amount: Int!
-
-  """  quotePrice represents the last quoted price of the NFT"""
-  quotePrice: TokenAmount
-
-  """  price represents the current price of the NFT, which can be different from quotePrice
-  """
-  price: TokenAmount!
-}
-
-input NftTradeInput {
-  id: ID!
-  contractAddress: String!
-  tokenId: String!
-  tokenType: NftStandard
-  marketplace: NftMarketplace!
-  amount: Int!
-  quotePrice: TokenAmountInput
-}
-
-type NftTransfer {
-  id: ID!
-  nftStandard: NftStandard!
-  asset: NftAsset!
-  sender: String!
-  recipient: String!
-  direction: TransactionDirection!
-}
-
-input NftTransferInput {
-  nftStandard: NftStandard!
-  asset: NftAssetInput!
-  sender: String!
-  recipient: String!
-  direction: TransactionDirection!
-}
-
-enum OrderStatus {
-  VALID
-  EXECUTED
-  CANCELLED
-  EXPIRED
-}
-
-enum OrderType {
-  LISTING
-  OFFER
-}
-
-type PageInfo {
-  hasPreviousPage: Boolean
-  hasNextPage: Boolean
-  startCursor: String
-  endCursor: String
-}
-
-"""  v2 pool parameters as defined by https://github.com/Uniswap/v2-sdk/blob/main/src/entities/pair.ts
-"""
-input PairInput {
-  tokenAmountA: TokenAmountInput!
-  tokenAmountB: TokenAmountInput!
-}
-
-input PermitDetailsInput {
-  token: String!
-  amount: String!
-  expiration: String!
-  nonce: String!
-}
-
-input PermitInput {
-  signature: String!
-  details: PermitDetailsInput!
-  spender: String!
-  sigDeadline: String!
-}
-
-"""  v3 pool parameters as defined by https://github.com/Uniswap/v3-sdk/blob/main/src/entities/pool.ts
-"""
-input PoolInput {
-  tokenA: TokenInput!
-  tokenB: TokenInput!
-  fee: Int!
-  sqrtRatioX96: String!
-  liquidity: String!
-  tickCurrent: String!
-}
-
-type Portfolio {
-  id: ID!
-  ownerAddress: String!
-  tokensTotalDenominatedValue: Amount
-  tokensTotalDenominatedValueChange(duration: HistoryDuration): AmountChange
-  tokenBalances: [TokenBalance]
-
-  """  TODO: (michael.zhang) replace with paginated query"""
-  nftBalances: [NftBalance]
-  assetActivities(page: Int, pageSize: Int, includeOffChain: Boolean, chains: [Chain!], _fs: AssetActivitySwitch): [AssetActivity]
-}
-
-"""  Specify how the portfolio value should be calculated for each `ownerAddress`.
-"""
-input PortfolioValueModifier {
-  ownerAddress: String!
-  tokenIncludeOverrides: [ContractInput!]
-  tokenExcludeOverrides: [ContractInput!]
-  includeSmallBalances: Boolean
-  includeSpamTokens: Boolean
-}
-
-enum PriceSource {
-  SUBGRAPH_V2
-  SUBGRAPH_V3
-}
-
-enum ProtocolVersion {
-  V2
-  V3
-}
-
-type PushNotification {
-  id: ID!
-  contents: AWSJSON!
-  notifyAddress: String!
-  viewerHeader: AWSJSON!
-  signerHeader: AWSJSON!
-}
-
-type Query {
-  historicalProtocolVolume(chain: Chain!, version: ProtocolVersion!, duration: HistoryDuration!): [TimestampedAmount!]
-  dailyProtocolTvl(chain: Chain!, version: ProtocolVersion!): [TimestampedAmount!]
-
-  """  returns top v3 pools sorted by total value locked in desc order"""
-  topV3Pools(chain: Chain!, first: Int!, tvlCursor: Float, tokenFilter: String): [V3Pool!]
-  v3Pool(chain: Chain!, address: String!): V3Pool
-
-  """  returns top v2 pairs sorted by total value locked in desc order"""
-  topV2Pairs(chain: Chain!, first: Int!, tvlCursor: Float, tokenFilter: String): [V2Pair!]
-  convert(fromAmount: CurrencyAmountInput!, toCurrency: Currency!): Amount
-  tokens(contracts: [ContractInput!]!): [Token]
-
-  """
-    token consumes chain and address instead of contract because the apollo client request cache can only use
-   keys from the response, and the token response does not contain a contract, but does contain an unwrapped
-   contract: chain and address.
-  """
-  token(chain: Chain!, address: String): Token
-  tokenProjects(contracts: [ContractInput!]!): [TokenProject]
-  searchTokens(searchQuery: String!, chains: [Chain!]): [Token]
-  portfolios(ownerAddresses: [String!]!, chains: [Chain!], lookupTokens: [ContractInput!], valueModifiers: [PortfolioValueModifier!]): [Portfolio]
-  topTokens(chain: Chain, page: Int, pageSize: Int, orderBy: TokenSortableField): [Token]
-  topCollections(chains: [Chain!], orderBy: CollectionSortableField, duration: HistoryDuration, after: String, first: Int, cursor: String, limit: Int): NftCollectionConnection
-  nftAssets(chain: Chain, address: String!, orderBy: NftAssetSortableField, asc: Boolean, filter: NftAssetsFilterInput, after: String, first: Int, before: String, last: Int): NftAssetConnection
-  nftCollections(chain: Chain, filter: NftCollectionsFilterInput, after: String, first: Int): NftCollectionConnection
-  nftBalances(chain: Chain, ownerAddress: String!, filter: NftBalancesFilterInput, after: String, first: Int, before: String, last: Int): NftBalanceConnection
-  nftRoute(chain: Chain, senderAddress: String!, nftTrades: [NftTradeInput!]!, tokenTrades: [TokenTradeInput!]): NftRouteResponse
-  nftActivity(chain: Chain, filter: NftActivityFilterInput, after: String, first: Int): NftActivityConnection
-  nftCollectionBalances(chain: Chain, ownerAddress: String!, after: String, first: Int, before: String, last: Int): NftCollectionBalanceConnection
-  transactionNotification(chain: Chain!, address: String!, transactionHash: String!): TransactionNotification
-}
-
-enum SafetyLevel {
-  VERIFIED
-  MEDIUM_WARNING
-  STRONG_WARNING
-  BLOCKED
-}
-
-type Status {
-  success: Boolean!
-}
-
-type Subscription {
-  onAssetActivity(subscriptionId: ID!, addresses: [String!]!): AssetActivity
-}
-
-enum SubscriptionType {
-  ASSET_ACTIVITY
-}
-
-type SwapOrderDetails {
-  id: ID!
-  offerer: String!
-  hash: String!
-  status: SwapOrderStatus! @deprecated(reason: "use swapOrderStatus to disambiguate from transactionStatus")
-  swapOrderStatus: SwapOrderStatus!
-  inputToken: Token!
-  inputTokenQuantity: String!
-  outputToken: Token!
-  outputTokenQuantity: String!
-  expiry: Int!
-}
-
-enum SwapOrderStatus {
-  OPEN
-  EXPIRED
-  ERROR
-  INSUFFICIENT_FUNDS
-}
-
-type TimestampedAmount implements IAmount {
-  id: ID!
-  currency: Currency
-  value: Float!
-  timestamp: Int!
-}
-
-type Token implements IContract {
-  id: ID!
-  chain: Chain!
-  address: String
-  standard: TokenStandard
-  decimals: Int
-  name: String
-  symbol: String
-  project: TokenProject
-  market(currency: Currency): TokenMarket
-  feeData: FeeData
-}
-
-type TokenAmount {
-  id: ID!
-  value: String!
-  currency: Currency!
-}
-
-input TokenAmountInput {
-  token: TokenInput!
-  amount: String!
-}
-
-type TokenApproval {
-  id: ID!
-  tokenStandard: TokenStandard!
-
-  """  can be erc20 or native"""
-  asset: Token!
-  approvedAddress: String!
-  quantity: String!
-}
-
-input TokenApprovalInput {
-  tokenStandard: TokenStandard!
-  asset: TokenAssetInput!
-  approvedAddress: String!
-  quantity: String!
-}
-
-input TokenAssetInput {
-  chain: Chain!
-  address: String
-  standard: TokenStandard
-  decimals: Int
-  name: String
-  symbol: String
-}
-
-type TokenBalance {
-  id: ID!
-  blockNumber: Int
-  blockTimestamp: Int
-  quantity: Float
-  denominatedValue: Amount
-  ownerAddress: String!
-  token: Token
-  tokenProjectMarket: TokenProjectMarket
-  isHidden: Boolean
-}
-
-input TokenInput {
-  chainId: Int!
-  address: String!
-  decimals: Int!
-  isNative: Boolean!
-}
-
-type TokenMarket {
-  id: ID!
-  token: Token!
-  price: Amount
-  priceSource: PriceSource!
-  totalValueLocked: Amount
-  fullyDilutedValuation: Amount
-  historicalVolume(duration: HistoryDuration!): [TimestampedAmount]
-  historicalTvl(duration: HistoryDuration!): [TimestampedAmount]
-  priceHistory(duration: HistoryDuration!): [TimestampedAmount]
-
-  """  this volume is cumulative volume over the specified duration"""
-  volume(duration: HistoryDuration!): Amount
-  pricePercentChange(duration: HistoryDuration!): Amount
-  priceHighLow(duration: HistoryDuration!, highLow: HighLow!): Amount
-}
-
-type TokenProject {
-  id: ID!
-  name: String
-  tokens: [Token!]!
-  description: String
-  descriptionTranslations: DescriptionTranslations
-  twitterName: String
-  homepageUrl: String
-  logoUrl: String @deprecated(reason: "use logo")
-  logo: Image
-  smallLogo: Image @deprecated(reason: "use logo")
-  isSpam: Boolean
-  spamCode: Int
-  safetyLevel: SafetyLevel
-  markets(currencies: [Currency!]!): [TokenProjectMarket]
-}
-
-type TokenProjectMarket {
-  id: ID!
-  tokenProject: TokenProject!
-  currency: Currency!
-  price: Amount
-  marketCap: Amount
-  fullyDilutedValuation: Amount
-  pricePercentChange24h: Amount
-  priceHigh52w: Amount
-  priceLow52w: Amount
-  priceHistory(duration: HistoryDuration!): [TimestampedAmount]
-  pricePercentChange(duration: HistoryDuration!): Amount
-  priceHighLow(duration: HistoryDuration!, highLow: HighLow!): Amount
-}
-
-enum TokenSortableField {
-  TOTAL_VALUE_LOCKED
-  MARKET_CAP
-  VOLUME
-  POPULARITY
-}
-
-enum TokenStandard {
-  NATIVE
-  ERC20
-}
-
-input TokenTradeInput {
-  tokenAmount: TokenAmountInput!
-  routes: TokenTradeRoutesInput
-  slippageToleranceBasisPoints: Int
-  permit: PermitInput
-}
-
-input TokenTradeRouteInput {
-  pools: [TradePoolInput!]!
-  inputAmount: TokenAmountInput!
-  outputAmount: TokenAmountInput!
-}
-
-input TokenTradeRoutesInput {
-  v2Routes: [TokenTradeRouteInput!]
-  v3Routes: [TokenTradeRouteInput!]
-  mixedRoutes: [TokenTradeRouteInput!]
-  tradeType: TokenTradeType!
-}
-
-enum TokenTradeType {
-  EXACT_INPUT
-  EXACT_OUTPUT
-}
-
-type TokenTransfer {
-  id: ID!
-  tokenStandard: TokenStandard!
-  asset: Token!
-  sender: String!
-  recipient: String!
-  quantity: String!
-  direction: TransactionDirection!
-  transactedValue: Amount
-}
-
-input TokenTransferInput {
-  tokenStandard: TokenStandard!
-  asset: TokenAssetInput!
-  sender: String!
-  recipient: String!
-  quantity: String!
-  direction: TransactionDirection!
-  transactedValue: AmountInput
-}
-
-input TradePoolInput {
-  pair: PairInput
-  pool: PoolInput
-}
-
-type Transaction {
-  id: ID!
-  blockNumber: Int!
-  from: String!
-  to: String!
-  hash: String!
-  nonce: Int!
-  gasLimit: Float
-  maxFeePerGas: Float
-  status: TransactionStatus!
-}
-
-type TransactionDetails {
-  id: ID!
-  type: TransactionType!
-  assetChanges: [AssetChange]!
-  from: String!
-  to: String!
-  hash: String!
-  status: TransactionStatus! @deprecated(reason: "use transactionStatus to disambiguate from swapOrderStatus")
-  transactionStatus: TransactionStatus!
-  nonce: Int!
-  application: ApplicationContract
-}
-
-input TransactionDetailsInput {
-  type: TransactionType!
-  assetChanges: [AssetChangeInput]!
-  from: String!
-  to: String!
-  hash: String!
-  status: TransactionStatus
-  transactionStatus: TransactionStatus!
-  nonce: Int!
-  application: ApplicationContractInput
-}
-
-enum TransactionDirection {
-  IN
-  OUT
-  SELF
-}
-
-type TransactionNotification {
-  id: ID!
-  hash: String!
-  push: [PushNotification!]!
-}
-
-enum TransactionStatus {
-  FAILED
-  CONFIRMED
-  PENDING
-}
-
-enum TransactionType {
-  APPROVE
-  BORROW
-  CANCEL
-  CLAIM
-  DEPLOYMENT
-  LEND
-  MINT
-  RECEIVE
-  REPAY
-  SEND
-  STAKE
-  SWAP
-  SWAP_ORDER
-  UNKNOWN
-  UNSTAKE
-  WITHDRAW
-}
-
-type V2Pair {
-  id: ID!
-  protocolVersion: ProtocolVersion!
-  chain: Chain!
-  address: String!
-  createdAtTimestamp: Int
-  totalLiquidity: Amount
-  token0: Token
-  token0Supply: Float
-  token1: Token
-  token1Supply: Float
-  txCount: Int
-  cumulativeVolume(duration: HistoryDuration!): Amount
-}
-
-type V3Pool {
-  id: ID!
-  protocolVersion: ProtocolVersion!
-  chain: Chain!
-  address: String!
-  createdAtTimestamp: Int
-  totalLiquidity: Amount
-  feeTier: Float
-  token0: Token
-  token0Supply: Float
-  token1: Token
-  token1Supply: Float
-  txCount: Int
-  cumulativeVolume(duration: HistoryDuration!): Amount
-}
-
diff --git a/apps/web/src/graphql/data/util.tsx b/apps/web/src/graphql/data/util.tsx
index aa6c38e38d0..abad694bb74 100644
--- a/apps/web/src/graphql/data/util.tsx
+++ b/apps/web/src/graphql/data/util.tsx
@@ -2,7 +2,7 @@ import { OperationVariables, QueryResult } from '@apollo/client'
 import * as Sentry from '@sentry/react'
 import { ChainId, Currency, Token } from '@uniswap/sdk-core'
 import { AVERAGE_L1_BLOCK_TIME } from 'constants/chainInfo'
-import { NATIVE_CHAIN_ID, WRAPPED_NATIVE_CURRENCY, nativeOnChain } from 'constants/tokens'
+import { NATIVE_CHAIN_ID, nativeOnChain, WRAPPED_NATIVE_CURRENCY } from 'constants/tokens'
 import ms from 'ms'
 import { useEffect } from 'react'
 import { DefaultTheme } from 'styled-components'
@@ -138,17 +138,6 @@ const URL_CHAIN_PARAM_TO_BACKEND: { [key: string]: InterfaceGqlChain } = {
   base: Chain.Base,
 }
 
-const URL_CHAIN_PARAM_TO_CHAIN_ID: { [key: string]: ChainId } = {
-  ethereum: ChainId.MAINNET,
-  polygon: ChainId.POLYGON,
-  celo: ChainId.CELO,
-  arbitrum: ChainId.ARBITRUM_ONE,
-  optimism: ChainId.OPTIMISM,
-  bnb: ChainId.BNB,
-  avalanche: ChainId.AVALANCHE,
-  base: ChainId.BASE,
-}
-
 /**
  * @param chainName parsed in chain name from url query parameter
  * @returns if chainName is a valid chain name, returns the backend chain name, otherwise returns undefined
@@ -158,15 +147,6 @@ export function getValidUrlChainName(chainName: string | undefined): Chain | und
   return validChainName ? validChainName : undefined
 }
 
-/**
- * @param chainName parsed in chain name from the url query parameter
- * @returns if chainName is a valid chain name, returns the ChainId, otherwise returns undefined
- */
-export function getValidUrlChainId(chainName: string | undefined): ChainId | undefined {
-  const validChainId = chainName && URL_CHAIN_PARAM_TO_CHAIN_ID[chainName]
-  return validChainId ? validChainId : undefined
-}
-
 /**
  * @param chainName parsed in chain name from url query parameter
  * @returns if chainName is a valid chain name supported by the backend, returns the backend chain name, otherwise returns Chain.Ethereum
@@ -279,8 +259,3 @@ export function getProtocolColor(priceSource: PriceSource, theme: DefaultTheme):
 export function getProtocolName(priceSource: PriceSource): string {
   return PROTOCOL_META[priceSource].name
 }
-
-export enum OrderDirection {
-  Asc = 'asc',
-  Desc = 'desc',
-}
diff --git a/apps/web/src/graphql/thegraph/PoolTransactions.ts b/apps/web/src/graphql/thegraph/PoolTransactions.ts
index 2437954590c..35128e7d3fc 100644
--- a/apps/web/src/graphql/thegraph/PoolTransactions.ts
+++ b/apps/web/src/graphql/thegraph/PoolTransactions.ts
@@ -2,23 +2,16 @@ import { gql } from '@apollo/client'
 import { ChainId } from '@uniswap/sdk-core'
 import { useCallback, useMemo, useRef } from 'react'
 
-import { OrderDirection, Token, Transaction_OrderBy, usePoolTransactionsQuery } from './__generated__/types-and-hooks'
+import { usePoolTransactionsQuery } from './__generated__/types-and-hooks'
 import { chainToApolloClient } from './apollo'
 
-// TODO(WEB-3236): once GQL BE Transaction query is supported add usd, token0 amount, and token1 amount sort support
 gql`
-  query PoolTransactions(
-    $address: String!
-    $first: Int
-    $skip: Int
-    $orderBy: Transaction_orderBy
-    $orderDirection: OrderDirection
-  ) {
+  query PoolTransactions($address: String!, $first: Int, $skip: Int) {
     mints(
       first: $first
       skip: $skip
       orderBy: timestamp
-      orderDirection: $orderDirection
+      orderDirection: desc
       where: { pool: $address }
       subgraphError: allow
     ) {
@@ -47,7 +40,7 @@ gql`
       first: $first
       skip: $skip
       orderBy: timestamp
-      orderDirection: $orderDirection
+      orderDirection: desc
       where: { pool: $address }
       subgraphError: allow
     ) {
@@ -74,7 +67,7 @@ gql`
       first: $first
       skip: $skip
       orderBy: timestamp
-      orderDirection: $orderDirection
+      orderDirection: desc
       where: { pool: $address }
       subgraphError: allow
     ) {
@@ -102,10 +95,9 @@ gql`
 `
 
 export enum PoolTransactionType {
-  BUY = 'Buy',
-  SELL = 'Sell',
-  BURN = 'Burn',
-  MINT = 'Mint',
+  SWAP,
+  BURN,
+  MINT,
 }
 
 export interface PoolTransaction {
@@ -128,36 +120,17 @@ export interface PoolTransaction {
   type: PoolTransactionType
 }
 
-const PoolTransactionDefaultQuerySize = 25
-
-export function usePoolTransactions(
-  address: string,
-  chainId?: ChainId,
-  orderBy: Transaction_OrderBy = Transaction_OrderBy.Timestamp,
-  orderDirection: OrderDirection = OrderDirection.Desc,
-  filter: PoolTransactionType[] = [
-    PoolTransactionType.BUY,
-    PoolTransactionType.SELL,
-    PoolTransactionType.BURN,
-    PoolTransactionType.MINT,
-  ],
-  token0?: Token,
-  first = PoolTransactionDefaultQuerySize,
-  skip?: number
-) {
+export function usePoolTransactions(address: string, chainId?: ChainId, first = 25, skip?: number) {
   const apolloClient = chainToApolloClient[chainId || ChainId.MAINNET]
   const { data, loading, fetchMore, error } = usePoolTransactionsQuery({
     variables: {
       address: address.toLowerCase(),
       first,
       skip,
-      orderBy,
-      orderDirection,
     },
     client: apolloClient,
   })
   const loadingMore = useRef(false)
-  const sizeRef = useRef(PoolTransactionDefaultQuerySize)
   const loadMore = useCallback(
     ({ onComplete }: { onComplete?: () => void }) => {
       if (loadingMore.current) {
@@ -171,7 +144,6 @@ export function usePoolTransactions(
         updateQuery: (prev, { fetchMoreResult }: any) => {
           if (!fetchMoreResult) return prev
           onComplete?.()
-          sizeRef.current += PoolTransactionDefaultQuerySize
           const mergedData = {
             mints: [...prev.mints, ...fetchMoreResult.mints],
             swaps: [...prev.swaps, ...fetchMoreResult.swaps],
@@ -182,62 +154,47 @@ export function usePoolTransactions(
         },
       })
     },
-    [data?.burns?.length, data?.mints?.length, data?.swaps?.length, fetchMore]
+    [data, fetchMore]
   )
+  const mints = data?.mints.map((tx) => {
+    return { ...tx, type: PoolTransactionType.MINT }
+  })
+  const burns = data?.burns
+    .map((tx) => {
+      return { ...tx, type: PoolTransactionType.BURN }
+    })
+    .filter((tx) => tx.amount0 !== '0' && tx.amount1 !== '0') // filter out collecting fees
+  const swaps = data?.swaps.map((tx) => {
+    return { ...tx, type: PoolTransactionType.SWAP }
+  })
 
-  const transactions = useMemo(() => {
-    const mints = filter.includes(PoolTransactionType.MINT)
-      ? data?.mints.map((tx) => {
-          return { ...tx, type: PoolTransactionType.MINT }
-        })
-      : []
-    const burns = filter.includes(PoolTransactionType.BURN)
-      ? data?.burns
-          .map((tx) => {
-            return { ...tx, type: PoolTransactionType.BURN }
-          })
-          .filter((tx) => tx.amount0 !== '0' && tx.amount1 !== '0') // filter out collecting fees
-      : []
-    const swaps =
-      filter.includes(PoolTransactionType.BUY) || filter.includes(PoolTransactionType.SELL)
-        ? data?.swaps
-            .map((tx) => {
-              const tokenIn = tx.amount0 > 0 ? tx.pool.token0 : tx.pool.token1
-              const isSell = tokenIn.id.toLowerCase() === token0?.id.toLowerCase()
-              if (isSell && filter.includes(PoolTransactionType.SELL)) {
-                return { ...tx, type: PoolTransactionType.SELL }
-              } else if (!isSell && filter.includes(PoolTransactionType.BUY)) {
-                return { ...tx, type: PoolTransactionType.BUY }
-              }
-              return undefined
-            })
-            .filter((tx) => tx !== undefined)
-        : []
-    return [...(mints ?? []), ...(swaps ?? []), ...(burns ?? [])]
-      .sort((a, b) => b?.timestamp - a?.timestamp)
-      .map((tx) => {
-        return {
-          timestamp: tx?.timestamp,
-          transaction: tx?.transaction.id,
-          pool: {
-            token0: {
-              id: tx?.pool.token0.id,
-              symbol: tx?.pool.token0.symbol,
+  const transactions = useMemo(
+    () =>
+      [...(mints ?? []), ...(swaps ?? []), ...(burns ?? [])]
+        .sort((a, b) => b.timestamp - a.timestamp)
+        .map((tx) => {
+          return {
+            timestamp: tx.timestamp,
+            transaction: tx.transaction.id,
+            pool: {
+              token0: {
+                id: tx.pool.token0.id,
+                symbol: tx.pool.token0.symbol,
+              },
+              token1: {
+                id: tx.pool.token1.id,
+                symbol: tx.pool.token1.symbol,
+              },
             },
-            token1: {
-              id: tx?.pool.token1.id,
-              symbol: tx?.pool.token1.symbol,
-            },
-          },
-          maker: tx?.origin,
-          amount0: tx?.amount0,
-          amount1: tx?.amount1,
-          amountUSD: tx?.amountUSD,
-          type: tx?.type,
-        } as PoolTransaction
-      })
-      .slice(0, sizeRef.current)
-  }, [data?.burns, data?.mints, data?.swaps, filter, token0?.id])
+            maker: tx.origin,
+            amount0: tx.amount0,
+            amount1: tx.amount1,
+            amountUSD: tx.amountUSD,
+            type: tx.type,
+          } as PoolTransaction
+        }),
+    [burns, mints, swaps]
+  )
 
   return useMemo(() => {
     return {
diff --git a/apps/web/src/graphql/thegraph/PoolsFromTokenAddress.ts b/apps/web/src/graphql/thegraph/PoolsFromTokenAddress.ts
new file mode 100644
index 00000000000..f59ab8bc444
--- /dev/null
+++ b/apps/web/src/graphql/thegraph/PoolsFromTokenAddress.ts
@@ -0,0 +1,90 @@
+import { ChainId } from '@uniswap/sdk-core'
+import { usePoolsFromTokenAddressQuery } from 'graphql/thegraph/__generated__/types-and-hooks'
+import { chainToApolloClient } from 'graphql/thegraph/apollo'
+import { TablePool } from 'graphql/thegraph/TopPools'
+import gql from 'graphql-tag'
+import { useCallback, useMemo, useRef } from 'react'
+
+gql`
+  query PoolsFromTokenAddress($tokenAddress: String!, $skip: Int) {
+    pools(
+      where: { or: [{ token0: $tokenAddress }, { token1: $tokenAddress }] }
+      first: 20
+      skip: $skip
+      orderBy: totalValueLockedUSD
+      orderDirection: desc
+      subgraphError: allow
+    ) {
+      id
+      txCount
+      totalValueLockedUSD
+      feeTier
+      token0 {
+        id
+        symbol
+      }
+      token1 {
+        id
+        symbol
+      }
+    }
+  }
+`
+
+export function usePoolsFromTokenAddress(tokenAddress: string, chainId?: ChainId) {
+  const apolloClient = chainToApolloClient[chainId || ChainId.MAINNET]
+  const { loading, error, data, fetchMore } = usePoolsFromTokenAddressQuery({
+    variables: {
+      tokenAddress: tokenAddress.toLowerCase(),
+    },
+    client: apolloClient,
+    fetchPolicy: 'cache-first',
+  })
+
+  const loadingMore = useRef(false)
+  const loadMore = useCallback(
+    ({ onComplete }: { onComplete?: () => void }) => {
+      if (loadingMore.current) {
+        return
+      }
+      loadingMore.current = true
+      fetchMore({
+        variables: {
+          skip: data?.pools?.length ?? 0,
+        },
+        updateQuery: (prev, { fetchMoreResult }) => {
+          if (!fetchMoreResult || !prev || !Object.keys(prev).length) return prev
+          onComplete?.()
+          const mergedData = {
+            pools: [...prev.pools, ...fetchMoreResult.pools],
+          }
+          loadingMore.current = false
+          return mergedData
+        },
+      })
+    },
+    [data?.pools?.length, fetchMore]
+  )
+
+  return useMemo(() => {
+    const pools: TablePool[] = (data?.pools ?? [])
+      .map((topPool) => {
+        const rand = Math.random()
+        const tvl = parseFloat(topPool.totalValueLockedUSD ?? '0')
+        return {
+          hash: topPool.id,
+          token0: topPool.token0,
+          token1: topPool.token1,
+          txCount: parseFloat(topPool.txCount ?? '0'),
+          tvl,
+          feeTier: parseFloat(topPool.feeTier ?? '0'),
+          // TODO(WEB-3236): once GQL BE TopToken query is supported use real value for volume24h, volumeWeek, and turnover
+          volume24h: rand * tvl,
+          volumeWeek: rand * tvl * 7,
+          turnover: rand,
+        } as TablePool
+      })
+      .sort((a, b) => b.tvl - a.tvl)
+    return { loading, error, pools, loadMore }
+  }, [data?.pools, error, loadMore, loading])
+}
diff --git a/apps/web/src/graphql/thegraph/TokenTransactions.ts b/apps/web/src/graphql/thegraph/TokenTransactions.ts
index 2b9eb79c3f0..02aecc46788 100644
--- a/apps/web/src/graphql/thegraph/TokenTransactions.ts
+++ b/apps/web/src/graphql/thegraph/TokenTransactions.ts
@@ -1,23 +1,17 @@
 import { gql } from '@apollo/client'
 import { ChainId } from '@uniswap/sdk-core'
-import { OrderDirection, Swap_OrderBy, useTokenTransactionsQuery } from 'graphql/thegraph/__generated__/types-and-hooks'
+import { useTokenTransactionsQuery } from 'graphql/thegraph/__generated__/types-and-hooks'
 import { useCallback, useMemo, useRef } from 'react'
 
 import { chainToApolloClient } from './apollo'
 
 gql`
-  query TokenTransactions(
-    $address: String!
-    $first: Int
-    $skip: Int
-    $orderBy: Swap_orderBy
-    $orderDirection: OrderDirection
-  ) {
+  query TokenTransactions($address: String!, $first: Int, $skip: Int) {
     swapsAs0: swaps(
       first: $first
       skip: $skip
-      orderBy: $orderBy
-      orderDirection: $orderDirection
+      orderBy: timestamp
+      orderDirection: desc
       where: { token0: $address }
       subgraphError: allow
     ) {
@@ -43,8 +37,8 @@ gql`
     swapsAs1: swaps(
       first: $first
       skip: $skip
-      orderBy: $orderBy
-      orderDirection: $orderDirection
+      orderBy: timestamp
+      orderDirection: desc
       where: { token1: $address }
       subgraphError: allow
     ) {
@@ -69,29 +63,13 @@ gql`
     }
   }
 `
-
-export enum TokenTransactionType {
-  BUY = 'Buy',
-  SELL = 'Sell',
-}
-
-export function useTokenTransactions(
-  address: string,
-  chainId?: ChainId,
-  orderBy: Swap_OrderBy = Swap_OrderBy.Timestamp,
-  orderDirection: OrderDirection = OrderDirection.Desc,
-  filter: TokenTransactionType[] = [TokenTransactionType.BUY, TokenTransactionType.SELL],
-  first = 25,
-  skip?: number
-) {
+export function useTokenTransactions(address: string, chainId?: ChainId, first = 25, skip?: number) {
   const apolloClient = chainToApolloClient[chainId || ChainId.MAINNET]
-  const { data, loading, fetchMore, error } = useTokenTransactionsQuery({
+  const { data, loading, fetchMore } = useTokenTransactionsQuery({
     variables: {
       address: address.toLowerCase(),
       first,
       skip,
-      orderBy,
-      orderDirection,
     },
     client: apolloClient,
   })
@@ -122,18 +100,8 @@ export function useTokenTransactions(
   )
 
   const transactions = useMemo(
-    () =>
-      [
-        ...(data?.swapsAs0.filter((swap) => {
-          const isSell = swap.amount0 > 0
-          return isSell ? filter.includes(TokenTransactionType.SELL) : filter.includes(TokenTransactionType.BUY)
-        }) ?? []),
-        ...(data?.swapsAs1.filter((swap) => {
-          const isSell = swap.amount1 > 0
-          return isSell ? filter.includes(TokenTransactionType.SELL) : filter.includes(TokenTransactionType.BUY)
-        }) ?? []),
-      ].sort((a, b) => b.timestamp - a.timestamp),
-    [data?.swapsAs0, data?.swapsAs1, filter]
+    () => [...(data?.swapsAs0 ?? []), ...(data?.swapsAs1 ?? [])].sort((a, b) => b.timestamp - a.timestamp),
+    [data?.swapsAs0, data?.swapsAs1]
   )
 
   return useMemo(() => {
@@ -141,7 +109,6 @@ export function useTokenTransactions(
       transactions,
       loading,
       loadMore,
-      error,
     }
-  }, [transactions, loading, loadMore, error])
+  }, [transactions, loading, loadMore])
 }
diff --git a/apps/web/src/graphql/thegraph/TopPools.ts b/apps/web/src/graphql/thegraph/TopPools.ts
new file mode 100644
index 00000000000..219d2c7b970
--- /dev/null
+++ b/apps/web/src/graphql/thegraph/TopPools.ts
@@ -0,0 +1,73 @@
+import { gql } from '@apollo/client'
+import { ChainId } from '@uniswap/sdk-core'
+import { useMemo } from 'react'
+
+import { Token, useTopPoolsQuery } from './__generated__/types-and-hooks'
+import { chainToApolloClient } from './apollo'
+
+gql`
+  query TopPools {
+    pools(
+      first: 100
+      orderBy: totalValueLockedUSD
+      orderDirection: desc
+      subgraphError: allow
+      where: { txCount_gte: 100 }
+    ) {
+      id
+      txCount
+      totalValueLockedUSD
+      feeTier
+      token0 {
+        id
+        symbol
+      }
+      token1 {
+        id
+        symbol
+      }
+    }
+  }
+`
+
+export interface TablePool {
+  hash: string
+  token0: Token
+  token1: Token
+  txCount: number
+  tvl: number
+  volume24h: number
+  volumeWeek: number
+  turnover: number
+  feeTier: number
+}
+
+export function useTopPools(chainId?: ChainId) {
+  const apolloClient = chainToApolloClient[chainId || ChainId.MAINNET]
+  const { loading, error, data } = useTopPoolsQuery({
+    client: apolloClient,
+    fetchPolicy: 'no-cache',
+  })
+
+  return useMemo(() => {
+    const topPools: TablePool[] | undefined = data?.pools
+      .filter((topPool) => topPool.token0.id && topPool.token1.id)
+      .map((topPool) => {
+        const rand = Math.random()
+        const tvl = parseFloat(topPool.totalValueLockedUSD ?? '0')
+        return {
+          hash: topPool.id,
+          token0: topPool.token0,
+          token1: topPool.token1,
+          txCount: parseFloat(topPool.txCount ?? '0'),
+          tvl,
+          feeTier: parseFloat(topPool.feeTier ?? '0'),
+          // TODO(WEB-3236): once GQL BE TopToken query is supported use real value for volume24h, volumeWeek, and turnover
+          volume24h: rand * tvl,
+          volumeWeek: rand * tvl * 7,
+          turnover: rand,
+        } as TablePool
+      })
+    return { loading, error, topPools }
+  }, [data?.pools, error, loading])
+}
diff --git a/apps/web/src/graphql/thegraph/Transactions.ts b/apps/web/src/graphql/thegraph/Transactions.ts
index 0dfed25fa79..050561c2466 100644
--- a/apps/web/src/graphql/thegraph/Transactions.ts
+++ b/apps/web/src/graphql/thegraph/Transactions.ts
@@ -1,16 +1,12 @@
 import { gql } from '@apollo/client'
 import { ChainId } from '@uniswap/sdk-core'
-import {
-  OrderDirection,
-  Transaction_OrderBy,
-  useTransactionsQuery,
-} from 'graphql/thegraph/__generated__/types-and-hooks'
+import { useTransactionsQuery } from 'graphql/thegraph/__generated__/types-and-hooks'
 import { chainToApolloClient } from 'graphql/thegraph/apollo'
 import { useCallback, useMemo, useRef } from 'react'
 
 gql`
-  query Transactions($first: Int, $skip: Int, $orderBy: Transaction_orderBy, $orderDirection: OrderDirection) {
-    transactions(first: $first, skip: $skip, orderBy: $orderBy, orderDirection: $orderDirection, subgraphError: allow) {
+  query Transactions($first: Int, $skip: Int) {
+    transactions(first: $first, skip: $skip, orderBy: timestamp, orderDirection: desc, subgraphError: allow) {
       id
       timestamp
       mints {
@@ -145,19 +141,12 @@ interface TransactionResults {
   transactions: TransactionEntry[]
 }
 
-export function useRecentTransactions(
-  chainId: number,
-  orderBy: Transaction_OrderBy = Transaction_OrderBy.Timestamp,
-  orderDirection: OrderDirection = OrderDirection.Desc,
-  filter: TransactionType[] = [TransactionType.SWAP, TransactionType.MINT, TransactionType.BURN]
-) {
+export function useRecentTransactions(chainId: number) {
   const apolloClient = chainToApolloClient[chainId || ChainId.MAINNET]
-  const { data, loading, fetchMore, error } = useTransactionsQuery({
+  const { data, loading, fetchMore } = useTransactionsQuery({
     variables: {
       first: 20,
       skip: 0,
-      orderBy,
-      orderDirection,
     },
     client: apolloClient,
   })
@@ -189,62 +178,56 @@ export function useRecentTransactions(
   const transactions = useMemo(
     () =>
       (data as TransactionResults)?.transactions?.reduce((accum: Transaction[], t: TransactionEntry) => {
-        const mints = filter.includes(TransactionType.MINT)
-          ? t.mints.map((m) => {
-              return {
-                type: TransactionType.MINT,
-                hash: t.id,
-                timestamp: t.timestamp,
-                sender: m.origin,
-                token0Symbol: m.pool.token0.symbol,
-                token1Symbol: m.pool.token1.symbol,
-                token0Address: m.pool.token0.id,
-                token1Address: m.pool.token1.id,
-                amountUSD: parseFloat(m.amountUSD),
-                amountToken0: parseFloat(m.amount0),
-                amountToken1: parseFloat(m.amount1),
-              }
-            })
-          : []
-        const burns = filter.includes(TransactionType.BURN)
-          ? t.burns.map((m) => {
-              return {
-                type: TransactionType.BURN,
-                hash: t.id,
-                timestamp: t.timestamp,
-                sender: m.origin,
-                token0Symbol: m.pool.token0.symbol,
-                token1Symbol: m.pool.token1.symbol,
-                token0Address: m.pool.token0.id,
-                token1Address: m.pool.token1.id,
-                amountUSD: parseFloat(m.amountUSD),
-                amountToken0: parseFloat(m.amount0),
-                amountToken1: parseFloat(m.amount1),
-              }
-            })
-          : []
+        const mints = t.mints.map((m) => {
+          return {
+            type: TransactionType.MINT,
+            hash: t.id,
+            timestamp: t.timestamp,
+            sender: m.origin,
+            token0Symbol: m.pool.token0.symbol,
+            token1Symbol: m.pool.token1.symbol,
+            token0Address: m.pool.token0.id,
+            token1Address: m.pool.token1.id,
+            amountUSD: parseFloat(m.amountUSD),
+            amountToken0: parseFloat(m.amount0),
+            amountToken1: parseFloat(m.amount1),
+          }
+        })
+        const burns = t.burns.map((m) => {
+          return {
+            type: TransactionType.BURN,
+            hash: t.id,
+            timestamp: t.timestamp,
+            sender: m.origin,
+            token0Symbol: m.pool.token0.symbol,
+            token1Symbol: m.pool.token1.symbol,
+            token0Address: m.pool.token0.id,
+            token1Address: m.pool.token1.id,
+            amountUSD: parseFloat(m.amountUSD),
+            amountToken0: parseFloat(m.amount0),
+            amountToken1: parseFloat(m.amount1),
+          }
+        })
 
-        const swaps = filter.includes(TransactionType.SWAP)
-          ? t.swaps.map((m) => {
-              return {
-                hash: t.id,
-                type: TransactionType.SWAP,
-                timestamp: t.timestamp,
-                sender: m.origin,
-                token0Symbol: m.pool.token0.symbol,
-                token1Symbol: m.pool.token1.symbol,
-                token0Address: m.pool.token0.id,
-                token1Address: m.pool.token1.id,
-                amountUSD: parseFloat(m.amountUSD),
-                amountToken0: parseFloat(m.amount0),
-                amountToken1: parseFloat(m.amount1),
-              }
-            })
-          : []
+        const swaps = t.swaps.map((m) => {
+          return {
+            hash: t.id,
+            type: TransactionType.SWAP,
+            timestamp: t.timestamp,
+            sender: m.origin,
+            token0Symbol: m.pool.token0.symbol,
+            token1Symbol: m.pool.token1.symbol,
+            token0Address: m.pool.token0.id,
+            token1Address: m.pool.token1.id,
+            amountUSD: parseFloat(m.amountUSD),
+            amountToken0: parseFloat(m.amount0),
+            amountToken1: parseFloat(m.amount1),
+          }
+        })
         accum = [...accum, ...mints, ...burns, ...swaps]
         return accum
       }, []),
-    [data, filter]
+    [data]
   )
 
   return useMemo(
@@ -252,8 +235,7 @@ export function useRecentTransactions(
       transactions,
       loading,
       loadMore,
-      error,
     }),
-    [transactions, loading, loadMore, error]
+    [transactions, loading, loadMore]
   )
 }
diff --git a/apps/web/src/graphql/thegraph/schema.graphql b/apps/web/src/graphql/thegraph/schema.graphql
deleted file mode 100644
index 879622282b1..00000000000
--- a/apps/web/src/graphql/thegraph/schema.graphql
+++ /dev/null
@@ -1,6031 +0,0 @@
-"""
-Marks the GraphQL type as indexable entity.  Each type that should be an entity
-is required to be annotated with this directive.
-"""
-directive @entity on OBJECT
-
-"""Defined a Subgraph ID for an object type"""
-directive @subgraphId(id: String!) on OBJECT
-
-"""
-creates a virtual field on the entity that may be queried but cannot be set manually through the mappings API.
-"""
-directive @derivedFrom(field: String!) on FIELD_DEFINITION
-
-type _Block_ {
-  """The hash of the block"""
-  hash: Bytes
-
-  """The block number"""
-  number: Int!
-
-  """Integer representation of the timestamp stored in blocks for the chain"""
-  timestamp: Int
-}
-
-"""The type for the top-level _meta field"""
-type _Meta_ {
-  """
-  Information about a specific subgraph block. The hash of the block
-  will be null if the _meta field has a block constraint that asks for
-  a block number. It will be filled if the _meta field has no block constraint
-  and therefore asks for the latest  block
-  
-  """
-  block: _Block_!
-
-  """The deployment ID"""
-  deployment: String!
-
-  """If `true`, the subgraph encountered indexing errors at some past block"""
-  hasIndexingErrors: Boolean!
-}
-
-enum _SubgraphErrorPolicy_ {
-  """Data will be returned even if the subgraph has indexing errors"""
-  allow
-
-  """
-  If the subgraph has indexing errors, data will be omitted. The default.
-  """
-  deny
-}
-
-scalar BigDecimal
-
-scalar BigInt
-
-input Block_height {
-  hash: Bytes
-  number: Int
-  number_gte: Int
-}
-
-input BlockChangedFilter {
-  number_gte: Int!
-}
-
-type Bundle {
-  id: ID!
-  ethPriceUSD: BigDecimal!
-}
-
-input Bundle_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  ethPriceUSD: BigDecimal
-  ethPriceUSD_not: BigDecimal
-  ethPriceUSD_gt: BigDecimal
-  ethPriceUSD_lt: BigDecimal
-  ethPriceUSD_gte: BigDecimal
-  ethPriceUSD_lte: BigDecimal
-  ethPriceUSD_in: [BigDecimal!]
-  ethPriceUSD_not_in: [BigDecimal!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [Bundle_filter]
-  or: [Bundle_filter]
-}
-
-enum Bundle_orderBy {
-  id
-  ethPriceUSD
-}
-
-type Burn {
-  id: ID!
-  transaction: Transaction!
-  pool: Pool!
-  token0: Token!
-  token1: Token!
-  timestamp: BigInt!
-  owner: Bytes
-  origin: Bytes!
-  amount: BigInt!
-  amount0: BigDecimal!
-  amount1: BigDecimal!
-  amountUSD: BigDecimal
-  tickLower: BigInt!
-  tickUpper: BigInt!
-  logIndex: BigInt
-}
-
-input Burn_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  transaction: String
-  transaction_not: String
-  transaction_gt: String
-  transaction_lt: String
-  transaction_gte: String
-  transaction_lte: String
-  transaction_in: [String!]
-  transaction_not_in: [String!]
-  transaction_contains: String
-  transaction_contains_nocase: String
-  transaction_not_contains: String
-  transaction_not_contains_nocase: String
-  transaction_starts_with: String
-  transaction_starts_with_nocase: String
-  transaction_not_starts_with: String
-  transaction_not_starts_with_nocase: String
-  transaction_ends_with: String
-  transaction_ends_with_nocase: String
-  transaction_not_ends_with: String
-  transaction_not_ends_with_nocase: String
-  transaction_: Transaction_filter
-  pool: String
-  pool_not: String
-  pool_gt: String
-  pool_lt: String
-  pool_gte: String
-  pool_lte: String
-  pool_in: [String!]
-  pool_not_in: [String!]
-  pool_contains: String
-  pool_contains_nocase: String
-  pool_not_contains: String
-  pool_not_contains_nocase: String
-  pool_starts_with: String
-  pool_starts_with_nocase: String
-  pool_not_starts_with: String
-  pool_not_starts_with_nocase: String
-  pool_ends_with: String
-  pool_ends_with_nocase: String
-  pool_not_ends_with: String
-  pool_not_ends_with_nocase: String
-  pool_: Pool_filter
-  token0: String
-  token0_not: String
-  token0_gt: String
-  token0_lt: String
-  token0_gte: String
-  token0_lte: String
-  token0_in: [String!]
-  token0_not_in: [String!]
-  token0_contains: String
-  token0_contains_nocase: String
-  token0_not_contains: String
-  token0_not_contains_nocase: String
-  token0_starts_with: String
-  token0_starts_with_nocase: String
-  token0_not_starts_with: String
-  token0_not_starts_with_nocase: String
-  token0_ends_with: String
-  token0_ends_with_nocase: String
-  token0_not_ends_with: String
-  token0_not_ends_with_nocase: String
-  token0_: Token_filter
-  token1: String
-  token1_not: String
-  token1_gt: String
-  token1_lt: String
-  token1_gte: String
-  token1_lte: String
-  token1_in: [String!]
-  token1_not_in: [String!]
-  token1_contains: String
-  token1_contains_nocase: String
-  token1_not_contains: String
-  token1_not_contains_nocase: String
-  token1_starts_with: String
-  token1_starts_with_nocase: String
-  token1_not_starts_with: String
-  token1_not_starts_with_nocase: String
-  token1_ends_with: String
-  token1_ends_with_nocase: String
-  token1_not_ends_with: String
-  token1_not_ends_with_nocase: String
-  token1_: Token_filter
-  timestamp: BigInt
-  timestamp_not: BigInt
-  timestamp_gt: BigInt
-  timestamp_lt: BigInt
-  timestamp_gte: BigInt
-  timestamp_lte: BigInt
-  timestamp_in: [BigInt!]
-  timestamp_not_in: [BigInt!]
-  owner: Bytes
-  owner_not: Bytes
-  owner_gt: Bytes
-  owner_lt: Bytes
-  owner_gte: Bytes
-  owner_lte: Bytes
-  owner_in: [Bytes!]
-  owner_not_in: [Bytes!]
-  owner_contains: Bytes
-  owner_not_contains: Bytes
-  origin: Bytes
-  origin_not: Bytes
-  origin_gt: Bytes
-  origin_lt: Bytes
-  origin_gte: Bytes
-  origin_lte: Bytes
-  origin_in: [Bytes!]
-  origin_not_in: [Bytes!]
-  origin_contains: Bytes
-  origin_not_contains: Bytes
-  amount: BigInt
-  amount_not: BigInt
-  amount_gt: BigInt
-  amount_lt: BigInt
-  amount_gte: BigInt
-  amount_lte: BigInt
-  amount_in: [BigInt!]
-  amount_not_in: [BigInt!]
-  amount0: BigDecimal
-  amount0_not: BigDecimal
-  amount0_gt: BigDecimal
-  amount0_lt: BigDecimal
-  amount0_gte: BigDecimal
-  amount0_lte: BigDecimal
-  amount0_in: [BigDecimal!]
-  amount0_not_in: [BigDecimal!]
-  amount1: BigDecimal
-  amount1_not: BigDecimal
-  amount1_gt: BigDecimal
-  amount1_lt: BigDecimal
-  amount1_gte: BigDecimal
-  amount1_lte: BigDecimal
-  amount1_in: [BigDecimal!]
-  amount1_not_in: [BigDecimal!]
-  amountUSD: BigDecimal
-  amountUSD_not: BigDecimal
-  amountUSD_gt: BigDecimal
-  amountUSD_lt: BigDecimal
-  amountUSD_gte: BigDecimal
-  amountUSD_lte: BigDecimal
-  amountUSD_in: [BigDecimal!]
-  amountUSD_not_in: [BigDecimal!]
-  tickLower: BigInt
-  tickLower_not: BigInt
-  tickLower_gt: BigInt
-  tickLower_lt: BigInt
-  tickLower_gte: BigInt
-  tickLower_lte: BigInt
-  tickLower_in: [BigInt!]
-  tickLower_not_in: [BigInt!]
-  tickUpper: BigInt
-  tickUpper_not: BigInt
-  tickUpper_gt: BigInt
-  tickUpper_lt: BigInt
-  tickUpper_gte: BigInt
-  tickUpper_lte: BigInt
-  tickUpper_in: [BigInt!]
-  tickUpper_not_in: [BigInt!]
-  logIndex: BigInt
-  logIndex_not: BigInt
-  logIndex_gt: BigInt
-  logIndex_lt: BigInt
-  logIndex_gte: BigInt
-  logIndex_lte: BigInt
-  logIndex_in: [BigInt!]
-  logIndex_not_in: [BigInt!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [Burn_filter]
-  or: [Burn_filter]
-}
-
-enum Burn_orderBy {
-  id
-  transaction
-  transaction__id
-  transaction__blockNumber
-  transaction__timestamp
-  transaction__gasUsed
-  transaction__gasPrice
-  pool
-  pool__id
-  pool__createdAtTimestamp
-  pool__createdAtBlockNumber
-  pool__feeTier
-  pool__liquidity
-  pool__sqrtPrice
-  pool__feeGrowthGlobal0X128
-  pool__feeGrowthGlobal1X128
-  pool__token0Price
-  pool__token1Price
-  pool__tick
-  pool__observationIndex
-  pool__volumeToken0
-  pool__volumeToken1
-  pool__volumeUSD
-  pool__untrackedVolumeUSD
-  pool__feesUSD
-  pool__txCount
-  pool__collectedFeesToken0
-  pool__collectedFeesToken1
-  pool__collectedFeesUSD
-  pool__totalValueLockedToken0
-  pool__totalValueLockedToken1
-  pool__totalValueLockedETH
-  pool__totalValueLockedUSD
-  pool__totalValueLockedUSDUntracked
-  pool__liquidityProviderCount
-  token0
-  token0__id
-  token0__symbol
-  token0__name
-  token0__decimals
-  token0__totalSupply
-  token0__volume
-  token0__volumeUSD
-  token0__untrackedVolumeUSD
-  token0__feesUSD
-  token0__txCount
-  token0__poolCount
-  token0__totalValueLocked
-  token0__totalValueLockedUSD
-  token0__totalValueLockedUSDUntracked
-  token0__derivedETH
-  token1
-  token1__id
-  token1__symbol
-  token1__name
-  token1__decimals
-  token1__totalSupply
-  token1__volume
-  token1__volumeUSD
-  token1__untrackedVolumeUSD
-  token1__feesUSD
-  token1__txCount
-  token1__poolCount
-  token1__totalValueLocked
-  token1__totalValueLockedUSD
-  token1__totalValueLockedUSDUntracked
-  token1__derivedETH
-  timestamp
-  owner
-  origin
-  amount
-  amount0
-  amount1
-  amountUSD
-  tickLower
-  tickUpper
-  logIndex
-}
-
-scalar Bytes
-
-type Collect {
-  id: ID!
-  transaction: Transaction!
-  timestamp: BigInt!
-  pool: Pool!
-  owner: Bytes
-  amount0: BigDecimal!
-  amount1: BigDecimal!
-  amountUSD: BigDecimal
-  tickLower: BigInt!
-  tickUpper: BigInt!
-  logIndex: BigInt
-}
-
-input Collect_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  transaction: String
-  transaction_not: String
-  transaction_gt: String
-  transaction_lt: String
-  transaction_gte: String
-  transaction_lte: String
-  transaction_in: [String!]
-  transaction_not_in: [String!]
-  transaction_contains: String
-  transaction_contains_nocase: String
-  transaction_not_contains: String
-  transaction_not_contains_nocase: String
-  transaction_starts_with: String
-  transaction_starts_with_nocase: String
-  transaction_not_starts_with: String
-  transaction_not_starts_with_nocase: String
-  transaction_ends_with: String
-  transaction_ends_with_nocase: String
-  transaction_not_ends_with: String
-  transaction_not_ends_with_nocase: String
-  transaction_: Transaction_filter
-  timestamp: BigInt
-  timestamp_not: BigInt
-  timestamp_gt: BigInt
-  timestamp_lt: BigInt
-  timestamp_gte: BigInt
-  timestamp_lte: BigInt
-  timestamp_in: [BigInt!]
-  timestamp_not_in: [BigInt!]
-  pool: String
-  pool_not: String
-  pool_gt: String
-  pool_lt: String
-  pool_gte: String
-  pool_lte: String
-  pool_in: [String!]
-  pool_not_in: [String!]
-  pool_contains: String
-  pool_contains_nocase: String
-  pool_not_contains: String
-  pool_not_contains_nocase: String
-  pool_starts_with: String
-  pool_starts_with_nocase: String
-  pool_not_starts_with: String
-  pool_not_starts_with_nocase: String
-  pool_ends_with: String
-  pool_ends_with_nocase: String
-  pool_not_ends_with: String
-  pool_not_ends_with_nocase: String
-  pool_: Pool_filter
-  owner: Bytes
-  owner_not: Bytes
-  owner_gt: Bytes
-  owner_lt: Bytes
-  owner_gte: Bytes
-  owner_lte: Bytes
-  owner_in: [Bytes!]
-  owner_not_in: [Bytes!]
-  owner_contains: Bytes
-  owner_not_contains: Bytes
-  amount0: BigDecimal
-  amount0_not: BigDecimal
-  amount0_gt: BigDecimal
-  amount0_lt: BigDecimal
-  amount0_gte: BigDecimal
-  amount0_lte: BigDecimal
-  amount0_in: [BigDecimal!]
-  amount0_not_in: [BigDecimal!]
-  amount1: BigDecimal
-  amount1_not: BigDecimal
-  amount1_gt: BigDecimal
-  amount1_lt: BigDecimal
-  amount1_gte: BigDecimal
-  amount1_lte: BigDecimal
-  amount1_in: [BigDecimal!]
-  amount1_not_in: [BigDecimal!]
-  amountUSD: BigDecimal
-  amountUSD_not: BigDecimal
-  amountUSD_gt: BigDecimal
-  amountUSD_lt: BigDecimal
-  amountUSD_gte: BigDecimal
-  amountUSD_lte: BigDecimal
-  amountUSD_in: [BigDecimal!]
-  amountUSD_not_in: [BigDecimal!]
-  tickLower: BigInt
-  tickLower_not: BigInt
-  tickLower_gt: BigInt
-  tickLower_lt: BigInt
-  tickLower_gte: BigInt
-  tickLower_lte: BigInt
-  tickLower_in: [BigInt!]
-  tickLower_not_in: [BigInt!]
-  tickUpper: BigInt
-  tickUpper_not: BigInt
-  tickUpper_gt: BigInt
-  tickUpper_lt: BigInt
-  tickUpper_gte: BigInt
-  tickUpper_lte: BigInt
-  tickUpper_in: [BigInt!]
-  tickUpper_not_in: [BigInt!]
-  logIndex: BigInt
-  logIndex_not: BigInt
-  logIndex_gt: BigInt
-  logIndex_lt: BigInt
-  logIndex_gte: BigInt
-  logIndex_lte: BigInt
-  logIndex_in: [BigInt!]
-  logIndex_not_in: [BigInt!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [Collect_filter]
-  or: [Collect_filter]
-}
-
-enum Collect_orderBy {
-  id
-  transaction
-  transaction__id
-  transaction__blockNumber
-  transaction__timestamp
-  transaction__gasUsed
-  transaction__gasPrice
-  timestamp
-  pool
-  pool__id
-  pool__createdAtTimestamp
-  pool__createdAtBlockNumber
-  pool__feeTier
-  pool__liquidity
-  pool__sqrtPrice
-  pool__feeGrowthGlobal0X128
-  pool__feeGrowthGlobal1X128
-  pool__token0Price
-  pool__token1Price
-  pool__tick
-  pool__observationIndex
-  pool__volumeToken0
-  pool__volumeToken1
-  pool__volumeUSD
-  pool__untrackedVolumeUSD
-  pool__feesUSD
-  pool__txCount
-  pool__collectedFeesToken0
-  pool__collectedFeesToken1
-  pool__collectedFeesUSD
-  pool__totalValueLockedToken0
-  pool__totalValueLockedToken1
-  pool__totalValueLockedETH
-  pool__totalValueLockedUSD
-  pool__totalValueLockedUSDUntracked
-  pool__liquidityProviderCount
-  owner
-  amount0
-  amount1
-  amountUSD
-  tickLower
-  tickUpper
-  logIndex
-}
-
-type Factory {
-  id: ID!
-  poolCount: BigInt!
-  txCount: BigInt!
-  totalVolumeUSD: BigDecimal!
-  totalVolumeETH: BigDecimal!
-  totalFeesUSD: BigDecimal!
-  totalFeesETH: BigDecimal!
-  untrackedVolumeUSD: BigDecimal!
-  totalValueLockedUSD: BigDecimal!
-  totalValueLockedETH: BigDecimal!
-  totalValueLockedUSDUntracked: BigDecimal!
-  totalValueLockedETHUntracked: BigDecimal!
-  owner: ID!
-}
-
-input Factory_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  poolCount: BigInt
-  poolCount_not: BigInt
-  poolCount_gt: BigInt
-  poolCount_lt: BigInt
-  poolCount_gte: BigInt
-  poolCount_lte: BigInt
-  poolCount_in: [BigInt!]
-  poolCount_not_in: [BigInt!]
-  txCount: BigInt
-  txCount_not: BigInt
-  txCount_gt: BigInt
-  txCount_lt: BigInt
-  txCount_gte: BigInt
-  txCount_lte: BigInt
-  txCount_in: [BigInt!]
-  txCount_not_in: [BigInt!]
-  totalVolumeUSD: BigDecimal
-  totalVolumeUSD_not: BigDecimal
-  totalVolumeUSD_gt: BigDecimal
-  totalVolumeUSD_lt: BigDecimal
-  totalVolumeUSD_gte: BigDecimal
-  totalVolumeUSD_lte: BigDecimal
-  totalVolumeUSD_in: [BigDecimal!]
-  totalVolumeUSD_not_in: [BigDecimal!]
-  totalVolumeETH: BigDecimal
-  totalVolumeETH_not: BigDecimal
-  totalVolumeETH_gt: BigDecimal
-  totalVolumeETH_lt: BigDecimal
-  totalVolumeETH_gte: BigDecimal
-  totalVolumeETH_lte: BigDecimal
-  totalVolumeETH_in: [BigDecimal!]
-  totalVolumeETH_not_in: [BigDecimal!]
-  totalFeesUSD: BigDecimal
-  totalFeesUSD_not: BigDecimal
-  totalFeesUSD_gt: BigDecimal
-  totalFeesUSD_lt: BigDecimal
-  totalFeesUSD_gte: BigDecimal
-  totalFeesUSD_lte: BigDecimal
-  totalFeesUSD_in: [BigDecimal!]
-  totalFeesUSD_not_in: [BigDecimal!]
-  totalFeesETH: BigDecimal
-  totalFeesETH_not: BigDecimal
-  totalFeesETH_gt: BigDecimal
-  totalFeesETH_lt: BigDecimal
-  totalFeesETH_gte: BigDecimal
-  totalFeesETH_lte: BigDecimal
-  totalFeesETH_in: [BigDecimal!]
-  totalFeesETH_not_in: [BigDecimal!]
-  untrackedVolumeUSD: BigDecimal
-  untrackedVolumeUSD_not: BigDecimal
-  untrackedVolumeUSD_gt: BigDecimal
-  untrackedVolumeUSD_lt: BigDecimal
-  untrackedVolumeUSD_gte: BigDecimal
-  untrackedVolumeUSD_lte: BigDecimal
-  untrackedVolumeUSD_in: [BigDecimal!]
-  untrackedVolumeUSD_not_in: [BigDecimal!]
-  totalValueLockedUSD: BigDecimal
-  totalValueLockedUSD_not: BigDecimal
-  totalValueLockedUSD_gt: BigDecimal
-  totalValueLockedUSD_lt: BigDecimal
-  totalValueLockedUSD_gte: BigDecimal
-  totalValueLockedUSD_lte: BigDecimal
-  totalValueLockedUSD_in: [BigDecimal!]
-  totalValueLockedUSD_not_in: [BigDecimal!]
-  totalValueLockedETH: BigDecimal
-  totalValueLockedETH_not: BigDecimal
-  totalValueLockedETH_gt: BigDecimal
-  totalValueLockedETH_lt: BigDecimal
-  totalValueLockedETH_gte: BigDecimal
-  totalValueLockedETH_lte: BigDecimal
-  totalValueLockedETH_in: [BigDecimal!]
-  totalValueLockedETH_not_in: [BigDecimal!]
-  totalValueLockedUSDUntracked: BigDecimal
-  totalValueLockedUSDUntracked_not: BigDecimal
-  totalValueLockedUSDUntracked_gt: BigDecimal
-  totalValueLockedUSDUntracked_lt: BigDecimal
-  totalValueLockedUSDUntracked_gte: BigDecimal
-  totalValueLockedUSDUntracked_lte: BigDecimal
-  totalValueLockedUSDUntracked_in: [BigDecimal!]
-  totalValueLockedUSDUntracked_not_in: [BigDecimal!]
-  totalValueLockedETHUntracked: BigDecimal
-  totalValueLockedETHUntracked_not: BigDecimal
-  totalValueLockedETHUntracked_gt: BigDecimal
-  totalValueLockedETHUntracked_lt: BigDecimal
-  totalValueLockedETHUntracked_gte: BigDecimal
-  totalValueLockedETHUntracked_lte: BigDecimal
-  totalValueLockedETHUntracked_in: [BigDecimal!]
-  totalValueLockedETHUntracked_not_in: [BigDecimal!]
-  owner: ID
-  owner_not: ID
-  owner_gt: ID
-  owner_lt: ID
-  owner_gte: ID
-  owner_lte: ID
-  owner_in: [ID!]
-  owner_not_in: [ID!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [Factory_filter]
-  or: [Factory_filter]
-}
-
-enum Factory_orderBy {
-  id
-  poolCount
-  txCount
-  totalVolumeUSD
-  totalVolumeETH
-  totalFeesUSD
-  totalFeesETH
-  untrackedVolumeUSD
-  totalValueLockedUSD
-  totalValueLockedETH
-  totalValueLockedUSDUntracked
-  totalValueLockedETHUntracked
-  owner
-}
-
-type Flash {
-  id: ID!
-  transaction: Transaction!
-  timestamp: BigInt!
-  pool: Pool!
-  sender: Bytes!
-  recipient: Bytes!
-  amount0: BigDecimal!
-  amount1: BigDecimal!
-  amountUSD: BigDecimal!
-  amount0Paid: BigDecimal!
-  amount1Paid: BigDecimal!
-  logIndex: BigInt
-}
-
-input Flash_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  transaction: String
-  transaction_not: String
-  transaction_gt: String
-  transaction_lt: String
-  transaction_gte: String
-  transaction_lte: String
-  transaction_in: [String!]
-  transaction_not_in: [String!]
-  transaction_contains: String
-  transaction_contains_nocase: String
-  transaction_not_contains: String
-  transaction_not_contains_nocase: String
-  transaction_starts_with: String
-  transaction_starts_with_nocase: String
-  transaction_not_starts_with: String
-  transaction_not_starts_with_nocase: String
-  transaction_ends_with: String
-  transaction_ends_with_nocase: String
-  transaction_not_ends_with: String
-  transaction_not_ends_with_nocase: String
-  transaction_: Transaction_filter
-  timestamp: BigInt
-  timestamp_not: BigInt
-  timestamp_gt: BigInt
-  timestamp_lt: BigInt
-  timestamp_gte: BigInt
-  timestamp_lte: BigInt
-  timestamp_in: [BigInt!]
-  timestamp_not_in: [BigInt!]
-  pool: String
-  pool_not: String
-  pool_gt: String
-  pool_lt: String
-  pool_gte: String
-  pool_lte: String
-  pool_in: [String!]
-  pool_not_in: [String!]
-  pool_contains: String
-  pool_contains_nocase: String
-  pool_not_contains: String
-  pool_not_contains_nocase: String
-  pool_starts_with: String
-  pool_starts_with_nocase: String
-  pool_not_starts_with: String
-  pool_not_starts_with_nocase: String
-  pool_ends_with: String
-  pool_ends_with_nocase: String
-  pool_not_ends_with: String
-  pool_not_ends_with_nocase: String
-  pool_: Pool_filter
-  sender: Bytes
-  sender_not: Bytes
-  sender_gt: Bytes
-  sender_lt: Bytes
-  sender_gte: Bytes
-  sender_lte: Bytes
-  sender_in: [Bytes!]
-  sender_not_in: [Bytes!]
-  sender_contains: Bytes
-  sender_not_contains: Bytes
-  recipient: Bytes
-  recipient_not: Bytes
-  recipient_gt: Bytes
-  recipient_lt: Bytes
-  recipient_gte: Bytes
-  recipient_lte: Bytes
-  recipient_in: [Bytes!]
-  recipient_not_in: [Bytes!]
-  recipient_contains: Bytes
-  recipient_not_contains: Bytes
-  amount0: BigDecimal
-  amount0_not: BigDecimal
-  amount0_gt: BigDecimal
-  amount0_lt: BigDecimal
-  amount0_gte: BigDecimal
-  amount0_lte: BigDecimal
-  amount0_in: [BigDecimal!]
-  amount0_not_in: [BigDecimal!]
-  amount1: BigDecimal
-  amount1_not: BigDecimal
-  amount1_gt: BigDecimal
-  amount1_lt: BigDecimal
-  amount1_gte: BigDecimal
-  amount1_lte: BigDecimal
-  amount1_in: [BigDecimal!]
-  amount1_not_in: [BigDecimal!]
-  amountUSD: BigDecimal
-  amountUSD_not: BigDecimal
-  amountUSD_gt: BigDecimal
-  amountUSD_lt: BigDecimal
-  amountUSD_gte: BigDecimal
-  amountUSD_lte: BigDecimal
-  amountUSD_in: [BigDecimal!]
-  amountUSD_not_in: [BigDecimal!]
-  amount0Paid: BigDecimal
-  amount0Paid_not: BigDecimal
-  amount0Paid_gt: BigDecimal
-  amount0Paid_lt: BigDecimal
-  amount0Paid_gte: BigDecimal
-  amount0Paid_lte: BigDecimal
-  amount0Paid_in: [BigDecimal!]
-  amount0Paid_not_in: [BigDecimal!]
-  amount1Paid: BigDecimal
-  amount1Paid_not: BigDecimal
-  amount1Paid_gt: BigDecimal
-  amount1Paid_lt: BigDecimal
-  amount1Paid_gte: BigDecimal
-  amount1Paid_lte: BigDecimal
-  amount1Paid_in: [BigDecimal!]
-  amount1Paid_not_in: [BigDecimal!]
-  logIndex: BigInt
-  logIndex_not: BigInt
-  logIndex_gt: BigInt
-  logIndex_lt: BigInt
-  logIndex_gte: BigInt
-  logIndex_lte: BigInt
-  logIndex_in: [BigInt!]
-  logIndex_not_in: [BigInt!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [Flash_filter]
-  or: [Flash_filter]
-}
-
-enum Flash_orderBy {
-  id
-  transaction
-  transaction__id
-  transaction__blockNumber
-  transaction__timestamp
-  transaction__gasUsed
-  transaction__gasPrice
-  timestamp
-  pool
-  pool__id
-  pool__createdAtTimestamp
-  pool__createdAtBlockNumber
-  pool__feeTier
-  pool__liquidity
-  pool__sqrtPrice
-  pool__feeGrowthGlobal0X128
-  pool__feeGrowthGlobal1X128
-  pool__token0Price
-  pool__token1Price
-  pool__tick
-  pool__observationIndex
-  pool__volumeToken0
-  pool__volumeToken1
-  pool__volumeUSD
-  pool__untrackedVolumeUSD
-  pool__feesUSD
-  pool__txCount
-  pool__collectedFeesToken0
-  pool__collectedFeesToken1
-  pool__collectedFeesUSD
-  pool__totalValueLockedToken0
-  pool__totalValueLockedToken1
-  pool__totalValueLockedETH
-  pool__totalValueLockedUSD
-  pool__totalValueLockedUSDUntracked
-  pool__liquidityProviderCount
-  sender
-  recipient
-  amount0
-  amount1
-  amountUSD
-  amount0Paid
-  amount1Paid
-  logIndex
-}
-
-"""
-8 bytes signed integer
-
-"""
-scalar Int8
-
-type Mint {
-  id: ID!
-  transaction: Transaction!
-  timestamp: BigInt!
-  pool: Pool!
-  token0: Token!
-  token1: Token!
-  owner: Bytes!
-  sender: Bytes
-  origin: Bytes!
-  amount: BigInt!
-  amount0: BigDecimal!
-  amount1: BigDecimal!
-  amountUSD: BigDecimal
-  tickLower: BigInt!
-  tickUpper: BigInt!
-  logIndex: BigInt
-}
-
-input Mint_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  transaction: String
-  transaction_not: String
-  transaction_gt: String
-  transaction_lt: String
-  transaction_gte: String
-  transaction_lte: String
-  transaction_in: [String!]
-  transaction_not_in: [String!]
-  transaction_contains: String
-  transaction_contains_nocase: String
-  transaction_not_contains: String
-  transaction_not_contains_nocase: String
-  transaction_starts_with: String
-  transaction_starts_with_nocase: String
-  transaction_not_starts_with: String
-  transaction_not_starts_with_nocase: String
-  transaction_ends_with: String
-  transaction_ends_with_nocase: String
-  transaction_not_ends_with: String
-  transaction_not_ends_with_nocase: String
-  transaction_: Transaction_filter
-  timestamp: BigInt
-  timestamp_not: BigInt
-  timestamp_gt: BigInt
-  timestamp_lt: BigInt
-  timestamp_gte: BigInt
-  timestamp_lte: BigInt
-  timestamp_in: [BigInt!]
-  timestamp_not_in: [BigInt!]
-  pool: String
-  pool_not: String
-  pool_gt: String
-  pool_lt: String
-  pool_gte: String
-  pool_lte: String
-  pool_in: [String!]
-  pool_not_in: [String!]
-  pool_contains: String
-  pool_contains_nocase: String
-  pool_not_contains: String
-  pool_not_contains_nocase: String
-  pool_starts_with: String
-  pool_starts_with_nocase: String
-  pool_not_starts_with: String
-  pool_not_starts_with_nocase: String
-  pool_ends_with: String
-  pool_ends_with_nocase: String
-  pool_not_ends_with: String
-  pool_not_ends_with_nocase: String
-  pool_: Pool_filter
-  token0: String
-  token0_not: String
-  token0_gt: String
-  token0_lt: String
-  token0_gte: String
-  token0_lte: String
-  token0_in: [String!]
-  token0_not_in: [String!]
-  token0_contains: String
-  token0_contains_nocase: String
-  token0_not_contains: String
-  token0_not_contains_nocase: String
-  token0_starts_with: String
-  token0_starts_with_nocase: String
-  token0_not_starts_with: String
-  token0_not_starts_with_nocase: String
-  token0_ends_with: String
-  token0_ends_with_nocase: String
-  token0_not_ends_with: String
-  token0_not_ends_with_nocase: String
-  token0_: Token_filter
-  token1: String
-  token1_not: String
-  token1_gt: String
-  token1_lt: String
-  token1_gte: String
-  token1_lte: String
-  token1_in: [String!]
-  token1_not_in: [String!]
-  token1_contains: String
-  token1_contains_nocase: String
-  token1_not_contains: String
-  token1_not_contains_nocase: String
-  token1_starts_with: String
-  token1_starts_with_nocase: String
-  token1_not_starts_with: String
-  token1_not_starts_with_nocase: String
-  token1_ends_with: String
-  token1_ends_with_nocase: String
-  token1_not_ends_with: String
-  token1_not_ends_with_nocase: String
-  token1_: Token_filter
-  owner: Bytes
-  owner_not: Bytes
-  owner_gt: Bytes
-  owner_lt: Bytes
-  owner_gte: Bytes
-  owner_lte: Bytes
-  owner_in: [Bytes!]
-  owner_not_in: [Bytes!]
-  owner_contains: Bytes
-  owner_not_contains: Bytes
-  sender: Bytes
-  sender_not: Bytes
-  sender_gt: Bytes
-  sender_lt: Bytes
-  sender_gte: Bytes
-  sender_lte: Bytes
-  sender_in: [Bytes!]
-  sender_not_in: [Bytes!]
-  sender_contains: Bytes
-  sender_not_contains: Bytes
-  origin: Bytes
-  origin_not: Bytes
-  origin_gt: Bytes
-  origin_lt: Bytes
-  origin_gte: Bytes
-  origin_lte: Bytes
-  origin_in: [Bytes!]
-  origin_not_in: [Bytes!]
-  origin_contains: Bytes
-  origin_not_contains: Bytes
-  amount: BigInt
-  amount_not: BigInt
-  amount_gt: BigInt
-  amount_lt: BigInt
-  amount_gte: BigInt
-  amount_lte: BigInt
-  amount_in: [BigInt!]
-  amount_not_in: [BigInt!]
-  amount0: BigDecimal
-  amount0_not: BigDecimal
-  amount0_gt: BigDecimal
-  amount0_lt: BigDecimal
-  amount0_gte: BigDecimal
-  amount0_lte: BigDecimal
-  amount0_in: [BigDecimal!]
-  amount0_not_in: [BigDecimal!]
-  amount1: BigDecimal
-  amount1_not: BigDecimal
-  amount1_gt: BigDecimal
-  amount1_lt: BigDecimal
-  amount1_gte: BigDecimal
-  amount1_lte: BigDecimal
-  amount1_in: [BigDecimal!]
-  amount1_not_in: [BigDecimal!]
-  amountUSD: BigDecimal
-  amountUSD_not: BigDecimal
-  amountUSD_gt: BigDecimal
-  amountUSD_lt: BigDecimal
-  amountUSD_gte: BigDecimal
-  amountUSD_lte: BigDecimal
-  amountUSD_in: [BigDecimal!]
-  amountUSD_not_in: [BigDecimal!]
-  tickLower: BigInt
-  tickLower_not: BigInt
-  tickLower_gt: BigInt
-  tickLower_lt: BigInt
-  tickLower_gte: BigInt
-  tickLower_lte: BigInt
-  tickLower_in: [BigInt!]
-  tickLower_not_in: [BigInt!]
-  tickUpper: BigInt
-  tickUpper_not: BigInt
-  tickUpper_gt: BigInt
-  tickUpper_lt: BigInt
-  tickUpper_gte: BigInt
-  tickUpper_lte: BigInt
-  tickUpper_in: [BigInt!]
-  tickUpper_not_in: [BigInt!]
-  logIndex: BigInt
-  logIndex_not: BigInt
-  logIndex_gt: BigInt
-  logIndex_lt: BigInt
-  logIndex_gte: BigInt
-  logIndex_lte: BigInt
-  logIndex_in: [BigInt!]
-  logIndex_not_in: [BigInt!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [Mint_filter]
-  or: [Mint_filter]
-}
-
-enum Mint_orderBy {
-  id
-  transaction
-  transaction__id
-  transaction__blockNumber
-  transaction__timestamp
-  transaction__gasUsed
-  transaction__gasPrice
-  timestamp
-  pool
-  pool__id
-  pool__createdAtTimestamp
-  pool__createdAtBlockNumber
-  pool__feeTier
-  pool__liquidity
-  pool__sqrtPrice
-  pool__feeGrowthGlobal0X128
-  pool__feeGrowthGlobal1X128
-  pool__token0Price
-  pool__token1Price
-  pool__tick
-  pool__observationIndex
-  pool__volumeToken0
-  pool__volumeToken1
-  pool__volumeUSD
-  pool__untrackedVolumeUSD
-  pool__feesUSD
-  pool__txCount
-  pool__collectedFeesToken0
-  pool__collectedFeesToken1
-  pool__collectedFeesUSD
-  pool__totalValueLockedToken0
-  pool__totalValueLockedToken1
-  pool__totalValueLockedETH
-  pool__totalValueLockedUSD
-  pool__totalValueLockedUSDUntracked
-  pool__liquidityProviderCount
-  token0
-  token0__id
-  token0__symbol
-  token0__name
-  token0__decimals
-  token0__totalSupply
-  token0__volume
-  token0__volumeUSD
-  token0__untrackedVolumeUSD
-  token0__feesUSD
-  token0__txCount
-  token0__poolCount
-  token0__totalValueLocked
-  token0__totalValueLockedUSD
-  token0__totalValueLockedUSDUntracked
-  token0__derivedETH
-  token1
-  token1__id
-  token1__symbol
-  token1__name
-  token1__decimals
-  token1__totalSupply
-  token1__volume
-  token1__volumeUSD
-  token1__untrackedVolumeUSD
-  token1__feesUSD
-  token1__txCount
-  token1__poolCount
-  token1__totalValueLocked
-  token1__totalValueLockedUSD
-  token1__totalValueLockedUSDUntracked
-  token1__derivedETH
-  owner
-  sender
-  origin
-  amount
-  amount0
-  amount1
-  amountUSD
-  tickLower
-  tickUpper
-  logIndex
-}
-
-"""Defines the order direction, either ascending or descending"""
-enum OrderDirection {
-  asc
-  desc
-}
-
-type Pool {
-  id: ID!
-  createdAtTimestamp: BigInt!
-  createdAtBlockNumber: BigInt!
-  token0: Token!
-  token1: Token!
-  feeTier: BigInt!
-  liquidity: BigInt!
-  sqrtPrice: BigInt!
-  feeGrowthGlobal0X128: BigInt!
-  feeGrowthGlobal1X128: BigInt!
-  token0Price: BigDecimal!
-  token1Price: BigDecimal!
-  tick: BigInt
-  observationIndex: BigInt!
-  volumeToken0: BigDecimal!
-  volumeToken1: BigDecimal!
-  volumeUSD: BigDecimal!
-  untrackedVolumeUSD: BigDecimal!
-  feesUSD: BigDecimal!
-  txCount: BigInt!
-  collectedFeesToken0: BigDecimal!
-  collectedFeesToken1: BigDecimal!
-  collectedFeesUSD: BigDecimal!
-  totalValueLockedToken0: BigDecimal!
-  totalValueLockedToken1: BigDecimal!
-  totalValueLockedETH: BigDecimal!
-  totalValueLockedUSD: BigDecimal!
-  totalValueLockedUSDUntracked: BigDecimal!
-  liquidityProviderCount: BigInt!
-  poolHourData(skip: Int = 0, first: Int = 100, orderBy: PoolHourData_orderBy, orderDirection: OrderDirection, where: PoolHourData_filter): [PoolHourData!]!
-  poolDayData(skip: Int = 0, first: Int = 100, orderBy: PoolDayData_orderBy, orderDirection: OrderDirection, where: PoolDayData_filter): [PoolDayData!]!
-  mints(skip: Int = 0, first: Int = 100, orderBy: Mint_orderBy, orderDirection: OrderDirection, where: Mint_filter): [Mint!]!
-  burns(skip: Int = 0, first: Int = 100, orderBy: Burn_orderBy, orderDirection: OrderDirection, where: Burn_filter): [Burn!]!
-  swaps(skip: Int = 0, first: Int = 100, orderBy: Swap_orderBy, orderDirection: OrderDirection, where: Swap_filter): [Swap!]!
-  collects(skip: Int = 0, first: Int = 100, orderBy: Collect_orderBy, orderDirection: OrderDirection, where: Collect_filter): [Collect!]!
-  ticks(skip: Int = 0, first: Int = 100, orderBy: Tick_orderBy, orderDirection: OrderDirection, where: Tick_filter): [Tick!]!
-}
-
-input Pool_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  createdAtTimestamp: BigInt
-  createdAtTimestamp_not: BigInt
-  createdAtTimestamp_gt: BigInt
-  createdAtTimestamp_lt: BigInt
-  createdAtTimestamp_gte: BigInt
-  createdAtTimestamp_lte: BigInt
-  createdAtTimestamp_in: [BigInt!]
-  createdAtTimestamp_not_in: [BigInt!]
-  createdAtBlockNumber: BigInt
-  createdAtBlockNumber_not: BigInt
-  createdAtBlockNumber_gt: BigInt
-  createdAtBlockNumber_lt: BigInt
-  createdAtBlockNumber_gte: BigInt
-  createdAtBlockNumber_lte: BigInt
-  createdAtBlockNumber_in: [BigInt!]
-  createdAtBlockNumber_not_in: [BigInt!]
-  token0: String
-  token0_not: String
-  token0_gt: String
-  token0_lt: String
-  token0_gte: String
-  token0_lte: String
-  token0_in: [String!]
-  token0_not_in: [String!]
-  token0_contains: String
-  token0_contains_nocase: String
-  token0_not_contains: String
-  token0_not_contains_nocase: String
-  token0_starts_with: String
-  token0_starts_with_nocase: String
-  token0_not_starts_with: String
-  token0_not_starts_with_nocase: String
-  token0_ends_with: String
-  token0_ends_with_nocase: String
-  token0_not_ends_with: String
-  token0_not_ends_with_nocase: String
-  token0_: Token_filter
-  token1: String
-  token1_not: String
-  token1_gt: String
-  token1_lt: String
-  token1_gte: String
-  token1_lte: String
-  token1_in: [String!]
-  token1_not_in: [String!]
-  token1_contains: String
-  token1_contains_nocase: String
-  token1_not_contains: String
-  token1_not_contains_nocase: String
-  token1_starts_with: String
-  token1_starts_with_nocase: String
-  token1_not_starts_with: String
-  token1_not_starts_with_nocase: String
-  token1_ends_with: String
-  token1_ends_with_nocase: String
-  token1_not_ends_with: String
-  token1_not_ends_with_nocase: String
-  token1_: Token_filter
-  feeTier: BigInt
-  feeTier_not: BigInt
-  feeTier_gt: BigInt
-  feeTier_lt: BigInt
-  feeTier_gte: BigInt
-  feeTier_lte: BigInt
-  feeTier_in: [BigInt!]
-  feeTier_not_in: [BigInt!]
-  liquidity: BigInt
-  liquidity_not: BigInt
-  liquidity_gt: BigInt
-  liquidity_lt: BigInt
-  liquidity_gte: BigInt
-  liquidity_lte: BigInt
-  liquidity_in: [BigInt!]
-  liquidity_not_in: [BigInt!]
-  sqrtPrice: BigInt
-  sqrtPrice_not: BigInt
-  sqrtPrice_gt: BigInt
-  sqrtPrice_lt: BigInt
-  sqrtPrice_gte: BigInt
-  sqrtPrice_lte: BigInt
-  sqrtPrice_in: [BigInt!]
-  sqrtPrice_not_in: [BigInt!]
-  feeGrowthGlobal0X128: BigInt
-  feeGrowthGlobal0X128_not: BigInt
-  feeGrowthGlobal0X128_gt: BigInt
-  feeGrowthGlobal0X128_lt: BigInt
-  feeGrowthGlobal0X128_gte: BigInt
-  feeGrowthGlobal0X128_lte: BigInt
-  feeGrowthGlobal0X128_in: [BigInt!]
-  feeGrowthGlobal0X128_not_in: [BigInt!]
-  feeGrowthGlobal1X128: BigInt
-  feeGrowthGlobal1X128_not: BigInt
-  feeGrowthGlobal1X128_gt: BigInt
-  feeGrowthGlobal1X128_lt: BigInt
-  feeGrowthGlobal1X128_gte: BigInt
-  feeGrowthGlobal1X128_lte: BigInt
-  feeGrowthGlobal1X128_in: [BigInt!]
-  feeGrowthGlobal1X128_not_in: [BigInt!]
-  token0Price: BigDecimal
-  token0Price_not: BigDecimal
-  token0Price_gt: BigDecimal
-  token0Price_lt: BigDecimal
-  token0Price_gte: BigDecimal
-  token0Price_lte: BigDecimal
-  token0Price_in: [BigDecimal!]
-  token0Price_not_in: [BigDecimal!]
-  token1Price: BigDecimal
-  token1Price_not: BigDecimal
-  token1Price_gt: BigDecimal
-  token1Price_lt: BigDecimal
-  token1Price_gte: BigDecimal
-  token1Price_lte: BigDecimal
-  token1Price_in: [BigDecimal!]
-  token1Price_not_in: [BigDecimal!]
-  tick: BigInt
-  tick_not: BigInt
-  tick_gt: BigInt
-  tick_lt: BigInt
-  tick_gte: BigInt
-  tick_lte: BigInt
-  tick_in: [BigInt!]
-  tick_not_in: [BigInt!]
-  observationIndex: BigInt
-  observationIndex_not: BigInt
-  observationIndex_gt: BigInt
-  observationIndex_lt: BigInt
-  observationIndex_gte: BigInt
-  observationIndex_lte: BigInt
-  observationIndex_in: [BigInt!]
-  observationIndex_not_in: [BigInt!]
-  volumeToken0: BigDecimal
-  volumeToken0_not: BigDecimal
-  volumeToken0_gt: BigDecimal
-  volumeToken0_lt: BigDecimal
-  volumeToken0_gte: BigDecimal
-  volumeToken0_lte: BigDecimal
-  volumeToken0_in: [BigDecimal!]
-  volumeToken0_not_in: [BigDecimal!]
-  volumeToken1: BigDecimal
-  volumeToken1_not: BigDecimal
-  volumeToken1_gt: BigDecimal
-  volumeToken1_lt: BigDecimal
-  volumeToken1_gte: BigDecimal
-  volumeToken1_lte: BigDecimal
-  volumeToken1_in: [BigDecimal!]
-  volumeToken1_not_in: [BigDecimal!]
-  volumeUSD: BigDecimal
-  volumeUSD_not: BigDecimal
-  volumeUSD_gt: BigDecimal
-  volumeUSD_lt: BigDecimal
-  volumeUSD_gte: BigDecimal
-  volumeUSD_lte: BigDecimal
-  volumeUSD_in: [BigDecimal!]
-  volumeUSD_not_in: [BigDecimal!]
-  untrackedVolumeUSD: BigDecimal
-  untrackedVolumeUSD_not: BigDecimal
-  untrackedVolumeUSD_gt: BigDecimal
-  untrackedVolumeUSD_lt: BigDecimal
-  untrackedVolumeUSD_gte: BigDecimal
-  untrackedVolumeUSD_lte: BigDecimal
-  untrackedVolumeUSD_in: [BigDecimal!]
-  untrackedVolumeUSD_not_in: [BigDecimal!]
-  feesUSD: BigDecimal
-  feesUSD_not: BigDecimal
-  feesUSD_gt: BigDecimal
-  feesUSD_lt: BigDecimal
-  feesUSD_gte: BigDecimal
-  feesUSD_lte: BigDecimal
-  feesUSD_in: [BigDecimal!]
-  feesUSD_not_in: [BigDecimal!]
-  txCount: BigInt
-  txCount_not: BigInt
-  txCount_gt: BigInt
-  txCount_lt: BigInt
-  txCount_gte: BigInt
-  txCount_lte: BigInt
-  txCount_in: [BigInt!]
-  txCount_not_in: [BigInt!]
-  collectedFeesToken0: BigDecimal
-  collectedFeesToken0_not: BigDecimal
-  collectedFeesToken0_gt: BigDecimal
-  collectedFeesToken0_lt: BigDecimal
-  collectedFeesToken0_gte: BigDecimal
-  collectedFeesToken0_lte: BigDecimal
-  collectedFeesToken0_in: [BigDecimal!]
-  collectedFeesToken0_not_in: [BigDecimal!]
-  collectedFeesToken1: BigDecimal
-  collectedFeesToken1_not: BigDecimal
-  collectedFeesToken1_gt: BigDecimal
-  collectedFeesToken1_lt: BigDecimal
-  collectedFeesToken1_gte: BigDecimal
-  collectedFeesToken1_lte: BigDecimal
-  collectedFeesToken1_in: [BigDecimal!]
-  collectedFeesToken1_not_in: [BigDecimal!]
-  collectedFeesUSD: BigDecimal
-  collectedFeesUSD_not: BigDecimal
-  collectedFeesUSD_gt: BigDecimal
-  collectedFeesUSD_lt: BigDecimal
-  collectedFeesUSD_gte: BigDecimal
-  collectedFeesUSD_lte: BigDecimal
-  collectedFeesUSD_in: [BigDecimal!]
-  collectedFeesUSD_not_in: [BigDecimal!]
-  totalValueLockedToken0: BigDecimal
-  totalValueLockedToken0_not: BigDecimal
-  totalValueLockedToken0_gt: BigDecimal
-  totalValueLockedToken0_lt: BigDecimal
-  totalValueLockedToken0_gte: BigDecimal
-  totalValueLockedToken0_lte: BigDecimal
-  totalValueLockedToken0_in: [BigDecimal!]
-  totalValueLockedToken0_not_in: [BigDecimal!]
-  totalValueLockedToken1: BigDecimal
-  totalValueLockedToken1_not: BigDecimal
-  totalValueLockedToken1_gt: BigDecimal
-  totalValueLockedToken1_lt: BigDecimal
-  totalValueLockedToken1_gte: BigDecimal
-  totalValueLockedToken1_lte: BigDecimal
-  totalValueLockedToken1_in: [BigDecimal!]
-  totalValueLockedToken1_not_in: [BigDecimal!]
-  totalValueLockedETH: BigDecimal
-  totalValueLockedETH_not: BigDecimal
-  totalValueLockedETH_gt: BigDecimal
-  totalValueLockedETH_lt: BigDecimal
-  totalValueLockedETH_gte: BigDecimal
-  totalValueLockedETH_lte: BigDecimal
-  totalValueLockedETH_in: [BigDecimal!]
-  totalValueLockedETH_not_in: [BigDecimal!]
-  totalValueLockedUSD: BigDecimal
-  totalValueLockedUSD_not: BigDecimal
-  totalValueLockedUSD_gt: BigDecimal
-  totalValueLockedUSD_lt: BigDecimal
-  totalValueLockedUSD_gte: BigDecimal
-  totalValueLockedUSD_lte: BigDecimal
-  totalValueLockedUSD_in: [BigDecimal!]
-  totalValueLockedUSD_not_in: [BigDecimal!]
-  totalValueLockedUSDUntracked: BigDecimal
-  totalValueLockedUSDUntracked_not: BigDecimal
-  totalValueLockedUSDUntracked_gt: BigDecimal
-  totalValueLockedUSDUntracked_lt: BigDecimal
-  totalValueLockedUSDUntracked_gte: BigDecimal
-  totalValueLockedUSDUntracked_lte: BigDecimal
-  totalValueLockedUSDUntracked_in: [BigDecimal!]
-  totalValueLockedUSDUntracked_not_in: [BigDecimal!]
-  liquidityProviderCount: BigInt
-  liquidityProviderCount_not: BigInt
-  liquidityProviderCount_gt: BigInt
-  liquidityProviderCount_lt: BigInt
-  liquidityProviderCount_gte: BigInt
-  liquidityProviderCount_lte: BigInt
-  liquidityProviderCount_in: [BigInt!]
-  liquidityProviderCount_not_in: [BigInt!]
-  poolHourData_: PoolHourData_filter
-  poolDayData_: PoolDayData_filter
-  mints_: Mint_filter
-  burns_: Burn_filter
-  swaps_: Swap_filter
-  collects_: Collect_filter
-  ticks_: Tick_filter
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [Pool_filter]
-  or: [Pool_filter]
-}
-
-enum Pool_orderBy {
-  id
-  createdAtTimestamp
-  createdAtBlockNumber
-  token0
-  token0__id
-  token0__symbol
-  token0__name
-  token0__decimals
-  token0__totalSupply
-  token0__volume
-  token0__volumeUSD
-  token0__untrackedVolumeUSD
-  token0__feesUSD
-  token0__txCount
-  token0__poolCount
-  token0__totalValueLocked
-  token0__totalValueLockedUSD
-  token0__totalValueLockedUSDUntracked
-  token0__derivedETH
-  token1
-  token1__id
-  token1__symbol
-  token1__name
-  token1__decimals
-  token1__totalSupply
-  token1__volume
-  token1__volumeUSD
-  token1__untrackedVolumeUSD
-  token1__feesUSD
-  token1__txCount
-  token1__poolCount
-  token1__totalValueLocked
-  token1__totalValueLockedUSD
-  token1__totalValueLockedUSDUntracked
-  token1__derivedETH
-  feeTier
-  liquidity
-  sqrtPrice
-  feeGrowthGlobal0X128
-  feeGrowthGlobal1X128
-  token0Price
-  token1Price
-  tick
-  observationIndex
-  volumeToken0
-  volumeToken1
-  volumeUSD
-  untrackedVolumeUSD
-  feesUSD
-  txCount
-  collectedFeesToken0
-  collectedFeesToken1
-  collectedFeesUSD
-  totalValueLockedToken0
-  totalValueLockedToken1
-  totalValueLockedETH
-  totalValueLockedUSD
-  totalValueLockedUSDUntracked
-  liquidityProviderCount
-  poolHourData
-  poolDayData
-  mints
-  burns
-  swaps
-  collects
-  ticks
-}
-
-type PoolDayData {
-  id: ID!
-  date: Int!
-  pool: Pool!
-  liquidity: BigInt!
-  sqrtPrice: BigInt!
-  token0Price: BigDecimal!
-  token1Price: BigDecimal!
-  tick: BigInt
-  feeGrowthGlobal0X128: BigInt!
-  feeGrowthGlobal1X128: BigInt!
-  tvlUSD: BigDecimal!
-  volumeToken0: BigDecimal!
-  volumeToken1: BigDecimal!
-  volumeUSD: BigDecimal!
-  feesUSD: BigDecimal!
-  txCount: BigInt!
-  open: BigDecimal!
-  high: BigDecimal!
-  low: BigDecimal!
-  close: BigDecimal!
-}
-
-input PoolDayData_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  date: Int
-  date_not: Int
-  date_gt: Int
-  date_lt: Int
-  date_gte: Int
-  date_lte: Int
-  date_in: [Int!]
-  date_not_in: [Int!]
-  pool: String
-  pool_not: String
-  pool_gt: String
-  pool_lt: String
-  pool_gte: String
-  pool_lte: String
-  pool_in: [String!]
-  pool_not_in: [String!]
-  pool_contains: String
-  pool_contains_nocase: String
-  pool_not_contains: String
-  pool_not_contains_nocase: String
-  pool_starts_with: String
-  pool_starts_with_nocase: String
-  pool_not_starts_with: String
-  pool_not_starts_with_nocase: String
-  pool_ends_with: String
-  pool_ends_with_nocase: String
-  pool_not_ends_with: String
-  pool_not_ends_with_nocase: String
-  pool_: Pool_filter
-  liquidity: BigInt
-  liquidity_not: BigInt
-  liquidity_gt: BigInt
-  liquidity_lt: BigInt
-  liquidity_gte: BigInt
-  liquidity_lte: BigInt
-  liquidity_in: [BigInt!]
-  liquidity_not_in: [BigInt!]
-  sqrtPrice: BigInt
-  sqrtPrice_not: BigInt
-  sqrtPrice_gt: BigInt
-  sqrtPrice_lt: BigInt
-  sqrtPrice_gte: BigInt
-  sqrtPrice_lte: BigInt
-  sqrtPrice_in: [BigInt!]
-  sqrtPrice_not_in: [BigInt!]
-  token0Price: BigDecimal
-  token0Price_not: BigDecimal
-  token0Price_gt: BigDecimal
-  token0Price_lt: BigDecimal
-  token0Price_gte: BigDecimal
-  token0Price_lte: BigDecimal
-  token0Price_in: [BigDecimal!]
-  token0Price_not_in: [BigDecimal!]
-  token1Price: BigDecimal
-  token1Price_not: BigDecimal
-  token1Price_gt: BigDecimal
-  token1Price_lt: BigDecimal
-  token1Price_gte: BigDecimal
-  token1Price_lte: BigDecimal
-  token1Price_in: [BigDecimal!]
-  token1Price_not_in: [BigDecimal!]
-  tick: BigInt
-  tick_not: BigInt
-  tick_gt: BigInt
-  tick_lt: BigInt
-  tick_gte: BigInt
-  tick_lte: BigInt
-  tick_in: [BigInt!]
-  tick_not_in: [BigInt!]
-  feeGrowthGlobal0X128: BigInt
-  feeGrowthGlobal0X128_not: BigInt
-  feeGrowthGlobal0X128_gt: BigInt
-  feeGrowthGlobal0X128_lt: BigInt
-  feeGrowthGlobal0X128_gte: BigInt
-  feeGrowthGlobal0X128_lte: BigInt
-  feeGrowthGlobal0X128_in: [BigInt!]
-  feeGrowthGlobal0X128_not_in: [BigInt!]
-  feeGrowthGlobal1X128: BigInt
-  feeGrowthGlobal1X128_not: BigInt
-  feeGrowthGlobal1X128_gt: BigInt
-  feeGrowthGlobal1X128_lt: BigInt
-  feeGrowthGlobal1X128_gte: BigInt
-  feeGrowthGlobal1X128_lte: BigInt
-  feeGrowthGlobal1X128_in: [BigInt!]
-  feeGrowthGlobal1X128_not_in: [BigInt!]
-  tvlUSD: BigDecimal
-  tvlUSD_not: BigDecimal
-  tvlUSD_gt: BigDecimal
-  tvlUSD_lt: BigDecimal
-  tvlUSD_gte: BigDecimal
-  tvlUSD_lte: BigDecimal
-  tvlUSD_in: [BigDecimal!]
-  tvlUSD_not_in: [BigDecimal!]
-  volumeToken0: BigDecimal
-  volumeToken0_not: BigDecimal
-  volumeToken0_gt: BigDecimal
-  volumeToken0_lt: BigDecimal
-  volumeToken0_gte: BigDecimal
-  volumeToken0_lte: BigDecimal
-  volumeToken0_in: [BigDecimal!]
-  volumeToken0_not_in: [BigDecimal!]
-  volumeToken1: BigDecimal
-  volumeToken1_not: BigDecimal
-  volumeToken1_gt: BigDecimal
-  volumeToken1_lt: BigDecimal
-  volumeToken1_gte: BigDecimal
-  volumeToken1_lte: BigDecimal
-  volumeToken1_in: [BigDecimal!]
-  volumeToken1_not_in: [BigDecimal!]
-  volumeUSD: BigDecimal
-  volumeUSD_not: BigDecimal
-  volumeUSD_gt: BigDecimal
-  volumeUSD_lt: BigDecimal
-  volumeUSD_gte: BigDecimal
-  volumeUSD_lte: BigDecimal
-  volumeUSD_in: [BigDecimal!]
-  volumeUSD_not_in: [BigDecimal!]
-  feesUSD: BigDecimal
-  feesUSD_not: BigDecimal
-  feesUSD_gt: BigDecimal
-  feesUSD_lt: BigDecimal
-  feesUSD_gte: BigDecimal
-  feesUSD_lte: BigDecimal
-  feesUSD_in: [BigDecimal!]
-  feesUSD_not_in: [BigDecimal!]
-  txCount: BigInt
-  txCount_not: BigInt
-  txCount_gt: BigInt
-  txCount_lt: BigInt
-  txCount_gte: BigInt
-  txCount_lte: BigInt
-  txCount_in: [BigInt!]
-  txCount_not_in: [BigInt!]
-  open: BigDecimal
-  open_not: BigDecimal
-  open_gt: BigDecimal
-  open_lt: BigDecimal
-  open_gte: BigDecimal
-  open_lte: BigDecimal
-  open_in: [BigDecimal!]
-  open_not_in: [BigDecimal!]
-  high: BigDecimal
-  high_not: BigDecimal
-  high_gt: BigDecimal
-  high_lt: BigDecimal
-  high_gte: BigDecimal
-  high_lte: BigDecimal
-  high_in: [BigDecimal!]
-  high_not_in: [BigDecimal!]
-  low: BigDecimal
-  low_not: BigDecimal
-  low_gt: BigDecimal
-  low_lt: BigDecimal
-  low_gte: BigDecimal
-  low_lte: BigDecimal
-  low_in: [BigDecimal!]
-  low_not_in: [BigDecimal!]
-  close: BigDecimal
-  close_not: BigDecimal
-  close_gt: BigDecimal
-  close_lt: BigDecimal
-  close_gte: BigDecimal
-  close_lte: BigDecimal
-  close_in: [BigDecimal!]
-  close_not_in: [BigDecimal!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [PoolDayData_filter]
-  or: [PoolDayData_filter]
-}
-
-enum PoolDayData_orderBy {
-  id
-  date
-  pool
-  pool__id
-  pool__createdAtTimestamp
-  pool__createdAtBlockNumber
-  pool__feeTier
-  pool__liquidity
-  pool__sqrtPrice
-  pool__feeGrowthGlobal0X128
-  pool__feeGrowthGlobal1X128
-  pool__token0Price
-  pool__token1Price
-  pool__tick
-  pool__observationIndex
-  pool__volumeToken0
-  pool__volumeToken1
-  pool__volumeUSD
-  pool__untrackedVolumeUSD
-  pool__feesUSD
-  pool__txCount
-  pool__collectedFeesToken0
-  pool__collectedFeesToken1
-  pool__collectedFeesUSD
-  pool__totalValueLockedToken0
-  pool__totalValueLockedToken1
-  pool__totalValueLockedETH
-  pool__totalValueLockedUSD
-  pool__totalValueLockedUSDUntracked
-  pool__liquidityProviderCount
-  liquidity
-  sqrtPrice
-  token0Price
-  token1Price
-  tick
-  feeGrowthGlobal0X128
-  feeGrowthGlobal1X128
-  tvlUSD
-  volumeToken0
-  volumeToken1
-  volumeUSD
-  feesUSD
-  txCount
-  open
-  high
-  low
-  close
-}
-
-type PoolHourData {
-  id: ID!
-  periodStartUnix: Int!
-  pool: Pool!
-  liquidity: BigInt!
-  sqrtPrice: BigInt!
-  token0Price: BigDecimal!
-  token1Price: BigDecimal!
-  tick: BigInt
-  feeGrowthGlobal0X128: BigInt!
-  feeGrowthGlobal1X128: BigInt!
-  tvlUSD: BigDecimal!
-  volumeToken0: BigDecimal!
-  volumeToken1: BigDecimal!
-  volumeUSD: BigDecimal!
-  feesUSD: BigDecimal!
-  txCount: BigInt!
-  open: BigDecimal!
-  high: BigDecimal!
-  low: BigDecimal!
-  close: BigDecimal!
-}
-
-input PoolHourData_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  periodStartUnix: Int
-  periodStartUnix_not: Int
-  periodStartUnix_gt: Int
-  periodStartUnix_lt: Int
-  periodStartUnix_gte: Int
-  periodStartUnix_lte: Int
-  periodStartUnix_in: [Int!]
-  periodStartUnix_not_in: [Int!]
-  pool: String
-  pool_not: String
-  pool_gt: String
-  pool_lt: String
-  pool_gte: String
-  pool_lte: String
-  pool_in: [String!]
-  pool_not_in: [String!]
-  pool_contains: String
-  pool_contains_nocase: String
-  pool_not_contains: String
-  pool_not_contains_nocase: String
-  pool_starts_with: String
-  pool_starts_with_nocase: String
-  pool_not_starts_with: String
-  pool_not_starts_with_nocase: String
-  pool_ends_with: String
-  pool_ends_with_nocase: String
-  pool_not_ends_with: String
-  pool_not_ends_with_nocase: String
-  pool_: Pool_filter
-  liquidity: BigInt
-  liquidity_not: BigInt
-  liquidity_gt: BigInt
-  liquidity_lt: BigInt
-  liquidity_gte: BigInt
-  liquidity_lte: BigInt
-  liquidity_in: [BigInt!]
-  liquidity_not_in: [BigInt!]
-  sqrtPrice: BigInt
-  sqrtPrice_not: BigInt
-  sqrtPrice_gt: BigInt
-  sqrtPrice_lt: BigInt
-  sqrtPrice_gte: BigInt
-  sqrtPrice_lte: BigInt
-  sqrtPrice_in: [BigInt!]
-  sqrtPrice_not_in: [BigInt!]
-  token0Price: BigDecimal
-  token0Price_not: BigDecimal
-  token0Price_gt: BigDecimal
-  token0Price_lt: BigDecimal
-  token0Price_gte: BigDecimal
-  token0Price_lte: BigDecimal
-  token0Price_in: [BigDecimal!]
-  token0Price_not_in: [BigDecimal!]
-  token1Price: BigDecimal
-  token1Price_not: BigDecimal
-  token1Price_gt: BigDecimal
-  token1Price_lt: BigDecimal
-  token1Price_gte: BigDecimal
-  token1Price_lte: BigDecimal
-  token1Price_in: [BigDecimal!]
-  token1Price_not_in: [BigDecimal!]
-  tick: BigInt
-  tick_not: BigInt
-  tick_gt: BigInt
-  tick_lt: BigInt
-  tick_gte: BigInt
-  tick_lte: BigInt
-  tick_in: [BigInt!]
-  tick_not_in: [BigInt!]
-  feeGrowthGlobal0X128: BigInt
-  feeGrowthGlobal0X128_not: BigInt
-  feeGrowthGlobal0X128_gt: BigInt
-  feeGrowthGlobal0X128_lt: BigInt
-  feeGrowthGlobal0X128_gte: BigInt
-  feeGrowthGlobal0X128_lte: BigInt
-  feeGrowthGlobal0X128_in: [BigInt!]
-  feeGrowthGlobal0X128_not_in: [BigInt!]
-  feeGrowthGlobal1X128: BigInt
-  feeGrowthGlobal1X128_not: BigInt
-  feeGrowthGlobal1X128_gt: BigInt
-  feeGrowthGlobal1X128_lt: BigInt
-  feeGrowthGlobal1X128_gte: BigInt
-  feeGrowthGlobal1X128_lte: BigInt
-  feeGrowthGlobal1X128_in: [BigInt!]
-  feeGrowthGlobal1X128_not_in: [BigInt!]
-  tvlUSD: BigDecimal
-  tvlUSD_not: BigDecimal
-  tvlUSD_gt: BigDecimal
-  tvlUSD_lt: BigDecimal
-  tvlUSD_gte: BigDecimal
-  tvlUSD_lte: BigDecimal
-  tvlUSD_in: [BigDecimal!]
-  tvlUSD_not_in: [BigDecimal!]
-  volumeToken0: BigDecimal
-  volumeToken0_not: BigDecimal
-  volumeToken0_gt: BigDecimal
-  volumeToken0_lt: BigDecimal
-  volumeToken0_gte: BigDecimal
-  volumeToken0_lte: BigDecimal
-  volumeToken0_in: [BigDecimal!]
-  volumeToken0_not_in: [BigDecimal!]
-  volumeToken1: BigDecimal
-  volumeToken1_not: BigDecimal
-  volumeToken1_gt: BigDecimal
-  volumeToken1_lt: BigDecimal
-  volumeToken1_gte: BigDecimal
-  volumeToken1_lte: BigDecimal
-  volumeToken1_in: [BigDecimal!]
-  volumeToken1_not_in: [BigDecimal!]
-  volumeUSD: BigDecimal
-  volumeUSD_not: BigDecimal
-  volumeUSD_gt: BigDecimal
-  volumeUSD_lt: BigDecimal
-  volumeUSD_gte: BigDecimal
-  volumeUSD_lte: BigDecimal
-  volumeUSD_in: [BigDecimal!]
-  volumeUSD_not_in: [BigDecimal!]
-  feesUSD: BigDecimal
-  feesUSD_not: BigDecimal
-  feesUSD_gt: BigDecimal
-  feesUSD_lt: BigDecimal
-  feesUSD_gte: BigDecimal
-  feesUSD_lte: BigDecimal
-  feesUSD_in: [BigDecimal!]
-  feesUSD_not_in: [BigDecimal!]
-  txCount: BigInt
-  txCount_not: BigInt
-  txCount_gt: BigInt
-  txCount_lt: BigInt
-  txCount_gte: BigInt
-  txCount_lte: BigInt
-  txCount_in: [BigInt!]
-  txCount_not_in: [BigInt!]
-  open: BigDecimal
-  open_not: BigDecimal
-  open_gt: BigDecimal
-  open_lt: BigDecimal
-  open_gte: BigDecimal
-  open_lte: BigDecimal
-  open_in: [BigDecimal!]
-  open_not_in: [BigDecimal!]
-  high: BigDecimal
-  high_not: BigDecimal
-  high_gt: BigDecimal
-  high_lt: BigDecimal
-  high_gte: BigDecimal
-  high_lte: BigDecimal
-  high_in: [BigDecimal!]
-  high_not_in: [BigDecimal!]
-  low: BigDecimal
-  low_not: BigDecimal
-  low_gt: BigDecimal
-  low_lt: BigDecimal
-  low_gte: BigDecimal
-  low_lte: BigDecimal
-  low_in: [BigDecimal!]
-  low_not_in: [BigDecimal!]
-  close: BigDecimal
-  close_not: BigDecimal
-  close_gt: BigDecimal
-  close_lt: BigDecimal
-  close_gte: BigDecimal
-  close_lte: BigDecimal
-  close_in: [BigDecimal!]
-  close_not_in: [BigDecimal!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [PoolHourData_filter]
-  or: [PoolHourData_filter]
-}
-
-enum PoolHourData_orderBy {
-  id
-  periodStartUnix
-  pool
-  pool__id
-  pool__createdAtTimestamp
-  pool__createdAtBlockNumber
-  pool__feeTier
-  pool__liquidity
-  pool__sqrtPrice
-  pool__feeGrowthGlobal0X128
-  pool__feeGrowthGlobal1X128
-  pool__token0Price
-  pool__token1Price
-  pool__tick
-  pool__observationIndex
-  pool__volumeToken0
-  pool__volumeToken1
-  pool__volumeUSD
-  pool__untrackedVolumeUSD
-  pool__feesUSD
-  pool__txCount
-  pool__collectedFeesToken0
-  pool__collectedFeesToken1
-  pool__collectedFeesUSD
-  pool__totalValueLockedToken0
-  pool__totalValueLockedToken1
-  pool__totalValueLockedETH
-  pool__totalValueLockedUSD
-  pool__totalValueLockedUSDUntracked
-  pool__liquidityProviderCount
-  liquidity
-  sqrtPrice
-  token0Price
-  token1Price
-  tick
-  feeGrowthGlobal0X128
-  feeGrowthGlobal1X128
-  tvlUSD
-  volumeToken0
-  volumeToken1
-  volumeUSD
-  feesUSD
-  txCount
-  open
-  high
-  low
-  close
-}
-
-type Position {
-  id: ID!
-  owner: Bytes!
-  pool: Pool!
-  token0: Token!
-  token1: Token!
-  tickLower: Tick!
-  tickUpper: Tick!
-  liquidity: BigInt!
-  depositedToken0: BigDecimal!
-  depositedToken1: BigDecimal!
-  withdrawnToken0: BigDecimal!
-  withdrawnToken1: BigDecimal!
-  collectedFeesToken0: BigDecimal!
-  collectedFeesToken1: BigDecimal!
-  transaction: Transaction!
-  feeGrowthInside0LastX128: BigInt!
-  feeGrowthInside1LastX128: BigInt!
-}
-
-input Position_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  owner: Bytes
-  owner_not: Bytes
-  owner_gt: Bytes
-  owner_lt: Bytes
-  owner_gte: Bytes
-  owner_lte: Bytes
-  owner_in: [Bytes!]
-  owner_not_in: [Bytes!]
-  owner_contains: Bytes
-  owner_not_contains: Bytes
-  pool: String
-  pool_not: String
-  pool_gt: String
-  pool_lt: String
-  pool_gte: String
-  pool_lte: String
-  pool_in: [String!]
-  pool_not_in: [String!]
-  pool_contains: String
-  pool_contains_nocase: String
-  pool_not_contains: String
-  pool_not_contains_nocase: String
-  pool_starts_with: String
-  pool_starts_with_nocase: String
-  pool_not_starts_with: String
-  pool_not_starts_with_nocase: String
-  pool_ends_with: String
-  pool_ends_with_nocase: String
-  pool_not_ends_with: String
-  pool_not_ends_with_nocase: String
-  pool_: Pool_filter
-  token0: String
-  token0_not: String
-  token0_gt: String
-  token0_lt: String
-  token0_gte: String
-  token0_lte: String
-  token0_in: [String!]
-  token0_not_in: [String!]
-  token0_contains: String
-  token0_contains_nocase: String
-  token0_not_contains: String
-  token0_not_contains_nocase: String
-  token0_starts_with: String
-  token0_starts_with_nocase: String
-  token0_not_starts_with: String
-  token0_not_starts_with_nocase: String
-  token0_ends_with: String
-  token0_ends_with_nocase: String
-  token0_not_ends_with: String
-  token0_not_ends_with_nocase: String
-  token0_: Token_filter
-  token1: String
-  token1_not: String
-  token1_gt: String
-  token1_lt: String
-  token1_gte: String
-  token1_lte: String
-  token1_in: [String!]
-  token1_not_in: [String!]
-  token1_contains: String
-  token1_contains_nocase: String
-  token1_not_contains: String
-  token1_not_contains_nocase: String
-  token1_starts_with: String
-  token1_starts_with_nocase: String
-  token1_not_starts_with: String
-  token1_not_starts_with_nocase: String
-  token1_ends_with: String
-  token1_ends_with_nocase: String
-  token1_not_ends_with: String
-  token1_not_ends_with_nocase: String
-  token1_: Token_filter
-  tickLower: String
-  tickLower_not: String
-  tickLower_gt: String
-  tickLower_lt: String
-  tickLower_gte: String
-  tickLower_lte: String
-  tickLower_in: [String!]
-  tickLower_not_in: [String!]
-  tickLower_contains: String
-  tickLower_contains_nocase: String
-  tickLower_not_contains: String
-  tickLower_not_contains_nocase: String
-  tickLower_starts_with: String
-  tickLower_starts_with_nocase: String
-  tickLower_not_starts_with: String
-  tickLower_not_starts_with_nocase: String
-  tickLower_ends_with: String
-  tickLower_ends_with_nocase: String
-  tickLower_not_ends_with: String
-  tickLower_not_ends_with_nocase: String
-  tickLower_: Tick_filter
-  tickUpper: String
-  tickUpper_not: String
-  tickUpper_gt: String
-  tickUpper_lt: String
-  tickUpper_gte: String
-  tickUpper_lte: String
-  tickUpper_in: [String!]
-  tickUpper_not_in: [String!]
-  tickUpper_contains: String
-  tickUpper_contains_nocase: String
-  tickUpper_not_contains: String
-  tickUpper_not_contains_nocase: String
-  tickUpper_starts_with: String
-  tickUpper_starts_with_nocase: String
-  tickUpper_not_starts_with: String
-  tickUpper_not_starts_with_nocase: String
-  tickUpper_ends_with: String
-  tickUpper_ends_with_nocase: String
-  tickUpper_not_ends_with: String
-  tickUpper_not_ends_with_nocase: String
-  tickUpper_: Tick_filter
-  liquidity: BigInt
-  liquidity_not: BigInt
-  liquidity_gt: BigInt
-  liquidity_lt: BigInt
-  liquidity_gte: BigInt
-  liquidity_lte: BigInt
-  liquidity_in: [BigInt!]
-  liquidity_not_in: [BigInt!]
-  depositedToken0: BigDecimal
-  depositedToken0_not: BigDecimal
-  depositedToken0_gt: BigDecimal
-  depositedToken0_lt: BigDecimal
-  depositedToken0_gte: BigDecimal
-  depositedToken0_lte: BigDecimal
-  depositedToken0_in: [BigDecimal!]
-  depositedToken0_not_in: [BigDecimal!]
-  depositedToken1: BigDecimal
-  depositedToken1_not: BigDecimal
-  depositedToken1_gt: BigDecimal
-  depositedToken1_lt: BigDecimal
-  depositedToken1_gte: BigDecimal
-  depositedToken1_lte: BigDecimal
-  depositedToken1_in: [BigDecimal!]
-  depositedToken1_not_in: [BigDecimal!]
-  withdrawnToken0: BigDecimal
-  withdrawnToken0_not: BigDecimal
-  withdrawnToken0_gt: BigDecimal
-  withdrawnToken0_lt: BigDecimal
-  withdrawnToken0_gte: BigDecimal
-  withdrawnToken0_lte: BigDecimal
-  withdrawnToken0_in: [BigDecimal!]
-  withdrawnToken0_not_in: [BigDecimal!]
-  withdrawnToken1: BigDecimal
-  withdrawnToken1_not: BigDecimal
-  withdrawnToken1_gt: BigDecimal
-  withdrawnToken1_lt: BigDecimal
-  withdrawnToken1_gte: BigDecimal
-  withdrawnToken1_lte: BigDecimal
-  withdrawnToken1_in: [BigDecimal!]
-  withdrawnToken1_not_in: [BigDecimal!]
-  collectedFeesToken0: BigDecimal
-  collectedFeesToken0_not: BigDecimal
-  collectedFeesToken0_gt: BigDecimal
-  collectedFeesToken0_lt: BigDecimal
-  collectedFeesToken0_gte: BigDecimal
-  collectedFeesToken0_lte: BigDecimal
-  collectedFeesToken0_in: [BigDecimal!]
-  collectedFeesToken0_not_in: [BigDecimal!]
-  collectedFeesToken1: BigDecimal
-  collectedFeesToken1_not: BigDecimal
-  collectedFeesToken1_gt: BigDecimal
-  collectedFeesToken1_lt: BigDecimal
-  collectedFeesToken1_gte: BigDecimal
-  collectedFeesToken1_lte: BigDecimal
-  collectedFeesToken1_in: [BigDecimal!]
-  collectedFeesToken1_not_in: [BigDecimal!]
-  transaction: String
-  transaction_not: String
-  transaction_gt: String
-  transaction_lt: String
-  transaction_gte: String
-  transaction_lte: String
-  transaction_in: [String!]
-  transaction_not_in: [String!]
-  transaction_contains: String
-  transaction_contains_nocase: String
-  transaction_not_contains: String
-  transaction_not_contains_nocase: String
-  transaction_starts_with: String
-  transaction_starts_with_nocase: String
-  transaction_not_starts_with: String
-  transaction_not_starts_with_nocase: String
-  transaction_ends_with: String
-  transaction_ends_with_nocase: String
-  transaction_not_ends_with: String
-  transaction_not_ends_with_nocase: String
-  transaction_: Transaction_filter
-  feeGrowthInside0LastX128: BigInt
-  feeGrowthInside0LastX128_not: BigInt
-  feeGrowthInside0LastX128_gt: BigInt
-  feeGrowthInside0LastX128_lt: BigInt
-  feeGrowthInside0LastX128_gte: BigInt
-  feeGrowthInside0LastX128_lte: BigInt
-  feeGrowthInside0LastX128_in: [BigInt!]
-  feeGrowthInside0LastX128_not_in: [BigInt!]
-  feeGrowthInside1LastX128: BigInt
-  feeGrowthInside1LastX128_not: BigInt
-  feeGrowthInside1LastX128_gt: BigInt
-  feeGrowthInside1LastX128_lt: BigInt
-  feeGrowthInside1LastX128_gte: BigInt
-  feeGrowthInside1LastX128_lte: BigInt
-  feeGrowthInside1LastX128_in: [BigInt!]
-  feeGrowthInside1LastX128_not_in: [BigInt!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [Position_filter]
-  or: [Position_filter]
-}
-
-enum Position_orderBy {
-  id
-  owner
-  pool
-  pool__id
-  pool__createdAtTimestamp
-  pool__createdAtBlockNumber
-  pool__feeTier
-  pool__liquidity
-  pool__sqrtPrice
-  pool__feeGrowthGlobal0X128
-  pool__feeGrowthGlobal1X128
-  pool__token0Price
-  pool__token1Price
-  pool__tick
-  pool__observationIndex
-  pool__volumeToken0
-  pool__volumeToken1
-  pool__volumeUSD
-  pool__untrackedVolumeUSD
-  pool__feesUSD
-  pool__txCount
-  pool__collectedFeesToken0
-  pool__collectedFeesToken1
-  pool__collectedFeesUSD
-  pool__totalValueLockedToken0
-  pool__totalValueLockedToken1
-  pool__totalValueLockedETH
-  pool__totalValueLockedUSD
-  pool__totalValueLockedUSDUntracked
-  pool__liquidityProviderCount
-  token0
-  token0__id
-  token0__symbol
-  token0__name
-  token0__decimals
-  token0__totalSupply
-  token0__volume
-  token0__volumeUSD
-  token0__untrackedVolumeUSD
-  token0__feesUSD
-  token0__txCount
-  token0__poolCount
-  token0__totalValueLocked
-  token0__totalValueLockedUSD
-  token0__totalValueLockedUSDUntracked
-  token0__derivedETH
-  token1
-  token1__id
-  token1__symbol
-  token1__name
-  token1__decimals
-  token1__totalSupply
-  token1__volume
-  token1__volumeUSD
-  token1__untrackedVolumeUSD
-  token1__feesUSD
-  token1__txCount
-  token1__poolCount
-  token1__totalValueLocked
-  token1__totalValueLockedUSD
-  token1__totalValueLockedUSDUntracked
-  token1__derivedETH
-  tickLower
-  tickLower__id
-  tickLower__poolAddress
-  tickLower__tickIdx
-  tickLower__liquidityGross
-  tickLower__liquidityNet
-  tickLower__price0
-  tickLower__price1
-  tickLower__volumeToken0
-  tickLower__volumeToken1
-  tickLower__volumeUSD
-  tickLower__untrackedVolumeUSD
-  tickLower__feesUSD
-  tickLower__collectedFeesToken0
-  tickLower__collectedFeesToken1
-  tickLower__collectedFeesUSD
-  tickLower__createdAtTimestamp
-  tickLower__createdAtBlockNumber
-  tickLower__liquidityProviderCount
-  tickLower__feeGrowthOutside0X128
-  tickLower__feeGrowthOutside1X128
-  tickUpper
-  tickUpper__id
-  tickUpper__poolAddress
-  tickUpper__tickIdx
-  tickUpper__liquidityGross
-  tickUpper__liquidityNet
-  tickUpper__price0
-  tickUpper__price1
-  tickUpper__volumeToken0
-  tickUpper__volumeToken1
-  tickUpper__volumeUSD
-  tickUpper__untrackedVolumeUSD
-  tickUpper__feesUSD
-  tickUpper__collectedFeesToken0
-  tickUpper__collectedFeesToken1
-  tickUpper__collectedFeesUSD
-  tickUpper__createdAtTimestamp
-  tickUpper__createdAtBlockNumber
-  tickUpper__liquidityProviderCount
-  tickUpper__feeGrowthOutside0X128
-  tickUpper__feeGrowthOutside1X128
-  liquidity
-  depositedToken0
-  depositedToken1
-  withdrawnToken0
-  withdrawnToken1
-  collectedFeesToken0
-  collectedFeesToken1
-  transaction
-  transaction__id
-  transaction__blockNumber
-  transaction__timestamp
-  transaction__gasUsed
-  transaction__gasPrice
-  feeGrowthInside0LastX128
-  feeGrowthInside1LastX128
-}
-
-type PositionSnapshot {
-  id: ID!
-  owner: Bytes!
-  pool: Pool!
-  position: Position!
-  blockNumber: BigInt!
-  timestamp: BigInt!
-  liquidity: BigInt!
-  depositedToken0: BigDecimal!
-  depositedToken1: BigDecimal!
-  withdrawnToken0: BigDecimal!
-  withdrawnToken1: BigDecimal!
-  collectedFeesToken0: BigDecimal!
-  collectedFeesToken1: BigDecimal!
-  transaction: Transaction!
-  feeGrowthInside0LastX128: BigInt!
-  feeGrowthInside1LastX128: BigInt!
-}
-
-input PositionSnapshot_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  owner: Bytes
-  owner_not: Bytes
-  owner_gt: Bytes
-  owner_lt: Bytes
-  owner_gte: Bytes
-  owner_lte: Bytes
-  owner_in: [Bytes!]
-  owner_not_in: [Bytes!]
-  owner_contains: Bytes
-  owner_not_contains: Bytes
-  pool: String
-  pool_not: String
-  pool_gt: String
-  pool_lt: String
-  pool_gte: String
-  pool_lte: String
-  pool_in: [String!]
-  pool_not_in: [String!]
-  pool_contains: String
-  pool_contains_nocase: String
-  pool_not_contains: String
-  pool_not_contains_nocase: String
-  pool_starts_with: String
-  pool_starts_with_nocase: String
-  pool_not_starts_with: String
-  pool_not_starts_with_nocase: String
-  pool_ends_with: String
-  pool_ends_with_nocase: String
-  pool_not_ends_with: String
-  pool_not_ends_with_nocase: String
-  pool_: Pool_filter
-  position: String
-  position_not: String
-  position_gt: String
-  position_lt: String
-  position_gte: String
-  position_lte: String
-  position_in: [String!]
-  position_not_in: [String!]
-  position_contains: String
-  position_contains_nocase: String
-  position_not_contains: String
-  position_not_contains_nocase: String
-  position_starts_with: String
-  position_starts_with_nocase: String
-  position_not_starts_with: String
-  position_not_starts_with_nocase: String
-  position_ends_with: String
-  position_ends_with_nocase: String
-  position_not_ends_with: String
-  position_not_ends_with_nocase: String
-  position_: Position_filter
-  blockNumber: BigInt
-  blockNumber_not: BigInt
-  blockNumber_gt: BigInt
-  blockNumber_lt: BigInt
-  blockNumber_gte: BigInt
-  blockNumber_lte: BigInt
-  blockNumber_in: [BigInt!]
-  blockNumber_not_in: [BigInt!]
-  timestamp: BigInt
-  timestamp_not: BigInt
-  timestamp_gt: BigInt
-  timestamp_lt: BigInt
-  timestamp_gte: BigInt
-  timestamp_lte: BigInt
-  timestamp_in: [BigInt!]
-  timestamp_not_in: [BigInt!]
-  liquidity: BigInt
-  liquidity_not: BigInt
-  liquidity_gt: BigInt
-  liquidity_lt: BigInt
-  liquidity_gte: BigInt
-  liquidity_lte: BigInt
-  liquidity_in: [BigInt!]
-  liquidity_not_in: [BigInt!]
-  depositedToken0: BigDecimal
-  depositedToken0_not: BigDecimal
-  depositedToken0_gt: BigDecimal
-  depositedToken0_lt: BigDecimal
-  depositedToken0_gte: BigDecimal
-  depositedToken0_lte: BigDecimal
-  depositedToken0_in: [BigDecimal!]
-  depositedToken0_not_in: [BigDecimal!]
-  depositedToken1: BigDecimal
-  depositedToken1_not: BigDecimal
-  depositedToken1_gt: BigDecimal
-  depositedToken1_lt: BigDecimal
-  depositedToken1_gte: BigDecimal
-  depositedToken1_lte: BigDecimal
-  depositedToken1_in: [BigDecimal!]
-  depositedToken1_not_in: [BigDecimal!]
-  withdrawnToken0: BigDecimal
-  withdrawnToken0_not: BigDecimal
-  withdrawnToken0_gt: BigDecimal
-  withdrawnToken0_lt: BigDecimal
-  withdrawnToken0_gte: BigDecimal
-  withdrawnToken0_lte: BigDecimal
-  withdrawnToken0_in: [BigDecimal!]
-  withdrawnToken0_not_in: [BigDecimal!]
-  withdrawnToken1: BigDecimal
-  withdrawnToken1_not: BigDecimal
-  withdrawnToken1_gt: BigDecimal
-  withdrawnToken1_lt: BigDecimal
-  withdrawnToken1_gte: BigDecimal
-  withdrawnToken1_lte: BigDecimal
-  withdrawnToken1_in: [BigDecimal!]
-  withdrawnToken1_not_in: [BigDecimal!]
-  collectedFeesToken0: BigDecimal
-  collectedFeesToken0_not: BigDecimal
-  collectedFeesToken0_gt: BigDecimal
-  collectedFeesToken0_lt: BigDecimal
-  collectedFeesToken0_gte: BigDecimal
-  collectedFeesToken0_lte: BigDecimal
-  collectedFeesToken0_in: [BigDecimal!]
-  collectedFeesToken0_not_in: [BigDecimal!]
-  collectedFeesToken1: BigDecimal
-  collectedFeesToken1_not: BigDecimal
-  collectedFeesToken1_gt: BigDecimal
-  collectedFeesToken1_lt: BigDecimal
-  collectedFeesToken1_gte: BigDecimal
-  collectedFeesToken1_lte: BigDecimal
-  collectedFeesToken1_in: [BigDecimal!]
-  collectedFeesToken1_not_in: [BigDecimal!]
-  transaction: String
-  transaction_not: String
-  transaction_gt: String
-  transaction_lt: String
-  transaction_gte: String
-  transaction_lte: String
-  transaction_in: [String!]
-  transaction_not_in: [String!]
-  transaction_contains: String
-  transaction_contains_nocase: String
-  transaction_not_contains: String
-  transaction_not_contains_nocase: String
-  transaction_starts_with: String
-  transaction_starts_with_nocase: String
-  transaction_not_starts_with: String
-  transaction_not_starts_with_nocase: String
-  transaction_ends_with: String
-  transaction_ends_with_nocase: String
-  transaction_not_ends_with: String
-  transaction_not_ends_with_nocase: String
-  transaction_: Transaction_filter
-  feeGrowthInside0LastX128: BigInt
-  feeGrowthInside0LastX128_not: BigInt
-  feeGrowthInside0LastX128_gt: BigInt
-  feeGrowthInside0LastX128_lt: BigInt
-  feeGrowthInside0LastX128_gte: BigInt
-  feeGrowthInside0LastX128_lte: BigInt
-  feeGrowthInside0LastX128_in: [BigInt!]
-  feeGrowthInside0LastX128_not_in: [BigInt!]
-  feeGrowthInside1LastX128: BigInt
-  feeGrowthInside1LastX128_not: BigInt
-  feeGrowthInside1LastX128_gt: BigInt
-  feeGrowthInside1LastX128_lt: BigInt
-  feeGrowthInside1LastX128_gte: BigInt
-  feeGrowthInside1LastX128_lte: BigInt
-  feeGrowthInside1LastX128_in: [BigInt!]
-  feeGrowthInside1LastX128_not_in: [BigInt!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [PositionSnapshot_filter]
-  or: [PositionSnapshot_filter]
-}
-
-enum PositionSnapshot_orderBy {
-  id
-  owner
-  pool
-  pool__id
-  pool__createdAtTimestamp
-  pool__createdAtBlockNumber
-  pool__feeTier
-  pool__liquidity
-  pool__sqrtPrice
-  pool__feeGrowthGlobal0X128
-  pool__feeGrowthGlobal1X128
-  pool__token0Price
-  pool__token1Price
-  pool__tick
-  pool__observationIndex
-  pool__volumeToken0
-  pool__volumeToken1
-  pool__volumeUSD
-  pool__untrackedVolumeUSD
-  pool__feesUSD
-  pool__txCount
-  pool__collectedFeesToken0
-  pool__collectedFeesToken1
-  pool__collectedFeesUSD
-  pool__totalValueLockedToken0
-  pool__totalValueLockedToken1
-  pool__totalValueLockedETH
-  pool__totalValueLockedUSD
-  pool__totalValueLockedUSDUntracked
-  pool__liquidityProviderCount
-  position
-  position__id
-  position__owner
-  position__liquidity
-  position__depositedToken0
-  position__depositedToken1
-  position__withdrawnToken0
-  position__withdrawnToken1
-  position__collectedFeesToken0
-  position__collectedFeesToken1
-  position__feeGrowthInside0LastX128
-  position__feeGrowthInside1LastX128
-  blockNumber
-  timestamp
-  liquidity
-  depositedToken0
-  depositedToken1
-  withdrawnToken0
-  withdrawnToken1
-  collectedFeesToken0
-  collectedFeesToken1
-  transaction
-  transaction__id
-  transaction__blockNumber
-  transaction__timestamp
-  transaction__gasUsed
-  transaction__gasPrice
-  feeGrowthInside0LastX128
-  feeGrowthInside1LastX128
-}
-
-type Query {
-  factory(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Factory
-  factories(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Factory_orderBy
-    orderDirection: OrderDirection
-    where: Factory_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Factory!]!
-  bundle(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Bundle
-  bundles(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Bundle_orderBy
-    orderDirection: OrderDirection
-    where: Bundle_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Bundle!]!
-  token(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Token
-  tokens(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Token_orderBy
-    orderDirection: OrderDirection
-    where: Token_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Token!]!
-  pool(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Pool
-  pools(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Pool_orderBy
-    orderDirection: OrderDirection
-    where: Pool_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Pool!]!
-  tick(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Tick
-  ticks(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Tick_orderBy
-    orderDirection: OrderDirection
-    where: Tick_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Tick!]!
-  position(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Position
-  positions(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Position_orderBy
-    orderDirection: OrderDirection
-    where: Position_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Position!]!
-  positionSnapshot(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): PositionSnapshot
-  positionSnapshots(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: PositionSnapshot_orderBy
-    orderDirection: OrderDirection
-    where: PositionSnapshot_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [PositionSnapshot!]!
-  transaction(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Transaction
-  transactions(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Transaction_orderBy
-    orderDirection: OrderDirection
-    where: Transaction_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Transaction!]!
-  mint(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Mint
-  mints(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Mint_orderBy
-    orderDirection: OrderDirection
-    where: Mint_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Mint!]!
-  burn(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Burn
-  burns(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Burn_orderBy
-    orderDirection: OrderDirection
-    where: Burn_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Burn!]!
-  swap(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Swap
-  swaps(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Swap_orderBy
-    orderDirection: OrderDirection
-    where: Swap_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Swap!]!
-  collect(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Collect
-  collects(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Collect_orderBy
-    orderDirection: OrderDirection
-    where: Collect_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Collect!]!
-  flash(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Flash
-  flashes(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Flash_orderBy
-    orderDirection: OrderDirection
-    where: Flash_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Flash!]!
-  uniswapDayData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): UniswapDayData
-  uniswapDayDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: UniswapDayData_orderBy
-    orderDirection: OrderDirection
-    where: UniswapDayData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [UniswapDayData!]!
-  poolDayData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): PoolDayData
-  poolDayDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: PoolDayData_orderBy
-    orderDirection: OrderDirection
-    where: PoolDayData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [PoolDayData!]!
-  poolHourData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): PoolHourData
-  poolHourDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: PoolHourData_orderBy
-    orderDirection: OrderDirection
-    where: PoolHourData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [PoolHourData!]!
-  tickHourData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): TickHourData
-  tickHourDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: TickHourData_orderBy
-    orderDirection: OrderDirection
-    where: TickHourData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [TickHourData!]!
-  tickDayData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): TickDayData
-  tickDayDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: TickDayData_orderBy
-    orderDirection: OrderDirection
-    where: TickDayData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [TickDayData!]!
-  tokenDayData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): TokenDayData
-  tokenDayDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: TokenDayData_orderBy
-    orderDirection: OrderDirection
-    where: TokenDayData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [TokenDayData!]!
-  tokenHourData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): TokenHourData
-  tokenHourDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: TokenHourData_orderBy
-    orderDirection: OrderDirection
-    where: TokenHourData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [TokenHourData!]!
-
-  """Access to subgraph metadata"""
-  _meta(block: Block_height): _Meta_
-}
-
-type Subscription {
-  factory(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Factory
-  factories(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Factory_orderBy
-    orderDirection: OrderDirection
-    where: Factory_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Factory!]!
-  bundle(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Bundle
-  bundles(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Bundle_orderBy
-    orderDirection: OrderDirection
-    where: Bundle_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Bundle!]!
-  token(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Token
-  tokens(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Token_orderBy
-    orderDirection: OrderDirection
-    where: Token_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Token!]!
-  pool(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Pool
-  pools(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Pool_orderBy
-    orderDirection: OrderDirection
-    where: Pool_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Pool!]!
-  tick(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Tick
-  ticks(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Tick_orderBy
-    orderDirection: OrderDirection
-    where: Tick_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Tick!]!
-  position(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Position
-  positions(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Position_orderBy
-    orderDirection: OrderDirection
-    where: Position_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Position!]!
-  positionSnapshot(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): PositionSnapshot
-  positionSnapshots(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: PositionSnapshot_orderBy
-    orderDirection: OrderDirection
-    where: PositionSnapshot_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [PositionSnapshot!]!
-  transaction(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Transaction
-  transactions(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Transaction_orderBy
-    orderDirection: OrderDirection
-    where: Transaction_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Transaction!]!
-  mint(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Mint
-  mints(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Mint_orderBy
-    orderDirection: OrderDirection
-    where: Mint_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Mint!]!
-  burn(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Burn
-  burns(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Burn_orderBy
-    orderDirection: OrderDirection
-    where: Burn_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Burn!]!
-  swap(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Swap
-  swaps(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Swap_orderBy
-    orderDirection: OrderDirection
-    where: Swap_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Swap!]!
-  collect(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Collect
-  collects(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Collect_orderBy
-    orderDirection: OrderDirection
-    where: Collect_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Collect!]!
-  flash(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): Flash
-  flashes(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: Flash_orderBy
-    orderDirection: OrderDirection
-    where: Flash_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [Flash!]!
-  uniswapDayData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): UniswapDayData
-  uniswapDayDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: UniswapDayData_orderBy
-    orderDirection: OrderDirection
-    where: UniswapDayData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [UniswapDayData!]!
-  poolDayData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): PoolDayData
-  poolDayDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: PoolDayData_orderBy
-    orderDirection: OrderDirection
-    where: PoolDayData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [PoolDayData!]!
-  poolHourData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): PoolHourData
-  poolHourDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: PoolHourData_orderBy
-    orderDirection: OrderDirection
-    where: PoolHourData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [PoolHourData!]!
-  tickHourData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): TickHourData
-  tickHourDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: TickHourData_orderBy
-    orderDirection: OrderDirection
-    where: TickHourData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [TickHourData!]!
-  tickDayData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): TickDayData
-  tickDayDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: TickDayData_orderBy
-    orderDirection: OrderDirection
-    where: TickDayData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [TickDayData!]!
-  tokenDayData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): TokenDayData
-  tokenDayDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: TokenDayData_orderBy
-    orderDirection: OrderDirection
-    where: TokenDayData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [TokenDayData!]!
-  tokenHourData(
-    id: ID!
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): TokenHourData
-  tokenHourDatas(
-    skip: Int = 0
-    first: Int = 100
-    orderBy: TokenHourData_orderBy
-    orderDirection: OrderDirection
-    where: TokenHourData_filter
-
-    """
-    The block at which the query should be executed. Can either be a `{ hash:
-    Bytes }` value containing a block hash, a `{ number: Int }` containing the
-    block number, or a `{ number_gte: Int }` containing the minimum block
-    number. In the case of `number_gte`, the query will be executed on the
-    latest block only if the subgraph has progressed to or past the minimum
-    block number. Defaults to the latest block when omitted.
-    """
-    block: Block_height
-
-    """
-    Set to `allow` to receive data even if the subgraph has skipped over errors while syncing.
-    """
-    subgraphError: _SubgraphErrorPolicy_! = deny
-  ): [TokenHourData!]!
-
-  """Access to subgraph metadata"""
-  _meta(block: Block_height): _Meta_
-}
-
-type Swap {
-  id: ID!
-  transaction: Transaction!
-  timestamp: BigInt!
-  pool: Pool!
-  token0: Token!
-  token1: Token!
-  sender: Bytes!
-  recipient: Bytes!
-  origin: Bytes!
-  amount0: BigDecimal!
-  amount1: BigDecimal!
-  amountUSD: BigDecimal!
-  sqrtPriceX96: BigInt!
-  tick: BigInt!
-  logIndex: BigInt
-}
-
-input Swap_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  transaction: String
-  transaction_not: String
-  transaction_gt: String
-  transaction_lt: String
-  transaction_gte: String
-  transaction_lte: String
-  transaction_in: [String!]
-  transaction_not_in: [String!]
-  transaction_contains: String
-  transaction_contains_nocase: String
-  transaction_not_contains: String
-  transaction_not_contains_nocase: String
-  transaction_starts_with: String
-  transaction_starts_with_nocase: String
-  transaction_not_starts_with: String
-  transaction_not_starts_with_nocase: String
-  transaction_ends_with: String
-  transaction_ends_with_nocase: String
-  transaction_not_ends_with: String
-  transaction_not_ends_with_nocase: String
-  transaction_: Transaction_filter
-  timestamp: BigInt
-  timestamp_not: BigInt
-  timestamp_gt: BigInt
-  timestamp_lt: BigInt
-  timestamp_gte: BigInt
-  timestamp_lte: BigInt
-  timestamp_in: [BigInt!]
-  timestamp_not_in: [BigInt!]
-  pool: String
-  pool_not: String
-  pool_gt: String
-  pool_lt: String
-  pool_gte: String
-  pool_lte: String
-  pool_in: [String!]
-  pool_not_in: [String!]
-  pool_contains: String
-  pool_contains_nocase: String
-  pool_not_contains: String
-  pool_not_contains_nocase: String
-  pool_starts_with: String
-  pool_starts_with_nocase: String
-  pool_not_starts_with: String
-  pool_not_starts_with_nocase: String
-  pool_ends_with: String
-  pool_ends_with_nocase: String
-  pool_not_ends_with: String
-  pool_not_ends_with_nocase: String
-  pool_: Pool_filter
-  token0: String
-  token0_not: String
-  token0_gt: String
-  token0_lt: String
-  token0_gte: String
-  token0_lte: String
-  token0_in: [String!]
-  token0_not_in: [String!]
-  token0_contains: String
-  token0_contains_nocase: String
-  token0_not_contains: String
-  token0_not_contains_nocase: String
-  token0_starts_with: String
-  token0_starts_with_nocase: String
-  token0_not_starts_with: String
-  token0_not_starts_with_nocase: String
-  token0_ends_with: String
-  token0_ends_with_nocase: String
-  token0_not_ends_with: String
-  token0_not_ends_with_nocase: String
-  token0_: Token_filter
-  token1: String
-  token1_not: String
-  token1_gt: String
-  token1_lt: String
-  token1_gte: String
-  token1_lte: String
-  token1_in: [String!]
-  token1_not_in: [String!]
-  token1_contains: String
-  token1_contains_nocase: String
-  token1_not_contains: String
-  token1_not_contains_nocase: String
-  token1_starts_with: String
-  token1_starts_with_nocase: String
-  token1_not_starts_with: String
-  token1_not_starts_with_nocase: String
-  token1_ends_with: String
-  token1_ends_with_nocase: String
-  token1_not_ends_with: String
-  token1_not_ends_with_nocase: String
-  token1_: Token_filter
-  sender: Bytes
-  sender_not: Bytes
-  sender_gt: Bytes
-  sender_lt: Bytes
-  sender_gte: Bytes
-  sender_lte: Bytes
-  sender_in: [Bytes!]
-  sender_not_in: [Bytes!]
-  sender_contains: Bytes
-  sender_not_contains: Bytes
-  recipient: Bytes
-  recipient_not: Bytes
-  recipient_gt: Bytes
-  recipient_lt: Bytes
-  recipient_gte: Bytes
-  recipient_lte: Bytes
-  recipient_in: [Bytes!]
-  recipient_not_in: [Bytes!]
-  recipient_contains: Bytes
-  recipient_not_contains: Bytes
-  origin: Bytes
-  origin_not: Bytes
-  origin_gt: Bytes
-  origin_lt: Bytes
-  origin_gte: Bytes
-  origin_lte: Bytes
-  origin_in: [Bytes!]
-  origin_not_in: [Bytes!]
-  origin_contains: Bytes
-  origin_not_contains: Bytes
-  amount0: BigDecimal
-  amount0_not: BigDecimal
-  amount0_gt: BigDecimal
-  amount0_lt: BigDecimal
-  amount0_gte: BigDecimal
-  amount0_lte: BigDecimal
-  amount0_in: [BigDecimal!]
-  amount0_not_in: [BigDecimal!]
-  amount1: BigDecimal
-  amount1_not: BigDecimal
-  amount1_gt: BigDecimal
-  amount1_lt: BigDecimal
-  amount1_gte: BigDecimal
-  amount1_lte: BigDecimal
-  amount1_in: [BigDecimal!]
-  amount1_not_in: [BigDecimal!]
-  amountUSD: BigDecimal
-  amountUSD_not: BigDecimal
-  amountUSD_gt: BigDecimal
-  amountUSD_lt: BigDecimal
-  amountUSD_gte: BigDecimal
-  amountUSD_lte: BigDecimal
-  amountUSD_in: [BigDecimal!]
-  amountUSD_not_in: [BigDecimal!]
-  sqrtPriceX96: BigInt
-  sqrtPriceX96_not: BigInt
-  sqrtPriceX96_gt: BigInt
-  sqrtPriceX96_lt: BigInt
-  sqrtPriceX96_gte: BigInt
-  sqrtPriceX96_lte: BigInt
-  sqrtPriceX96_in: [BigInt!]
-  sqrtPriceX96_not_in: [BigInt!]
-  tick: BigInt
-  tick_not: BigInt
-  tick_gt: BigInt
-  tick_lt: BigInt
-  tick_gte: BigInt
-  tick_lte: BigInt
-  tick_in: [BigInt!]
-  tick_not_in: [BigInt!]
-  logIndex: BigInt
-  logIndex_not: BigInt
-  logIndex_gt: BigInt
-  logIndex_lt: BigInt
-  logIndex_gte: BigInt
-  logIndex_lte: BigInt
-  logIndex_in: [BigInt!]
-  logIndex_not_in: [BigInt!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [Swap_filter]
-  or: [Swap_filter]
-}
-
-enum Swap_orderBy {
-  id
-  transaction
-  transaction__id
-  transaction__blockNumber
-  transaction__timestamp
-  transaction__gasUsed
-  transaction__gasPrice
-  timestamp
-  pool
-  pool__id
-  pool__createdAtTimestamp
-  pool__createdAtBlockNumber
-  pool__feeTier
-  pool__liquidity
-  pool__sqrtPrice
-  pool__feeGrowthGlobal0X128
-  pool__feeGrowthGlobal1X128
-  pool__token0Price
-  pool__token1Price
-  pool__tick
-  pool__observationIndex
-  pool__volumeToken0
-  pool__volumeToken1
-  pool__volumeUSD
-  pool__untrackedVolumeUSD
-  pool__feesUSD
-  pool__txCount
-  pool__collectedFeesToken0
-  pool__collectedFeesToken1
-  pool__collectedFeesUSD
-  pool__totalValueLockedToken0
-  pool__totalValueLockedToken1
-  pool__totalValueLockedETH
-  pool__totalValueLockedUSD
-  pool__totalValueLockedUSDUntracked
-  pool__liquidityProviderCount
-  token0
-  token0__id
-  token0__symbol
-  token0__name
-  token0__decimals
-  token0__totalSupply
-  token0__volume
-  token0__volumeUSD
-  token0__untrackedVolumeUSD
-  token0__feesUSD
-  token0__txCount
-  token0__poolCount
-  token0__totalValueLocked
-  token0__totalValueLockedUSD
-  token0__totalValueLockedUSDUntracked
-  token0__derivedETH
-  token1
-  token1__id
-  token1__symbol
-  token1__name
-  token1__decimals
-  token1__totalSupply
-  token1__volume
-  token1__volumeUSD
-  token1__untrackedVolumeUSD
-  token1__feesUSD
-  token1__txCount
-  token1__poolCount
-  token1__totalValueLocked
-  token1__totalValueLockedUSD
-  token1__totalValueLockedUSDUntracked
-  token1__derivedETH
-  sender
-  recipient
-  origin
-  amount0
-  amount1
-  amountUSD
-  sqrtPriceX96
-  tick
-  logIndex
-}
-
-type Tick {
-  id: ID!
-  poolAddress: String
-  tickIdx: BigInt!
-  pool: Pool!
-  liquidityGross: BigInt!
-  liquidityNet: BigInt!
-  price0: BigDecimal!
-  price1: BigDecimal!
-  volumeToken0: BigDecimal!
-  volumeToken1: BigDecimal!
-  volumeUSD: BigDecimal!
-  untrackedVolumeUSD: BigDecimal!
-  feesUSD: BigDecimal!
-  collectedFeesToken0: BigDecimal!
-  collectedFeesToken1: BigDecimal!
-  collectedFeesUSD: BigDecimal!
-  createdAtTimestamp: BigInt!
-  createdAtBlockNumber: BigInt!
-  liquidityProviderCount: BigInt!
-  feeGrowthOutside0X128: BigInt!
-  feeGrowthOutside1X128: BigInt!
-}
-
-input Tick_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  poolAddress: String
-  poolAddress_not: String
-  poolAddress_gt: String
-  poolAddress_lt: String
-  poolAddress_gte: String
-  poolAddress_lte: String
-  poolAddress_in: [String!]
-  poolAddress_not_in: [String!]
-  poolAddress_contains: String
-  poolAddress_contains_nocase: String
-  poolAddress_not_contains: String
-  poolAddress_not_contains_nocase: String
-  poolAddress_starts_with: String
-  poolAddress_starts_with_nocase: String
-  poolAddress_not_starts_with: String
-  poolAddress_not_starts_with_nocase: String
-  poolAddress_ends_with: String
-  poolAddress_ends_with_nocase: String
-  poolAddress_not_ends_with: String
-  poolAddress_not_ends_with_nocase: String
-  tickIdx: BigInt
-  tickIdx_not: BigInt
-  tickIdx_gt: BigInt
-  tickIdx_lt: BigInt
-  tickIdx_gte: BigInt
-  tickIdx_lte: BigInt
-  tickIdx_in: [BigInt!]
-  tickIdx_not_in: [BigInt!]
-  pool: String
-  pool_not: String
-  pool_gt: String
-  pool_lt: String
-  pool_gte: String
-  pool_lte: String
-  pool_in: [String!]
-  pool_not_in: [String!]
-  pool_contains: String
-  pool_contains_nocase: String
-  pool_not_contains: String
-  pool_not_contains_nocase: String
-  pool_starts_with: String
-  pool_starts_with_nocase: String
-  pool_not_starts_with: String
-  pool_not_starts_with_nocase: String
-  pool_ends_with: String
-  pool_ends_with_nocase: String
-  pool_not_ends_with: String
-  pool_not_ends_with_nocase: String
-  pool_: Pool_filter
-  liquidityGross: BigInt
-  liquidityGross_not: BigInt
-  liquidityGross_gt: BigInt
-  liquidityGross_lt: BigInt
-  liquidityGross_gte: BigInt
-  liquidityGross_lte: BigInt
-  liquidityGross_in: [BigInt!]
-  liquidityGross_not_in: [BigInt!]
-  liquidityNet: BigInt
-  liquidityNet_not: BigInt
-  liquidityNet_gt: BigInt
-  liquidityNet_lt: BigInt
-  liquidityNet_gte: BigInt
-  liquidityNet_lte: BigInt
-  liquidityNet_in: [BigInt!]
-  liquidityNet_not_in: [BigInt!]
-  price0: BigDecimal
-  price0_not: BigDecimal
-  price0_gt: BigDecimal
-  price0_lt: BigDecimal
-  price0_gte: BigDecimal
-  price0_lte: BigDecimal
-  price0_in: [BigDecimal!]
-  price0_not_in: [BigDecimal!]
-  price1: BigDecimal
-  price1_not: BigDecimal
-  price1_gt: BigDecimal
-  price1_lt: BigDecimal
-  price1_gte: BigDecimal
-  price1_lte: BigDecimal
-  price1_in: [BigDecimal!]
-  price1_not_in: [BigDecimal!]
-  volumeToken0: BigDecimal
-  volumeToken0_not: BigDecimal
-  volumeToken0_gt: BigDecimal
-  volumeToken0_lt: BigDecimal
-  volumeToken0_gte: BigDecimal
-  volumeToken0_lte: BigDecimal
-  volumeToken0_in: [BigDecimal!]
-  volumeToken0_not_in: [BigDecimal!]
-  volumeToken1: BigDecimal
-  volumeToken1_not: BigDecimal
-  volumeToken1_gt: BigDecimal
-  volumeToken1_lt: BigDecimal
-  volumeToken1_gte: BigDecimal
-  volumeToken1_lte: BigDecimal
-  volumeToken1_in: [BigDecimal!]
-  volumeToken1_not_in: [BigDecimal!]
-  volumeUSD: BigDecimal
-  volumeUSD_not: BigDecimal
-  volumeUSD_gt: BigDecimal
-  volumeUSD_lt: BigDecimal
-  volumeUSD_gte: BigDecimal
-  volumeUSD_lte: BigDecimal
-  volumeUSD_in: [BigDecimal!]
-  volumeUSD_not_in: [BigDecimal!]
-  untrackedVolumeUSD: BigDecimal
-  untrackedVolumeUSD_not: BigDecimal
-  untrackedVolumeUSD_gt: BigDecimal
-  untrackedVolumeUSD_lt: BigDecimal
-  untrackedVolumeUSD_gte: BigDecimal
-  untrackedVolumeUSD_lte: BigDecimal
-  untrackedVolumeUSD_in: [BigDecimal!]
-  untrackedVolumeUSD_not_in: [BigDecimal!]
-  feesUSD: BigDecimal
-  feesUSD_not: BigDecimal
-  feesUSD_gt: BigDecimal
-  feesUSD_lt: BigDecimal
-  feesUSD_gte: BigDecimal
-  feesUSD_lte: BigDecimal
-  feesUSD_in: [BigDecimal!]
-  feesUSD_not_in: [BigDecimal!]
-  collectedFeesToken0: BigDecimal
-  collectedFeesToken0_not: BigDecimal
-  collectedFeesToken0_gt: BigDecimal
-  collectedFeesToken0_lt: BigDecimal
-  collectedFeesToken0_gte: BigDecimal
-  collectedFeesToken0_lte: BigDecimal
-  collectedFeesToken0_in: [BigDecimal!]
-  collectedFeesToken0_not_in: [BigDecimal!]
-  collectedFeesToken1: BigDecimal
-  collectedFeesToken1_not: BigDecimal
-  collectedFeesToken1_gt: BigDecimal
-  collectedFeesToken1_lt: BigDecimal
-  collectedFeesToken1_gte: BigDecimal
-  collectedFeesToken1_lte: BigDecimal
-  collectedFeesToken1_in: [BigDecimal!]
-  collectedFeesToken1_not_in: [BigDecimal!]
-  collectedFeesUSD: BigDecimal
-  collectedFeesUSD_not: BigDecimal
-  collectedFeesUSD_gt: BigDecimal
-  collectedFeesUSD_lt: BigDecimal
-  collectedFeesUSD_gte: BigDecimal
-  collectedFeesUSD_lte: BigDecimal
-  collectedFeesUSD_in: [BigDecimal!]
-  collectedFeesUSD_not_in: [BigDecimal!]
-  createdAtTimestamp: BigInt
-  createdAtTimestamp_not: BigInt
-  createdAtTimestamp_gt: BigInt
-  createdAtTimestamp_lt: BigInt
-  createdAtTimestamp_gte: BigInt
-  createdAtTimestamp_lte: BigInt
-  createdAtTimestamp_in: [BigInt!]
-  createdAtTimestamp_not_in: [BigInt!]
-  createdAtBlockNumber: BigInt
-  createdAtBlockNumber_not: BigInt
-  createdAtBlockNumber_gt: BigInt
-  createdAtBlockNumber_lt: BigInt
-  createdAtBlockNumber_gte: BigInt
-  createdAtBlockNumber_lte: BigInt
-  createdAtBlockNumber_in: [BigInt!]
-  createdAtBlockNumber_not_in: [BigInt!]
-  liquidityProviderCount: BigInt
-  liquidityProviderCount_not: BigInt
-  liquidityProviderCount_gt: BigInt
-  liquidityProviderCount_lt: BigInt
-  liquidityProviderCount_gte: BigInt
-  liquidityProviderCount_lte: BigInt
-  liquidityProviderCount_in: [BigInt!]
-  liquidityProviderCount_not_in: [BigInt!]
-  feeGrowthOutside0X128: BigInt
-  feeGrowthOutside0X128_not: BigInt
-  feeGrowthOutside0X128_gt: BigInt
-  feeGrowthOutside0X128_lt: BigInt
-  feeGrowthOutside0X128_gte: BigInt
-  feeGrowthOutside0X128_lte: BigInt
-  feeGrowthOutside0X128_in: [BigInt!]
-  feeGrowthOutside0X128_not_in: [BigInt!]
-  feeGrowthOutside1X128: BigInt
-  feeGrowthOutside1X128_not: BigInt
-  feeGrowthOutside1X128_gt: BigInt
-  feeGrowthOutside1X128_lt: BigInt
-  feeGrowthOutside1X128_gte: BigInt
-  feeGrowthOutside1X128_lte: BigInt
-  feeGrowthOutside1X128_in: [BigInt!]
-  feeGrowthOutside1X128_not_in: [BigInt!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [Tick_filter]
-  or: [Tick_filter]
-}
-
-enum Tick_orderBy {
-  id
-  poolAddress
-  tickIdx
-  pool
-  pool__id
-  pool__createdAtTimestamp
-  pool__createdAtBlockNumber
-  pool__feeTier
-  pool__liquidity
-  pool__sqrtPrice
-  pool__feeGrowthGlobal0X128
-  pool__feeGrowthGlobal1X128
-  pool__token0Price
-  pool__token1Price
-  pool__tick
-  pool__observationIndex
-  pool__volumeToken0
-  pool__volumeToken1
-  pool__volumeUSD
-  pool__untrackedVolumeUSD
-  pool__feesUSD
-  pool__txCount
-  pool__collectedFeesToken0
-  pool__collectedFeesToken1
-  pool__collectedFeesUSD
-  pool__totalValueLockedToken0
-  pool__totalValueLockedToken1
-  pool__totalValueLockedETH
-  pool__totalValueLockedUSD
-  pool__totalValueLockedUSDUntracked
-  pool__liquidityProviderCount
-  liquidityGross
-  liquidityNet
-  price0
-  price1
-  volumeToken0
-  volumeToken1
-  volumeUSD
-  untrackedVolumeUSD
-  feesUSD
-  collectedFeesToken0
-  collectedFeesToken1
-  collectedFeesUSD
-  createdAtTimestamp
-  createdAtBlockNumber
-  liquidityProviderCount
-  feeGrowthOutside0X128
-  feeGrowthOutside1X128
-}
-
-type TickDayData {
-  id: ID!
-  date: Int!
-  pool: Pool!
-  tick: Tick!
-  liquidityGross: BigInt!
-  liquidityNet: BigInt!
-  volumeToken0: BigDecimal!
-  volumeToken1: BigDecimal!
-  volumeUSD: BigDecimal!
-  feesUSD: BigDecimal!
-  feeGrowthOutside0X128: BigInt!
-  feeGrowthOutside1X128: BigInt!
-}
-
-input TickDayData_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  date: Int
-  date_not: Int
-  date_gt: Int
-  date_lt: Int
-  date_gte: Int
-  date_lte: Int
-  date_in: [Int!]
-  date_not_in: [Int!]
-  pool: String
-  pool_not: String
-  pool_gt: String
-  pool_lt: String
-  pool_gte: String
-  pool_lte: String
-  pool_in: [String!]
-  pool_not_in: [String!]
-  pool_contains: String
-  pool_contains_nocase: String
-  pool_not_contains: String
-  pool_not_contains_nocase: String
-  pool_starts_with: String
-  pool_starts_with_nocase: String
-  pool_not_starts_with: String
-  pool_not_starts_with_nocase: String
-  pool_ends_with: String
-  pool_ends_with_nocase: String
-  pool_not_ends_with: String
-  pool_not_ends_with_nocase: String
-  pool_: Pool_filter
-  tick: String
-  tick_not: String
-  tick_gt: String
-  tick_lt: String
-  tick_gte: String
-  tick_lte: String
-  tick_in: [String!]
-  tick_not_in: [String!]
-  tick_contains: String
-  tick_contains_nocase: String
-  tick_not_contains: String
-  tick_not_contains_nocase: String
-  tick_starts_with: String
-  tick_starts_with_nocase: String
-  tick_not_starts_with: String
-  tick_not_starts_with_nocase: String
-  tick_ends_with: String
-  tick_ends_with_nocase: String
-  tick_not_ends_with: String
-  tick_not_ends_with_nocase: String
-  tick_: Tick_filter
-  liquidityGross: BigInt
-  liquidityGross_not: BigInt
-  liquidityGross_gt: BigInt
-  liquidityGross_lt: BigInt
-  liquidityGross_gte: BigInt
-  liquidityGross_lte: BigInt
-  liquidityGross_in: [BigInt!]
-  liquidityGross_not_in: [BigInt!]
-  liquidityNet: BigInt
-  liquidityNet_not: BigInt
-  liquidityNet_gt: BigInt
-  liquidityNet_lt: BigInt
-  liquidityNet_gte: BigInt
-  liquidityNet_lte: BigInt
-  liquidityNet_in: [BigInt!]
-  liquidityNet_not_in: [BigInt!]
-  volumeToken0: BigDecimal
-  volumeToken0_not: BigDecimal
-  volumeToken0_gt: BigDecimal
-  volumeToken0_lt: BigDecimal
-  volumeToken0_gte: BigDecimal
-  volumeToken0_lte: BigDecimal
-  volumeToken0_in: [BigDecimal!]
-  volumeToken0_not_in: [BigDecimal!]
-  volumeToken1: BigDecimal
-  volumeToken1_not: BigDecimal
-  volumeToken1_gt: BigDecimal
-  volumeToken1_lt: BigDecimal
-  volumeToken1_gte: BigDecimal
-  volumeToken1_lte: BigDecimal
-  volumeToken1_in: [BigDecimal!]
-  volumeToken1_not_in: [BigDecimal!]
-  volumeUSD: BigDecimal
-  volumeUSD_not: BigDecimal
-  volumeUSD_gt: BigDecimal
-  volumeUSD_lt: BigDecimal
-  volumeUSD_gte: BigDecimal
-  volumeUSD_lte: BigDecimal
-  volumeUSD_in: [BigDecimal!]
-  volumeUSD_not_in: [BigDecimal!]
-  feesUSD: BigDecimal
-  feesUSD_not: BigDecimal
-  feesUSD_gt: BigDecimal
-  feesUSD_lt: BigDecimal
-  feesUSD_gte: BigDecimal
-  feesUSD_lte: BigDecimal
-  feesUSD_in: [BigDecimal!]
-  feesUSD_not_in: [BigDecimal!]
-  feeGrowthOutside0X128: BigInt
-  feeGrowthOutside0X128_not: BigInt
-  feeGrowthOutside0X128_gt: BigInt
-  feeGrowthOutside0X128_lt: BigInt
-  feeGrowthOutside0X128_gte: BigInt
-  feeGrowthOutside0X128_lte: BigInt
-  feeGrowthOutside0X128_in: [BigInt!]
-  feeGrowthOutside0X128_not_in: [BigInt!]
-  feeGrowthOutside1X128: BigInt
-  feeGrowthOutside1X128_not: BigInt
-  feeGrowthOutside1X128_gt: BigInt
-  feeGrowthOutside1X128_lt: BigInt
-  feeGrowthOutside1X128_gte: BigInt
-  feeGrowthOutside1X128_lte: BigInt
-  feeGrowthOutside1X128_in: [BigInt!]
-  feeGrowthOutside1X128_not_in: [BigInt!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [TickDayData_filter]
-  or: [TickDayData_filter]
-}
-
-enum TickDayData_orderBy {
-  id
-  date
-  pool
-  pool__id
-  pool__createdAtTimestamp
-  pool__createdAtBlockNumber
-  pool__feeTier
-  pool__liquidity
-  pool__sqrtPrice
-  pool__feeGrowthGlobal0X128
-  pool__feeGrowthGlobal1X128
-  pool__token0Price
-  pool__token1Price
-  pool__tick
-  pool__observationIndex
-  pool__volumeToken0
-  pool__volumeToken1
-  pool__volumeUSD
-  pool__untrackedVolumeUSD
-  pool__feesUSD
-  pool__txCount
-  pool__collectedFeesToken0
-  pool__collectedFeesToken1
-  pool__collectedFeesUSD
-  pool__totalValueLockedToken0
-  pool__totalValueLockedToken1
-  pool__totalValueLockedETH
-  pool__totalValueLockedUSD
-  pool__totalValueLockedUSDUntracked
-  pool__liquidityProviderCount
-  tick
-  tick__id
-  tick__poolAddress
-  tick__tickIdx
-  tick__liquidityGross
-  tick__liquidityNet
-  tick__price0
-  tick__price1
-  tick__volumeToken0
-  tick__volumeToken1
-  tick__volumeUSD
-  tick__untrackedVolumeUSD
-  tick__feesUSD
-  tick__collectedFeesToken0
-  tick__collectedFeesToken1
-  tick__collectedFeesUSD
-  tick__createdAtTimestamp
-  tick__createdAtBlockNumber
-  tick__liquidityProviderCount
-  tick__feeGrowthOutside0X128
-  tick__feeGrowthOutside1X128
-  liquidityGross
-  liquidityNet
-  volumeToken0
-  volumeToken1
-  volumeUSD
-  feesUSD
-  feeGrowthOutside0X128
-  feeGrowthOutside1X128
-}
-
-type TickHourData {
-  id: ID!
-  periodStartUnix: Int!
-  pool: Pool!
-  tick: Tick!
-  liquidityGross: BigInt!
-  liquidityNet: BigInt!
-  volumeToken0: BigDecimal!
-  volumeToken1: BigDecimal!
-  volumeUSD: BigDecimal!
-  feesUSD: BigDecimal!
-}
-
-input TickHourData_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  periodStartUnix: Int
-  periodStartUnix_not: Int
-  periodStartUnix_gt: Int
-  periodStartUnix_lt: Int
-  periodStartUnix_gte: Int
-  periodStartUnix_lte: Int
-  periodStartUnix_in: [Int!]
-  periodStartUnix_not_in: [Int!]
-  pool: String
-  pool_not: String
-  pool_gt: String
-  pool_lt: String
-  pool_gte: String
-  pool_lte: String
-  pool_in: [String!]
-  pool_not_in: [String!]
-  pool_contains: String
-  pool_contains_nocase: String
-  pool_not_contains: String
-  pool_not_contains_nocase: String
-  pool_starts_with: String
-  pool_starts_with_nocase: String
-  pool_not_starts_with: String
-  pool_not_starts_with_nocase: String
-  pool_ends_with: String
-  pool_ends_with_nocase: String
-  pool_not_ends_with: String
-  pool_not_ends_with_nocase: String
-  pool_: Pool_filter
-  tick: String
-  tick_not: String
-  tick_gt: String
-  tick_lt: String
-  tick_gte: String
-  tick_lte: String
-  tick_in: [String!]
-  tick_not_in: [String!]
-  tick_contains: String
-  tick_contains_nocase: String
-  tick_not_contains: String
-  tick_not_contains_nocase: String
-  tick_starts_with: String
-  tick_starts_with_nocase: String
-  tick_not_starts_with: String
-  tick_not_starts_with_nocase: String
-  tick_ends_with: String
-  tick_ends_with_nocase: String
-  tick_not_ends_with: String
-  tick_not_ends_with_nocase: String
-  tick_: Tick_filter
-  liquidityGross: BigInt
-  liquidityGross_not: BigInt
-  liquidityGross_gt: BigInt
-  liquidityGross_lt: BigInt
-  liquidityGross_gte: BigInt
-  liquidityGross_lte: BigInt
-  liquidityGross_in: [BigInt!]
-  liquidityGross_not_in: [BigInt!]
-  liquidityNet: BigInt
-  liquidityNet_not: BigInt
-  liquidityNet_gt: BigInt
-  liquidityNet_lt: BigInt
-  liquidityNet_gte: BigInt
-  liquidityNet_lte: BigInt
-  liquidityNet_in: [BigInt!]
-  liquidityNet_not_in: [BigInt!]
-  volumeToken0: BigDecimal
-  volumeToken0_not: BigDecimal
-  volumeToken0_gt: BigDecimal
-  volumeToken0_lt: BigDecimal
-  volumeToken0_gte: BigDecimal
-  volumeToken0_lte: BigDecimal
-  volumeToken0_in: [BigDecimal!]
-  volumeToken0_not_in: [BigDecimal!]
-  volumeToken1: BigDecimal
-  volumeToken1_not: BigDecimal
-  volumeToken1_gt: BigDecimal
-  volumeToken1_lt: BigDecimal
-  volumeToken1_gte: BigDecimal
-  volumeToken1_lte: BigDecimal
-  volumeToken1_in: [BigDecimal!]
-  volumeToken1_not_in: [BigDecimal!]
-  volumeUSD: BigDecimal
-  volumeUSD_not: BigDecimal
-  volumeUSD_gt: BigDecimal
-  volumeUSD_lt: BigDecimal
-  volumeUSD_gte: BigDecimal
-  volumeUSD_lte: BigDecimal
-  volumeUSD_in: [BigDecimal!]
-  volumeUSD_not_in: [BigDecimal!]
-  feesUSD: BigDecimal
-  feesUSD_not: BigDecimal
-  feesUSD_gt: BigDecimal
-  feesUSD_lt: BigDecimal
-  feesUSD_gte: BigDecimal
-  feesUSD_lte: BigDecimal
-  feesUSD_in: [BigDecimal!]
-  feesUSD_not_in: [BigDecimal!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [TickHourData_filter]
-  or: [TickHourData_filter]
-}
-
-enum TickHourData_orderBy {
-  id
-  periodStartUnix
-  pool
-  pool__id
-  pool__createdAtTimestamp
-  pool__createdAtBlockNumber
-  pool__feeTier
-  pool__liquidity
-  pool__sqrtPrice
-  pool__feeGrowthGlobal0X128
-  pool__feeGrowthGlobal1X128
-  pool__token0Price
-  pool__token1Price
-  pool__tick
-  pool__observationIndex
-  pool__volumeToken0
-  pool__volumeToken1
-  pool__volumeUSD
-  pool__untrackedVolumeUSD
-  pool__feesUSD
-  pool__txCount
-  pool__collectedFeesToken0
-  pool__collectedFeesToken1
-  pool__collectedFeesUSD
-  pool__totalValueLockedToken0
-  pool__totalValueLockedToken1
-  pool__totalValueLockedETH
-  pool__totalValueLockedUSD
-  pool__totalValueLockedUSDUntracked
-  pool__liquidityProviderCount
-  tick
-  tick__id
-  tick__poolAddress
-  tick__tickIdx
-  tick__liquidityGross
-  tick__liquidityNet
-  tick__price0
-  tick__price1
-  tick__volumeToken0
-  tick__volumeToken1
-  tick__volumeUSD
-  tick__untrackedVolumeUSD
-  tick__feesUSD
-  tick__collectedFeesToken0
-  tick__collectedFeesToken1
-  tick__collectedFeesUSD
-  tick__createdAtTimestamp
-  tick__createdAtBlockNumber
-  tick__liquidityProviderCount
-  tick__feeGrowthOutside0X128
-  tick__feeGrowthOutside1X128
-  liquidityGross
-  liquidityNet
-  volumeToken0
-  volumeToken1
-  volumeUSD
-  feesUSD
-}
-
-type Token {
-  id: ID!
-  symbol: String!
-  name: String!
-  decimals: BigInt!
-  totalSupply: BigInt!
-  volume: BigDecimal!
-  volumeUSD: BigDecimal!
-  untrackedVolumeUSD: BigDecimal!
-  feesUSD: BigDecimal!
-  txCount: BigInt!
-  poolCount: BigInt!
-  totalValueLocked: BigDecimal!
-  totalValueLockedUSD: BigDecimal!
-  totalValueLockedUSDUntracked: BigDecimal!
-  derivedETH: BigDecimal!
-  whitelistPools(skip: Int = 0, first: Int = 100, orderBy: Pool_orderBy, orderDirection: OrderDirection, where: Pool_filter): [Pool!]!
-  tokenDayData(skip: Int = 0, first: Int = 100, orderBy: TokenDayData_orderBy, orderDirection: OrderDirection, where: TokenDayData_filter): [TokenDayData!]!
-}
-
-input Token_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  symbol: String
-  symbol_not: String
-  symbol_gt: String
-  symbol_lt: String
-  symbol_gte: String
-  symbol_lte: String
-  symbol_in: [String!]
-  symbol_not_in: [String!]
-  symbol_contains: String
-  symbol_contains_nocase: String
-  symbol_not_contains: String
-  symbol_not_contains_nocase: String
-  symbol_starts_with: String
-  symbol_starts_with_nocase: String
-  symbol_not_starts_with: String
-  symbol_not_starts_with_nocase: String
-  symbol_ends_with: String
-  symbol_ends_with_nocase: String
-  symbol_not_ends_with: String
-  symbol_not_ends_with_nocase: String
-  name: String
-  name_not: String
-  name_gt: String
-  name_lt: String
-  name_gte: String
-  name_lte: String
-  name_in: [String!]
-  name_not_in: [String!]
-  name_contains: String
-  name_contains_nocase: String
-  name_not_contains: String
-  name_not_contains_nocase: String
-  name_starts_with: String
-  name_starts_with_nocase: String
-  name_not_starts_with: String
-  name_not_starts_with_nocase: String
-  name_ends_with: String
-  name_ends_with_nocase: String
-  name_not_ends_with: String
-  name_not_ends_with_nocase: String
-  decimals: BigInt
-  decimals_not: BigInt
-  decimals_gt: BigInt
-  decimals_lt: BigInt
-  decimals_gte: BigInt
-  decimals_lte: BigInt
-  decimals_in: [BigInt!]
-  decimals_not_in: [BigInt!]
-  totalSupply: BigInt
-  totalSupply_not: BigInt
-  totalSupply_gt: BigInt
-  totalSupply_lt: BigInt
-  totalSupply_gte: BigInt
-  totalSupply_lte: BigInt
-  totalSupply_in: [BigInt!]
-  totalSupply_not_in: [BigInt!]
-  volume: BigDecimal
-  volume_not: BigDecimal
-  volume_gt: BigDecimal
-  volume_lt: BigDecimal
-  volume_gte: BigDecimal
-  volume_lte: BigDecimal
-  volume_in: [BigDecimal!]
-  volume_not_in: [BigDecimal!]
-  volumeUSD: BigDecimal
-  volumeUSD_not: BigDecimal
-  volumeUSD_gt: BigDecimal
-  volumeUSD_lt: BigDecimal
-  volumeUSD_gte: BigDecimal
-  volumeUSD_lte: BigDecimal
-  volumeUSD_in: [BigDecimal!]
-  volumeUSD_not_in: [BigDecimal!]
-  untrackedVolumeUSD: BigDecimal
-  untrackedVolumeUSD_not: BigDecimal
-  untrackedVolumeUSD_gt: BigDecimal
-  untrackedVolumeUSD_lt: BigDecimal
-  untrackedVolumeUSD_gte: BigDecimal
-  untrackedVolumeUSD_lte: BigDecimal
-  untrackedVolumeUSD_in: [BigDecimal!]
-  untrackedVolumeUSD_not_in: [BigDecimal!]
-  feesUSD: BigDecimal
-  feesUSD_not: BigDecimal
-  feesUSD_gt: BigDecimal
-  feesUSD_lt: BigDecimal
-  feesUSD_gte: BigDecimal
-  feesUSD_lte: BigDecimal
-  feesUSD_in: [BigDecimal!]
-  feesUSD_not_in: [BigDecimal!]
-  txCount: BigInt
-  txCount_not: BigInt
-  txCount_gt: BigInt
-  txCount_lt: BigInt
-  txCount_gte: BigInt
-  txCount_lte: BigInt
-  txCount_in: [BigInt!]
-  txCount_not_in: [BigInt!]
-  poolCount: BigInt
-  poolCount_not: BigInt
-  poolCount_gt: BigInt
-  poolCount_lt: BigInt
-  poolCount_gte: BigInt
-  poolCount_lte: BigInt
-  poolCount_in: [BigInt!]
-  poolCount_not_in: [BigInt!]
-  totalValueLocked: BigDecimal
-  totalValueLocked_not: BigDecimal
-  totalValueLocked_gt: BigDecimal
-  totalValueLocked_lt: BigDecimal
-  totalValueLocked_gte: BigDecimal
-  totalValueLocked_lte: BigDecimal
-  totalValueLocked_in: [BigDecimal!]
-  totalValueLocked_not_in: [BigDecimal!]
-  totalValueLockedUSD: BigDecimal
-  totalValueLockedUSD_not: BigDecimal
-  totalValueLockedUSD_gt: BigDecimal
-  totalValueLockedUSD_lt: BigDecimal
-  totalValueLockedUSD_gte: BigDecimal
-  totalValueLockedUSD_lte: BigDecimal
-  totalValueLockedUSD_in: [BigDecimal!]
-  totalValueLockedUSD_not_in: [BigDecimal!]
-  totalValueLockedUSDUntracked: BigDecimal
-  totalValueLockedUSDUntracked_not: BigDecimal
-  totalValueLockedUSDUntracked_gt: BigDecimal
-  totalValueLockedUSDUntracked_lt: BigDecimal
-  totalValueLockedUSDUntracked_gte: BigDecimal
-  totalValueLockedUSDUntracked_lte: BigDecimal
-  totalValueLockedUSDUntracked_in: [BigDecimal!]
-  totalValueLockedUSDUntracked_not_in: [BigDecimal!]
-  derivedETH: BigDecimal
-  derivedETH_not: BigDecimal
-  derivedETH_gt: BigDecimal
-  derivedETH_lt: BigDecimal
-  derivedETH_gte: BigDecimal
-  derivedETH_lte: BigDecimal
-  derivedETH_in: [BigDecimal!]
-  derivedETH_not_in: [BigDecimal!]
-  whitelistPools: [String!]
-  whitelistPools_not: [String!]
-  whitelistPools_contains: [String!]
-  whitelistPools_contains_nocase: [String!]
-  whitelistPools_not_contains: [String!]
-  whitelistPools_not_contains_nocase: [String!]
-  whitelistPools_: Pool_filter
-  tokenDayData_: TokenDayData_filter
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [Token_filter]
-  or: [Token_filter]
-}
-
-enum Token_orderBy {
-  id
-  symbol
-  name
-  decimals
-  totalSupply
-  volume
-  volumeUSD
-  untrackedVolumeUSD
-  feesUSD
-  txCount
-  poolCount
-  totalValueLocked
-  totalValueLockedUSD
-  totalValueLockedUSDUntracked
-  derivedETH
-  whitelistPools
-  tokenDayData
-}
-
-type TokenDayData {
-  id: ID!
-  date: Int!
-  token: Token!
-  volume: BigDecimal!
-  volumeUSD: BigDecimal!
-  untrackedVolumeUSD: BigDecimal!
-  totalValueLocked: BigDecimal!
-  totalValueLockedUSD: BigDecimal!
-  priceUSD: BigDecimal!
-  feesUSD: BigDecimal!
-  open: BigDecimal!
-  high: BigDecimal!
-  low: BigDecimal!
-  close: BigDecimal!
-}
-
-input TokenDayData_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  date: Int
-  date_not: Int
-  date_gt: Int
-  date_lt: Int
-  date_gte: Int
-  date_lte: Int
-  date_in: [Int!]
-  date_not_in: [Int!]
-  token: String
-  token_not: String
-  token_gt: String
-  token_lt: String
-  token_gte: String
-  token_lte: String
-  token_in: [String!]
-  token_not_in: [String!]
-  token_contains: String
-  token_contains_nocase: String
-  token_not_contains: String
-  token_not_contains_nocase: String
-  token_starts_with: String
-  token_starts_with_nocase: String
-  token_not_starts_with: String
-  token_not_starts_with_nocase: String
-  token_ends_with: String
-  token_ends_with_nocase: String
-  token_not_ends_with: String
-  token_not_ends_with_nocase: String
-  token_: Token_filter
-  volume: BigDecimal
-  volume_not: BigDecimal
-  volume_gt: BigDecimal
-  volume_lt: BigDecimal
-  volume_gte: BigDecimal
-  volume_lte: BigDecimal
-  volume_in: [BigDecimal!]
-  volume_not_in: [BigDecimal!]
-  volumeUSD: BigDecimal
-  volumeUSD_not: BigDecimal
-  volumeUSD_gt: BigDecimal
-  volumeUSD_lt: BigDecimal
-  volumeUSD_gte: BigDecimal
-  volumeUSD_lte: BigDecimal
-  volumeUSD_in: [BigDecimal!]
-  volumeUSD_not_in: [BigDecimal!]
-  untrackedVolumeUSD: BigDecimal
-  untrackedVolumeUSD_not: BigDecimal
-  untrackedVolumeUSD_gt: BigDecimal
-  untrackedVolumeUSD_lt: BigDecimal
-  untrackedVolumeUSD_gte: BigDecimal
-  untrackedVolumeUSD_lte: BigDecimal
-  untrackedVolumeUSD_in: [BigDecimal!]
-  untrackedVolumeUSD_not_in: [BigDecimal!]
-  totalValueLocked: BigDecimal
-  totalValueLocked_not: BigDecimal
-  totalValueLocked_gt: BigDecimal
-  totalValueLocked_lt: BigDecimal
-  totalValueLocked_gte: BigDecimal
-  totalValueLocked_lte: BigDecimal
-  totalValueLocked_in: [BigDecimal!]
-  totalValueLocked_not_in: [BigDecimal!]
-  totalValueLockedUSD: BigDecimal
-  totalValueLockedUSD_not: BigDecimal
-  totalValueLockedUSD_gt: BigDecimal
-  totalValueLockedUSD_lt: BigDecimal
-  totalValueLockedUSD_gte: BigDecimal
-  totalValueLockedUSD_lte: BigDecimal
-  totalValueLockedUSD_in: [BigDecimal!]
-  totalValueLockedUSD_not_in: [BigDecimal!]
-  priceUSD: BigDecimal
-  priceUSD_not: BigDecimal
-  priceUSD_gt: BigDecimal
-  priceUSD_lt: BigDecimal
-  priceUSD_gte: BigDecimal
-  priceUSD_lte: BigDecimal
-  priceUSD_in: [BigDecimal!]
-  priceUSD_not_in: [BigDecimal!]
-  feesUSD: BigDecimal
-  feesUSD_not: BigDecimal
-  feesUSD_gt: BigDecimal
-  feesUSD_lt: BigDecimal
-  feesUSD_gte: BigDecimal
-  feesUSD_lte: BigDecimal
-  feesUSD_in: [BigDecimal!]
-  feesUSD_not_in: [BigDecimal!]
-  open: BigDecimal
-  open_not: BigDecimal
-  open_gt: BigDecimal
-  open_lt: BigDecimal
-  open_gte: BigDecimal
-  open_lte: BigDecimal
-  open_in: [BigDecimal!]
-  open_not_in: [BigDecimal!]
-  high: BigDecimal
-  high_not: BigDecimal
-  high_gt: BigDecimal
-  high_lt: BigDecimal
-  high_gte: BigDecimal
-  high_lte: BigDecimal
-  high_in: [BigDecimal!]
-  high_not_in: [BigDecimal!]
-  low: BigDecimal
-  low_not: BigDecimal
-  low_gt: BigDecimal
-  low_lt: BigDecimal
-  low_gte: BigDecimal
-  low_lte: BigDecimal
-  low_in: [BigDecimal!]
-  low_not_in: [BigDecimal!]
-  close: BigDecimal
-  close_not: BigDecimal
-  close_gt: BigDecimal
-  close_lt: BigDecimal
-  close_gte: BigDecimal
-  close_lte: BigDecimal
-  close_in: [BigDecimal!]
-  close_not_in: [BigDecimal!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [TokenDayData_filter]
-  or: [TokenDayData_filter]
-}
-
-enum TokenDayData_orderBy {
-  id
-  date
-  token
-  token__id
-  token__symbol
-  token__name
-  token__decimals
-  token__totalSupply
-  token__volume
-  token__volumeUSD
-  token__untrackedVolumeUSD
-  token__feesUSD
-  token__txCount
-  token__poolCount
-  token__totalValueLocked
-  token__totalValueLockedUSD
-  token__totalValueLockedUSDUntracked
-  token__derivedETH
-  volume
-  volumeUSD
-  untrackedVolumeUSD
-  totalValueLocked
-  totalValueLockedUSD
-  priceUSD
-  feesUSD
-  open
-  high
-  low
-  close
-}
-
-type TokenHourData {
-  id: ID!
-  periodStartUnix: Int!
-  token: Token!
-  volume: BigDecimal!
-  volumeUSD: BigDecimal!
-  untrackedVolumeUSD: BigDecimal!
-  totalValueLocked: BigDecimal!
-  totalValueLockedUSD: BigDecimal!
-  priceUSD: BigDecimal!
-  feesUSD: BigDecimal!
-  open: BigDecimal!
-  high: BigDecimal!
-  low: BigDecimal!
-  close: BigDecimal!
-}
-
-input TokenHourData_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  periodStartUnix: Int
-  periodStartUnix_not: Int
-  periodStartUnix_gt: Int
-  periodStartUnix_lt: Int
-  periodStartUnix_gte: Int
-  periodStartUnix_lte: Int
-  periodStartUnix_in: [Int!]
-  periodStartUnix_not_in: [Int!]
-  token: String
-  token_not: String
-  token_gt: String
-  token_lt: String
-  token_gte: String
-  token_lte: String
-  token_in: [String!]
-  token_not_in: [String!]
-  token_contains: String
-  token_contains_nocase: String
-  token_not_contains: String
-  token_not_contains_nocase: String
-  token_starts_with: String
-  token_starts_with_nocase: String
-  token_not_starts_with: String
-  token_not_starts_with_nocase: String
-  token_ends_with: String
-  token_ends_with_nocase: String
-  token_not_ends_with: String
-  token_not_ends_with_nocase: String
-  token_: Token_filter
-  volume: BigDecimal
-  volume_not: BigDecimal
-  volume_gt: BigDecimal
-  volume_lt: BigDecimal
-  volume_gte: BigDecimal
-  volume_lte: BigDecimal
-  volume_in: [BigDecimal!]
-  volume_not_in: [BigDecimal!]
-  volumeUSD: BigDecimal
-  volumeUSD_not: BigDecimal
-  volumeUSD_gt: BigDecimal
-  volumeUSD_lt: BigDecimal
-  volumeUSD_gte: BigDecimal
-  volumeUSD_lte: BigDecimal
-  volumeUSD_in: [BigDecimal!]
-  volumeUSD_not_in: [BigDecimal!]
-  untrackedVolumeUSD: BigDecimal
-  untrackedVolumeUSD_not: BigDecimal
-  untrackedVolumeUSD_gt: BigDecimal
-  untrackedVolumeUSD_lt: BigDecimal
-  untrackedVolumeUSD_gte: BigDecimal
-  untrackedVolumeUSD_lte: BigDecimal
-  untrackedVolumeUSD_in: [BigDecimal!]
-  untrackedVolumeUSD_not_in: [BigDecimal!]
-  totalValueLocked: BigDecimal
-  totalValueLocked_not: BigDecimal
-  totalValueLocked_gt: BigDecimal
-  totalValueLocked_lt: BigDecimal
-  totalValueLocked_gte: BigDecimal
-  totalValueLocked_lte: BigDecimal
-  totalValueLocked_in: [BigDecimal!]
-  totalValueLocked_not_in: [BigDecimal!]
-  totalValueLockedUSD: BigDecimal
-  totalValueLockedUSD_not: BigDecimal
-  totalValueLockedUSD_gt: BigDecimal
-  totalValueLockedUSD_lt: BigDecimal
-  totalValueLockedUSD_gte: BigDecimal
-  totalValueLockedUSD_lte: BigDecimal
-  totalValueLockedUSD_in: [BigDecimal!]
-  totalValueLockedUSD_not_in: [BigDecimal!]
-  priceUSD: BigDecimal
-  priceUSD_not: BigDecimal
-  priceUSD_gt: BigDecimal
-  priceUSD_lt: BigDecimal
-  priceUSD_gte: BigDecimal
-  priceUSD_lte: BigDecimal
-  priceUSD_in: [BigDecimal!]
-  priceUSD_not_in: [BigDecimal!]
-  feesUSD: BigDecimal
-  feesUSD_not: BigDecimal
-  feesUSD_gt: BigDecimal
-  feesUSD_lt: BigDecimal
-  feesUSD_gte: BigDecimal
-  feesUSD_lte: BigDecimal
-  feesUSD_in: [BigDecimal!]
-  feesUSD_not_in: [BigDecimal!]
-  open: BigDecimal
-  open_not: BigDecimal
-  open_gt: BigDecimal
-  open_lt: BigDecimal
-  open_gte: BigDecimal
-  open_lte: BigDecimal
-  open_in: [BigDecimal!]
-  open_not_in: [BigDecimal!]
-  high: BigDecimal
-  high_not: BigDecimal
-  high_gt: BigDecimal
-  high_lt: BigDecimal
-  high_gte: BigDecimal
-  high_lte: BigDecimal
-  high_in: [BigDecimal!]
-  high_not_in: [BigDecimal!]
-  low: BigDecimal
-  low_not: BigDecimal
-  low_gt: BigDecimal
-  low_lt: BigDecimal
-  low_gte: BigDecimal
-  low_lte: BigDecimal
-  low_in: [BigDecimal!]
-  low_not_in: [BigDecimal!]
-  close: BigDecimal
-  close_not: BigDecimal
-  close_gt: BigDecimal
-  close_lt: BigDecimal
-  close_gte: BigDecimal
-  close_lte: BigDecimal
-  close_in: [BigDecimal!]
-  close_not_in: [BigDecimal!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [TokenHourData_filter]
-  or: [TokenHourData_filter]
-}
-
-enum TokenHourData_orderBy {
-  id
-  periodStartUnix
-  token
-  token__id
-  token__symbol
-  token__name
-  token__decimals
-  token__totalSupply
-  token__volume
-  token__volumeUSD
-  token__untrackedVolumeUSD
-  token__feesUSD
-  token__txCount
-  token__poolCount
-  token__totalValueLocked
-  token__totalValueLockedUSD
-  token__totalValueLockedUSDUntracked
-  token__derivedETH
-  volume
-  volumeUSD
-  untrackedVolumeUSD
-  totalValueLocked
-  totalValueLockedUSD
-  priceUSD
-  feesUSD
-  open
-  high
-  low
-  close
-}
-
-type Transaction {
-  id: ID!
-  blockNumber: BigInt!
-  timestamp: BigInt!
-  gasUsed: BigInt!
-  gasPrice: BigInt!
-  mints(skip: Int = 0, first: Int = 100, orderBy: Mint_orderBy, orderDirection: OrderDirection, where: Mint_filter): [Mint]!
-  burns(skip: Int = 0, first: Int = 100, orderBy: Burn_orderBy, orderDirection: OrderDirection, where: Burn_filter): [Burn]!
-  swaps(skip: Int = 0, first: Int = 100, orderBy: Swap_orderBy, orderDirection: OrderDirection, where: Swap_filter): [Swap]!
-  flashed(skip: Int = 0, first: Int = 100, orderBy: Flash_orderBy, orderDirection: OrderDirection, where: Flash_filter): [Flash]!
-  collects(skip: Int = 0, first: Int = 100, orderBy: Collect_orderBy, orderDirection: OrderDirection, where: Collect_filter): [Collect]!
-}
-
-input Transaction_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  blockNumber: BigInt
-  blockNumber_not: BigInt
-  blockNumber_gt: BigInt
-  blockNumber_lt: BigInt
-  blockNumber_gte: BigInt
-  blockNumber_lte: BigInt
-  blockNumber_in: [BigInt!]
-  blockNumber_not_in: [BigInt!]
-  timestamp: BigInt
-  timestamp_not: BigInt
-  timestamp_gt: BigInt
-  timestamp_lt: BigInt
-  timestamp_gte: BigInt
-  timestamp_lte: BigInt
-  timestamp_in: [BigInt!]
-  timestamp_not_in: [BigInt!]
-  gasUsed: BigInt
-  gasUsed_not: BigInt
-  gasUsed_gt: BigInt
-  gasUsed_lt: BigInt
-  gasUsed_gte: BigInt
-  gasUsed_lte: BigInt
-  gasUsed_in: [BigInt!]
-  gasUsed_not_in: [BigInt!]
-  gasPrice: BigInt
-  gasPrice_not: BigInt
-  gasPrice_gt: BigInt
-  gasPrice_lt: BigInt
-  gasPrice_gte: BigInt
-  gasPrice_lte: BigInt
-  gasPrice_in: [BigInt!]
-  gasPrice_not_in: [BigInt!]
-  mints_: Mint_filter
-  burns_: Burn_filter
-  swaps_: Swap_filter
-  flashed_: Flash_filter
-  collects_: Collect_filter
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [Transaction_filter]
-  or: [Transaction_filter]
-}
-
-enum Transaction_orderBy {
-  id
-  blockNumber
-  timestamp
-  gasUsed
-  gasPrice
-  mints
-  burns
-  swaps
-  flashed
-  collects
-}
-
-type UniswapDayData {
-  id: ID!
-  date: Int!
-  volumeETH: BigDecimal!
-  volumeUSD: BigDecimal!
-  volumeUSDUntracked: BigDecimal!
-  feesUSD: BigDecimal!
-  txCount: BigInt!
-  tvlUSD: BigDecimal!
-}
-
-input UniswapDayData_filter {
-  id: ID
-  id_not: ID
-  id_gt: ID
-  id_lt: ID
-  id_gte: ID
-  id_lte: ID
-  id_in: [ID!]
-  id_not_in: [ID!]
-  date: Int
-  date_not: Int
-  date_gt: Int
-  date_lt: Int
-  date_gte: Int
-  date_lte: Int
-  date_in: [Int!]
-  date_not_in: [Int!]
-  volumeETH: BigDecimal
-  volumeETH_not: BigDecimal
-  volumeETH_gt: BigDecimal
-  volumeETH_lt: BigDecimal
-  volumeETH_gte: BigDecimal
-  volumeETH_lte: BigDecimal
-  volumeETH_in: [BigDecimal!]
-  volumeETH_not_in: [BigDecimal!]
-  volumeUSD: BigDecimal
-  volumeUSD_not: BigDecimal
-  volumeUSD_gt: BigDecimal
-  volumeUSD_lt: BigDecimal
-  volumeUSD_gte: BigDecimal
-  volumeUSD_lte: BigDecimal
-  volumeUSD_in: [BigDecimal!]
-  volumeUSD_not_in: [BigDecimal!]
-  volumeUSDUntracked: BigDecimal
-  volumeUSDUntracked_not: BigDecimal
-  volumeUSDUntracked_gt: BigDecimal
-  volumeUSDUntracked_lt: BigDecimal
-  volumeUSDUntracked_gte: BigDecimal
-  volumeUSDUntracked_lte: BigDecimal
-  volumeUSDUntracked_in: [BigDecimal!]
-  volumeUSDUntracked_not_in: [BigDecimal!]
-  feesUSD: BigDecimal
-  feesUSD_not: BigDecimal
-  feesUSD_gt: BigDecimal
-  feesUSD_lt: BigDecimal
-  feesUSD_gte: BigDecimal
-  feesUSD_lte: BigDecimal
-  feesUSD_in: [BigDecimal!]
-  feesUSD_not_in: [BigDecimal!]
-  txCount: BigInt
-  txCount_not: BigInt
-  txCount_gt: BigInt
-  txCount_lt: BigInt
-  txCount_gte: BigInt
-  txCount_lte: BigInt
-  txCount_in: [BigInt!]
-  txCount_not_in: [BigInt!]
-  tvlUSD: BigDecimal
-  tvlUSD_not: BigDecimal
-  tvlUSD_gt: BigDecimal
-  tvlUSD_lt: BigDecimal
-  tvlUSD_gte: BigDecimal
-  tvlUSD_lte: BigDecimal
-  tvlUSD_in: [BigDecimal!]
-  tvlUSD_not_in: [BigDecimal!]
-
-  """Filter for the block changed event."""
-  _change_block: BlockChangedFilter
-  and: [UniswapDayData_filter]
-  or: [UniswapDayData_filter]
-}
-
-enum UniswapDayData_orderBy {
-  id
-  date
-  volumeETH
-  volumeUSD
-  volumeUSDUntracked
-  feesUSD
-  txCount
-  tvlUSD
-}
-
diff --git a/apps/web/src/hooks/Tokens.ts b/apps/web/src/hooks/Tokens.ts
index e0dd318dac4..942b0da47f7 100644
--- a/apps/web/src/hooks/Tokens.ts
+++ b/apps/web/src/hooks/Tokens.ts
@@ -63,11 +63,6 @@ export function useAllTokensMultichain(): ChainTokenMap {
   }, [allTokensFromLists, userAddedTokensMap])
 }
 
-export function useDefaultListTokens(chainId: Maybe<ChainId>) {
-  const defaultListTokens = useCombinedActiveList()
-  return useTokensFromMap(defaultListTokens, chainId)
-}
-
 /** Returns all tokens from the default list + user added tokens */
 export function useDefaultActiveTokens(chainId: Maybe<ChainId>): { [address: string]: Token } {
   const defaultListTokens = useCombinedActiveList()
diff --git a/apps/web/src/hooks/useActiveLocalCurrency.ts b/apps/web/src/hooks/useActiveLocalCurrency.ts
index 72d06bb3267..b5ae8e9e4f5 100644
--- a/apps/web/src/hooks/useActiveLocalCurrency.ts
+++ b/apps/web/src/hooks/useActiveLocalCurrency.ts
@@ -1,9 +1,7 @@
 import { DEFAULT_LOCAL_CURRENCY, SUPPORTED_LOCAL_CURRENCIES, SupportedLocalCurrency } from 'constants/localCurrencies'
 import { atomWithStorage, useAtomValue } from 'jotai/utils'
 import { useMemo } from 'react'
-import { getFiatCurrencyComponents } from 'utils/formatNumbers'
 
-import { useActiveLocale } from './useActiveLocale'
 import useParsedQueryString from './useParsedQueryString'
 
 export const activeLocalCurrencyAtom = atomWithStorage<SupportedLocalCurrency>(
@@ -29,13 +27,3 @@ export function useActiveLocalCurrency(): SupportedLocalCurrency {
 
   return useMemo(() => urlLocalCurrency ?? activeLocalCurrency, [activeLocalCurrency, urlLocalCurrency])
 }
-
-export function useActiveLocalCurrencyComponents() {
-  const activeLocale = useActiveLocale()
-  const activeLocalCurrency = useActiveLocalCurrency()
-
-  return useMemo(
-    () => getFiatCurrencyComponents(activeLocale, activeLocalCurrency),
-    [activeLocalCurrency, activeLocale]
-  )
-}
diff --git a/apps/web/src/hooks/useArgentWalletContract.ts b/apps/web/src/hooks/useArgentWalletContract.ts
index 4c36518b6bd..1b5f9d8ce23 100644
--- a/apps/web/src/hooks/useArgentWalletContract.ts
+++ b/apps/web/src/hooks/useArgentWalletContract.ts
@@ -1,7 +1,7 @@
 import { useWeb3React } from '@web3-react/core'
-import ArgentWalletContractABI from 'wallet/src/abis/argent-wallet-contract.json'
-import { ArgentWalletContract } from 'wallet/src/abis/types'
 
+import ArgentWalletContractABI from '../abis/argent-wallet-contract.json'
+import { ArgentWalletContract } from '../abis/types'
 import { useContract } from './useContract'
 import useIsArgentWallet from './useIsArgentWallet'
 
diff --git a/apps/web/src/hooks/useAssetLogoSource.ts b/apps/web/src/hooks/useAssetLogoSource.ts
index ec564d61db4..d8772c8e31f 100644
--- a/apps/web/src/hooks/useAssetLogoSource.ts
+++ b/apps/web/src/hooks/useAssetLogoSource.ts
@@ -3,7 +3,7 @@ import { isCelo, nativeOnChain } from 'constants/tokens'
 import { checkWarning, WARNING_LEVEL } from 'constants/tokenSafety'
 import { chainIdToNetworkName, getNativeLogoURI } from 'lib/hooks/useCurrencyLogoURIs'
 import uriToHttp from 'lib/utils/uriToHttp'
-import { useCallback, useMemo, useReducer } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { isAddress } from 'utils'
 
 import celoLogo from '../assets/svg/celo_logo.svg'
@@ -38,7 +38,7 @@ function prioritizeLogoSources(uris: string[]) {
   return coingeckoUrl ? [...preferredUris, coingeckoUrl] : preferredUris
 }
 
-export function getInitialUrl(
+function getInitialUrl(
   address?: string | null,
   chainId?: number | null,
   isNative?: boolean,
@@ -67,23 +67,33 @@ export default function useAssetLogoSource(
   backupImg?: string | null
 ): [string | undefined, () => void] {
   const hideLogo = Boolean(address && checkWarning(address, chainId)?.level === WARNING_LEVEL.BLOCKED)
-  const [srcIndex, incrementSrcIndex] = useReducer((n: number) => n + 1, 0)
+  const [current, setCurrent] = useState<string | undefined>(
+    hideLogo ? undefined : getInitialUrl(address, chainId, isNative, backupImg)
+  )
+  const [fallbackSrcs, setFallbackSrcs] = useState<string[] | undefined>(undefined)
 
-  const current = useMemo(() => {
-    if (hideLogo) return undefined
+  useEffect(() => {
+    if (hideLogo) return
+    setCurrent(getInitialUrl(address, chainId, isNative))
+    setFallbackSrcs(undefined)
+  }, [address, chainId, hideLogo, isNative])
 
-    if (srcIndex === 0) {
-      return getInitialUrl(address, chainId, isNative, backupImg)
+  const nextSrc = useCallback(() => {
+    if (current) {
+      BAD_SRCS[current] = true
     }
-    const uris = tokenLogoLookup.getIcons(address, chainId) ?? []
-    const fallbackSrcs = prioritizeLogoSources(parseLogoSources(uris))
-    return fallbackSrcs.find((src) => !BAD_SRCS[src])
-  }, [address, backupImg, chainId, hideLogo, isNative, srcIndex])
+    // Parses and stores logo sources from tokenlists if assets repo url fails
+    if (!fallbackSrcs) {
+      const uris = tokenLogoLookup.getIcons(address, chainId) ?? []
+      if (backupImg) uris.push(backupImg)
+      const tokenListIcons = prioritizeLogoSources(parseLogoSources(uris))
 
-  const nextSrc = useCallback(() => {
-    if (current) BAD_SRCS[current] = true
-    incrementSrcIndex()
-  }, [current])
+      setCurrent(tokenListIcons.find((src) => !BAD_SRCS[src]))
+      setFallbackSrcs(tokenListIcons)
+    } else {
+      setCurrent(fallbackSrcs.find((src) => !BAD_SRCS[src]))
+    }
+  }, [current, fallbackSrcs, address, chainId, backupImg])
 
   return [current, nextSrc]
 }
diff --git a/apps/web/src/hooks/useAsyncData.ts b/apps/web/src/hooks/useAsyncData.ts
deleted file mode 100644
index 27ac92ccf00..00000000000
--- a/apps/web/src/hooks/useAsyncData.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { useEffect, useMemo, useRef, useState } from 'react'
-
-// TODO: https://linear.app/uniswap/issue/WEB-3495/import-useasyncdata-from-mobile
-export function useAsyncData<T>(
-  asyncCallback: () => Promise<T> | undefined,
-  onCancel?: () => void
-): {
-  isLoading: boolean
-  data?: T
-} {
-  const [state, setState] = useState<{
-    data?: T
-    isLoading: boolean
-  }>({
-    data: undefined,
-    isLoading: true,
-  })
-  const onCancelRef = useRef(onCancel)
-  const lastCompletedAsyncCallbackRef = useRef(asyncCallback)
-
-  useEffect(() => {
-    let isPending = false
-
-    async function runCallback(): Promise<void> {
-      isPending = true
-      const data = await asyncCallback()
-      if (isPending) {
-        lastCompletedAsyncCallbackRef.current = asyncCallback
-        setState((prevState) => ({ ...prevState, data, isLoading: false }))
-      }
-    }
-
-    runCallback()
-      .catch(() => {
-        if (isPending) {
-          lastCompletedAsyncCallbackRef.current = asyncCallback
-          setState((prevState) => ({ ...prevState, isLoading: false }))
-        }
-      })
-      .finally(() => {
-        isPending = false
-      })
-
-    const handleCancel = onCancelRef.current
-
-    return () => {
-      if (!isPending) {
-        return
-      }
-      isPending = false
-      if (handleCancel) {
-        handleCancel()
-      }
-    }
-  }, [asyncCallback])
-
-  return useMemo(() => {
-    if (asyncCallback !== lastCompletedAsyncCallbackRef.current) {
-      return { isLoading: true, data: undefined }
-    }
-    return state
-  }, [asyncCallback, state])
-}
diff --git a/apps/web/src/hooks/useAutoSlippageTolerance.ts b/apps/web/src/hooks/useAutoSlippageTolerance.ts
index 5dd39070a22..70d3649ff05 100644
--- a/apps/web/src/hooks/useAutoSlippageTolerance.ts
+++ b/apps/web/src/hooks/useAutoSlippageTolerance.ts
@@ -3,7 +3,8 @@ import { Currency, CurrencyAmount, Percent, TradeType } from '@uniswap/sdk-core'
 import { Pair } from '@uniswap/v2-sdk'
 import { Pool } from '@uniswap/v3-sdk'
 import { useWeb3React } from '@web3-react/core'
-import { L2_CHAIN_IDS, SUPPORTED_GAS_ESTIMATE_CHAIN_IDS } from 'constants/chains'
+import { SUPPORTED_GAS_ESTIMATE_CHAIN_IDS } from 'constants/chains'
+import { L2_CHAIN_IDS } from 'constants/chains'
 import JSBI from 'jsbi'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
 import { useMemo } from 'react'
diff --git a/apps/web/src/hooks/useColor.ts b/apps/web/src/hooks/useColor.ts
index 74cac59fcc9..941a1fe5567 100644
--- a/apps/web/src/hooks/useColor.ts
+++ b/apps/web/src/hooks/useColor.ts
@@ -1,104 +1,98 @@
 import { ChainId, Currency } from '@uniswap/sdk-core'
 import { DEFAULT_COLOR } from 'constants/tokenColors'
 import useTokenLogoSource from 'hooks/useAssetLogoSource'
-import { rgb } from 'polished'
-import { useEffect, useMemo, useRef, useState } from 'react'
+import { darken, lighten, rgb } from 'polished'
+import { useEffect, useState } from 'react'
 import { TokenFromList } from 'state/lists/tokenFromList'
 import { useTheme } from 'styled-components'
-import { getAccessibleColor } from 'theme/utils'
 import { getColor } from 'utils/getColor'
+import { hex } from 'wcag-contrast'
+
+// The WCAG AA standard color contrast threshold
+const MIN_COLOR_CONTRAST_THRESHOLD = 3
+
+/**
+ * Compares a given color against the background color to determine if it passes the minimum contrast threshold.
+ * @param color The hex value of the extracted color
+ * @param backgroundColor The hex value of the background color to check contrast against
+ * @returns either 'sporeWhite' or 'sporeBlack'
+ */
+function passesContrast(color: string, backgroundColor: string): boolean {
+  const contrast = hex(color, backgroundColor)
+  return contrast >= MIN_COLOR_CONTRAST_THRESHOLD
+}
 
 function URIForEthToken(address: string) {
   return `https://raw.githubusercontent.com/uniswap/assets/master/blockchains/ethereum/assets/${address}/logo.png`
 }
 
-const COLOR_CACHE: Record<string, string | undefined> = {}
-
 /**
  * Retrieves the average color from a token's symbol using various sources.
  *
  * @param {Currency} currency - The currency for which to fetch the color.
  * @param {string} primarySrc - Primary source URL for color retrieval (optional).
  *
- * @returns {Promise<string | null>} A promise that resolves to a color string or null if color cannot be determined.
+ * @returns {Promise< | null>} A promise that resolves to a color string or null if color cannot be determined.
  */
-async function getColorFromToken(srcs: string[]): Promise<string | undefined> {
+async function getColorFromToken(currency: Currency, primarySrc?: string): Promise<string | null> {
+  const wrappedToken = currency.wrapped as TokenFromList
   let color: string | null = null
+
   try {
-    for (const src of srcs) {
-      const cachedColor = COLOR_CACHE[src]
-      if (cachedColor) return cachedColor
+    if (primarySrc) {
+      const colorArray = await getColor(primarySrc)
+      color = colorArray === DEFAULT_COLOR ? null : convertColorArrayToString(colorArray)
+    }
 
-      const colorArray = await getColor(src)
+    if (!color && wrappedToken?.logoURI) {
+      const colorArray = await getColor(wrappedToken.logoURI)
       color = colorArray === DEFAULT_COLOR ? null : convertColorArrayToString(colorArray)
-      if (color) {
-        COLOR_CACHE[src] = color
-        return color
-      }
     }
-    return undefined
-  } catch (error) {
-    console.warn(`Unable to extract color from logo sources: ${srcs}`)
-    return undefined
-  }
-}
 
-function getBackupCurrencySrcs(currency?: Currency) {
-  const srcs = []
-  const wrappedToken = currency?.wrapped as TokenFromList
+    if (!color && currency.chainId === ChainId.MAINNET) {
+      const colorArray = await getColor(URIForEthToken(wrappedToken.address))
+      color = colorArray === DEFAULT_COLOR ? null : convertColorArrayToString(colorArray)
+    }
 
-  if (wrappedToken?.logoURI) {
-    srcs.push(wrappedToken.logoURI)
-  }
-  if (currency?.chainId === ChainId.MAINNET) {
-    srcs.push(URIForEthToken(wrappedToken.address))
+    return color
+  } catch (error) {
+    console.warn(`Unable to load logoURI (${currency.symbol}): ${primarySrc}, ${wrappedToken.logoURI}`)
+    return null
   }
-
-  return srcs
 }
 
 function convertColorArrayToString([red, green, blue]: number[]): string {
   return rgb({ red, green, blue })
 }
 
-type ContrastSettings = { backgroundColor: string; darkMode: boolean }
-
-export function useColor(currency?: Currency, contrastSettings?: ContrastSettings) {
+export function useColor(currency?: Currency, backgroundColor?: string, makeLighter?: boolean) {
   const theme = useTheme()
+  const [color, setColor] = useState(theme.accent1)
   const [src] = useTokenLogoSource(currency?.wrapped.address, currency?.chainId, currency?.isNative)
 
-  const srcs = useMemo(() => {
-    const backupSrcs = getBackupCurrencySrcs(currency)
-    return src ? [src, ...backupSrcs] : backupSrcs
-  }, [currency, src])
-
-  return useSrcColor(srcs, contrastSettings) ?? theme.accent1
-}
-
-export function useSrcColor(src?: string[] | string, contrastSettings?: ContrastSettings) {
-  const theme = useTheme()
-  const [color, setColor] = useState<string | undefined>()
-
-  const prevSrcRef = useRef(src)
-  prevSrcRef.current = src
-
   useEffect(() => {
-    async function fetchColor() {
-      if (src) {
-        let color = await getColorFromToken(Array.isArray(src) ? src : [src])
-        // Update the color if the src has not changed since before fetch started
-        if (color && prevSrcRef.current === src) {
-          if (contrastSettings) {
-            color = getAccessibleColor(color, contrastSettings.backgroundColor, contrastSettings.darkMode)
+    let stale = false
+
+    if (currency) {
+      getColorFromToken(currency, src).then((tokenColor) => {
+        if (!stale && tokenColor !== null) {
+          if (backgroundColor) {
+            let increment = 0.1
+            while (!passesContrast(tokenColor, backgroundColor)) {
+              tokenColor = makeLighter ? lighten(increment, tokenColor) : darken(increment, tokenColor)
+              increment += 0.1
+            }
           }
-          setColor(color)
-        } else {
-          setColor(undefined)
+          setColor(tokenColor)
         }
-      }
+      })
+    }
+
+    return () => {
+      stale = true
+      setColor(theme.accent1)
     }
-    fetchColor()
-  }, [contrastSettings, src, theme.accent1])
+  }, [backgroundColor, makeLighter, src, theme.accent1, currency])
 
   return color
 }
diff --git a/apps/web/src/hooks/useContract.ts b/apps/web/src/hooks/useContract.ts
index ec3bebf5330..b31dd057e44 100644
--- a/apps/web/src/hooks/useContract.ts
+++ b/apps/web/src/hooks/useContract.ts
@@ -15,32 +15,24 @@ import UniswapInterfaceMulticallJson from '@uniswap/v3-periphery/artifacts/contr
 import NonfungiblePositionManagerJson from '@uniswap/v3-periphery/artifacts/contracts/NonfungiblePositionManager.sol/NonfungiblePositionManager.json'
 import V3MigratorJson from '@uniswap/v3-periphery/artifacts/contracts/V3Migrator.sol/V3Migrator.json'
 import { useWeb3React } from '@web3-react/core'
+import ARGENT_WALLET_DETECTOR_ABI from 'abis/argent-wallet-detector.json'
+import EIP_2612 from 'abis/eip_2612.json'
+import ENS_PUBLIC_RESOLVER_ABI from 'abis/ens-public-resolver.json'
+import ENS_ABI from 'abis/ens-registrar.json'
+import ERC20_ABI from 'abis/erc20.json'
+import ERC20_BYTES32_ABI from 'abis/erc20_bytes32.json'
+import ERC721_ABI from 'abis/erc721.json'
+import ERC1155_ABI from 'abis/erc1155.json'
+import { ArgentWalletDetector, EnsPublicResolver, EnsRegistrar, Erc20, Erc721, Erc1155, Weth } from 'abis/types'
+import WETH_ABI from 'abis/weth.json'
 import { sendAnalyticsEvent } from 'analytics'
 import { DEPRECATED_RPC_PROVIDERS, RPC_PROVIDERS } from 'constants/providers'
 import { WRAPPED_NATIVE_CURRENCY } from 'constants/tokens'
 import { useFallbackProviderEnabled } from 'featureFlags/flags/fallbackProvider'
 import { useEffect, useMemo } from 'react'
+import { NonfungiblePositionManager, UniswapInterfaceMulticall } from 'types/v3'
+import { V3Migrator } from 'types/v3/V3Migrator'
 import { getContract } from 'utils'
-import ARGENT_WALLET_DETECTOR_ABI from 'wallet/src/abis/argent-wallet-detector.json'
-import EIP_2612 from 'wallet/src/abis/eip_2612.json'
-import ENS_PUBLIC_RESOLVER_ABI from 'wallet/src/abis/ens-public-resolver.json'
-import ENS_ABI from 'wallet/src/abis/ens-registrar.json'
-import ERC1155_ABI from 'wallet/src/abis/erc1155.json'
-import ERC20_ABI from 'wallet/src/abis/erc20.json'
-import ERC20_BYTES32_ABI from 'wallet/src/abis/erc20_bytes32.json'
-import ERC721_ABI from 'wallet/src/abis/erc721.json'
-import {
-  ArgentWalletDetector,
-  EnsPublicResolver,
-  EnsRegistrar,
-  Erc1155,
-  Erc20,
-  Erc721,
-  Weth,
-} from 'wallet/src/abis/types'
-import { NonfungiblePositionManager, UniswapInterfaceMulticall } from 'wallet/src/abis/types/v3'
-import { V3Migrator } from 'wallet/src/abis/types/v3/V3Migrator'
-import WETH_ABI from 'wallet/src/abis/weth.json'
 
 const { abi: IUniswapV2PairABI } = IUniswapV2PairJson
 const { abi: IUniswapV2Router02ABI } = IUniswapV2Router02Json
diff --git a/apps/web/src/hooks/useDebouncedTrade.ts b/apps/web/src/hooks/useDebouncedTrade.ts
index 7b7eac8ee5f..ab90ac434f4 100644
--- a/apps/web/src/hooks/useDebouncedTrade.ts
+++ b/apps/web/src/hooks/useDebouncedTrade.ts
@@ -1,6 +1,7 @@
 import { Currency, CurrencyAmount, Percent, TradeType } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
 import { WRAPPED_NATIVE_CURRENCY } from 'constants/tokens'
+import { DebounceSwapQuoteVariant, useDebounceSwapQuoteFlag } from 'featureFlags/flags/debounceSwapQuote'
 import { useMemo } from 'react'
 import { ClassicTrade, InterfaceTrade, QuoteMethod, RouterPreference, TradeState } from 'state/routing/types'
 import { usePreviewTrade } from 'state/routing/usePreviewTrade'
@@ -14,6 +15,9 @@ import useDebounce from './useDebounce'
 const DEBOUNCE_TIME = 350
 const DEBOUNCE_TIME_QUICKROUTE = 50
 
+// Temporary until we remove the feature flag.
+const DEBOUNCE_TIME_INCREASED = 650
+
 export function useDebouncedTrade(
   tradeType: TradeType,
   amountSpecified?: CurrencyAmount<Currency>,
@@ -71,7 +75,9 @@ export function useDebouncedTrade(
     () => [amountSpecified, otherCurrency],
     [amountSpecified, otherCurrency]
   )
-  const isDebouncing = useDebounce(inputs, DEBOUNCE_TIME) !== inputs
+  const debouncedSwapQuoteFlagEnabled = useDebounceSwapQuoteFlag() === DebounceSwapQuoteVariant.Enabled
+  const isDebouncing =
+    useDebounce(inputs, debouncedSwapQuoteFlagEnabled ? DEBOUNCE_TIME_INCREASED : DEBOUNCE_TIME) !== inputs
 
   const isPreviewTradeDebouncing = useDebounce(inputs, DEBOUNCE_TIME_QUICKROUTE) !== inputs
 
diff --git a/apps/web/src/hooks/useENSAvatar.ts b/apps/web/src/hooks/useENSAvatar.ts
index f500227a40a..b8948cf0362 100644
--- a/apps/web/src/hooks/useENSAvatar.ts
+++ b/apps/web/src/hooks/useENSAvatar.ts
@@ -8,7 +8,7 @@ import { safeNamehash } from 'utils/safeNamehash'
 
 import { isAddress } from '../utils'
 import isZero from '../utils/isZero'
-import { useENSRegistrarContract, useENSResolverContract, useERC1155Contract, useERC721Contract } from './useContract'
+import { useENSRegistrarContract, useENSResolverContract, useERC721Contract, useERC1155Contract } from './useContract'
 import useDebounce from './useDebounce'
 import useENSName from './useENSName'
 
diff --git a/apps/web/src/hooks/useGroupedRecentTransfers.ts b/apps/web/src/hooks/useGroupedRecentTransfers.ts
deleted file mode 100644
index 859a87e18f1..00000000000
--- a/apps/web/src/hooks/useGroupedRecentTransfers.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { useRecentTokenTransfers } from 'graphql/data/RecentTokenTransfers'
-import { useMemo } from 'react'
-
-export function useGroupedRecentTransfers(account?: string) {
-  const { data: recentTransfers, loading } = useRecentTokenTransfers(account)
-
-  return useMemo(
-    () => ({
-      transfers: recentTransfers?.reduce((acc, transfer) => {
-        const address = transfer.recipient
-        if (acc[address]) {
-          acc[address]++
-        } else {
-          acc[address] = 1
-        }
-        return acc
-      }, {} as { [address: string]: number }),
-      loading,
-    }),
-
-    [loading, recentTransfers]
-  )
-}
diff --git a/apps/web/src/hooks/useIsTickAtLimit.ts b/apps/web/src/hooks/useIsTickAtLimit.ts
index 930f7087b02..8763d239cc8 100644
--- a/apps/web/src/hooks/useIsTickAtLimit.ts
+++ b/apps/web/src/hooks/useIsTickAtLimit.ts
@@ -1,4 +1,4 @@
-import { FeeAmount, TICK_SPACINGS, TickMath, nearestUsableTick } from '@uniswap/v3-sdk'
+import { FeeAmount, nearestUsableTick, TICK_SPACINGS, TickMath } from '@uniswap/v3-sdk'
 import { useMemo } from 'react'
 import { Bound } from 'state/mint/v3/actions'
 
diff --git a/apps/web/src/hooks/usePermitAllowance.ts b/apps/web/src/hooks/usePermitAllowance.ts
index 970cc67d949..40a776078cf 100644
--- a/apps/web/src/hooks/usePermitAllowance.ts
+++ b/apps/web/src/hooks/usePermitAllowance.ts
@@ -1,15 +1,15 @@
 import { AllowanceTransfer, MaxAllowanceTransferAmount, PERMIT2_ADDRESS, PermitSingle } from '@uniswap/permit2-sdk'
 import { CurrencyAmount, Token } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
+import PERMIT2_ABI from 'abis/permit2.json'
+import { Permit2 } from 'abis/types'
 import { useContract } from 'hooks/useContract'
 import { useSingleCallResult } from 'lib/hooks/multicall'
 import ms from 'ms'
 import { useCallback, useEffect, useMemo, useState } from 'react'
-import { UserRejectedRequestError, toReadableError } from 'utils/errors'
+import { toReadableError, UserRejectedRequestError } from 'utils/errors'
 import { signTypedData } from 'utils/signing'
 import { didUserReject } from 'utils/swapErrorToUserReadableMessage'
-import PERMIT2_ABI from 'wallet/src/abis/permit2.json'
-import { Permit2 } from 'wallet/src/abis/types'
 
 const PERMIT_EXPIRATION = ms(`30d`)
 const PERMIT_SIG_EXPIRATION = ms(`30m`)
diff --git a/apps/web/src/hooks/usePoolTickData.ts b/apps/web/src/hooks/usePoolTickData.ts
index 46860ecaeeb..a3b761536d9 100644
--- a/apps/web/src/hooks/usePoolTickData.ts
+++ b/apps/web/src/hooks/usePoolTickData.ts
@@ -1,8 +1,8 @@
 import { Currency, V3_CORE_FACTORY_ADDRESSES } from '@uniswap/sdk-core'
 import { FeeAmount, Pool, TICK_SPACINGS, tickToPrice } from '@uniswap/v3-sdk'
 import { useWeb3React } from '@web3-react/core'
-import { TickData, Ticks } from 'graphql/thegraph/AllV3TicksQuery'
 import { useAllV3TicksQuery } from 'graphql/thegraph/__generated__/types-and-hooks'
+import { TickData, Ticks } from 'graphql/thegraph/AllV3TicksQuery'
 import { apolloClient } from 'graphql/thegraph/apollo'
 import JSBI from 'jsbi'
 import ms from 'ms'
diff --git a/apps/web/src/hooks/usePools.ts b/apps/web/src/hooks/usePools.ts
index 57d0c8e4266..a748b8a7395 100644
--- a/apps/web/src/hooks/usePools.ts
+++ b/apps/web/src/hooks/usePools.ts
@@ -1,12 +1,14 @@
 import { Interface } from '@ethersproject/abi'
 import { BigintIsh, Currency, Token, V3_CORE_FACTORY_ADDRESSES } from '@uniswap/sdk-core'
 import IUniswapV3PoolStateJSON from '@uniswap/v3-core/artifacts/contracts/interfaces/pool/IUniswapV3PoolState.sol/IUniswapV3PoolState.json'
-import { FeeAmount, Pool, computePoolAddress } from '@uniswap/v3-sdk'
+import { computePoolAddress } from '@uniswap/v3-sdk'
+import { FeeAmount, Pool } from '@uniswap/v3-sdk'
 import { useWeb3React } from '@web3-react/core'
 import JSBI from 'jsbi'
 import { useMultipleContractSingleData } from 'lib/hooks/multicall'
 import { useMemo } from 'react'
-import { IUniswapV3PoolStateInterface } from 'wallet/src/abis/types/v3/IUniswapV3PoolState'
+
+import { IUniswapV3PoolStateInterface } from '../types/v3/IUniswapV3PoolState'
 
 const POOL_STATE_INTERFACE = new Interface(IUniswapV3PoolStateJSON.abi) as IUniswapV3PoolStateInterface
 
diff --git a/apps/web/src/hooks/useSelectChain.ts b/apps/web/src/hooks/useSelectChain.ts
index 938f989ede6..a199670d8c8 100644
--- a/apps/web/src/hooks/useSelectChain.ts
+++ b/apps/web/src/hooks/useSelectChain.ts
@@ -5,7 +5,7 @@ import { didUserReject } from 'connection/utils'
 import { CHAIN_IDS_TO_NAMES, isSupportedChain } from 'constants/chains'
 import { useCallback } from 'react'
 import { useSearchParams } from 'react-router-dom'
-import { PopupType, addPopup } from 'state/application/reducer'
+import { addPopup, PopupType } from 'state/application/reducer'
 import { useAppDispatch } from 'state/hooks'
 
 import { useSwitchChain } from './useSwitchChain'
diff --git a/apps/web/src/hooks/useSendCallback.ts b/apps/web/src/hooks/useSendCallback.ts
deleted file mode 100644
index d288a4b6153..00000000000
--- a/apps/web/src/hooks/useSendCallback.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { TransactionRequest } from '@ethersproject/abstract-provider'
-import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
-import { useWeb3React } from '@web3-react/core'
-import { useCallback } from 'react'
-import { useTransactionAdder } from 'state/transactions/hooks'
-import { SendTransactionInfo, TransactionType } from 'state/transactions/types'
-import { currencyId } from 'utils/currencyId'
-import { UserRejectedRequestError, toReadableError } from 'utils/errors'
-import { didUserReject } from 'utils/swapErrorToUserReadableMessage'
-
-export function useSendCallback({
-  currencyAmount,
-  recipient,
-  transactionRequest,
-}: {
-  currencyAmount?: CurrencyAmount<Currency>
-  recipient?: string
-  transactionRequest?: TransactionRequest
-}) {
-  const { account, chainId, provider } = useWeb3React()
-  const addTransaction = useTransactionAdder()
-
-  return useCallback(async () => {
-    if (!account || !chainId) throw new Error('wallet must be connect to send')
-    if (!provider) throw new Error('missing provider')
-    if (!transactionRequest) throw new Error('missing to transaction to execute')
-    if (!currencyAmount) throw new Error('missing currency amount to send')
-    if (!recipient) throw new Error('missing recipient')
-
-    try {
-      const response = await provider.getSigner().sendTransaction(transactionRequest)
-      const sendInfo: SendTransactionInfo = {
-        type: TransactionType.SEND,
-        currencyId: currencyId(currencyAmount.currency),
-        amount: currencyAmount.quotient.toString(),
-        recipient,
-      }
-      addTransaction(response, sendInfo)
-    } catch (e: unknown) {
-      if (didUserReject(e)) {
-        throw new UserRejectedRequestError(`Transfer failed: User rejected signature`)
-      }
-      throw toReadableError(`Transfer failed:`, e)
-    }
-  }, [account, addTransaction, chainId, currencyAmount, provider, recipient, transactionRequest])
-}
diff --git a/apps/web/src/hooks/useStablecoinPrice.ts b/apps/web/src/hooks/useStablecoinPrice.ts
index b4745496537..695f773d83e 100644
--- a/apps/web/src/hooks/useStablecoinPrice.ts
+++ b/apps/web/src/hooks/useStablecoinPrice.ts
@@ -18,7 +18,7 @@ import {
 
 // Stablecoin amounts used when calculating spot price for a given currency.
 // The amount is large enough to filter low liquidity pairs.
-export const STABLECOIN_AMOUNT_OUT: { [chainId: number]: CurrencyAmount<Token> } = {
+const STABLECOIN_AMOUNT_OUT: { [chainId: number]: CurrencyAmount<Token> } = {
   [ChainId.MAINNET]: CurrencyAmount.fromRawAmount(USDC_MAINNET, 100_000e6),
   [ChainId.ARBITRUM_ONE]: CurrencyAmount.fromRawAmount(USDC_ARBITRUM, 10_000e6),
   [ChainId.OPTIMISM]: CurrencyAmount.fromRawAmount(DAI_OPTIMISM, 10_000e18),
diff --git a/apps/web/src/hooks/useSwapCallback.tsx b/apps/web/src/hooks/useSwapCallback.tsx
index 2e86ecf73d3..3820ff0bc12 100644
--- a/apps/web/src/hooks/useSwapCallback.tsx
+++ b/apps/web/src/hooks/useSwapCallback.tsx
@@ -101,9 +101,7 @@ export function useSwapCallback(
         result.response.orderHash,
         chainId,
         result.response.deadline,
-        swapInfo as UniswapXOrderDetails['swapInfo'],
-        result.response.encodedOrder,
-        isUniswapXTrade(trade) ? trade.offchainOrderType : undefined
+        swapInfo as UniswapXOrderDetails['swapInfo']
       )
     } else {
       addTransaction(result.response, swapInfo, deadline?.toNumber())
diff --git a/apps/web/src/hooks/useSwapTaxes.ts b/apps/web/src/hooks/useSwapTaxes.ts
index 59d9cca1a52..588c29edc03 100644
--- a/apps/web/src/hooks/useSwapTaxes.ts
+++ b/apps/web/src/hooks/useSwapTaxes.ts
@@ -2,11 +2,11 @@ import { InterfaceEventName } from '@uniswap/analytics-events'
 import { ChainId, Percent } from '@uniswap/sdk-core'
 import { WETH_ADDRESS as getWethAddress } from '@uniswap/universal-router-sdk'
 import { useWeb3React } from '@web3-react/core'
+import FOT_DETECTOR_ABI from 'abis/fee-on-transfer-detector.json'
+import { FeeOnTransferDetector } from 'abis/types'
 import { sendAnalyticsEvent } from 'analytics'
 import { BIPS_BASE, ZERO_PERCENT } from 'constants/misc'
 import { useEffect, useState } from 'react'
-import FOT_DETECTOR_ABI from 'wallet/src/abis/fee-on-transfer-detector.json'
-import { FeeOnTransferDetector } from 'wallet/src/abis/types'
 
 import { useContract } from './useContract'
 
diff --git a/apps/web/src/hooks/useSwitchChain.ts b/apps/web/src/hooks/useSwitchChain.ts
index 1bda33b3a6d..c3be3e5481b 100644
--- a/apps/web/src/hooks/useSwitchChain.ts
+++ b/apps/web/src/hooks/useSwitchChain.ts
@@ -7,7 +7,7 @@ import {
   walletConnectV2Connection,
 } from 'connection'
 import { getChainInfo } from 'constants/chainInfo'
-import { SupportedInterfaceChain, isSupportedChain } from 'constants/chains'
+import { isSupportedChain, SupportedInterfaceChain } from 'constants/chains'
 import { FALLBACK_URLS, RPC_URLS } from 'constants/networks'
 import { useCallback } from 'react'
 import { useAppDispatch } from 'state/hooks'
diff --git a/apps/web/src/hooks/useTokenContractsConstant.ts b/apps/web/src/hooks/useTokenContractsConstant.ts
index dbd2813c779..ec021043aea 100644
--- a/apps/web/src/hooks/useTokenContractsConstant.ts
+++ b/apps/web/src/hooks/useTokenContractsConstant.ts
@@ -1,7 +1,7 @@
 import { Interface } from '@ethersproject/abi'
+import ERC20ABI from 'abis/erc20.json'
+import { Erc20Interface } from 'abis/types/Erc20'
 import { NEVER_RELOAD, useMultipleContractSingleData } from 'lib/hooks/multicall'
-import ERC20ABI from 'wallet/src/abis/erc20.json'
-import { Erc20Interface } from 'wallet/src/abis/types/Erc20'
 
 const ERC20Interface = new Interface(ERC20ABI) as Erc20Interface
 
diff --git a/apps/web/src/hooks/useTransactionGasFee.ts b/apps/web/src/hooks/useTransactionGasFee.ts
deleted file mode 100644
index 99bc9692c0e..00000000000
--- a/apps/web/src/hooks/useTransactionGasFee.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import { TransactionRequest } from '@ethersproject/abstract-provider'
-import { useCallback, useMemo } from 'react'
-
-import { useAsyncData } from './useAsyncData'
-
-enum FeeType {
-  Legacy = 'legacy',
-  Eip1559 = 'eip1559',
-}
-
-interface GasFeeResponseBase {
-  type: FeeType
-  gasLimit: string
-  gasFee: {
-    normal: string
-    fast: string
-    urgent: string
-  }
-}
-
-interface GasFeeResponseEip1559 extends GasFeeResponseBase {
-  type: FeeType.Eip1559
-  maxFeePerGas: {
-    normal: string
-    fast: string
-    urgent: string
-  }
-  maxPriorityFeePerGas: {
-    normal: string
-    fast: string
-    urgent: string
-  }
-}
-
-interface GasFeeResponseLegacy extends GasFeeResponseBase {
-  type: FeeType.Legacy
-  gasPrice: {
-    normal: string
-    fast: string
-    urgent: string
-  }
-}
-
-type TransactionLegacyFeeParams = {
-  gasPrice: string
-  gasLimit: string
-}
-
-type TransactionEip1559FeeParams = {
-  maxFeePerGas: string
-  maxPriorityFeePerGas: string
-  gasLimit: string
-}
-
-interface GasFeeResult {
-  value?: string
-  isLoading: boolean
-  params?: TransactionLegacyFeeParams | TransactionEip1559FeeParams
-}
-
-// GasFeeResponse is the type that comes directly from the Gas Service API
-type GasFeeResponseError = { errorCode: string; detail?: string; id?: string }
-type GasFeeResponse = GasFeeResponseEip1559 | GasFeeResponseLegacy | GasFeeResponseError
-
-export enum GasSpeed {
-  Normal = 'normal',
-  Fast = 'fast',
-  Urgent = 'urgent',
-}
-
-export function useTransactionGasFee(
-  tx?: TransactionRequest,
-  speed: GasSpeed = GasSpeed.Urgent,
-  skip?: boolean
-): GasFeeResult {
-  const gasFeeFetcher = useGasFeeQuery(tx, skip)
-  const { data, isLoading } = useAsyncData(gasFeeFetcher)
-
-  return useMemo(() => {
-    if (!data) {
-      return { isLoading }
-    }
-
-    const params =
-      data.type === FeeType.Eip1559
-        ? {
-            maxPriorityFeePerGas: data.maxPriorityFeePerGas[speed],
-            maxFeePerGas: data.maxFeePerGas[speed],
-            gasLimit: data.gasLimit,
-          }
-        : {
-            gasPrice: data.gasPrice[speed],
-            gasLimit: data.gasLimit,
-          }
-
-    return {
-      value: data.gasFee[speed],
-      isLoading,
-      params,
-    }
-  }, [data, isLoading, speed])
-}
-
-const UNISWAP_API_URL = process.env.REACT_APP_UNISWAP_BASE_API_URL
-
-const isErrorResponse = (res: Response, gasFee: GasFeeResponse): gasFee is GasFeeResponseError =>
-  res.status < 200 || res.status > 202
-
-function useGasFeeQuery(tx?: TransactionRequest, skip?: boolean) {
-  const gasFeeFetcher = useCallback(async () => {
-    if (skip) {
-      return
-    }
-
-    const res = await fetch(`${UNISWAP_API_URL}/v1/gas-fee`, {
-      method: 'POST',
-      body: JSON.stringify(tx),
-    })
-
-    const body = (await res.json()) as GasFeeResponse
-
-    if (isErrorResponse(res, body)) {
-      return
-    }
-
-    return body
-  }, [skip, tx])
-
-  return gasFeeFetcher
-}
diff --git a/apps/web/src/hooks/useUSDPrice.ts b/apps/web/src/hooks/useUSDPrice.ts
index 43833a50934..5012b6e5c38 100644
--- a/apps/web/src/hooks/useUSDPrice.ts
+++ b/apps/web/src/hooks/useUSDPrice.ts
@@ -2,7 +2,7 @@ import { NetworkStatus } from '@apollo/client'
 import { ChainId, Currency, CurrencyAmount, Price, TradeType } from '@uniswap/sdk-core'
 import { nativeOnChain } from 'constants/tokens'
 import { Chain, useTokenSpotPriceQuery } from 'graphql/data/__generated__/types-and-hooks'
-import { PollingInterval, chainIdToBackendName, isGqlSupportedChain } from 'graphql/data/util'
+import { chainIdToBackendName, isGqlSupportedChain, PollingInterval } from 'graphql/data/util'
 import { useMemo } from 'react'
 import { ClassicTrade, INTERNAL_ROUTER_PREFERENCE_PRICE, TradeState } from 'state/routing/types'
 import { useRoutingAPITrade } from 'state/routing/useRoutingAPITrade'
diff --git a/apps/web/src/hooks/useUSDTokenUpdater.ts b/apps/web/src/hooks/useUSDTokenUpdater.ts
deleted file mode 100644
index d18580a4f76..00000000000
--- a/apps/web/src/hooks/useUSDTokenUpdater.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-import { Currency } from '@uniswap/sdk-core'
-import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
-import { useMemo } from 'react'
-import { NumberType, useFormatter } from 'utils/formatNumbers'
-
-import useStablecoinPrice, { STABLECOIN_AMOUNT_OUT } from './useStablecoinPrice'
-
-const NUM_DECIMALS_USD = 2
-const NUM_DECIMALS_DISPLAY = 2
-
-export function useUSDTokenUpdater(isFiatInput: boolean, exactAmount: string, exactCurrency?: Currency) {
-  const price = useStablecoinPrice(exactCurrency)
-  const { convertToFiatAmount, formatCurrencyAmount } = useFormatter()
-  const conversionRate = convertToFiatAmount().amount
-
-  return useMemo(() => {
-    if (!exactCurrency || !price) {
-      return
-    }
-
-    if (isFiatInput) {
-      const exactAmountUSD = (parseFloat(exactAmount || '0') / conversionRate).toFixed(NUM_DECIMALS_USD)
-      const stablecoinAmount = tryParseCurrencyAmount(
-        exactAmountUSD,
-        STABLECOIN_AMOUNT_OUT[exactCurrency.chainId]?.currency
-      )
-
-      const currencyAmount = stablecoinAmount ? price?.invert().quote(stablecoinAmount) : undefined
-      const formattedCurrencyAmount = formatCurrencyAmount({
-        amount: currencyAmount,
-        type: NumberType.SwapTradeAmount,
-        placeholder: '',
-      })
-
-      return formattedCurrencyAmount
-    }
-
-    const exactCurrencyAmount = tryParseCurrencyAmount(exactAmount || '0', exactCurrency)
-
-    const usdPrice = exactCurrencyAmount ? price?.quote(exactCurrencyAmount) : undefined
-    const fiatPrice = convertToFiatAmount(parseFloat(usdPrice?.toExact() ?? '0')).amount
-    const formattedFiatPrice = fiatPrice ? fiatPrice.toFixed(NUM_DECIMALS_DISPLAY) : '0'
-
-    return formattedFiatPrice
-  }, [conversionRate, convertToFiatAmount, exactAmount, exactCurrency, formatCurrencyAmount, isFiatInput, price])
-}
diff --git a/apps/web/src/hooks/useUniswapXSwapCallback.ts b/apps/web/src/hooks/useUniswapXSwapCallback.ts
index 31db425fcb5..ae70eeecf4e 100644
--- a/apps/web/src/hooks/useUniswapXSwapCallback.ts
+++ b/apps/web/src/hooks/useUniswapXSwapCallback.ts
@@ -10,7 +10,7 @@ import { getConnection } from 'connection'
 import { useGatewayDNSUpdateAllEnabled } from 'featureFlags/flags/gatewayDNSUpdate'
 import { formatSwapSignedAnalyticsEventProperties } from 'lib/utils/analytics'
 import { useCallback } from 'react'
-import { DutchOrderTrade, LimitOrderTrade, TradeFillType } from 'state/routing/types'
+import { DutchOrderTrade, TradeFillType } from 'state/routing/types'
 import { trace } from 'tracing/trace'
 import { SignatureExpiredError, UserRejectedRequestError } from 'utils/errors'
 import { signTypedData } from 'utils/signing'
@@ -41,10 +41,9 @@ async function getUpdatedNonce(
 ): Promise<BigNumber | null> {
   const baseURL = gatewayDNSUpdateAllEnabled ? UNISWAP_GATEWAY_DNS_URL : UNISWAP_API_URL
   try {
-    // endpoint fetches current nonce
-    const res = await fetch(`${baseURL}/nonce?address=${swapper.toLowerCase()}&chainId=${chainId}`)
+    const res = await fetch(`${baseURL}/nonce?address=${swapper}&chainId=${chainId}`)
     const { nonce } = await res.json()
-    return BigNumber.from(nonce).add(1)
+    return BigNumber.from(nonce)
   } catch (e) {
     Sentry.withScope(function (scope) {
       scope.setTag('method', 'getUpdatedNonce')
@@ -60,7 +59,7 @@ export function useUniswapXSwapCallback({
   allowedSlippage,
   fiatValues,
 }: {
-  trade?: DutchOrderTrade | LimitOrderTrade
+  trade?: DutchOrderTrade
   fiatValues: { amountIn?: number; amountOut?: number; feeUsd?: number }
   allowedSlippage: Percent
 }) {
@@ -80,16 +79,7 @@ export function useUniswapXSwapCallback({
 
         const signDutchOrder = async (): Promise<{ signature: string; updatedOrder: DutchOrder }> => {
           try {
-            const updatedNonce = await getUpdatedNonce(
-              account,
-              trade.inputAmount.currency.chainId,
-              gatewayDNSUpdateAllEnabled
-            )
-
-            // TODO(limits): WEB-3434 - add error state for missing nonce
-            if (!updatedNonce) throw new Error('missing nonce')
-
-            const order = trade.asDutchOrderTrade({ nonce: updatedNonce, swapper: account }).order
+            const updatedNonce = await getUpdatedNonce(account, trade.order.chainId, gatewayDNSUpdateAllEnabled)
 
             const startTime = Math.floor(Date.now() / 1000) + trade.startTimeBufferSecs
             setTraceData('startTime', startTime)
@@ -101,14 +91,14 @@ export function useUniswapXSwapCallback({
             setTraceData('deadline', deadline)
 
             // Set timestamp and account based values when the user clicks 'swap' to make them as recent as possible
-            const updatedOrder = DutchOrderBuilder.fromOrder(order)
+            const updatedOrder = DutchOrderBuilder.fromOrder(trade.order)
               .decayStartTime(startTime)
               .decayEndTime(endTime)
               .deadline(deadline)
               .swapper(account)
               .nonFeeRecipient(account, trade.swapFee?.recipient)
               // if fetching the nonce fails for any reason, default to existing nonce from the Swap quote.
-              .nonce(updatedNonce ?? order.info.nonce)
+              .nonce(updatedNonce ?? trade.order.info.nonce)
               .build()
 
             const { domain, types, values } = updatedOrder.permitData()
@@ -149,12 +139,10 @@ export function useUniswapXSwapCallback({
         })
 
         const baseURL = gatewayDNSUpdateAllEnabled ? UNISWAP_GATEWAY_DNS_URL : UNISWAP_API_URL
-        const encodedOrder = updatedOrder.serialize()
-
         const res = await fetch(`${baseURL}/order`, {
           method: 'POST',
           body: JSON.stringify({
-            encodedOrder,
+            encodedOrder: updatedOrder.serialize(),
             signature,
             chainId: updatedOrder.chainId,
             quoteId: trade.quoteId,
@@ -184,7 +172,7 @@ export function useUniswapXSwapCallback({
 
         return {
           type: TradeFillType.UniswapX as const,
-          response: { orderHash: body.hash, deadline: updatedOrder.info.deadline, encodedOrder },
+          response: { orderHash: body.hash, deadline: updatedOrder.info.deadline },
         }
       }),
     [
diff --git a/apps/web/src/hooks/useV2Pairs.ts b/apps/web/src/hooks/useV2Pairs.ts
index 6445a3daf5c..63499c440bc 100644
--- a/apps/web/src/hooks/useV2Pairs.ts
+++ b/apps/web/src/hooks/useV2Pairs.ts
@@ -1,7 +1,7 @@
 import { Interface } from '@ethersproject/abi'
 import { Currency, CurrencyAmount, V2_FACTORY_ADDRESSES } from '@uniswap/sdk-core'
 import IUniswapV2PairJSON from '@uniswap/v2-core/build/IUniswapV2Pair.json'
-import { Pair, computePairAddress } from '@uniswap/v2-sdk'
+import { computePairAddress, Pair } from '@uniswap/v2-sdk'
 import { useMultipleContractSingleData } from 'lib/hooks/multicall'
 import { useMemo } from 'react'
 
diff --git a/apps/web/src/i18n.tsx b/apps/web/src/i18n.tsx
index 0085fec94a8..e47a819876d 100644
--- a/apps/web/src/i18n.tsx
+++ b/apps/web/src/i18n.tsx
@@ -1,6 +1,6 @@
 import { SupportedLocale } from 'constants/locales'
 import { initialLocale, useActiveLocale } from 'hooks/useActiveLocale'
-import { Provider, dynamicActivate } from 'lib/i18n'
+import { dynamicActivate, Provider } from 'lib/i18n'
 import { ReactNode, useCallback } from 'react'
 import { useUserLocaleManager } from 'state/user/hooks'
 
diff --git a/apps/web/src/index.tsx b/apps/web/src/index.tsx
index bbe01668a77..a98e17570d8 100644
--- a/apps/web/src/index.tsx
+++ b/apps/web/src/index.tsx
@@ -1,8 +1,8 @@
 import '@reach/dialog/styles.css'
-import 'connection/eagerlyConnect'
 import 'inter-ui'
 import 'polyfills'
 import 'tracing'
+import 'connection/eagerlyConnect'
 
 import { ApolloProvider } from '@apollo/client'
 import { FeatureFlagsProvider } from 'featureFlags'
@@ -29,7 +29,7 @@ import ListsUpdater from './state/lists/updater'
 import LogsUpdater from './state/logs/updater'
 import OrderUpdater from './state/signatures/updater'
 import TransactionUpdater from './state/transactions/updater'
-import { ThemedGlobalStyle, ThemeProvider } from './theme'
+import ThemeProvider, { ThemedGlobalStyle } from './theme'
 import RadialGradientByChainUpdater from './theme/components/RadialGradientByChainUpdater'
 
 if (window.ethereum) {
diff --git a/apps/web/src/lib/hooks/multicall.ts b/apps/web/src/lib/hooks/multicall.ts
index af7309bab2d..8a5f21e8afd 100644
--- a/apps/web/src/lib/hooks/multicall.ts
+++ b/apps/web/src/lib/hooks/multicall.ts
@@ -4,8 +4,8 @@ import useBlockNumber, { useMainnetBlockNumber } from 'lib/hooks/useBlockNumber'
 import multicall from 'lib/state/multicall'
 import { SkipFirst } from 'types/tuple'
 
-export { NEVER_RELOAD } from '@uniswap/redux-multicall' // re-export for convenience
 export type { CallStateResult } from '@uniswap/redux-multicall' // re-export for convenience
+export { NEVER_RELOAD } from '@uniswap/redux-multicall' // re-export for convenience
 
 // Create wrappers for hooks so consumers don't need to get latest block themselves
 
diff --git a/apps/web/src/lib/hooks/orders/updater.tsx b/apps/web/src/lib/hooks/orders/updater.tsx
index bbe2ad95910..9c23f8b83b0 100644
--- a/apps/web/src/lib/hooks/orders/updater.tsx
+++ b/apps/web/src/lib/hooks/orders/updater.tsx
@@ -1,7 +1,7 @@
 import { useWeb3React } from '@web3-react/core'
 import { useGatewayDNSUpdateAllEnabled } from 'featureFlags/flags/gatewayDNSUpdate'
 import ms from 'ms'
-import { useEffect, useState } from 'react'
+import { useEffect } from 'react'
 import { isFinalizedOrder } from 'state/signatures/hooks'
 import { UniswapXOrderDetails } from 'state/signatures/types'
 
@@ -19,7 +19,7 @@ function fetchOrderStatuses(account: string, orders: UniswapXOrderDetails[], gat
   return global.fetch(`${baseURL}/orders?swapper=${account}&orderHashes=${orderHashes}`)
 }
 
-const OFF_CHAIN_ORDER_STATUS_POLLING_INITIAL_INTERVAL = ms(`2s`)
+const OFF_CHAIN_ORDER_STATUS_POLLING = ms(`2s`)
 
 interface UpdaterProps {
   pendingOrders: UniswapXOrderDetails[]
@@ -31,18 +31,16 @@ export default function OrderUpdater({ pendingOrders, onOrderUpdate }: UpdaterPr
 
   const gatewayDNSUpdateAllEnabled = useGatewayDNSUpdateAllEnabled()
 
-  const [currentDelay, setCurrentDelay] = useState(OFF_CHAIN_ORDER_STATUS_POLLING_INITIAL_INTERVAL)
-
   useEffect(() => {
-    let timeout: NodeJS.Timeout
     async function getOrderStatuses() {
       if (!account || pendingOrders.length === 0) return
 
       // Stop polling if all orders in our queue have "finalized" states
       if (pendingOrders.every((order) => isFinalizedOrder(order.status))) {
-        clearTimeout(timeout)
+        clearInterval(interval)
         return
       }
+
       try {
         const pollOrderStatus = await fetchOrderStatuses(account, pendingOrders, gatewayDNSUpdateAllEnabled)
 
@@ -56,13 +54,11 @@ export default function OrderUpdater({ pendingOrders, onOrderUpdate }: UpdaterPr
       } catch (e) {
         console.error('Error fetching order statuses', e)
       }
-      setCurrentDelay((currentDelay) => Math.min(currentDelay * 2, ms('30s')))
-      timeout = setTimeout(getOrderStatuses, currentDelay)
     }
 
-    timeout = setTimeout(getOrderStatuses, currentDelay)
-    return () => clearTimeout(timeout)
-  }, [account, currentDelay, gatewayDNSUpdateAllEnabled, onOrderUpdate, pendingOrders])
+    const interval = setInterval(getOrderStatuses, OFF_CHAIN_ORDER_STATUS_POLLING)
+    return () => clearInterval(interval)
+  }, [account, gatewayDNSUpdateAllEnabled, onOrderUpdate, pendingOrders])
 
   return null
 }
diff --git a/apps/web/src/lib/hooks/useBlockNumber.tsx b/apps/web/src/lib/hooks/useBlockNumber.tsx
index 2c151e609b6..bcb1990633d 100644
--- a/apps/web/src/lib/hooks/useBlockNumber.tsx
+++ b/apps/web/src/lib/hooks/useBlockNumber.tsx
@@ -3,7 +3,7 @@ import { useWeb3React } from '@web3-react/core'
 import { DEPRECATED_RPC_PROVIDERS, RPC_PROVIDERS } from 'constants/providers'
 import { useFallbackProviderEnabled } from 'featureFlags/flags/fallbackProvider'
 import useIsWindowVisible from 'hooks/useIsWindowVisible'
-import { ReactNode, createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react'
+import { createContext, ReactNode, useCallback, useContext, useEffect, useMemo, useState } from 'react'
 
 const MISSING_PROVIDER = Symbol()
 const BlockNumberContext = createContext<
@@ -49,8 +49,7 @@ export function BlockNumberProvider({ children }: { children: ReactNode }) {
     setChainBlock((chainBlock) => {
       if (chainBlock.chainId === chainId) {
         if (!chainBlock.block || chainBlock.block < block) {
-          const mainnetBlock = chainId === ChainId.MAINNET ? block : chainBlock.mainnetBlock
-          return { chainId, block, mainnetBlock }
+          return { chainId, block, mainnetBlock: chainId === ChainId.MAINNET ? block : chainBlock.mainnetBlock }
         }
       } else if (chainId === ChainId.MAINNET) {
         if (!chainBlock.mainnetBlock || chainBlock.mainnetBlock < block) {
@@ -63,41 +62,60 @@ export function BlockNumberProvider({ children }: { children: ReactNode }) {
 
   const windowVisible = useIsWindowVisible()
   useEffect(() => {
+    let stale = false
+
     if (provider && activeChainId && windowVisible) {
       setChainBlock((chainBlock) => {
+        // If chainId hasn't changed, don't clear the block. This prevents re-fetching still valid data.
         if (chainBlock.chainId !== activeChainId) {
           return { chainId: activeChainId, mainnetBlock: chainBlock.mainnetBlock }
         }
-        // If chainId hasn't changed, don't invalidate the reference, as it will trigger re-fetching of still-valid data.
         return chainBlock
       })
 
+      provider
+        .getBlockNumber()
+        .then((block) => {
+          if (!stale) onChainBlock(activeChainId, block)
+        })
+        .catch((error) => {
+          console.error(`Failed to get block number for chainId ${activeChainId}`, error)
+        })
+
       const onBlock = (block: number) => onChainBlock(activeChainId, block)
       provider.on('block', onBlock)
       return () => {
+        stale = true
         provider.removeListener('block', onBlock)
       }
     }
-    return
+
+    return void 0
   }, [activeChainId, provider, windowVisible, onChainBlock])
 
   const networkProviders = useFallbackProviderEnabled() ? RPC_PROVIDERS : DEPRECATED_RPC_PROVIDERS
+
   useEffect(() => {
-    networkProviders[ChainId.MAINNET]
-      .getBlockNumber()
-      .then((block) => {
-        onChainBlock(ChainId.MAINNET, block)
-      })
-      // swallow errors - it's ok if this fails, as we'll try again if we activate mainnet
-      .catch(() => undefined)
-  }, [networkProviders, onChainBlock])
+    if (mainnetBlock === undefined) {
+      networkProviders[ChainId.MAINNET]
+        .getBlockNumber()
+        .then((block) => {
+          onChainBlock(ChainId.MAINNET, block)
+        })
+        // swallow errors - it's ok if this fails, as we'll try again if we activate mainnet
+        .catch(() => undefined)
+    }
+  }, [mainnetBlock, networkProviders, onChainBlock])
 
   const value = useMemo(
     () => ({
       fastForward: (update: number) => {
         if (activeBlock && update > activeBlock) {
-          const mainnetUpdate = activeChainId === ChainId.MAINNET ? update : mainnetBlock
-          setChainBlock({ chainId: activeChainId, block: update, mainnetBlock: mainnetUpdate })
+          setChainBlock({
+            chainId: activeChainId,
+            block: update,
+            mainnetBlock: activeChainId === ChainId.MAINNET ? update : mainnetBlock,
+          })
         }
       },
       block: activeBlock,
diff --git a/apps/web/src/lib/hooks/useCurrency.ts b/apps/web/src/lib/hooks/useCurrency.ts
index 9b2b633f309..108a9335f64 100644
--- a/apps/web/src/lib/hooks/useCurrency.ts
+++ b/apps/web/src/lib/hooks/useCurrency.ts
@@ -10,7 +10,8 @@ import { NEVER_RELOAD, useSingleCallResult } from 'lib/hooks/multicall'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
 import { useEffect, useMemo } from 'react'
 
-import { DEFAULT_ERC20_DECIMALS, TOKEN_SHORTHANDS } from '../../constants/tokens'
+import { DEFAULT_ERC20_DECIMALS } from '../../constants/tokens'
+import { TOKEN_SHORTHANDS } from '../../constants/tokens'
 import { isAddress } from '../../utils'
 
 // parse a name or symbol from a token response
diff --git a/apps/web/src/lib/hooks/useCurrencyBalance.ts b/apps/web/src/lib/hooks/useCurrencyBalance.ts
index 582535db6a3..1e7ad3dc8eb 100644
--- a/apps/web/src/lib/hooks/useCurrencyBalance.ts
+++ b/apps/web/src/lib/hooks/useCurrencyBalance.ts
@@ -1,11 +1,11 @@
 import { Interface } from '@ethersproject/abi'
 import { Currency, CurrencyAmount, Token } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
+import ERC20ABI from 'abis/erc20.json'
+import { Erc20Interface } from 'abis/types/Erc20'
 import JSBI from 'jsbi'
 import { useMultipleContractSingleData, useSingleContractMultipleData } from 'lib/hooks/multicall'
 import { useMemo } from 'react'
-import ERC20ABI from 'wallet/src/abis/erc20.json'
-import { Erc20Interface } from 'wallet/src/abis/types/Erc20'
 
 import { nativeOnChain } from '../../constants/tokens'
 import { useInterfaceMulticall } from '../../hooks/useContract'
diff --git a/apps/web/src/lib/hooks/useCurrencyLogoURIs.ts b/apps/web/src/lib/hooks/useCurrencyLogoURIs.ts
index ed6d2a03680..e0e9fbf3a1c 100644
--- a/apps/web/src/lib/hooks/useCurrencyLogoURIs.ts
+++ b/apps/web/src/lib/hooks/useCurrencyLogoURIs.ts
@@ -8,7 +8,7 @@ import AvaxLogo from '../../assets/svg/avax_logo.svg'
 import BnbLogo from '../../assets/svg/bnb-logo.svg'
 import CeloLogo from '../../assets/svg/celo_logo.svg'
 import MaticLogo from '../../assets/svg/matic-token-icon.svg'
-import { NATIVE_CHAIN_ID, isCelo, nativeOnChain } from '../../constants/tokens'
+import { isCelo, NATIVE_CHAIN_ID, nativeOnChain } from '../../constants/tokens'
 
 type Network = 'ethereum' | 'arbitrum' | 'optimism' | 'polygon' | 'smartchain' | 'celo' | 'avalanchec' | 'base'
 
diff --git a/apps/web/src/lib/hooks/useTokenList/sorting.test.ts b/apps/web/src/lib/hooks/useTokenList/sorting.test.ts
index 42f67515731..8d8cfda9cc9 100644
--- a/apps/web/src/lib/hooks/useTokenList/sorting.test.ts
+++ b/apps/web/src/lib/hooks/useTokenList/sorting.test.ts
@@ -1,5 +1,6 @@
-import { ChainId, Token as InterfaceToken } from '@uniswap/sdk-core'
-import { DAI, USDC_MAINNET, USDT, WBTC, nativeOnChain } from 'constants/tokens'
+import { ChainId } from '@uniswap/sdk-core'
+import { Token as InterfaceToken } from '@uniswap/sdk-core'
+import { DAI, nativeOnChain, USDC_MAINNET, USDT, WBTC } from 'constants/tokens'
 import { Chain, Currency, Token, TokenBalance, TokenStandard } from 'graphql/data/__generated__/types-and-hooks'
 
 import { getSortedPortfolioTokens, tokenQuerySortComparator } from './sorting'
diff --git a/apps/web/src/lib/hooks/useTokenList/sorting.ts b/apps/web/src/lib/hooks/useTokenList/sorting.ts
index 4fc2e8b6b8c..1ff8318886c 100644
--- a/apps/web/src/lib/hooks/useTokenList/sorting.ts
+++ b/apps/web/src/lib/hooks/useTokenList/sorting.ts
@@ -3,7 +3,7 @@ import { TokenInfo } from '@uniswap/token-lists'
 import { nativeOnChain } from 'constants/tokens'
 import { PortfolioTokenBalancePartsFragment } from 'graphql/data/__generated__/types-and-hooks'
 import { supportedChainIdFromGQLChain } from 'graphql/data/util'
-import { SplitOptions, splitHiddenTokens } from 'utils/splitHiddenTokens'
+import { splitHiddenTokens, SplitOptions } from 'utils/splitHiddenTokens'
 
 /** Sorts currency amounts (descending). */
 function balanceComparator(a?: number, b?: number) {
diff --git a/apps/web/src/nft/components/bag/BagFooter.tsx b/apps/web/src/nft/components/bag/BagFooter.tsx
index 4748e27687b..668d9d79791 100644
--- a/apps/web/src/nft/components/bag/BagFooter.tsx
+++ b/apps/web/src/nft/components/bag/BagFooter.tsx
@@ -1,10 +1,10 @@
 import { BigNumber } from '@ethersproject/bignumber'
 import { formatEther, parseEther } from '@ethersproject/units'
-import { Trans, t } from '@lingui/macro'
+import { t, Trans } from '@lingui/macro'
 import { BrowserEvent, InterfaceElementName, NFTEventName } from '@uniswap/analytics-events'
 import { ChainId, Currency, CurrencyAmount, Token } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
-import { TraceEvent, sendAnalyticsEvent } from 'analytics'
+import { sendAnalyticsEvent, TraceEvent } from 'analytics'
 import { useToggleAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
 import Column from 'components/Column'
 import Loader from 'components/Icons/LoadingSpinner'
@@ -38,7 +38,6 @@ import styled, { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
-import { CurrencySearchFilters } from 'components/SearchModal/CurrencySearch'
 import { BuyButtonStateData, BuyButtonStates, getBuyButtonStateData } from './ButtonStates'
 
 const FooterContainer = styled.div`
@@ -177,10 +176,6 @@ const Helper = ({ children, color }: PropsWithChildren<HelperTextProps>) => {
   )
 }
 
-const BAG_FOOTER_CURRENCY_SEARCH_FILTERS: CurrencySearchFilters = {
-  onlyShowCurrenciesWithBalance: true,
-}
-
 const InputCurrencyValue = ({
   usingPayWithAnyToken,
   totalEthPrice,
@@ -543,7 +538,7 @@ export const BagFooter = ({ setModalIsOpen, eventProperties }: BagFooterProps) =
           }
         }}
         selectedCurrency={activeCurrency ?? undefined}
-        currencySearchFilters={BAG_FOOTER_CURRENCY_SEARCH_FILTERS}
+        onlyShowCurrenciesWithBalance={true}
       />
     </FooterContainer>
   )
diff --git a/apps/web/src/nft/components/collection/CollectionStats.tsx b/apps/web/src/nft/components/collection/CollectionStats.tsx
index c395bb2c20f..1e46f8a9c0e 100644
--- a/apps/web/src/nft/components/collection/CollectionStats.tsx
+++ b/apps/web/src/nft/components/collection/CollectionStats.tsx
@@ -227,10 +227,9 @@ const CollectionName = ({
   )
 }
 
-const CollectionDescriptionText = styled.p<{ readMore: boolean }>`
+const CollectionDescriptionText = styled.div<{ readMore: boolean }>`
   vertical-align: top;
   text-overflow: ellipsis;
-  margin: 0;
 
   ${({ readMore }) =>
     readMore
@@ -288,11 +287,9 @@ const CollectionDescription = ({ description }: { description: string }) => {
       descriptionRef.current &&
       (descriptionRef.current.getBoundingClientRect().width >= baseRef.current?.getBoundingClientRect().width - 112 ||
         descriptionRef.current.getBoundingClientRect().width >= 590)
-    ) {
+    )
       setShowReadMore(true)
-    } else {
-      setShowReadMore(false)
-    }
+    else setShowReadMore(false)
   }, [descriptionRef, baseRef, isCollectionStatsLoading, description])
 
   return isCollectionStatsLoading ? (
diff --git a/apps/web/src/nft/components/collection/Sweep.tsx b/apps/web/src/nft/components/collection/Sweep.tsx
index 9a596562b1e..3cb7f76d049 100644
--- a/apps/web/src/nft/components/collection/Sweep.tsx
+++ b/apps/web/src/nft/components/collection/Sweep.tsx
@@ -5,7 +5,7 @@ import { formatEther as ethersFormatEther, parseEther } from '@ethersproject/uni
 import { Trans } from '@lingui/macro'
 import { SweepFetcherParams, useSweepNftAssets } from 'graphql/data/nft/Asset'
 import { useBag, useCollectionFilters } from 'nft/hooks'
-import { GenieAsset, Markets, isPooledMarket } from 'nft/types'
+import { GenieAsset, isPooledMarket, Markets } from 'nft/types'
 import { calcPoolPrice, isInSameSudoSwapPool } from 'nft/utils'
 import { default as Slider } from 'rc-slider'
 import { useEffect, useMemo, useReducer, useState } from 'react'
diff --git a/apps/web/src/nft/components/collection/__snapshots__/CollectionAsset.test.tsx.snap b/apps/web/src/nft/components/collection/__snapshots__/CollectionAsset.test.tsx.snap
index 15182b362b9..e60138298e3 100644
--- a/apps/web/src/nft/components/collection/__snapshots__/CollectionAsset.test.tsx.snap
+++ b/apps/web/src/nft/components/collection/__snapshots__/CollectionAsset.test.tsx.snap
@@ -27,10 +27,6 @@ exports[`NftCard renders correctly 1`] = `
 
 .c16 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c11 {
diff --git a/apps/web/src/nft/components/details/AssetDetails.tsx b/apps/web/src/nft/components/details/AssetDetails.tsx
index f7595b5321f..92e3b55dc19 100644
--- a/apps/web/src/nft/components/details/AssetDetails.tsx
+++ b/apps/web/src/nft/components/details/AssetDetails.tsx
@@ -4,10 +4,10 @@ import { MouseoverTooltip } from 'components/Tooltip/index'
 import { NftActivityType } from 'graphql/data/__generated__/types-and-hooks'
 import { useNftActivity } from 'graphql/data/nft/NftActivity'
 import { Box } from 'nft/components/Box'
-import { Center } from 'nft/components/Flex'
 import { reduceFilters } from 'nft/components/collection/Activity'
 import { LoadingSparkle } from 'nft/components/common/Loading/LoadingSparkle'
 import { AssetPriceDetails } from 'nft/components/details/AssetPriceDetails'
+import { Center } from 'nft/components/Flex'
 import { themeVars, vars } from 'nft/css/sprinkles.css'
 import { ActivityEventType, CollectionInfoForAsset, GenieAsset } from 'nft/types'
 import { isAudio } from 'nft/utils/isAudio'
@@ -60,7 +60,7 @@ const SocialsContainer = styled.div`
   margin-top: 20px;
 `
 
-const DescriptionText = styled.p`
+const DescriptionText = styled.div`
   margin-top: 8px;
   font-size: 14px;
   line-height: 20px;
diff --git a/apps/web/src/nft/components/layout/Checkbox.css.ts b/apps/web/src/nft/components/layout/Checkbox.css.ts
index 82247d9a137..56f6781b966 100644
--- a/apps/web/src/nft/components/layout/Checkbox.css.ts
+++ b/apps/web/src/nft/components/layout/Checkbox.css.ts
@@ -1,6 +1,24 @@
 import { style } from '@vanilla-extract/css'
 import { sprinkles } from 'nft/css/sprinkles.css'
 
+export const input = style([
+  sprinkles({ position: 'absolute' }),
+  {
+    top: '-24px',
+    selectors: {
+      '&[type="checkbox"]': {
+        clip: 'rect(0 0 0 0)',
+        clipPath: 'inset(50%)',
+        height: '1px',
+        overflow: 'hidden',
+        position: 'absolute',
+        whiteSpace: 'nowrap',
+        width: '1px',
+      },
+    },
+  },
+])
+
 export const checkbox = style([
   sprinkles({
     display: 'inline-block',
@@ -12,3 +30,20 @@ export const checkbox = style([
     borderWidth: '2px',
   }),
 ])
+
+export const checkMark = sprinkles({
+  display: 'none',
+  height: '24',
+  width: '24',
+  color: 'white',
+})
+
+export const checkMarkActive = style([
+  sprinkles({
+    display: 'inline-block',
+    color: 'white',
+    position: 'absolute',
+    top: '0',
+    right: '1',
+  }),
+])
diff --git a/apps/web/src/nft/components/layout/Checkbox.tsx b/apps/web/src/nft/components/layout/Checkbox.tsx
index 8fa705427ce..4fd7bbc4f27 100644
--- a/apps/web/src/nft/components/layout/Checkbox.tsx
+++ b/apps/web/src/nft/components/layout/Checkbox.tsx
@@ -1,66 +1,38 @@
+import clsx from 'clsx'
+import { Box } from 'nft/components/Box'
 import { ApprovedCheckmarkIcon } from 'nft/components/icons'
 import React from 'react'
-import styled from 'styled-components'
 
-const CheckboxLabel = styled.label`
-  display: flex;
-  align-items: center;
-  position: relative;
-  overflow: hidden;
-  cursor: pointer;
-  line-height: 1;
-`
-const CheckContainer = styled.span<{ checked?: boolean; hovered?: boolean; size?: number }>`
-  border-color: ${({ checked, hovered, theme }) => (checked || hovered ? theme.accent1 : theme.neutral2)};
-  background: ${({ checked, theme }) => (checked ? theme.accent1 : undefined)};
-  display: inline-block;
-  margin-right: 1px;
-  border-radius: 4px;
-  height: ${({ size }) => (size ? `${size}px` : '24px')};
-  width: ${({ size }) => (size ? `${size}px` : '24px')};
-  border-style: solid;
-  border-width: 2px;
-  position: relative;
-`
-const Input = styled.input`
-  position: absolute;
-  top: -24px;
-  clip: rect(0 0 0 0);
-  clip-path: inset(50%);
-  height: 1px;
-  overflow: hidden;
-  position: absolute;
-  white-space: nowrap;
-  width: 1px;
-`
-const StyledCheck = styled(ApprovedCheckmarkIcon)<{ checked?: boolean; size?: number }>`
-  display: ${({ checked }) => (checked ? 'inline-block' : 'none')};
-  height: ${({ size }) => (size ? `${size}px` : '24px')};
-  width: ${({ size }) => (size ? `${size}px` : '24px')};
-  color: white;
-  position: absolute;
-  right: 1px;
-`
+import * as styles from './Checkbox.css'
 
 interface CheckboxProps extends React.InputHTMLAttributes<HTMLInputElement> {
   hovered: boolean
-  children?: React.ReactNode
+  children: React.ReactNode
 }
 
 export const Checkbox: React.FC<CheckboxProps> = ({ hovered, children, ...props }: CheckboxProps) => {
   return (
-    <CheckboxLabel>
+    <Box
+      as="label"
+      display="flex"
+      alignItems="center"
+      position="relative"
+      overflow="hidden"
+      cursor="pointer"
+      lineHeight="1"
+    >
       {children}
-      <CheckContainer
-        checked={props.checked}
-        hovered={hovered}
-        size={props.size}
+      <Box
+        as="span"
+        borderColor={props.checked || hovered ? 'accent1' : 'neutral2'}
+        className={styles.checkbox}
+        background={props.checked ? 'accent1' : undefined}
         // This element is purely decorative so
         // we hide it for screen readers
         aria-hidden="true"
       />
-      <Input {...props} type="checkbox" />
-      <StyledCheck checked={props.checked} size={props.size} />
-    </CheckboxLabel>
+      <input {...props} className={styles.input} type="checkbox" />
+      <ApprovedCheckmarkIcon className={clsx(styles.checkMark, props.checked && styles.checkMarkActive)} />
+    </Box>
   )
 }
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 8895a3c239c..4975162bc5a 100644
--- a/apps/web/src/nft/components/profile/list/Modal/ListModal.tsx
+++ b/apps/web/src/nft/components/profile/list/Modal/ListModal.tsx
@@ -1,7 +1,7 @@
 import { Trans } from '@lingui/macro'
 import { InterfaceModalName, NFTEventName } from '@uniswap/analytics-events'
 import { useWeb3React } from '@web3-react/core'
-import { Trace, sendAnalyticsEvent, useTrace } from 'analytics'
+import { sendAnalyticsEvent, Trace, useTrace } from 'analytics'
 import { useStablecoinValue } from 'hooks/useStablecoinPrice'
 import useNativeCurrency from 'lib/hooks/useNativeCurrency'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
diff --git a/apps/web/src/nft/components/profile/list/utils.ts b/apps/web/src/nft/components/profile/list/utils.ts
index 1e3c091c090..872d966438b 100644
--- a/apps/web/src/nft/components/profile/list/utils.ts
+++ b/apps/web/src/nft/components/profile/list/utils.ts
@@ -1,17 +1,17 @@
 import type { JsonRpcSigner, Web3Provider } from '@ethersproject/providers'
-import { SupportedChainId, addressesByNetwork } from '@looksrare/sdk'
+import { addressesByNetwork, SupportedChainId } from '@looksrare/sdk'
 import { NftStandard } from 'graphql/data/__generated__/types-and-hooks'
 import ms from 'ms'
 import { SetPriceMethod, WarningType } from 'nft/components/profile/list/shared'
 import { useNFTList, useSellAsset } from 'nft/hooks'
 import {
-  LOOKSRARE_MARKETPLACE_CONTRACT_1155,
   LOOKSRARE_MARKETPLACE_CONTRACT_721,
+  LOOKSRARE_MARKETPLACE_CONTRACT_1155,
 } from 'nft/queries/looksRare/constants'
 import { OPENSEA_CROSS_CHAIN_CONDUIT } from 'nft/queries/openSea/constants'
-import { X2Y2_TRANSFER_CONTRACT_1155, X2Y2_TRANSFER_CONTRACT_721 } from 'nft/queries/x2y2'
+import { X2Y2_TRANSFER_CONTRACT_721, X2Y2_TRANSFER_CONTRACT_1155 } from 'nft/queries/x2y2'
 import { CollectionRow, Listing, ListingMarket, ListingRow, ListingStatus, WalletAsset } from 'nft/types'
-import { LOOKS_RARE_CREATOR_BASIS_POINTS, approveCollection, signListing } from 'nft/utils/listNfts'
+import { approveCollection, LOOKS_RARE_CREATOR_BASIS_POINTS, signListing } from 'nft/utils/listNfts'
 import { Dispatch, useEffect } from 'react'
 
 export async function approveCollectionRow(
diff --git a/apps/web/src/nft/components/profile/view/__snapshots__/EmptyWalletContent.test.tsx.snap b/apps/web/src/nft/components/profile/view/__snapshots__/EmptyWalletContent.test.tsx.snap
index f0d7e921a3d..9b0404393eb 100644
--- a/apps/web/src/nft/components/profile/view/__snapshots__/EmptyWalletContent.test.tsx.snap
+++ b/apps/web/src/nft/components/profile/view/__snapshots__/EmptyWalletContent.test.tsx.snap
@@ -4,18 +4,10 @@ exports[`EmptyWalletContent.tsx matches base snapshot 1`] = `
 <DocumentFragment>
   .c1 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c3 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c0 {
diff --git a/apps/web/src/nft/components/profile/view/__snapshots__/ViewMyNftsAsset.test.tsx.snap b/apps/web/src/nft/components/profile/view/__snapshots__/ViewMyNftsAsset.test.tsx.snap
index 325cf0da0e1..7a60887cb33 100644
--- a/apps/web/src/nft/components/profile/view/__snapshots__/ViewMyNftsAsset.test.tsx.snap
+++ b/apps/web/src/nft/components/profile/view/__snapshots__/ViewMyNftsAsset.test.tsx.snap
@@ -27,10 +27,6 @@ exports[`NftCard renders correctly 1`] = `
 
 .c14 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c9 {
diff --git a/apps/web/src/nft/hooks/index.ts b/apps/web/src/nft/hooks/index.ts
index 1fc7ccc9819..fb60fd9e405 100644
--- a/apps/web/src/nft/hooks/index.ts
+++ b/apps/web/src/nft/hooks/index.ts
@@ -1,12 +1,12 @@
 export { useBag } from './useBag'
+export type { CollectionFilters, Trait } from './useCollectionFilters'
 export {
+  initialCollectionFilterState,
   SortBy,
   SortByPointers,
   SortByQueries,
-  initialCollectionFilterState,
   useCollectionFilters,
 } from './useCollectionFilters'
-export type { CollectionFilters, Trait } from './useCollectionFilters'
 export { useFiltersExpanded } from './useFiltersExpanded'
 export { useIsCollectionLoading } from './useIsCollectionLoading'
 export { useIsMobile } from './useIsMobile'
diff --git a/apps/web/src/nft/hooks/useSendTransaction.ts b/apps/web/src/nft/hooks/useSendTransaction.ts
index e99857e58fc..136a61c7784 100644
--- a/apps/web/src/nft/hooks/useSendTransaction.ts
+++ b/apps/web/src/nft/hooks/useSendTransaction.ts
@@ -5,11 +5,11 @@ import { ContractReceipt } from '@ethersproject/contracts'
 import type { JsonRpcSigner } from '@ethersproject/providers'
 import { NFTEventName } from '@uniswap/analytics-events'
 import { sendAnalyticsEvent } from 'analytics'
-import ERC1155 from 'wallet/src/abis/erc1155.json'
-import ERC721 from 'wallet/src/abis/erc721.json'
 import { create } from 'zustand'
 import { devtools } from 'zustand/middleware'
 
+import ERC721 from '../../abis/erc721.json'
+import ERC1155 from '../../abis/erc1155.json'
 import CryptoPunksMarket from '../abis/CryptoPunksMarket.json'
 import { GenieAsset, RouteResponse, RoutingItem, TxResponse, TxStateType, UpdatedGenieAsset } from '../types'
 import { compareAssetsWithTransactionRoute } from '../utils/txRoute/combineItemsWithTxRoute'
diff --git a/apps/web/src/nft/types/index.ts b/apps/web/src/nft/types/index.ts
index 833461799f9..aed324032a0 100644
--- a/apps/web/src/nft/types/index.ts
+++ b/apps/web/src/nft/types/index.ts
@@ -1,6 +1,5 @@
-export { BagItemStatus, BagStatus, RoutingActions, TxStateType } from './checkout'
 export type { BagItem, BuyItem, RouteResponse, RoutingItem, TxResponse, UpdatedGenieAsset } from './checkout'
-export { ActivityEventType, ActivityEventTypeDisplay, UniformAspectRatios } from './collection'
+export { BagItemStatus, BagStatus, RoutingActions, TxStateType } from './checkout'
 export type {
   ActivityEvent,
   CollectionInfoForAsset,
@@ -8,11 +7,11 @@ export type {
   TokenRarity,
   UniformAspectRatio,
 } from './collection'
-export { DetailsOrigin, Markets, TokenType, isPooledMarket } from './common'
+export { ActivityEventType, ActivityEventTypeDisplay, UniformAspectRatios } from './collection'
 export type { DropDownOption, GenieAsset, GenieCollection, PriceInfo, Rarity, Trait } from './common'
-export { Denomination, TimePeriod } from './discover'
+export { DetailsOrigin, isPooledMarket, Markets, TokenType } from './common'
 export type { CollectionTableColumn, TrendingCollection, VolumeType } from './discover'
-export { ListingStatus, ProfilePageStateType } from './sell'
+export { Denomination, TimePeriod } from './discover'
 export type {
   AssetRow,
   CollectionRow,
@@ -23,3 +22,4 @@ export type {
   WalletAsset,
   WalletCollection,
 } from './sell'
+export { ListingStatus, ProfilePageStateType } from './sell'
diff --git a/apps/web/src/nft/utils/listNfts.ts b/apps/web/src/nft/utils/listNfts.ts
index 54bee70480a..754b5327d03 100644
--- a/apps/web/src/nft/utils/listNfts.ts
+++ b/apps/web/src/nft/utils/listNfts.ts
@@ -3,7 +3,7 @@ import { BigNumber } from '@ethersproject/bignumber'
 import { Contract } from '@ethersproject/contracts'
 import type { JsonRpcSigner, Web3Provider } from '@ethersproject/providers'
 import { parseEther } from '@ethersproject/units'
-import { MakerOrder, SupportedChainId, addressesByNetwork, signMakerOrder } from '@looksrare/sdk'
+import { addressesByNetwork, MakerOrder, signMakerOrder, SupportedChainId } from '@looksrare/sdk'
 import { Seaport } from '@opensea/seaport-js'
 import { ItemType } from '@opensea/seaport-js/lib/constants'
 import { ConsiderationInputItem } from '@opensea/seaport-js/lib/types'
@@ -13,18 +13,18 @@ import { createLooksRareOrder } from 'nft/queries/looksRare'
 import { LOOKSRARE_MARKETPLACE_CONTRACT_721 } from 'nft/queries/looksRare/constants'
 import { PostOpenSeaSellOrder } from 'nft/queries/openSea'
 import {
-  INVERSE_BASIS_POINTS,
   OPENSEA_DEFAULT_CROSS_CHAIN_CONDUIT_KEY,
   OPENSEA_FEE_ADDRESS,
   OPENSEA_KEY_TO_CONDUIT,
   OPENSEA_SEAPORT_V1_5_CONTRACT,
 } from 'nft/queries/openSea/constants'
+import { INVERSE_BASIS_POINTS } from 'nft/queries/openSea/constants'
 import { getX2Y2OrderId, newX2Y2Order } from 'nft/queries/x2y2'
-import ERC1155 from 'wallet/src/abis/erc1155.json'
-import ERC721 from 'wallet/src/abis/erc721.json'
 
+import ERC721 from '../../abis/erc721.json'
+import ERC1155 from '../../abis/erc1155.json'
 import { ListingMarket, ListingStatus, WalletAsset } from '../types'
-import { OfferItem, OrderPayload, createSellOrder, encodeOrder, signOrderData } from './x2y2'
+import { createSellOrder, encodeOrder, OfferItem, OrderPayload, signOrderData } from './x2y2'
 
 export const LOOKS_RARE_CREATOR_BASIS_POINTS = 50
 
diff --git a/apps/web/src/pages/AddLiquidity/index.tsx b/apps/web/src/pages/AddLiquidity/index.tsx
index db00a1a22d7..fbbe9d7ea17 100644
--- a/apps/web/src/pages/AddLiquidity/index.tsx
+++ b/apps/web/src/pages/AddLiquidity/index.tsx
@@ -5,7 +5,7 @@ import { BrowserEvent, InterfaceElementName, InterfaceEventName, LiquidityEventN
 import { Currency, CurrencyAmount, NONFUNGIBLE_POSITION_MANAGER_ADDRESSES, Percent } from '@uniswap/sdk-core'
 import { FeeAmount, NonfungiblePositionManager } from '@uniswap/v3-sdk'
 import { useWeb3React } from '@web3-react/core'
-import { TraceEvent, sendAnalyticsEvent, useTrace } from 'analytics'
+import { sendAnalyticsEvent, TraceEvent, useTrace } from 'analytics'
 import { useToggleAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
 import OwnershipWarning from 'components/addLiquidity/OwnershipWarning'
 import UnsupportedCurrencyFooter from 'components/swap/UnsupportedCurrencyFooter'
@@ -647,6 +647,7 @@ function AddLiquidity() {
                           showMaxButton={!atMaxAmounts[Field.CURRENCY_A]}
                           currency={currencies[Field.CURRENCY_A] ?? null}
                           id="add-liquidity-input-tokena"
+                          showCommonBases
                         />
 
                         <CurrencyInputPanel
@@ -660,6 +661,7 @@ function AddLiquidity() {
                           showMaxButton={!atMaxAmounts[Field.CURRENCY_B]}
                           currency={currencies[Field.CURRENCY_B] ?? null}
                           id="add-liquidity-input-tokenb"
+                          showCommonBases
                         />
                       </RowBetween>
 
@@ -876,6 +878,7 @@ function AddLiquidity() {
                       currency={currencies[Field.CURRENCY_A] ?? null}
                       id="add-liquidity-input-tokena"
                       fiatValue={currencyAFiat}
+                      showCommonBases
                       locked={depositADisabled}
                     />
 
@@ -889,6 +892,7 @@ function AddLiquidity() {
                       fiatValue={currencyBFiat}
                       currency={currencies[Field.CURRENCY_B] ?? null}
                       id="add-liquidity-input-tokenb"
+                      showCommonBases
                       locked={depositBDisabled}
                     />
                   </AutoColumn>
diff --git a/apps/web/src/pages/AddLiquidityV2/index.tsx b/apps/web/src/pages/AddLiquidityV2/index.tsx
index eb1e8317f61..ed2344673e9 100644
--- a/apps/web/src/pages/AddLiquidityV2/index.tsx
+++ b/apps/web/src/pages/AddLiquidityV2/index.tsx
@@ -399,6 +399,7 @@ export default function AddLiquidity() {
               showMaxButton={!atMaxAmounts[Field.CURRENCY_A]}
               currency={currencies[Field.CURRENCY_A] ?? null}
               id="add-liquidity-input-tokena"
+              showCommonBases
             />
             <ColumnCenter>
               <Plus size="16" color={theme.neutral2} />
@@ -413,6 +414,7 @@ export default function AddLiquidity() {
               showMaxButton={!atMaxAmounts[Field.CURRENCY_B]}
               currency={currencies[Field.CURRENCY_B] ?? null}
               id="add-liquidity-input-tokenb"
+              showCommonBases
             />
             {currencies[Field.CURRENCY_A] && currencies[Field.CURRENCY_B] && pairState !== PairState.INVALID && (
               <>
diff --git a/apps/web/src/pages/App.tsx b/apps/web/src/pages/App.tsx
index e6435f6a529..a431bd63f07 100644
--- a/apps/web/src/pages/App.tsx
+++ b/apps/web/src/pages/App.tsx
@@ -35,7 +35,6 @@ const AppChrome = lazy(() => import('./AppChrome'))
 const BodyWrapper = styled.div<{ bannerIsVisible?: boolean }>`
   display: flex;
   flex-direction: column;
-  position: relative;
   width: 100%;
   min-height: calc(100vh - ${({ bannerIsVisible }) => (bannerIsVisible ? UK_BANNER_HEIGHT : 0)}px);
   padding: ${({ theme }) => theme.navHeight}px 0px 5rem 0px;
diff --git a/apps/web/src/pages/CreateProposal/ProposalActionDetail.tsx b/apps/web/src/pages/CreateProposal/ProposalActionDetail.tsx
index db010c99645..6525ca39a9e 100644
--- a/apps/web/src/pages/CreateProposal/ProposalActionDetail.tsx
+++ b/apps/web/src/pages/CreateProposal/ProposalActionDetail.tsx
@@ -4,7 +4,6 @@ import AddressInputPanel from 'components/AddressInputPanel'
 import CurrencyInputPanel from 'components/CurrencyInputPanel'
 import styled from 'styled-components'
 
-import { CurrencySearchFilters } from 'components/SearchModal/CurrencySearch'
 import { ProposalAction } from './ProposalActionSelector'
 
 enum ProposalActionDetailField {
@@ -25,11 +24,6 @@ const ProposalActionDetailContainer = styled.div`
   }
 `
 
-const CREATE_PROPOSAL_CURRENCY_SEARCH_FILTERS: CurrencySearchFilters = {
-  disableNonToken: true,
-  showCommonBases: false,
-}
-
 export const ProposalActionDetail = ({
   className,
   proposalAction,
@@ -83,10 +77,11 @@ export const ProposalActionDetail = ({
             onUserInput={(amount: string) => onAmountInput(amount)}
             onCurrencySelect={(currency: Currency) => onCurrencySelect(currency)}
             showMaxButton={false}
+            showCommonBases={false}
             showCurrencyAmount={false}
+            disableNonToken
             hideBalance
             id="currency-input"
-            currencySearchFilters={CREATE_PROPOSAL_CURRENCY_SEARCH_FILTERS}
           />
         ) : null
       )}
diff --git a/apps/web/src/pages/CreateProposal/ProposalActionSelector.tsx b/apps/web/src/pages/CreateProposal/ProposalActionSelector.tsx
index 4ea72473b77..89ea2df7050 100644
--- a/apps/web/src/pages/CreateProposal/ProposalActionSelector.tsx
+++ b/apps/web/src/pages/CreateProposal/ProposalActionSelector.tsx
@@ -4,7 +4,7 @@ import Column from 'components/Column'
 import Modal from 'components/Modal'
 import { RowBetween } from 'components/Row'
 import { MenuItem, PaddedColumn, Separator } from 'components/SearchModal/styled'
-import { useCallback } from 'react'
+import React, { useCallback } from 'react'
 import { Text } from 'rebass'
 import styled from 'styled-components'
 import { CloseIcon } from 'theme/components'
diff --git a/apps/web/src/pages/CreateProposal/ProposalEditor.tsx b/apps/web/src/pages/CreateProposal/ProposalEditor.tsx
index c6fecfb7297..3f5d105c3e3 100644
--- a/apps/web/src/pages/CreateProposal/ProposalEditor.tsx
+++ b/apps/web/src/pages/CreateProposal/ProposalEditor.tsx
@@ -1,7 +1,7 @@
 // eslint-disable-next-line no-restricted-imports
 import { t, Trans } from '@lingui/macro'
 import { ResizingTextArea, TextInput } from 'components/TextInput'
-import { memo } from 'react'
+import React, { memo } from 'react'
 import { Text } from 'rebass'
 import styled from 'styled-components'
 
diff --git a/apps/web/src/pages/Explore/charts/ExploreChartsSection.tsx b/apps/web/src/pages/Explore/charts/ExploreChartsSection.tsx
index 3a8c9034a73..79894faec90 100644
--- a/apps/web/src/pages/Explore/charts/ExploreChartsSection.tsx
+++ b/apps/web/src/pages/Explore/charts/ExploreChartsSection.tsx
@@ -1,26 +1,21 @@
 import { Trans } from '@lingui/macro'
-import { ChartHeader } from 'components/Charts/ChartHeader'
-import { Chart } from 'components/Charts/ChartModel'
-import { StackedLineData, TVLChartModel } from 'components/Charts/StackedLineChart'
+import { StackedLineChart, StackedLineData } from 'components/Charts/StackedLineChart'
+import { getCumulativeVolume, StackedVolumeChart } from 'components/Charts/StackedVolumeChart'
+import { StackedBarsData } from 'components/Charts/StackedVolumeChart/renderer'
 import TimePeriodSelector from 'components/Charts/TimeSelector'
-import { getTimePeriodDisplay } from 'components/Charts/VolumeChart'
-import { CustomVolumeChartModel } from 'components/Charts/VolumeChart/CustomVolumeChartModel'
-import { StackedHistogramData } from 'components/Charts/VolumeChart/renderer'
-import { getCumulativeSum, getCumulativeVolume, getVolumeProtocolInfo } from 'components/Charts/VolumeChart/utils'
 import Column from 'components/Column'
-import { RowBetween } from 'components/Row'
+import Row, { RowBetween } from 'components/Row'
 import { MAX_WIDTH_MEDIA_BREAKPOINT } from 'components/Tokens/constants'
 import { PriceSource } from 'graphql/data/__generated__/types-and-hooks'
-import { TimePeriod, getProtocolColor } from 'graphql/data/util'
+import { TimePeriod } from 'graphql/data/util'
 import { useScreenSize } from 'hooks/useScreenSize'
 import { HARDCODED_TVL_DATA, HARDCODED_VOLUME_DATA } from 'pages/Explore/charts/mockData'
 import { ReactNode, useMemo, useState } from 'react'
-import styled, { useTheme } from 'styled-components'
+import styled from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
 
 const EXPLORE_CHART_HEIGHT_PX = 368
-const EXPLORE_PRICE_SOURCES = [PriceSource.SubgraphV2, PriceSource.SubgraphV3]
 
 const TIME_SELECTOR_OPTIONS = [
   { time: TimePeriod.DAY, display: 'D' },
@@ -35,40 +30,51 @@ const StyledTimePeriodSelector = styled(TimePeriodSelector)`
     font-size: 14px;
   }
 `
-const ChartsContainer = styled(RowBetween)`
+const ChartsContainer = styled.div`
   max-width: ${MAX_WIDTH_MEDIA_BREAKPOINT};
   width: 100%;
   margin-left: auto;
   margin-right: auto;
   padding-bottom: 56px;
+
+  /* Clearfix hack allows parent div to adjust to floated children height: https://www.w3schools.com/howto/howto_css_clearfix.asp */
+  &::after {
+    content: '';
+    display: table;
+    clear: both;
+  }
 `
-// a 6% gap is achieved using two 47% width containers, as a parent gap causes an autosizing error with side-by-side lightweight-charts
-const SectionContainer = styled(Column)`
+// side-by-side lightweight-charts autosizing throws an error when aligned via grid or flex, so float is used instead.
+const FloatContainer = styled.div<{ side: 'left' | 'right' }>`
+  float: ${({ side }) => side};
+  width: 48%;
   position: relative;
-  width: 47%;
-  gap: 4px;
+`
+const MinimalDisplaysWrapper = styled(Row)`
+  max-width: ${MAX_WIDTH_MEDIA_BREAKPOINT};
+  width: 100%;
+  gap: 20px;
+  padding-bottom: 40px;
 
-  @media only screen and (max-width: ${({ theme }) => `${theme.breakpoint.sm}px`}) {
-    background-color: ${({ theme }) => theme.surface2};
-    border-radius: 20px;
-    height: 120px;
-    padding: 20px;
+  @media only screen and (max-width: ${({ theme }) => `${theme.breakpoint.xs}px`}) {
+    gap: 12px;
   }
+`
+const MinimalDisplayContainer = styled(Column)`
+  gap: 4px;
+  width: 100%;
+  background-color: ${({ theme }) => theme.surface2};
+  border-radius: 20px;
+  height: 120px;
+  padding: 20px;
 
   @media only screen and (max-width: ${({ theme }) => `${theme.breakpoint.xs}px`}) {
     height: 112px;
     padding: 16px;
   }
 `
-const SectionTitle = styled(ThemedText.SubHeader)`
-  color: ${({ theme }) => theme.neutral2};
-  white-space: nowrap;
-`
-const StyledChart = styled(Chart)`
-  height: ${EXPLORE_CHART_HEIGHT_PX}px;
-` /* cast preserves generic Chart props that the `styled` return type looses: */ as typeof Chart
 
-function VolumeChartSection({ data }: { data: StackedHistogramData[] }) {
+function VolumeChartSection({ data }: { data: StackedBarsData[] }) {
   const [timePeriod, setTimePeriod] = useState<TimePeriod>(TimePeriod.DAY)
 
   const mockDataForTimePeriod = useMemo(() => {
@@ -90,31 +96,12 @@ function VolumeChartSection({ data }: { data: StackedHistogramData[] }) {
     return data.slice(-numDataPoints)
   }, [timePeriod, data])
 
-  const theme = useTheme()
-
-  const params = useMemo<{ data: StackedHistogramData[]; colors: [string, string]; headerHeight: number }>(
-    () => ({ data: mockDataForTimePeriod, colors: [theme.accent1, theme.accent3], headerHeight: 85 }),
-    [mockDataForTimePeriod, theme]
-  )
-  const cumulativeVolume = useMemo(() => getCumulativeVolume(mockDataForTimePeriod), [mockDataForTimePeriod])
-
-  const isSmallScreen = !useScreenSize()['sm']
-  if (isSmallScreen) {
-    return (
-      <MinimalStatDisplay
-        title={<Trans>Uniswap volume</Trans>}
-        value={cumulativeVolume}
-        time={<Trans>Past month</Trans>}
-      />
-    )
-  }
-
   return (
-    <SectionContainer>
+    <FloatContainer side="right">
       <RowBetween>
-        <SectionTitle>
+        <ThemedText.SubHeader color="neutral2" marginBottom="4px">
           <Trans>Uniswap volume</Trans>
-        </SectionTitle>
+        </ThemedText.SubHeader>
         <div style={{ position: 'absolute', right: 0 }}>
           <StyledTimePeriodSelector
             options={TIME_SELECTOR_OPTIONS}
@@ -123,55 +110,23 @@ function VolumeChartSection({ data }: { data: StackedHistogramData[] }) {
           />
         </div>
       </RowBetween>
-      <StyledChart Model={CustomVolumeChartModel<StackedHistogramData>} params={params}>
-        {(crosshairData) => (
-          <ChartHeader
-            value={crosshairData ? getCumulativeSum(crosshairData) : getCumulativeVolume(mockDataForTimePeriod)}
-            time={crosshairData?.time}
-            timePlaceholder={getTimePeriodDisplay(timePeriod)}
-            protocolData={getVolumeProtocolInfo(crosshairData, EXPLORE_PRICE_SOURCES)}
-          />
-        )}
-      </StyledChart>
-    </SectionContainer>
+      <StackedVolumeChart height={EXPLORE_CHART_HEIGHT_PX} data={mockDataForTimePeriod} timePeriod={timePeriod} />
+    </FloatContainer>
   )
 }
 
 function TVLChartSection({ data }: { data: StackedLineData[] }) {
-  const theme = useTheme()
-  const params = useMemo(
-    () => ({
-      data,
-      colors: EXPLORE_PRICE_SOURCES?.map((source) => getProtocolColor(source, theme)) ?? [theme.accent1],
-    }),
-    [data, theme]
-  )
-
-  const lastEntry = data[data.length - 1]
-  const isSmallScreen = !useScreenSize()['sm']
-  if (isSmallScreen) {
-    const currentTVL = lastEntry?.values.reduce((acc, curr) => acc + curr, 0)
-    return <MinimalStatDisplay title={<Trans>Uniswap TVL</Trans>} value={currentTVL} time={<Trans>All time</Trans>} />
-  }
-
   return (
-    <SectionContainer>
-      <SectionTitle>
+    <FloatContainer side="left">
+      <ThemedText.SubHeader color="neutral2" marginBottom="4px">
         <Trans>Uniswap TVL</Trans>
-      </SectionTitle>
-      <StyledChart Model={TVLChartModel} params={params}>
-        {(crosshairData) => (
-          <ChartHeader
-            value={(crosshairData ?? lastEntry)?.values.reduce((v, sum) => (sum += v), 0)}
-            time={crosshairData?.time}
-            protocolData={EXPLORE_PRICE_SOURCES?.map((source, index) => ({
-              protocol: source,
-              value: crosshairData?.values[index],
-            }))}
-          />
-        )}
-      </StyledChart>
-    </SectionContainer>
+      </ThemedText.SubHeader>
+      <StackedLineChart
+        height={EXPLORE_CHART_HEIGHT_PX}
+        data={data}
+        sources={[PriceSource.SubgraphV2, PriceSource.SubgraphV3]}
+      />
+    </FloatContainer>
   )
 }
 
@@ -179,17 +134,35 @@ function MinimalStatDisplay({ title, value, time }: { title: ReactNode; value: n
   const { formatFiatPrice } = useFormatter()
 
   return (
-    <SectionContainer>
-      <SectionTitle color="neutral2">{title}</SectionTitle>
+    <MinimalDisplayContainer>
+      <ThemedText.SubHeader color="neutral2">{title}</ThemedText.SubHeader>
       <ThemedText.HeadlineSmall fontSize="24px" lineHeight="32px">
         {formatFiatPrice({ price: value, type: NumberType.FiatTokenStatChartHeader })}
       </ThemedText.HeadlineSmall>
       <ThemedText.Caption color="neutral2">{time}</ThemedText.Caption>
-    </SectionContainer>
+    </MinimalDisplayContainer>
   )
 }
 
 export function ExploreChartsSection() {
+  const isNarrowDisplay = !useScreenSize()['sm']
+
+  if (isNarrowDisplay) {
+    const currentTVL = HARDCODED_TVL_DATA[HARDCODED_TVL_DATA.length - 1].values.reduce((acc, curr) => acc + curr, 0)
+    const cumulativeVolume = getCumulativeVolume(HARDCODED_VOLUME_DATA)
+
+    return (
+      <MinimalDisplaysWrapper>
+        <MinimalStatDisplay title={<Trans>Uniswap TVL</Trans>} value={currentTVL} time={<Trans>All time</Trans>} />
+        <MinimalStatDisplay
+          title={<Trans>Uniswap volume</Trans>}
+          value={cumulativeVolume}
+          time={<Trans>Past month</Trans>}
+        />
+      </MinimalDisplaysWrapper>
+    )
+  }
+
   return (
     <ChartsContainer>
       <TVLChartSection data={HARDCODED_TVL_DATA} />
diff --git a/apps/web/src/pages/Explore/charts/mockData.ts b/apps/web/src/pages/Explore/charts/mockData.ts
index faed8d29fec..5b930d01194 100644
--- a/apps/web/src/pages/Explore/charts/mockData.ts
+++ b/apps/web/src/pages/Explore/charts/mockData.ts
@@ -1,57 +1,56 @@
 import { StackedLineData } from 'components/Charts/StackedLineChart'
-import { StackedHistogramData } from 'components/Charts/VolumeChart/renderer'
-import { PriceSource } from 'graphql/data/__generated__/types-and-hooks'
+import { StackedBarsData } from 'components/Charts/StackedVolumeChart/renderer'
 
 export const HARDCODED_VOLUME_DATA = [
-  { time: 1702500046, values: { [PriceSource.SubgraphV2]: 1000000, [PriceSource.SubgraphV3]: 3000000 } },
-  { time: 1702500146, values: { [PriceSource.SubgraphV2]: 1400000, [PriceSource.SubgraphV3]: 4000000 } },
-  { time: 1702500246, values: { [PriceSource.SubgraphV2]: 1300000, [PriceSource.SubgraphV3]: 3500000 } },
-  { time: 1702500346, values: { [PriceSource.SubgraphV2]: 2000000, [PriceSource.SubgraphV3]: 7000000 } },
-  { time: 1702500446, values: { [PriceSource.SubgraphV2]: 1000000, [PriceSource.SubgraphV3]: 8000000 } },
-  { time: 1702500546, values: { [PriceSource.SubgraphV2]: 4000000, [PriceSource.SubgraphV3]: 15000000 } },
-  { time: 1702500646, values: { [PriceSource.SubgraphV2]: 9250000, [PriceSource.SubgraphV3]: 16000000 } },
-  { time: 1702500746, values: { [PriceSource.SubgraphV2]: 6000000, [PriceSource.SubgraphV3]: 9000000 } },
-  { time: 1702500846, values: { [PriceSource.SubgraphV2]: 5000000, [PriceSource.SubgraphV3]: 8500000 } },
-  { time: 1702500946, values: { [PriceSource.SubgraphV2]: 6000000, [PriceSource.SubgraphV3]: 7000000 } },
-  { time: 1702501046, values: { [PriceSource.SubgraphV2]: 10000000, [PriceSource.SubgraphV3]: 5000000 } },
-  { time: 1702501146, values: { [PriceSource.SubgraphV2]: 11000000, [PriceSource.SubgraphV3]: 6000000 } },
-  { time: 1702501246, values: { [PriceSource.SubgraphV2]: 5000000, [PriceSource.SubgraphV3]: 8000000 } },
-  { time: 1702501346, values: { [PriceSource.SubgraphV2]: 11000000, [PriceSource.SubgraphV3]: 6500000 } },
-  { time: 1702501446, values: { [PriceSource.SubgraphV2]: 2000000, [PriceSource.SubgraphV3]: 8000000 } },
-  { time: 1702501546, values: { [PriceSource.SubgraphV2]: 1900000, [PriceSource.SubgraphV3]: 7000000 } },
-  { time: 1702502046, values: { [PriceSource.SubgraphV2]: 1000000, [PriceSource.SubgraphV3]: 3000000 } },
-  { time: 1702502146, values: { [PriceSource.SubgraphV2]: 1400000, [PriceSource.SubgraphV3]: 4000000 } },
-  { time: 1702502246, values: { [PriceSource.SubgraphV2]: 1300000, [PriceSource.SubgraphV3]: 3500000 } },
-  { time: 1702502346, values: { [PriceSource.SubgraphV2]: 2000000, [PriceSource.SubgraphV3]: 7000000 } },
-  { time: 1702502446, values: { [PriceSource.SubgraphV2]: 1000000, [PriceSource.SubgraphV3]: 8000000 } },
-  { time: 1702502546, values: { [PriceSource.SubgraphV2]: 4000000, [PriceSource.SubgraphV3]: 7000000 } },
-  { time: 1702502646, values: { [PriceSource.SubgraphV2]: 9250000, [PriceSource.SubgraphV3]: 6000000 } },
-  { time: 1702502746, values: { [PriceSource.SubgraphV2]: 6000000, [PriceSource.SubgraphV3]: 9000000 } },
-  { time: 1702502846, values: { [PriceSource.SubgraphV2]: 5000000, [PriceSource.SubgraphV3]: 8500000 } },
-  { time: 1702502946, values: { [PriceSource.SubgraphV2]: 6000000, [PriceSource.SubgraphV3]: 7000000 } },
-  { time: 1702503046, values: { [PriceSource.SubgraphV2]: 10000000, [PriceSource.SubgraphV3]: 5000000 } },
-  { time: 1702503146, values: { [PriceSource.SubgraphV2]: 11000000, [PriceSource.SubgraphV3]: 6000000 } },
-  { time: 1702503246, values: { [PriceSource.SubgraphV2]: 5000000, [PriceSource.SubgraphV3]: 8000000 } },
-  { time: 1702503346, values: { [PriceSource.SubgraphV2]: 11000000, [PriceSource.SubgraphV3]: 6500000 } },
-  { time: 1702503446, values: { [PriceSource.SubgraphV2]: 2000000, [PriceSource.SubgraphV3]: 8000000 } },
-  { time: 1702503546, values: { [PriceSource.SubgraphV2]: 1900000, [PriceSource.SubgraphV3]: 7000000 } },
-  { time: 1702504046, values: { [PriceSource.SubgraphV2]: 1000000, [PriceSource.SubgraphV3]: 3000000 } },
-  { time: 1702504146, values: { [PriceSource.SubgraphV2]: 1400000, [PriceSource.SubgraphV3]: 4000000 } },
-  { time: 1702504246, values: { [PriceSource.SubgraphV2]: 1300000, [PriceSource.SubgraphV3]: 3500000 } },
-  { time: 1702504346, values: { [PriceSource.SubgraphV2]: 2000000, [PriceSource.SubgraphV3]: 7000000 } },
-  { time: 1702504446, values: { [PriceSource.SubgraphV2]: 1000000, [PriceSource.SubgraphV3]: 8000000 } },
-  { time: 1702504546, values: { [PriceSource.SubgraphV2]: 4000000, [PriceSource.SubgraphV3]: 12000000 } },
-  { time: 1702504646, values: { [PriceSource.SubgraphV2]: 9250000, [PriceSource.SubgraphV3]: 14000000 } },
-  { time: 1702504746, values: { [PriceSource.SubgraphV2]: 6000000, [PriceSource.SubgraphV3]: 9000000 } },
-  { time: 1702504846, values: { [PriceSource.SubgraphV2]: 5000000, [PriceSource.SubgraphV3]: 8500000 } },
-  { time: 1702504946, values: { [PriceSource.SubgraphV2]: 6000000, [PriceSource.SubgraphV3]: 7000000 } },
-  { time: 1702505046, values: { [PriceSource.SubgraphV2]: 10000000, [PriceSource.SubgraphV3]: 5000000 } },
-  { time: 1702505146, values: { [PriceSource.SubgraphV2]: 9000000, [PriceSource.SubgraphV3]: 6000000 } },
-  { time: 1702505246, values: { [PriceSource.SubgraphV2]: 5000000, [PriceSource.SubgraphV3]: 8000000 } },
-  { time: 1702505346, values: { [PriceSource.SubgraphV2]: 4000000, [PriceSource.SubgraphV3]: 6500000 } },
-  { time: 1702505446, values: { [PriceSource.SubgraphV2]: 2000000, [PriceSource.SubgraphV3]: 8000000 } },
-  { time: 1702505546, values: { [PriceSource.SubgraphV2]: 1900000, [PriceSource.SubgraphV3]: 7000000 } },
-] as StackedHistogramData[]
+  { time: 1702500046, values: { v2: 1000000, v3: 3000000 } },
+  { time: 1702500146, values: { v2: 1400000, v3: 4000000 } },
+  { time: 1702500246, values: { v2: 1300000, v3: 3500000 } },
+  { time: 1702500346, values: { v2: 2000000, v3: 7000000 } },
+  { time: 1702500446, values: { v2: 1000000, v3: 8000000 } },
+  { time: 1702500546, values: { v2: 4000000, v3: 15000000 } },
+  { time: 1702500646, values: { v2: 9250000, v3: 16000000 } },
+  { time: 1702500746, values: { v2: 6000000, v3: 9000000 } },
+  { time: 1702500846, values: { v2: 5000000, v3: 8500000 } },
+  { time: 1702500946, values: { v2: 6000000, v3: 7000000 } },
+  { time: 1702501046, values: { v2: 10000000, v3: 5000000 } },
+  { time: 1702501146, values: { v2: 11000000, v3: 6000000 } },
+  { time: 1702501246, values: { v2: 5000000, v3: 8000000 } },
+  { time: 1702501346, values: { v2: 11000000, v3: 6500000 } },
+  { time: 1702501446, values: { v2: 2000000, v3: 8000000 } },
+  { time: 1702501546, values: { v2: 1900000, v3: 7000000 } },
+  { time: 1702502046, values: { v2: 1000000, v3: 3000000 } },
+  { time: 1702502146, values: { v2: 1400000, v3: 4000000 } },
+  { time: 1702502246, values: { v2: 1300000, v3: 3500000 } },
+  { time: 1702502346, values: { v2: 2000000, v3: 7000000 } },
+  { time: 1702502446, values: { v2: 1000000, v3: 8000000 } },
+  { time: 1702502546, values: { v2: 4000000, v3: 7000000 } },
+  { time: 1702502646, values: { v2: 9250000, v3: 6000000 } },
+  { time: 1702502746, values: { v2: 6000000, v3: 9000000 } },
+  { time: 1702502846, values: { v2: 5000000, v3: 8500000 } },
+  { time: 1702502946, values: { v2: 6000000, v3: 7000000 } },
+  { time: 1702503046, values: { v2: 10000000, v3: 5000000 } },
+  { time: 1702503146, values: { v2: 11000000, v3: 6000000 } },
+  { time: 1702503246, values: { v2: 5000000, v3: 8000000 } },
+  { time: 1702503346, values: { v2: 11000000, v3: 6500000 } },
+  { time: 1702503446, values: { v2: 2000000, v3: 8000000 } },
+  { time: 1702503546, values: { v2: 1900000, v3: 7000000 } },
+  { time: 1702504046, values: { v2: 1000000, v3: 3000000 } },
+  { time: 1702504146, values: { v2: 1400000, v3: 4000000 } },
+  { time: 1702504246, values: { v2: 1300000, v3: 3500000 } },
+  { time: 1702504346, values: { v2: 2000000, v3: 7000000 } },
+  { time: 1702504446, values: { v2: 1000000, v3: 8000000 } },
+  { time: 1702504546, values: { v2: 4000000, v3: 12000000 } },
+  { time: 1702504646, values: { v2: 9250000, v3: 14000000 } },
+  { time: 1702504746, values: { v2: 6000000, v3: 9000000 } },
+  { time: 1702504846, values: { v2: 5000000, v3: 8500000 } },
+  { time: 1702504946, values: { v2: 6000000, v3: 7000000 } },
+  { time: 1702505046, values: { v2: 10000000, v3: 5000000 } },
+  { time: 1702505146, values: { v2: 9000000, v3: 6000000 } },
+  { time: 1702505246, values: { v2: 5000000, v3: 8000000 } },
+  { time: 1702505346, values: { v2: 4000000, v3: 6500000 } },
+  { time: 1702505446, values: { v2: 2000000, v3: 8000000 } },
+  { time: 1702505546, values: { v2: 1900000, v3: 7000000 } },
+] as StackedBarsData[]
 
 export const HARDCODED_TVL_DATA = [
   { time: 1702500046, values: [1000000, 3000000] },
diff --git a/apps/web/src/pages/Explore/index.tsx b/apps/web/src/pages/Explore/index.tsx
index 5e47c51e483..5011fb58c1e 100644
--- a/apps/web/src/pages/Explore/index.tsx
+++ b/apps/web/src/pages/Explore/index.tsx
@@ -1,15 +1,15 @@
 import { Trans } from '@lingui/macro'
 import { BrowserEvent, InterfaceElementName, InterfacePageName, SharedEventName } from '@uniswap/analytics-events'
-import { Trace, TraceEvent } from 'analytics'
+import { TraceEvent } from 'analytics'
+import { Trace } from 'analytics'
 import { TopPoolTable } from 'components/Pools/PoolTable/PoolTable'
 import { AutoRow } from 'components/Row'
 import { MAX_WIDTH_MEDIA_BREAKPOINT, MEDIUM_MEDIA_BREAKPOINT } from 'components/Tokens/constants'
-import { exploreSearchStringAtom } from 'components/Tokens/state'
-import { TopTokensTable } from 'components/Tokens/TokenTable'
+import { filterStringAtom } from 'components/Tokens/state'
 import NetworkFilter from 'components/Tokens/TokenTable/NetworkFilter'
-import OldTokenTable from 'components/Tokens/TokenTable/OldTokenTable'
 import SearchBar from 'components/Tokens/TokenTable/SearchBar'
 import TimeSelector from 'components/Tokens/TokenTable/TimeSelector'
+import TokenTable from 'components/Tokens/TokenTable/TokenTable'
 import { MouseoverTooltip } from 'components/Tooltip'
 import { useInfoExplorePageEnabled } from 'featureFlags/flags/infoExplore'
 import { useResetAtom } from 'jotai/utils'
@@ -144,7 +144,7 @@ const Pages: Array<Page> = [
   {
     title: <Trans>Tokens</Trans>,
     key: ExploreTab.Tokens,
-    component: TopTokensTable,
+    component: TokenTable,
     loggingElementName: InterfaceElementName.EXPLORE_TOKENS_TAB,
   },
   {
@@ -162,7 +162,7 @@ const Pages: Array<Page> = [
 ]
 
 const Explore = ({ initialTab }: { initialTab?: ExploreTab }) => {
-  const resetFilterString = useResetAtom(exploreSearchStringAtom)
+  const resetFilterString = useResetAtom(filterStringAtom)
   const location = useLocation()
   const navigate = useNavigate()
 
@@ -175,7 +175,7 @@ const Explore = ({ initialTab }: { initialTab?: ExploreTab }) => {
   const isInfoExplorePageEnabled = useInfoExplorePageEnabled()
 
   // to allow backward navigation between tabs
-  const { tab, chainName } = useExploreParams()
+  const { tab } = useExploreParams()
   useEffect(() => {
     const tabIndex = Pages.findIndex((page) => page.key === tab)
     if (tabIndex !== -1) {
@@ -184,10 +184,8 @@ const Explore = ({ initialTab }: { initialTab?: ExploreTab }) => {
   }, [tab])
 
   useEffect(() => {
-    if (!isInfoExplorePageEnabled) {
-      resetFilterString()
-    }
-  }, [isInfoExplorePageEnabled, location, resetFilterString])
+    resetFilterString()
+  }, [location, resetFilterString])
 
   const { component: Page, key: currentKey } = Pages[currentTab]
 
@@ -217,7 +215,7 @@ const Explore = ({ initialTab }: { initialTab?: ExploreTab }) => {
               {Pages.map(({ title, loggingElementName, key }, index) => {
                 const handleNavItemClick = () => {
                   setCurrentTab(index)
-                  navigate(`/explore/${key}` + (chainName ? `/${chainName}` : ''))
+                  navigate(`/explore/${key}`)
                 }
                 return (
                   <TraceEvent
@@ -256,7 +254,7 @@ const Explore = ({ initialTab }: { initialTab?: ExploreTab }) => {
             </>
           )}
         </NavWrapper>
-        {isInfoExplorePageEnabled ? <Page /> : <OldTokenTable />}
+        {isInfoExplorePageEnabled ? <Page /> : <TokenTable />}
       </ExploreContainer>
     </Trace>
   )
diff --git a/apps/web/src/pages/Explore/tables/RecentTransactions.tsx b/apps/web/src/pages/Explore/tables/RecentTransactions.tsx
index b0ec5269da6..e30911f9c05 100644
--- a/apps/web/src/pages/Explore/tables/RecentTransactions.tsx
+++ b/apps/web/src/pages/Explore/tables/RecentTransactions.tsx
@@ -1,129 +1,79 @@
 import { Trans } from '@lingui/macro'
 import { createColumnHelper } from '@tanstack/react-table'
 import { ChainId } from '@uniswap/sdk-core'
-import Row from 'components/Row'
 import { Table } from 'components/Table'
 import { Cell } from 'components/Table/Cell'
-import { Filter } from 'components/Table/Filter'
-import {
-  ClickableHeaderRow,
-  FilterHeaderRow,
-  HeaderArrow,
-  StyledExternalLink,
-  TimestampCell,
-  TokenLinkCell,
-} from 'components/Table/styled'
+import { StyledExternalLink, StyledInternalLink } from 'components/Table/styled'
+import { getLocaleTimeString } from 'components/Table/utils'
+import { DEFAULT_LOCALE } from 'constants/locales'
 import { supportedChainIdFromGQLChain, validateUrlChainParam } from 'graphql/data/util'
 import { Transaction, TransactionType, useRecentTransactions } from 'graphql/thegraph/Transactions'
-import { OrderDirection, Transaction_OrderBy } from 'graphql/thegraph/__generated__/types-and-hooks'
 import { useActiveLocalCurrency } from 'hooks/useActiveLocalCurrency'
-import { useCallback, useMemo, useReducer, useState } from 'react'
+import { useActiveLocale } from 'hooks/useActiveLocale'
+import { useMemo } from 'react'
+import { ExternalLink as ExternalLinkIcon } from 'react-feather'
 import { useParams } from 'react-router-dom'
+import { useTheme } from 'styled-components'
 import { ThemedText } from 'theme/components'
 import { shortenAddress } from 'utils/addresses'
 import { useFormatter } from 'utils/formatNumbers'
 import { ExplorerDataType, getExplorerLink } from 'utils/getExplorerLink'
 
-type ExploreTxTableSortState = {
-  sortBy: Transaction_OrderBy
-  sortDirection: OrderDirection
-}
-
 export default function RecentTransactions() {
+  const theme = useTheme()
+  const locale = useActiveLocale()
   const activeLocalCurrency = useActiveLocalCurrency()
   const { formatNumber, formatFiatPrice } = useFormatter()
-  const [filterModalIsOpen, toggleFilterModal] = useReducer((s) => !s, false)
-  const [filter, setFilters] = useState<TransactionType[]>([
-    TransactionType.SWAP,
-    TransactionType.BURN,
-    TransactionType.MINT,
-  ])
+
   const chainName = validateUrlChainParam(useParams<{ chainName?: string }>().chainName)
   const chainId = supportedChainIdFromGQLChain(chainName)
+  const { transactions, loading, loadMore } = useRecentTransactions(chainId ?? ChainId.MAINNET)
 
-  const [sortState, setSortMethod] = useState<ExploreTxTableSortState>({
-    sortBy: Transaction_OrderBy.Timestamp,
-    sortDirection: OrderDirection.Desc,
-  })
-  const { transactions, loading, loadMore, error } = useRecentTransactions(
-    chainId ?? ChainId.MAINNET,
-    sortState.sortBy,
-    sortState.sortDirection,
-    filter
-  )
-
-  const handleHeaderClick = useCallback(
-    (newSortMethod: Transaction_OrderBy) => {
-      if (sortState.sortBy === newSortMethod) {
-        setSortMethod({
-          sortBy: newSortMethod,
-          sortDirection: sortState.sortDirection === OrderDirection.Asc ? OrderDirection.Desc : OrderDirection.Asc,
-        })
-      } else {
-        setSortMethod({
-          sortBy: newSortMethod,
-          sortDirection: OrderDirection.Desc,
-        })
-      }
-    },
-    [sortState.sortBy, sortState.sortDirection]
-  )
-  // TODO(WEB-3236): once GQL BE Transaction query is supported add usd, token0 amount, and token1 amount sort support
   const columns = useMemo(() => {
     const columnHelper = createColumnHelper<Transaction>()
     return [
-      columnHelper.accessor((transaction) => transaction, {
+      columnHelper.accessor((transaction) => transaction.timestamp, {
         id: 'timestamp',
         header: () => (
-          <Cell minWidth={164} justifyContent="flex-start" grow>
-            <ClickableHeaderRow $justify="flex-start" onClick={() => handleHeaderClick(Transaction_OrderBy.Timestamp)}>
-              {sortState.sortBy === Transaction_OrderBy.Timestamp && (
-                <HeaderArrow direction={sortState.sortDirection} />
-              )}
-              <ThemedText.BodySecondary>
-                <Trans>Time</Trans>
-              </ThemedText.BodySecondary>
-            </ClickableHeaderRow>
+          <Cell minWidth={185} justifyContent="flex-start" grow>
+            <ThemedText.BodySecondary>
+              <Trans>Time</Trans>
+            </ThemedText.BodySecondary>
           </Cell>
         ),
-        cell: (transaction) => (
-          <Cell loading={loading} minWidth={164} justifyContent="flex-start" grow>
-            <TimestampCell
-              timestamp={Number(transaction.getValue?.().timestamp)}
-              link={getExplorerLink(chainId, transaction.getValue?.().hash, ExplorerDataType.TRANSACTION)}
-            />
+        cell: (timestamp) => (
+          <Cell loading={loading} minWidth={185} justifyContent="flex-start" grow>
+            <ThemedText.BodySecondary>
+              {getLocaleTimeString(Number(timestamp.getValue?.()) * 1000, locale ?? DEFAULT_LOCALE)}
+            </ThemedText.BodySecondary>
           </Cell>
         ),
       }),
       columnHelper.accessor((transaction) => transaction, {
         id: 'swap-type',
         header: () => (
-          <Cell minWidth={300} justifyContent="flex-start" grow>
-            <FilterHeaderRow modalOpen={filterModalIsOpen} onClick={() => toggleFilterModal()}>
-              <Filter
-                allFilters={Object.values(TransactionType)}
-                activeFilter={filter}
-                setFilters={setFilters}
-                isOpen={filterModalIsOpen}
-                toggleFilterModal={toggleFilterModal}
-                isSticky={true}
-              />
-              <ThemedText.BodySecondary>
-                <Trans>Type</Trans>
-              </ThemedText.BodySecondary>
-            </FilterHeaderRow>
+          <Cell minWidth={185} justifyContent="flex-start" grow>
+            <ThemedText.BodySecondary>
+              <Trans>Type</Trans>
+            </ThemedText.BodySecondary>
           </Cell>
         ),
         cell: (transaction) => (
-          <Cell loading={loading} minWidth={300} justifyContent="flex-start" grow>
-            <Row gap="8px">
-              <ThemedText.BodySecondary>{transaction.getValue?.().type}</ThemedText.BodySecondary>
-              <TokenLinkCell chainId={chainId} tokenAddress={transaction.getValue?.().token0Address} />
-              <ThemedText.BodySecondary>
-                {transaction.getValue?.().type === TransactionType.SWAP ? <Trans>for</Trans> : <Trans>and</Trans>}
-              </ThemedText.BodySecondary>
-              <TokenLinkCell chainId={chainId} tokenAddress={transaction.getValue?.().token1Address} />
-            </Row>
+          <Cell loading={loading} minWidth={185} justifyContent="flex-start" grow>
+            <ThemedText.BodyPrimary>
+              {transaction.getValue?.().type}{' '}
+              <StyledInternalLink
+                to={`/explore/tokens/${chainName.toLowerCase()}/${transaction.getValue?.().token0Address}`}
+              >
+                {transaction.getValue?.().token0Symbol}
+              </StyledInternalLink>{' '}
+              {transaction.getValue?.().type === TransactionType.SWAP ? <Trans>for</Trans> : <Trans>and</Trans>}{' '}
+              <StyledInternalLink
+                to={`/explore/tokens/${chainName.toLowerCase()}/${transaction.getValue?.().token1Address}`}
+              >
+                {transaction.getValue?.().token1Symbol}
+              </StyledInternalLink>{' '}
+            </ThemedText.BodyPrimary>
           </Cell>
         ),
       }),
@@ -151,14 +101,16 @@ export default function RecentTransactions() {
         ),
         cell: (transaction) => (
           <Cell loading={loading} minWidth={200}>
-            <Row gap="8px" justify="flex-end">
-              <ThemedText.BodyPrimary>
-                {formatNumber({
-                  input: Math.abs(transaction.getValue?.().amountToken0) || 0,
-                })}
-              </ThemedText.BodyPrimary>
-              <TokenLinkCell chainId={chainId} tokenAddress={transaction.getValue?.().token0Address} />
-            </Row>
+            <ThemedText.BodyPrimary>
+              {formatNumber({
+                input: Math.abs(transaction.getValue?.().amountToken0) || 0,
+              })}{' '}
+              <StyledInternalLink
+                to={`/explore/tokens/${chainName.toLowerCase()}/${transaction.getValue?.().token0Address}`}
+              >
+                {transaction.getValue?.().token0Symbol}
+              </StyledInternalLink>
+            </ThemedText.BodyPrimary>
           </Cell>
         ),
       }),
@@ -173,14 +125,16 @@ export default function RecentTransactions() {
         ),
         cell: (transaction) => (
           <Cell loading={loading} minWidth={200}>
-            <Row gap="8px" justify="flex-end">
-              <ThemedText.BodyPrimary>
-                {formatNumber({
-                  input: Math.abs(transaction.getValue?.().amountToken1) || 0,
-                })}
-              </ThemedText.BodyPrimary>
-              <TokenLinkCell chainId={chainId} tokenAddress={transaction.getValue?.().token1Address} />
-            </Row>
+            <ThemedText.BodyPrimary>
+              {formatNumber({
+                input: Math.abs(transaction.getValue?.().amountToken1) || 0,
+              })}{' '}
+              <StyledInternalLink
+                to={`/explore/tokens/${chainName.toLowerCase()}/${transaction.getValue?.().token1Address}`}
+              >
+                {transaction.getValue?.().token1Symbol}
+              </StyledInternalLink>
+            </ThemedText.BodyPrimary>
           </Cell>
         ),
       }),
@@ -189,7 +143,7 @@ export default function RecentTransactions() {
         header: () => (
           <Cell minWidth={125}>
             <ThemedText.BodySecondary>
-              <Trans>Wallet</Trans>
+              <Trans>Maker</Trans>
             </ThemedText.BodySecondary>
           </Cell>
         ),
@@ -201,27 +155,28 @@ export default function RecentTransactions() {
           </Cell>
         ),
       }),
+      columnHelper.accessor(
+        (transaction) => getExplorerLink(chainId ?? ChainId.MAINNET, transaction.hash, ExplorerDataType.TRANSACTION),
+        {
+          id: 'explorer-link',
+          header: () => (
+            <Cell minWidth={60}>
+              <ThemedText.BodySecondary>
+                <Trans>Tx</Trans>
+              </ThemedText.BodySecondary>
+            </Cell>
+          ),
+          cell: (explorerLink) => (
+            <Cell loading={loading} minWidth={60}>
+              <StyledExternalLink href={explorerLink.getValue?.()}>
+                <ExternalLinkIcon size="16px" stroke={theme.neutral2} />
+              </StyledExternalLink>
+            </Cell>
+          ),
+        }
+      ),
     ]
-  }, [
-    activeLocalCurrency,
-    chainId,
-    filter,
-    filterModalIsOpen,
-    formatFiatPrice,
-    formatNumber,
-    handleHeaderClick,
-    loading,
-    sortState.sortBy,
-    sortState.sortDirection,
-  ])
-
-  if (error) {
-    return (
-      <ThemedText.BodyPrimary>
-        <Trans>Error loading transactions</Trans>
-      </ThemedText.BodyPrimary>
-    )
-  }
+  }, [activeLocalCurrency, chainId, chainName, formatFiatPrice, formatNumber, loading, locale, theme.neutral2])
 
   return <Table columns={columns} data={transactions} loading={loading} loadMore={loadMore} />
 }
diff --git a/apps/web/src/pages/Landing/LandingV2.tsx b/apps/web/src/pages/Landing/LandingV2.tsx
index 3532ad31611..581dda9a5fd 100644
--- a/apps/web/src/pages/Landing/LandingV2.tsx
+++ b/apps/web/src/pages/Landing/LandingV2.tsx
@@ -1,4 +1,4 @@
-import { memo, useRef } from 'react'
+import { memo } from 'react'
 import styled from 'styled-components'
 
 import { DirectToDefi } from './sections/DirectToDefi'
@@ -12,52 +12,19 @@ const Container = styled.div`
   display: flex;
   flex-direction: column;
   align-items: center;
-  gap: 120px;
-  @media (max-width: 1024px) {
-    gap: 80px;
-  }
-  margin-top: -72px;
-  min-width: 100%;
-  max-width: 1280px;
-  z-index: 1;
+  gap: 80px;
+  margin-top: -100px;
 `
 
-const Grain = styled.div`
-  display: flex;
-  position: absolute;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background: url(/images/noise-color.png);
-  opacity: 0.018;
-  z-index: 0;
-`
-
-function LandingV2({ transition }: { transition?: boolean }) {
-  const scrollAnchor = useRef<HTMLDivElement | null>(null)
-  const scrollToRef = () => {
-    if (scrollAnchor.current) {
-      window.scrollTo({
-        top: scrollAnchor.current.offsetTop - 120,
-        behavior: 'smooth',
-      })
-    }
-  }
-
+function LandingV2() {
   return (
-    <>
-      <Grain />
-      <Container>
-        <Hero scrollToRef={scrollToRef} transition={transition} />
-        <div ref={scrollAnchor}>
-          <DirectToDefi />
-        </div>
-        <Stats />
-        <NewsletterEtc />
-        <Footer />
-      </Container>
-    </>
+    <Container>
+      <Hero />
+      <DirectToDefi />
+      <Stats />
+      <NewsletterEtc />
+      <Footer />
+    </Container>
   )
 }
 
diff --git a/apps/web/src/pages/Landing/__snapshots__/index.test.tsx.snap b/apps/web/src/pages/Landing/__snapshots__/index.test.tsx.snap
index b4ea0d90451..f58bcabbc47 100644
--- a/apps/web/src/pages/Landing/__snapshots__/index.test.tsx.snap
+++ b/apps/web/src/pages/Landing/__snapshots__/index.test.tsx.snap
@@ -7,7 +7,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   min-width: 0;
 }
 
-.c28 {
+.c16 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -30,7 +30,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   border-radius: 4px;
 }
 
-.c47 {
+.c48 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -84,12 +84,8 @@ exports[`disable nft on landing page does not render nft information and card 1`
   width: fit-content;
 }
 
-.c24 {
+.c27 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c13 {
@@ -117,7 +113,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   text-decoration: underline;
 }
 
-.c98 {
+.c99 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -128,15 +124,15 @@ exports[`disable nft on landing page does not render nft information and card 1`
   font-weight: 500;
 }
 
-.c98:hover {
+.c99:hover {
   opacity: 0.6;
 }
 
-.c98:active {
+.c99:active {
   opacity: 0.4;
 }
 
-.c96 {
+.c97 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -147,36 +143,36 @@ exports[`disable nft on landing page does not render nft information and card 1`
   font-weight: 500;
 }
 
-.c96:hover {
+.c97:hover {
   opacity: 0.6;
 }
 
-.c96:active {
+.c97:active {
   opacity: 0.4;
 }
 
-.c89 {
+.c90 {
   height: 32px;
   width: 32px;
   fill: #98A1C0;
   opacity: 1;
 }
 
-.c90 {
+.c91 {
   height: 32px;
   width: 32px;
   fill: #98A1C0;
   opacity: 1;
 }
 
-.c91 {
+.c92 {
   height: 32px;
   width: 32px;
   fill: #98A1C0;
   opacity: 1;
 }
 
-.c83 {
+.c84 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -189,7 +185,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   max-width: 1440px;
 }
 
-.c84 {
+.c85 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -199,24 +195,24 @@ exports[`disable nft on landing page does not render nft information and card 1`
   flex-direction: column;
 }
 
-.c85 {
+.c86 {
   display: none;
 }
 
-.c100 {
+.c101 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
 }
 
-.c86 {
+.c87 {
   width: 72px;
   height: 72px;
   display: none;
 }
 
-.c87 {
+.c88 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -229,20 +225,20 @@ exports[`disable nft on landing page does not render nft information and card 1`
   margin: 20px 0 0 0;
 }
 
-.c88 {
+.c89 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
 }
 
-.c93 {
+.c94 {
   display: grid;
   grid-template-columns: 1fr 1fr;
   gap: 12px;
 }
 
-.c94 {
+.c95 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -255,32 +251,32 @@ exports[`disable nft on landing page does not render nft information and card 1`
   margin: 20px 0 0 0;
 }
 
-.c95 {
+.c96 {
   font-size: 16px;
   line-height: 20px;
   font-weight: 535;
 }
 
-.c99 {
+.c100 {
   font-size: 16px;
   line-height: 20px;
   color: #7D7D7D;
 }
 
-.c97 {
+.c98 {
   font-size: 16px;
   line-height: 20px;
   color: #7D7D7D;
 }
 
-.c92 {
+.c93 {
   font-size: 16px;
   line-height: 20px;
   margin: 1rem 0 0 0;
   color: #CECECE;
 }
 
-.c66 {
+.c67 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -308,11 +304,11 @@ exports[`disable nft on landing page does not render nft information and card 1`
   transition: 250ms ease border;
 }
 
-.c66:hover {
+.c67:hover {
   border: 1px solid #CECECE;
 }
 
-.c72 {
+.c73 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -340,11 +336,11 @@ exports[`disable nft on landing page does not render nft information and card 1`
   transition: 250ms ease border;
 }
 
-.c72:hover {
+.c73:hover {
   border: 1px solid #CECECE;
 }
 
-.c67 {
+.c68 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -359,13 +355,13 @@ exports[`disable nft on landing page does not render nft information and card 1`
   justify-content: space-between;
 }
 
-.c68 {
+.c69 {
   font-size: 20px;
   line-height: 28px;
   font-weight: 535;
 }
 
-.c69 {
+.c70 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -380,7 +376,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   max-width: 480px;
 }
 
-.c73 {
+.c74 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -395,7 +391,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   max-width: 480px;
 }
 
-.c70 {
+.c71 {
   color: #FC72FF;
   font-weight: 535;
   margin: 24px 0 0;
@@ -404,18 +400,18 @@ exports[`disable nft on landing page does not render nft information and card 1`
   transition: 250ms ease opacity;
 }
 
-.c70:hover {
+.c71:hover {
   opacity: 0.6;
 }
 
-.c74 {
+.c75 {
   min-width: 20px;
   min-height: 20px;
   max-height: 48px;
   max-width: 48px;
 }
 
-.c50 {
+.c51 {
   background-color: transparent;
   bottom: 0;
   border-radius: inherit;
@@ -429,7 +425,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   width: 100%;
 }
 
-.c29 {
+.c17 {
   padding: 16px;
   width: 100%;
   line-height: 24px;
@@ -468,25 +464,25 @@ exports[`disable nft on landing page does not render nft information and card 1`
   transform: perspective(1px) translateZ(0);
 }
 
-.c29:disabled {
+.c17:disabled {
   opacity: 50%;
   cursor: auto;
   pointer-events: none;
 }
 
-.c29 > * {
+.c17 > * {
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
 }
 
-.c29 > a {
+.c17 > a {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c80 {
+.c81 {
   padding: 16px;
   width: 200px;
   line-height: 24px;
@@ -525,58 +521,58 @@ exports[`disable nft on landing page does not render nft information and card 1`
   transform: perspective(1px) translateZ(0);
 }
 
-.c80:disabled {
+.c81:disabled {
   opacity: 50%;
   cursor: auto;
   pointer-events: none;
 }
 
-.c80 > * {
+.c81 > * {
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
 }
 
-.c80 > a {
+.c81 > a {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c48 {
+.c49 {
   background-color: #FFEFFF;
   color: #FC72FF;
   font-size: 20px;
   font-weight: 535;
 }
 
-.c48:focus {
+.c49:focus {
   box-shadow: 0 0 0 1pt #FFEFFF;
   background-color: #FFEFFF;
 }
 
-.c48:hover {
+.c49:hover {
   background-color: #FFEFFF;
 }
 
-.c48:active {
+.c49:active {
   box-shadow: 0 0 0 1pt #FFEFFF;
   background-color: #FFEFFF;
 }
 
-.c48:hover .c49 {
+.c49:hover .c50 {
   background-color: #98A1C014;
 }
 
-.c48:active .c49 {
+.c49:active .c50 {
   background-color: #B8C0DC3d;
 }
 
-.c48:disabled {
+.c49:disabled {
   opacity: 0.4;
 }
 
-.c48:disabled:hover {
+.c49:disabled:hover {
   cursor: auto;
   background-color: transparent;
   box-shadow: none;
@@ -584,7 +580,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   outline: none;
 }
 
-.c30 {
+.c31 {
   background-color: #FFFFFF;
   color: #7D7D7D;
   border: 1px solid #22222212;
@@ -592,15 +588,15 @@ exports[`disable nft on landing page does not render nft information and card 1`
   font-weight: 535;
 }
 
-.c30:hover {
+.c31:hover {
   background-color: #ececec;
 }
 
-.c30:active {
+.c31:active {
   background-color: #e0e0e0;
 }
 
-.c81 {
+.c82 {
   background-color: transparent;
   color: #FC72FF;
   display: -webkit-box;
@@ -617,27 +613,56 @@ exports[`disable nft on landing page does not render nft information and card 1`
   align-items: center;
 }
 
-.c81:focus {
+.c82:focus {
   -webkit-text-decoration: underline;
   text-decoration: underline;
 }
 
-.c81:hover {
+.c82:hover {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c81:active {
+.c82:active {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c81:disabled {
+.c82:disabled {
   opacity: 50%;
   cursor: auto;
 }
 
-.c75 {
+.c18 {
+  padding: 0;
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+  background: none;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c18:focus {
+  -webkit-text-decoration: underline;
+  text-decoration: underline;
+}
+
+.c18:hover {
+  opacity: 0.9;
+}
+
+.c18:active {
+  -webkit-text-decoration: underline;
+  text-decoration: underline;
+}
+
+.c18:disabled {
+  opacity: 50%;
+  cursor: auto;
+}
+
+.c76 {
   height: 340px;
   width: 100%;
   border-radius: 32px;
@@ -663,7 +688,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   background: url(Mesh.png),linear-gradient(93.06deg,#FF00C7 2.66%,#FF9FFB 98.99%);
 }
 
-.c76 {
+.c77 {
   color: white;
   display: -webkit-box;
   display: -webkit-flex;
@@ -677,20 +702,20 @@ exports[`disable nft on landing page does not render nft information and card 1`
   flex-direction: column;
 }
 
-.c77 {
+.c78 {
   font-weight: 535;
   font-size: 28px;
   line-height: 36px;
 }
 
-.c78 {
+.c79 {
   margin: 10px 10px 0 0;
   font-weight: 535;
   font-size: 16px;
   line-height: 20px;
 }
 
-.c79 {
+.c80 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -704,16 +729,16 @@ exports[`disable nft on landing page does not render nft information and card 1`
   transition: 250ms ease opacity;
 }
 
-.c79:hover {
+.c80:hover {
   opacity: 0.6;
 }
 
-.c82 {
+.c83 {
   color: white;
   border: 1px solid white;
 }
 
-.c43 {
+.c44 {
   display: grid;
   grid-auto-rows: auto;
   grid-row-gap: 4px;
@@ -728,19 +753,43 @@ exports[`disable nft on landing page does not render nft information and card 1`
 .c4 {
   position: relative;
   z-index: 1;
+  border: 1px solid #22222212;
   -webkit-transition: -webkit-transform 250ms ease;
   -webkit-transition: transform 250ms ease;
   transition: transform 250ms ease;
   border-radius: 24px;
 }
 
+.c4:before {
+  content: ' ';
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  position: absolute;
+  inset: 0;
+  -webkit-transform: scale(1.1);
+  -ms-transform: scale(1.1);
+  transform: scale(1.1);
+  -webkit-filter: blur(50px);
+  filter: blur(50px);
+  background-color: rgba(252,114,255,0.075);
+  z-index: -2;
+}
+
+.c4:hover {
+  border: 1px solid #22222212;
+}
+
 .c6 {
   border-radius: 24px;
+  background: #FFFFFF;
   z-index: -1;
+  padding: 8px;
   padding-top: 12px;
 }
 
-.c41 {
+.c42 {
   border-radius: 12px;
   height: 40px;
   width: 40px;
@@ -755,12 +804,12 @@ exports[`disable nft on landing page does not render nft information and card 1`
   z-index: 2;
 }
 
-.c41:hover {
+.c42:hover {
   cursor: pointer;
   opacity: 0.8;
 }
 
-.c21 {
+.c24 {
   background-color: #F9F9F9;
   border-radius: 16px;
   color: #7D7D7D;
@@ -772,7 +821,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   position: relative;
 }
 
-.c21:before {
+.c24:before {
   box-sizing: border-box;
   background-size: 100%;
   border-radius: inherit;
@@ -786,19 +835,19 @@ exports[`disable nft on landing page does not render nft information and card 1`
   border: 1px solid #F9F9F9;
 }
 
-.c21:hover:before {
+.c24:hover:before {
   border-color: #98A1C014;
 }
 
-.c21:focus-within:before {
+.c24:focus-within:before {
   border-color: #B8C0DC3d;
 }
 
-.c44 {
+.c45 {
   border-bottom: 1px solid #FFFFFF;
 }
 
-.c42 {
+.c43 {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
   display: -ms-inline-flexbox;
@@ -815,64 +864,39 @@ exports[`disable nft on landing page does not render nft information and card 1`
   height: 100%;
 }
 
-.c14 {
-  color: #222222;
-  background-color: #F9F9F9;
-  padding: 8px 16px;
-  border-radius: 20px;
-  gap: 4px;
-  font-weight: 485;
-}
-
-.c14:focus {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c14:active {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c16 {
-  color: #7D7D7D;
-  padding: 8px 16px;
-  border-radius: 20px;
-  gap: 4px;
-  font-weight: 485;
-}
-
-.c16:focus {
-  -webkit-text-decoration: none;
-  text-decoration: none;
+.c41 {
+  -webkit-filter: none;
+  filter: none;
+  opacity: 1;
+  -webkit-transition: opacity 250ms ease-in-out;
+  transition: opacity 250ms ease-in-out;
 }
 
-.c16:active {
-  -webkit-text-decoration: none;
-  text-decoration: none;
+.c15 {
+  display: inline-block;
+  height: inherit;
 }
 
-.c34 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+.c36 {
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
 }
 
 .c35 {
   width: 24px;
   height: 24px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
-.c33 {
+.c34 {
   position: relative;
   display: -webkit-box;
   display: -webkit-flex;
@@ -880,29 +904,16 @@ exports[`disable nft on landing page does not render nft information and card 1`
   display: flex;
 }
 
-.c15 {
-  display: inline-block;
-  height: inherit;
-}
-
-.c40 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-}
-
-.c20 {
+.c23 {
   height: 24px;
   width: 24px;
 }
 
-.c20 > * {
+.c23 > * {
   fill: #7D7D7D;
 }
 
-.c18 {
+.c21 {
   border: none;
   background-color: transparent;
   margin: 0;
@@ -911,30 +922,72 @@ exports[`disable nft on landing page does not render nft information and card 1`
   outline: none;
 }
 
-.c18:not([disabled]):hover {
+.c21:not([disabled]):hover {
   opacity: 0.7;
 }
 
-.c19 {
+.c22 {
   padding: 6px 12px;
   border-radius: 16px;
 }
 
-.c17 {
+.c20 {
   position: relative;
 }
 
+.c19 {
+  color: #7D7D7D;
+  gap: 4px;
+  font-weight: 485;
+  -webkit-transition-duration: 125ms;
+  transition-duration: 125ms;
+  -webkit-transition-timing-function: ease-in-out;
+  transition-timing-function: ease-in-out;
+  -webkit-transition-property: opacity,color,background-color;
+  transition-property: opacity,color,background-color;
+}
+
+.c19:focus {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c19:active {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c19:hover {
+  opacity: 0.6;
+}
+
 .c10 {
-  margin-bottom: 4px;
+  margin-bottom: 10px;
   color: #7D7D7D;
 }
 
 .c12 {
+  padding: 0 12px;
   gap: 16px;
-  padding-bottom: 8px;
 }
 
-.c26 {
+.c14 {
+  color: #222222;
+  gap: 4px;
+  font-weight: 485;
+}
+
+.c14:focus {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c14:active {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c29 {
   color: #222222;
   pointer-events: auto;
   width: 0;
@@ -955,48 +1008,36 @@ exports[`disable nft on landing page does not render nft information and card 1`
   text-align: right;
 }
 
-.c26::-webkit-search-decoration {
+.c29::-webkit-search-decoration {
   -webkit-appearance: none;
 }
 
-.c26 [type='number'] {
+.c29 [type='number'] {
   -moz-appearance: textfield;
 }
 
-.c26::-webkit-outer-spin-button,
-.c26::-webkit-inner-spin-button {
+.c29::-webkit-outer-spin-button,
+.c29::-webkit-inner-spin-button {
   -webkit-appearance: none;
 }
 
-.c26::-webkit-input-placeholder {
+.c29::-webkit-input-placeholder {
   color: #CECECE;
 }
 
-.c26::-moz-placeholder {
+.c29::-moz-placeholder {
   color: #CECECE;
 }
 
-.c26:-ms-input-placeholder {
+.c29:-ms-input-placeholder {
   color: #CECECE;
 }
 
-.c26::placeholder {
+.c29::placeholder {
   color: #CECECE;
 }
 
-.c27 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-  text-align: left;
-  font-size: 36px;
-  font-weight: 485;
-  max-height: 44px;
-}
-
-.c22 {
+.c25 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1013,13 +1054,13 @@ exports[`disable nft on landing page does not render nft information and card 1`
   will-change: height;
 }
 
-.c23 {
+.c26 {
   min-height: 44px;
   border-radius: 20px;
   width: initial;
 }
 
-.c31 {
+.c32 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -1052,12 +1093,12 @@ exports[`disable nft on landing page does not render nft information and card 1`
   animation: none;
 }
 
-.c31:hover,
-.c31:active {
+.c32:hover,
+.c32:active {
   background-color: #F9F9F9;
 }
 
-.c31:before {
+.c32:before {
   background-size: 100%;
   border-radius: inherit;
   position: absolute;
@@ -1068,15 +1109,15 @@ exports[`disable nft on landing page does not render nft information and card 1`
   content: '';
 }
 
-.c31:hover:before {
+.c32:hover:before {
   background-color: #98A1C014;
 }
 
-.c31:active:before {
+.c32:active:before {
   background-color: #B8C0DC3d;
 }
 
-.c45 {
+.c46 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -1109,12 +1150,12 @@ exports[`disable nft on landing page does not render nft information and card 1`
   animation: none;
 }
 
-.c45:hover,
-.c45:active {
+.c46:hover,
+.c46:active {
   background-color: #FC72FF;
 }
 
-.c45:before {
+.c46:before {
   background-size: 100%;
   border-radius: inherit;
   position: absolute;
@@ -1125,15 +1166,15 @@ exports[`disable nft on landing page does not render nft information and card 1`
   content: '';
 }
 
-.c45:hover:before {
+.c46:hover:before {
   background-color: #98A1C014;
 }
 
-.c45:active:before {
+.c46:active:before {
   background-color: #B8C0DC3d;
 }
 
-.c25 {
+.c28 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1151,7 +1192,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   justify-content: space-between;
 }
 
-.c38 {
+.c39 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1168,12 +1209,12 @@ exports[`disable nft on landing page does not render nft information and card 1`
   line-height: 1rem;
 }
 
-.c38 span:hover {
+.c39 span:hover {
   cursor: pointer;
   color: #4a4a4a;
 }
 
-.c39 {
+.c40 {
   -webkit-box-pack: end;
   -webkit-justify-content: flex-end;
   -ms-flex-pack: end;
@@ -1182,7 +1223,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   padding: 8px 0px 0px 0px;
 }
 
-.c32 {
+.c33 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1198,34 +1239,46 @@ exports[`disable nft on landing page does not render nft information and card 1`
   width: 100%;
 }
 
-.c37 {
+.c38 {
   margin: 0 0.25rem 0 0.35rem;
   height: 35%;
   margin-left: 8px;
 }
 
-.c37 path {
+.c38 path {
   stroke: #222222;
   stroke-width: 2px;
 }
 
-.c46 {
+.c47 {
   margin: 0 0.25rem 0 0.35rem;
   height: 35%;
   margin-left: 8px;
 }
 
-.c46 path {
+.c47 path {
   stroke: #FFFFFF;
   stroke-width: 2px;
 }
 
-.c36 {
+.c37 {
   margin: 0 0.25rem 0 0.25rem;
   font-size: 20px;
   font-weight: 535;
 }
 
+.c30 {
+  -webkit-filter: none;
+  filter: none;
+  opacity: 1;
+  -webkit-transition: opacity 250ms ease-in-out;
+  transition: opacity 250ms ease-in-out;
+  text-align: left;
+  font-size: 36px;
+  font-weight: 485;
+  max-height: 44px;
+}
+
 .c0 {
   padding: 72px 0px 0px 0px;
   width: 100%;
@@ -1243,7 +1296,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   overflow-x: hidden;
 }
 
-.c51 {
+.c52 {
   position: absolute;
   display: -webkit-box;
   display: -webkit-flex;
@@ -1267,7 +1320,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   height: calc(100vh - 48px);
 }
 
-.c52 {
+.c53 {
   position: absolute;
   display: -webkit-box;
   display: -webkit-flex;
@@ -1288,7 +1341,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   height: calc(100vh - 48px);
 }
 
-.c53 {
+.c54 {
   position: absolute;
   top: 68px;
   bottom: 0;
@@ -1301,7 +1354,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   height: 100%;
 }
 
-.c54 {
+.c55 {
   position: absolute;
   display: -webkit-box;
   display: -webkit-flex;
@@ -1329,11 +1382,11 @@ exports[`disable nft on landing page does not render nft information and card 1`
   pointer-events: none;
 }
 
-.c54 * {
+.c55 * {
   pointer-events: auto;
 }
 
-.c63 {
+.c64 {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
   display: -ms-inline-flexbox;
@@ -1353,11 +1406,11 @@ exports[`disable nft on landing page does not render nft information and card 1`
   align-items: center;
 }
 
-.c63:hover {
+.c64:hover {
   color: #CECECE;
 }
 
-.c55 {
+.c56 {
   color: transparent;
   font-size: 36px;
   line-height: 44px;
@@ -1369,7 +1422,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   -webkit-background-clip: text;
 }
 
-.c57 {
+.c58 {
   color: #7D7D7D;
   font-size: 16px;
   line-height: 24px;
@@ -1379,7 +1432,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   margin: 0 0 32px;
 }
 
-.c56 {
+.c57 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1390,12 +1443,12 @@ exports[`disable nft on landing page does not render nft information and card 1`
   justify-content: center;
 }
 
-.c59 {
+.c60 {
   padding: 16px 0px;
   border-radius: 24px;
 }
 
-.c60 {
+.c61 {
   background: linear-gradient(93.06deg,#ff00c7 2.66%,#ff9ffb 98.99%);
   border: none;
   color: #FFFFFF;
@@ -1403,24 +1456,24 @@ exports[`disable nft on landing page does not render nft information and card 1`
   transition: all 250ms ease;
 }
 
-.c60:hover {
+.c61:hover {
   box-shadow: 0px 0px 16px 0px #ff00c7;
 }
 
-.c61 {
+.c62 {
   margin: 0px;
   font-size: 16px;
   font-weight: 535;
   white-space: nowrap;
 }
 
-.c58 {
+.c59 {
   max-width: 300px;
   width: 100%;
   pointer-events: auto;
 }
 
-.c62 {
+.c63 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -1440,11 +1493,11 @@ exports[`disable nft on landing page does not render nft information and card 1`
   transition: 250ms ease opacity;
 }
 
-.c62:hover {
+.c63:hover {
   opacity: 0.6;
 }
 
-.c64 {
+.c65 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1461,7 +1514,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   background: linear-gradient(179.82deg,rgba(255,255,255,0) 0.16%,#eaeaea 99.85%);
 }
 
-.c65 {
+.c66 {
   display: grid;
   gap: 12px;
   width: 100%;
@@ -1474,7 +1527,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
   grid-template-columns: 1fr;
 }
 
-.c71 {
+.c72 {
   display: grid;
   gap: 12px;
   width: 100%;
@@ -1517,6 +1570,10 @@ exports[`disable nft on landing page does not render nft information and card 1`
   transition: transform 250ms ease;
 }
 
+.c5:hover {
+  border: 1px solid #FC72FF;
+}
+
 .c2 {
   -webkit-text-decoration: none;
   text-decoration: none;
@@ -1525,7 +1582,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
 }
 
 @media screen and (min-width:1024px) {
-  .c83 {
+  .c84 {
     -webkit-flex-direction: row;
     -ms-flex-direction: row;
     flex-direction: row;
@@ -1537,7 +1594,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
 }
 
 @media screen and (min-width:1024px) {
-  .c85 {
+  .c86 {
     display: -webkit-box;
     display: -webkit-flex;
     display: -ms-flexbox;
@@ -1546,63 +1603,63 @@ exports[`disable nft on landing page does not render nft information and card 1`
 }
 
 @media screen and (min-width:1024px) {
-  .c100 {
+  .c101 {
     display: none;
   }
 }
 
 @media screen and (min-width:1024px) {
-  .c86 {
+  .c87 {
     display: block;
   }
 }
 
 @media screen and (min-width:1280px) {
-  .c93 {
+  .c94 {
     grid-template-columns: 1fr 1fr 1fr 1fr;
     gap: 24px;
   }
 }
 
 @media screen and (min-width:1280px) {
-  .c94 {
+  .c95 {
     margin: 0;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c66 {
+  .c67 {
     height: 360px;
   }
 }
 
 @media screen and (min-width:1280px) {
-  .c66 {
+  .c67 {
     padding: 32px;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c72 {
+  .c73 {
     height: 260px;
   }
 }
 
 @media screen and (min-width:1280px) {
-  .c72 {
+  .c73 {
     padding: 32px;
   }
 }
 
 @media screen and (min-width:1024px) {
-  .c68 {
+  .c69 {
     font-size: 28px;
     line-height: 36px;
   }
 }
 
 @media screen and (min-width:1280px) {
-  .c69 {
+  .c70 {
     font-size: 20px;
     line-height: 28px;
     max-width: 480px;
@@ -1610,7 +1667,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
 }
 
 @media screen and (min-width:1280px) {
-  .c73 {
+  .c74 {
     font-size: 20px;
     line-height: 28px;
     max-width: 480px;
@@ -1618,7 +1675,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
 }
 
 @media screen and (min-width:1024px) {
-  .c75 {
+  .c76 {
     height: 140px;
     -webkit-flex-direction: row;
     -ms-flex-direction: row;
@@ -1627,21 +1684,21 @@ exports[`disable nft on landing page does not render nft information and card 1`
 }
 
 @media screen and (min-width:1280px) {
-  .c77 {
+  .c78 {
     font-size: 28px;
     line-height: 36px;
   }
 }
 
 @media screen and (min-width:1280px) {
-  .c78 {
+  .c79 {
     font-size: 20px;
     line-height: 28px;
   }
 }
 
 @media screen and (min-width:1024px) {
-  .c79 {
+  .c80 {
     width: auto;
   }
 }
@@ -1659,79 +1716,79 @@ exports[`disable nft on landing page does not render nft information and card 1`
 }
 
 @media screen and (min-width:768px) {
-  .c51 {
+  .c52 {
     height: 100vh;
   }
 }
 
 @media screen and (min-width:768px) {
-  .c52 {
+  .c53 {
     height: 100vh;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c55 {
+  .c56 {
     font-size: 48px;
     line-height: 56px;
   }
 }
 
 @media screen and (min-width:768px) {
-  .c55 {
+  .c56 {
     font-size: 64px;
     line-height: 72px;
   }
 }
 
 @media screen and (min-width:768px) {
-  .c57 {
+  .c58 {
     font-size: 20px;
     line-height: 28px;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c61 {
+  .c62 {
     font-size: 20px;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c62 {
+  .c63 {
     visibility: visible;
   }
 }
 
 @media screen and (min-width:768px) {
-  .c64 {
+  .c65 {
     padding: 0 96px 5rem;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c65 {
+  .c66 {
     grid-template-columns: 1fr;
     gap: 32px;
   }
 }
 
 @media screen and (min-width:1024px) {
-  .c65 {
+  .c66 {
     grid-template-columns: 1fr;
     gap: 32px;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c71 {
+  .c72 {
     grid-template-columns: 1fr;
     gap: 32px;
   }
 }
 
 @media screen and (min-width:1024px) {
-  .c71 {
+  .c72 {
     grid-template-columns: 1fr 1fr 1fr;
     gap: 32px;
   }
@@ -1777,7 +1834,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
                   >
                     <div>
                       <button
-                        class="c13 c16"
+                        class="c16 c17 c18 c19"
                         data-testid="buy-fiat-button"
                       >
                         Buy
@@ -1789,19 +1846,19 @@ exports[`disable nft on landing page does not render nft information and card 1`
                   class="c7 c8 c11"
                 >
                   <div
-                    class="c17"
+                    class="c20"
                   >
                     <button
                       aria-label="Transaction Settings"
-                      class="c18"
+                      class="c21"
                       data-testid="open-settings-dialog-button"
                       id="open-settings-dialog-button"
                     >
                       <div
-                        class="c7 c8 c19"
+                        class="c7 c8 c22"
                       >
                         <svg
-                          class="c20"
+                          class="c23"
                           fill="none"
                           height="24"
                           viewBox="0 0 24 24"
@@ -1822,23 +1879,23 @@ exports[`disable nft on landing page does not render nft information and card 1`
                 style="display: relative;"
               >
                 <div
-                  class="c21"
+                  class="c24"
                 >
                   <div
-                    class="c22"
+                    class="c25"
                     id="swap-currency-input"
                   >
                     <div
-                      class="c23"
+                      class="c26"
                     >
                       <div
-                        class="c24 css-142zc9n"
+                        class="c27 css-142zc9n"
                         style="user-select: none;"
                       >
                         You pay
                       </div>
                       <div
-                        class="c25"
+                        class="c28"
                       >
                         <div
                           style="display: flex; flex-grow: 1;"
@@ -1846,7 +1903,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
                           <input
                             autocomplete="off"
                             autocorrect="off"
-                            class="c26 c27 token-amount-input"
+                            class="c29 c30 token-amount-input"
                             id="swap-currency-input"
                             inputmode="decimal"
                             maxlength="79"
@@ -1863,35 +1920,37 @@ exports[`disable nft on landing page does not render nft information and card 1`
                             class="c15"
                           >
                             <button
-                              class="c28 c29 c30 c31 open-currency-select-button"
+                              class="c16 c17 c31 c32 open-currency-select-button"
                             >
                               <span
-                                class="c32"
+                                class="c33"
                               >
                                 <div
                                   class="c7 c8 c11"
                                 >
                                   <div
-                                    class="c33"
+                                    class="c34"
                                     style="height: 24px; width: 24px; margin-right: 2px;"
                                   >
                                     <div
-                                      class="c34"
+                                      class="c35"
                                     >
                                       <img
-                                        class="c35"
+                                        alt="ETH logo"
+                                        class="c36"
+                                        loading="lazy"
                                         src="ethereum-logo.png"
                                       />
                                     </div>
                                   </div>
                                   <span
-                                    class="c36 token-symbol-container"
+                                    class="c37 token-symbol-container"
                                   >
                                     ETH
                                   </span>
                                 </div>
                                 <svg
-                                  class="c37"
+                                  class="c38"
                                 >
                                   dropdown.svg
                                 </svg>
@@ -1901,13 +1960,13 @@ exports[`disable nft on landing page does not render nft information and card 1`
                         </div>
                       </div>
                       <div
-                        class="c38 c39"
+                        class="c39 c40"
                       >
                         <div
                           class="c7 c8 c9"
                         >
                           <div
-                            class="c40"
+                            class="c41"
                           />
                           <span />
                         </div>
@@ -1916,10 +1975,10 @@ exports[`disable nft on landing page does not render nft information and card 1`
                   </div>
                 </div>
                 <div
-                  class="c41"
+                  class="c42"
                 >
                   <div
-                    class="c42"
+                    class="c43"
                     color="#222222"
                     data-testid="swap-currency-button"
                   >
@@ -1948,27 +2007,27 @@ exports[`disable nft on landing page does not render nft information and card 1`
                 </div>
               </div>
               <div
-                class="c43"
+                class="c44"
               >
                 <div>
                   <div
-                    class="c21 c44"
+                    class="c24 c45"
                   >
                     <div
-                      class="c22"
+                      class="c25"
                       id="swap-currency-output"
                     >
                       <div
-                        class="c23"
+                        class="c26"
                       >
                         <div
-                          class="c24 css-142zc9n"
+                          class="c27 css-142zc9n"
                           style="user-select: none;"
                         >
                           You receive
                         </div>
                         <div
-                          class="c25"
+                          class="c28"
                         >
                           <div
                             style="display: flex; flex-grow: 1;"
@@ -1976,7 +2035,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
                             <input
                               autocomplete="off"
                               autocorrect="off"
-                              class="c26 c27 token-amount-input"
+                              class="c29 c30 token-amount-input"
                               id="swap-currency-output"
                               inputmode="decimal"
                               maxlength="79"
@@ -1993,22 +2052,22 @@ exports[`disable nft on landing page does not render nft information and card 1`
                               class="c15"
                             >
                               <button
-                                class="c28 c29 c30 c45 open-currency-select-button"
+                                class="c16 c17 c31 c46 open-currency-select-button"
                               >
                                 <span
-                                  class="c32"
+                                  class="c33"
                                 >
                                   <div
                                     class="c7 c8 c11"
                                   >
                                     <span
-                                      class="c36 token-symbol-container"
+                                      class="c37 token-symbol-container"
                                     >
                                       Select token
                                     </span>
                                   </div>
                                   <svg
-                                    class="c46"
+                                    class="c47"
                                   >
                                     dropdown.svg
                                   </svg>
@@ -2018,13 +2077,13 @@ exports[`disable nft on landing page does not render nft information and card 1`
                           </div>
                         </div>
                         <div
-                          class="c38 c39"
+                          class="c39 c40"
                         >
                           <div
                             class="c7 c8 c9"
                           >
                             <div
-                              class="c40"
+                              class="c41"
                             />
                             <span />
                           </div>
@@ -2035,11 +2094,11 @@ exports[`disable nft on landing page does not render nft information and card 1`
                 </div>
                 <div>
                   <button
-                    class="c47 c29 c48"
+                    class="c48 c17 c49"
                     font-weight="535"
                   >
                     <div
-                      class="c49 c50"
+                      class="c50 c51"
                     />
                     Connect wallet
                   </button>
@@ -2051,53 +2110,53 @@ exports[`disable nft on landing page does not render nft information and card 1`
       </a>
     </div>
     <div
-      class="c51"
+      class="c52"
     />
     <div
-      class="c52"
+      class="c53"
     >
       <div
-        class="c53"
+        class="c54"
       />
     </div>
     <div
-      class="c54"
+      class="c55"
     >
       <h1
-        class="c55"
+        class="c56"
       >
         Trade crypto with confidence
       </h1>
       <div
-        class="c56"
+        class="c57"
       >
         <div
-          class="c57"
+          class="c58"
         >
           Buy, sell, and explore tokens
         </div>
       </div>
       <span
-        class="c58"
+        class="c59"
       >
         <a
-          class="c2 c29 c59 c60"
+          class="c2 c17 c60 c61"
           href="/swap"
         >
           <p
-            class="c61"
+            class="c62"
           >
             Get started
           </p>
         </a>
       </span>
       <div
-        class="c62"
+        class="c63"
       >
         Learn more
       </div>
       <a
-        class="c63"
+        class="c64"
         href="https://uniswapwallet.onelink.me/8q3y/79gveilz"
       >
         <svg
@@ -2110,32 +2169,32 @@ exports[`disable nft on landing page does not render nft information and card 1`
       </a>
     </div>
     <div
-      class="c64"
+      class="c65"
     >
       <div
-        class="c65"
+        class="c66"
         cols="1"
       >
         <a
-          class="c66"
+          class="c67"
           href="/swap"
         >
           <div
-            class="c67"
+            class="c68"
           >
             <div
-              class="c68"
+              class="c69"
             >
               Swap tokens
             </div>
           </div>
           <div
-            class="c69"
+            class="c70"
             type="Primary"
           >
             Buy, sell, and explore tokens on Ethereum, Polygon, Optimism, and more.
             <div
-              class="c69 c70"
+              class="c70 c71"
               type="Primary"
             >
               Trade Tokens
@@ -2144,20 +2203,20 @@ exports[`disable nft on landing page does not render nft information and card 1`
         </a>
       </div>
       <div
-        class="c71"
+        class="c72"
         cols="3"
       >
         <a
-          class="c72"
+          class="c73"
           href="https://support.uniswap.org/hc/en-us/articles/11306574799117-How-to-use-Moon-Pay-on-the-Uniswap-web-app-"
           rel="noopenener noreferrer"
           target="_blank"
         >
           <div
-            class="c67"
+            class="c68"
           >
             <div
-              class="c68"
+              class="c69"
             >
               Buy crypto
             </div>
@@ -2184,12 +2243,12 @@ exports[`disable nft on landing page does not render nft information and card 1`
             </svg>
           </div>
           <div
-            class="c73"
+            class="c74"
             type="Secondary"
           >
             Buy crypto with your credit card or bank account at the best rates.
             <div
-              class="c73 c70"
+              class="c74 c71"
               type="Secondary"
             >
               Buy now
@@ -2197,30 +2256,30 @@ exports[`disable nft on landing page does not render nft information and card 1`
           </div>
         </a>
         <a
-          class="c72"
+          class="c73"
           href="/pools"
         >
           <div
-            class="c67"
+            class="c68"
           >
             <div
-              class="c68"
+              class="c69"
             >
               Earn
             </div>
             <img
               alt="Analytics"
-              class="c74"
+              class="c75"
               src="aboutArrowLight.png"
             />
           </div>
           <div
-            class="c73"
+            class="c74"
             type="Secondary"
           >
             Provide liquidity to pools on Uniswap and earn fees on swaps.
             <div
-              class="c73 c70"
+              class="c74 c71"
               type="Secondary"
             >
               Provide liquidity
@@ -2228,16 +2287,16 @@ exports[`disable nft on landing page does not render nft information and card 1`
           </div>
         </a>
         <a
-          class="c72"
+          class="c73"
           href="https://docs.uniswap.org"
           rel="noopenener noreferrer"
           target="_blank"
         >
           <div
-            class="c67"
+            class="c68"
           >
             <div
-              class="c68"
+              class="c69"
             >
               Build dApps
             </div>
@@ -2264,12 +2323,12 @@ exports[`disable nft on landing page does not render nft information and card 1`
             </svg>
           </div>
           <div
-            class="c73"
+            class="c74"
             type="Secondary"
           >
             Build apps and tools on the largest DeFi protocol on Ethereum.
             <div
-              class="c73 c70"
+              class="c74 c71"
               type="Secondary"
             >
               Developer docs
@@ -2278,27 +2337,27 @@ exports[`disable nft on landing page does not render nft information and card 1`
         </a>
       </div>
       <div
-        class="c75"
+        class="c76"
       >
         <div
-          class="c76"
+          class="c77"
         >
           <div
-            class="c77"
+            class="c78"
           >
             Powered by the Uniswap Protocol
           </div>
           <div
-            class="c78"
+            class="c79"
           >
             The leading decentralized crypto trading protocol, governed by a global community.
           </div>
         </div>
         <div
-          class="c79"
+          class="c80"
         >
           <a
-            class="c80 c81 c82"
+            class="c81 c82 c83"
             href="https://uniswap.org"
             rel="noopener noreferrer"
             target="_blank"
@@ -2309,53 +2368,53 @@ exports[`disable nft on landing page does not render nft information and card 1`
         </div>
       </div>
       <div
-        class="c83"
+        class="c84"
       >
         <div
-          class="c84 c85"
+          class="c85 c86"
         >
           <img
             alt="Uniswap Logo"
-            class="c86"
+            class="c87"
             src="unicornEmbossLight.png"
           />
           <div
-            class="c87"
+            class="c88"
           >
             <a
-              class="c88"
+              class="c89"
               href="https://discord.gg/FCfyBSbCU5"
               rel="noopener noreferrer"
               target="_blank"
             >
               <svg
-                class="c89"
+                class="c90"
                 size="32"
               >
                 discord.svg
               </svg>
             </a>
             <a
-              class="c88"
+              class="c89"
               href="https://twitter.com/uniswap"
               rel="noopener noreferrer"
               target="_blank"
             >
               <svg
-                class="c90"
+                class="c91"
                 size="32"
               >
                 twitter-safe.svg
               </svg>
             </a>
             <a
-              class="c88"
+              class="c89"
               href="https://github.com/Uniswap"
               rel="noopener noreferrer"
               target="_blank"
             >
               <svg
-                class="c91"
+                class="c92"
                 size="32"
               >
                 github.svg
@@ -2363,7 +2422,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
             </a>
           </div>
           <span
-            class="c92"
+            class="c93"
           >
             © 
             2024
@@ -2371,45 +2430,45 @@ exports[`disable nft on landing page does not render nft information and card 1`
           </span>
         </div>
         <div
-          class="c93"
+          class="c94"
         >
           <div
-            class="c94"
+            class="c95"
           >
             <span
-              class="c95"
+              class="c96"
             >
               App
             </span>
             <a
-              class="c96 c97"
+              class="c97 c98"
               href="/swap"
             >
               Swap
             </a>
             <a
-              class="c96 c97"
+              class="c97 c98"
               href="/tokens"
             >
               Tokens
             </a>
             <a
-              class="c96 c97"
+              class="c97 c98"
               href="/pools"
             >
               Pools
             </a>
           </div>
           <div
-            class="c94"
+            class="c95"
           >
             <span
-              class="c95"
+              class="c96"
             >
               Protocol
             </span>
             <a
-              class="c98 c99"
+              class="c99 c100"
               href="https://uniswap.org/community"
               rel="noopener noreferrer"
               target="_blank"
@@ -2417,7 +2476,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
               Community
             </a>
             <a
-              class="c98 c99"
+              class="c99 c100"
               href="https://uniswap.org/governance"
               rel="noopener noreferrer"
               target="_blank"
@@ -2425,7 +2484,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
               Governance
             </a>
             <a
-              class="c98 c99"
+              class="c99 c100"
               href="https://uniswap.org/developers"
               rel="noopener noreferrer"
               target="_blank"
@@ -2434,15 +2493,15 @@ exports[`disable nft on landing page does not render nft information and card 1`
             </a>
           </div>
           <div
-            class="c94"
+            class="c95"
           >
             <span
-              class="c95"
+              class="c96"
             >
               Company
             </span>
             <a
-              class="c98 c99"
+              class="c99 c100"
               href="https://boards.greenhouse.io/uniswaplabs"
               rel="noopener noreferrer"
               target="_blank"
@@ -2450,7 +2509,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
               Careers
             </a>
             <a
-              class="c98 c99"
+              class="c99 c100"
               href="https://uniswap.org/blog"
               rel="noopener noreferrer"
               target="_blank"
@@ -2459,15 +2518,15 @@ exports[`disable nft on landing page does not render nft information and card 1`
             </a>
           </div>
           <div
-            class="c94"
+            class="c95"
           >
             <span
-              class="c95"
+              class="c96"
             >
               Get Help
             </span>
             <a
-              class="c98 c99"
+              class="c99 c100"
               href="https://support.uniswap.org/hc/en-us/requests/new"
               rel="noopener noreferrer"
               target="_blank"
@@ -2475,7 +2534,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
               Contact Us
             </a>
             <a
-              class="c98 c99"
+              class="c99 c100"
               href="https://support.uniswap.org/hc/en-us"
               rel="noopener noreferrer"
               target="_blank"
@@ -2485,50 +2544,50 @@ exports[`disable nft on landing page does not render nft information and card 1`
           </div>
         </div>
         <div
-          class="c84 c100"
+          class="c85 c101"
         >
           <img
             alt="Uniswap Logo"
-            class="c86"
+            class="c87"
             src="unicornEmbossLight.png"
           />
           <div
-            class="c87"
+            class="c88"
           >
             <a
-              class="c88"
+              class="c89"
               href="https://discord.gg/FCfyBSbCU5"
               rel="noopener noreferrer"
               target="_blank"
             >
               <svg
-                class="c89"
+                class="c90"
                 size="32"
               >
                 discord.svg
               </svg>
             </a>
             <a
-              class="c88"
+              class="c89"
               href="https://twitter.com/uniswap"
               rel="noopener noreferrer"
               target="_blank"
             >
               <svg
-                class="c90"
+                class="c91"
                 size="32"
               >
                 twitter-safe.svg
               </svg>
             </a>
             <a
-              class="c88"
+              class="c89"
               href="https://github.com/Uniswap"
               rel="noopener noreferrer"
               target="_blank"
             >
               <svg
-                class="c91"
+                class="c92"
                 size="32"
               >
                 github.svg
@@ -2536,7 +2595,7 @@ exports[`disable nft on landing page does not render nft information and card 1`
             </a>
           </div>
           <span
-            class="c92"
+            class="c93"
           >
             © 
             2024
@@ -2556,7 +2615,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   min-width: 0;
 }
 
-.c28 {
+.c16 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -2579,7 +2638,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   border-radius: 4px;
 }
 
-.c47 {
+.c48 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -2633,12 +2692,8 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   width: fit-content;
 }
 
-.c24 {
+.c27 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
 .c13 {
@@ -2666,7 +2721,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   text-decoration: underline;
 }
 
-.c99 {
+.c100 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -2677,15 +2732,15 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   font-weight: 500;
 }
 
-.c99:hover {
+.c100:hover {
   opacity: 0.6;
 }
 
-.c99:active {
+.c100:active {
   opacity: 0.4;
 }
 
-.c97 {
+.c98 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -2696,36 +2751,36 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   font-weight: 500;
 }
 
-.c97:hover {
+.c98:hover {
   opacity: 0.6;
 }
 
-.c97:active {
+.c98:active {
   opacity: 0.4;
 }
 
-.c90 {
+.c91 {
   height: 32px;
   width: 32px;
   fill: #98A1C0;
   opacity: 1;
 }
 
-.c91 {
+.c92 {
   height: 32px;
   width: 32px;
   fill: #98A1C0;
   opacity: 1;
 }
 
-.c92 {
+.c93 {
   height: 32px;
   width: 32px;
   fill: #98A1C0;
   opacity: 1;
 }
 
-.c84 {
+.c85 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -2738,7 +2793,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   max-width: 1440px;
 }
 
-.c85 {
+.c86 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -2748,24 +2803,24 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   flex-direction: column;
 }
 
-.c86 {
+.c87 {
   display: none;
 }
 
-.c101 {
+.c102 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
 }
 
-.c87 {
+.c88 {
   width: 72px;
   height: 72px;
   display: none;
 }
 
-.c88 {
+.c89 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -2778,20 +2833,20 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   margin: 20px 0 0 0;
 }
 
-.c89 {
+.c90 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
   display: flex;
 }
 
-.c94 {
+.c95 {
   display: grid;
   grid-template-columns: 1fr 1fr;
   gap: 12px;
 }
 
-.c95 {
+.c96 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -2804,32 +2859,32 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   margin: 20px 0 0 0;
 }
 
-.c96 {
+.c97 {
   font-size: 16px;
   line-height: 20px;
   font-weight: 535;
 }
 
-.c100 {
+.c101 {
   font-size: 16px;
   line-height: 20px;
   color: #7D7D7D;
 }
 
-.c98 {
+.c99 {
   font-size: 16px;
   line-height: 20px;
   color: #7D7D7D;
 }
 
-.c93 {
+.c94 {
   font-size: 16px;
   line-height: 20px;
   margin: 1rem 0 0 0;
   color: #CECECE;
 }
 
-.c66 {
+.c67 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -2857,11 +2912,11 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   transition: 250ms ease border;
 }
 
-.c66:hover {
+.c67:hover {
   border: 1px solid #CECECE;
 }
 
-.c71 {
+.c72 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -2889,11 +2944,11 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   transition: 250ms ease border;
 }
 
-.c71:hover {
+.c72:hover {
   border: 1px solid #CECECE;
 }
 
-.c73 {
+.c74 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -2921,11 +2976,11 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   transition: 250ms ease border;
 }
 
-.c73:hover {
+.c74:hover {
   border: 1px solid #CECECE;
 }
 
-.c67 {
+.c68 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -2940,13 +2995,13 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   justify-content: space-between;
 }
 
-.c68 {
+.c69 {
   font-size: 20px;
   line-height: 28px;
   font-weight: 535;
 }
 
-.c69 {
+.c70 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -2961,7 +3016,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   max-width: 480px;
 }
 
-.c74 {
+.c75 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -2976,7 +3031,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   max-width: 480px;
 }
 
-.c70 {
+.c71 {
   color: #FC72FF;
   font-weight: 535;
   margin: 24px 0 0;
@@ -2985,18 +3040,18 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   transition: 250ms ease opacity;
 }
 
-.c70:hover {
+.c71:hover {
   opacity: 0.6;
 }
 
-.c75 {
+.c76 {
   min-width: 20px;
   min-height: 20px;
   max-height: 48px;
   max-width: 48px;
 }
 
-.c50 {
+.c51 {
   background-color: transparent;
   bottom: 0;
   border-radius: inherit;
@@ -3010,7 +3065,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   width: 100%;
 }
 
-.c29 {
+.c17 {
   padding: 16px;
   width: 100%;
   line-height: 24px;
@@ -3049,25 +3104,25 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   transform: perspective(1px) translateZ(0);
 }
 
-.c29:disabled {
+.c17:disabled {
   opacity: 50%;
   cursor: auto;
   pointer-events: none;
 }
 
-.c29 > * {
+.c17 > * {
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
 }
 
-.c29 > a {
+.c17 > a {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c81 {
+.c82 {
   padding: 16px;
   width: 200px;
   line-height: 24px;
@@ -3106,58 +3161,58 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   transform: perspective(1px) translateZ(0);
 }
 
-.c81:disabled {
+.c82:disabled {
   opacity: 50%;
   cursor: auto;
   pointer-events: none;
 }
 
-.c81 > * {
+.c82 > * {
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
 }
 
-.c81 > a {
+.c82 > a {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c48 {
+.c49 {
   background-color: #FFEFFF;
   color: #FC72FF;
   font-size: 20px;
   font-weight: 535;
 }
 
-.c48:focus {
+.c49:focus {
   box-shadow: 0 0 0 1pt #FFEFFF;
   background-color: #FFEFFF;
 }
 
-.c48:hover {
+.c49:hover {
   background-color: #FFEFFF;
 }
 
-.c48:active {
+.c49:active {
   box-shadow: 0 0 0 1pt #FFEFFF;
   background-color: #FFEFFF;
 }
 
-.c48:hover .c49 {
+.c49:hover .c50 {
   background-color: #98A1C014;
 }
 
-.c48:active .c49 {
+.c49:active .c50 {
   background-color: #B8C0DC3d;
 }
 
-.c48:disabled {
+.c49:disabled {
   opacity: 0.4;
 }
 
-.c48:disabled:hover {
+.c49:disabled:hover {
   cursor: auto;
   background-color: transparent;
   box-shadow: none;
@@ -3165,7 +3220,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   outline: none;
 }
 
-.c30 {
+.c31 {
   background-color: #FFFFFF;
   color: #7D7D7D;
   border: 1px solid #22222212;
@@ -3173,15 +3228,15 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   font-weight: 535;
 }
 
-.c30:hover {
+.c31:hover {
   background-color: #ececec;
 }
 
-.c30:active {
+.c31:active {
   background-color: #e0e0e0;
 }
 
-.c82 {
+.c83 {
   background-color: transparent;
   color: #FC72FF;
   display: -webkit-box;
@@ -3198,27 +3253,56 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   align-items: center;
 }
 
-.c82:focus {
+.c83:focus {
   -webkit-text-decoration: underline;
   text-decoration: underline;
 }
 
-.c82:hover {
+.c83:hover {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c82:active {
+.c83:active {
   -webkit-text-decoration: none;
   text-decoration: none;
 }
 
-.c82:disabled {
+.c83:disabled {
   opacity: 50%;
   cursor: auto;
 }
 
-.c76 {
+.c18 {
+  padding: 0;
+  width: -webkit-fit-content;
+  width: -moz-fit-content;
+  width: fit-content;
+  background: none;
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c18:focus {
+  -webkit-text-decoration: underline;
+  text-decoration: underline;
+}
+
+.c18:hover {
+  opacity: 0.9;
+}
+
+.c18:active {
+  -webkit-text-decoration: underline;
+  text-decoration: underline;
+}
+
+.c18:disabled {
+  opacity: 50%;
+  cursor: auto;
+}
+
+.c77 {
   height: 340px;
   width: 100%;
   border-radius: 32px;
@@ -3244,7 +3328,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   background: url(Mesh.png),linear-gradient(93.06deg,#FF00C7 2.66%,#FF9FFB 98.99%);
 }
 
-.c77 {
+.c78 {
   color: white;
   display: -webkit-box;
   display: -webkit-flex;
@@ -3258,20 +3342,20 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   flex-direction: column;
 }
 
-.c78 {
+.c79 {
   font-weight: 535;
   font-size: 28px;
   line-height: 36px;
 }
 
-.c79 {
+.c80 {
   margin: 10px 10px 0 0;
   font-weight: 535;
   font-size: 16px;
   line-height: 20px;
 }
 
-.c80 {
+.c81 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -3285,16 +3369,16 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   transition: 250ms ease opacity;
 }
 
-.c80:hover {
+.c81:hover {
   opacity: 0.6;
 }
 
-.c83 {
+.c84 {
   color: white;
   border: 1px solid white;
 }
 
-.c43 {
+.c44 {
   display: grid;
   grid-auto-rows: auto;
   grid-row-gap: 4px;
@@ -3309,19 +3393,43 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
 .c4 {
   position: relative;
   z-index: 1;
+  border: 1px solid #22222212;
   -webkit-transition: -webkit-transform 250ms ease;
   -webkit-transition: transform 250ms ease;
   transition: transform 250ms ease;
   border-radius: 24px;
 }
 
+.c4:before {
+  content: ' ';
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  position: absolute;
+  inset: 0;
+  -webkit-transform: scale(1.1);
+  -ms-transform: scale(1.1);
+  transform: scale(1.1);
+  -webkit-filter: blur(50px);
+  filter: blur(50px);
+  background-color: rgba(252,114,255,0.075);
+  z-index: -2;
+}
+
+.c4:hover {
+  border: 1px solid #22222212;
+}
+
 .c6 {
   border-radius: 24px;
+  background: #FFFFFF;
   z-index: -1;
+  padding: 8px;
   padding-top: 12px;
 }
 
-.c41 {
+.c42 {
   border-radius: 12px;
   height: 40px;
   width: 40px;
@@ -3336,12 +3444,12 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   z-index: 2;
 }
 
-.c41:hover {
+.c42:hover {
   cursor: pointer;
   opacity: 0.8;
 }
 
-.c21 {
+.c24 {
   background-color: #F9F9F9;
   border-radius: 16px;
   color: #7D7D7D;
@@ -3353,7 +3461,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   position: relative;
 }
 
-.c21:before {
+.c24:before {
   box-sizing: border-box;
   background-size: 100%;
   border-radius: inherit;
@@ -3367,19 +3475,19 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   border: 1px solid #F9F9F9;
 }
 
-.c21:hover:before {
+.c24:hover:before {
   border-color: #98A1C014;
 }
 
-.c21:focus-within:before {
+.c24:focus-within:before {
   border-color: #B8C0DC3d;
 }
 
-.c44 {
+.c45 {
   border-bottom: 1px solid #FFFFFF;
 }
 
-.c42 {
+.c43 {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
   display: -ms-inline-flexbox;
@@ -3396,94 +3504,56 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   height: 100%;
 }
 
-.c14 {
-  color: #222222;
-  background-color: #F9F9F9;
-  padding: 8px 16px;
-  border-radius: 20px;
-  gap: 4px;
-  font-weight: 485;
-}
-
-.c14:focus {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c14:active {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c16 {
-  color: #7D7D7D;
-  padding: 8px 16px;
-  border-radius: 20px;
-  gap: 4px;
-  font-weight: 485;
-}
-
-.c16:focus {
-  -webkit-text-decoration: none;
-  text-decoration: none;
+.c41 {
+  -webkit-filter: none;
+  filter: none;
+  opacity: 1;
+  -webkit-transition: opacity 250ms ease-in-out;
+  transition: opacity 250ms ease-in-out;
 }
 
-.c16:active {
-  -webkit-text-decoration: none;
-  text-decoration: none;
+.c15 {
+  display: inline-block;
+  height: inherit;
 }
 
-.c34 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
+.c36 {
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 24px;
+  height: 24px;
+  border-radius: 50%;
 }
 
 .c35 {
   width: 24px;
   height: 24px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
   border-radius: 50%;
 }
 
-.c33 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-}
-
-.c15 {
-  display: inline-block;
-  height: inherit;
-}
-
-.c40 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
+.c34 {
+  position: relative;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
 }
 
-.c20 {
+.c23 {
   height: 24px;
   width: 24px;
 }
 
-.c20 > * {
+.c23 > * {
   fill: #7D7D7D;
 }
 
-.c18 {
+.c21 {
   border: none;
   background-color: transparent;
   margin: 0;
@@ -3492,30 +3562,72 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   outline: none;
 }
 
-.c18:not([disabled]):hover {
+.c21:not([disabled]):hover {
   opacity: 0.7;
 }
 
-.c19 {
+.c22 {
   padding: 6px 12px;
   border-radius: 16px;
 }
 
-.c17 {
+.c20 {
   position: relative;
 }
 
+.c19 {
+  color: #7D7D7D;
+  gap: 4px;
+  font-weight: 485;
+  -webkit-transition-duration: 125ms;
+  transition-duration: 125ms;
+  -webkit-transition-timing-function: ease-in-out;
+  transition-timing-function: ease-in-out;
+  -webkit-transition-property: opacity,color,background-color;
+  transition-property: opacity,color,background-color;
+}
+
+.c19:focus {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c19:active {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c19:hover {
+  opacity: 0.6;
+}
+
 .c10 {
-  margin-bottom: 4px;
+  margin-bottom: 10px;
   color: #7D7D7D;
 }
 
 .c12 {
+  padding: 0 12px;
   gap: 16px;
-  padding-bottom: 8px;
 }
 
-.c26 {
+.c14 {
+  color: #222222;
+  gap: 4px;
+  font-weight: 485;
+}
+
+.c14:focus {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c14:active {
+  -webkit-text-decoration: none;
+  text-decoration: none;
+}
+
+.c29 {
   color: #222222;
   pointer-events: auto;
   width: 0;
@@ -3536,48 +3648,36 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   text-align: right;
 }
 
-.c26::-webkit-search-decoration {
+.c29::-webkit-search-decoration {
   -webkit-appearance: none;
 }
 
-.c26 [type='number'] {
+.c29 [type='number'] {
   -moz-appearance: textfield;
 }
 
-.c26::-webkit-outer-spin-button,
-.c26::-webkit-inner-spin-button {
+.c29::-webkit-outer-spin-button,
+.c29::-webkit-inner-spin-button {
   -webkit-appearance: none;
 }
 
-.c26::-webkit-input-placeholder {
+.c29::-webkit-input-placeholder {
   color: #CECECE;
 }
 
-.c26::-moz-placeholder {
+.c29::-moz-placeholder {
   color: #CECECE;
 }
 
-.c26:-ms-input-placeholder {
+.c29:-ms-input-placeholder {
   color: #CECECE;
 }
 
-.c26::placeholder {
+.c29::placeholder {
   color: #CECECE;
 }
 
-.c27 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-  text-align: left;
-  font-size: 36px;
-  font-weight: 485;
-  max-height: 44px;
-}
-
-.c22 {
+.c25 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -3594,13 +3694,13 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   will-change: height;
 }
 
-.c23 {
+.c26 {
   min-height: 44px;
   border-radius: 20px;
   width: initial;
 }
 
-.c31 {
+.c32 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -3633,12 +3733,12 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   animation: none;
 }
 
-.c31:hover,
-.c31:active {
+.c32:hover,
+.c32:active {
   background-color: #F9F9F9;
 }
 
-.c31:before {
+.c32:before {
   background-size: 100%;
   border-radius: inherit;
   position: absolute;
@@ -3649,15 +3749,15 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   content: '';
 }
 
-.c31:hover:before {
+.c32:hover:before {
   background-color: #98A1C014;
 }
 
-.c31:active:before {
+.c32:active:before {
   background-color: #B8C0DC3d;
 }
 
-.c45 {
+.c46 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -3690,12 +3790,12 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   animation: none;
 }
 
-.c45:hover,
-.c45:active {
+.c46:hover,
+.c46:active {
   background-color: #FC72FF;
 }
 
-.c45:before {
+.c46:before {
   background-size: 100%;
   border-radius: inherit;
   position: absolute;
@@ -3706,15 +3806,15 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   content: '';
 }
 
-.c45:hover:before {
+.c46:hover:before {
   background-color: #98A1C014;
 }
 
-.c45:active:before {
+.c46:active:before {
   background-color: #B8C0DC3d;
 }
 
-.c25 {
+.c28 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -3732,7 +3832,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   justify-content: space-between;
 }
 
-.c38 {
+.c39 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -3749,12 +3849,12 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   line-height: 1rem;
 }
 
-.c38 span:hover {
+.c39 span:hover {
   cursor: pointer;
   color: #4a4a4a;
 }
 
-.c39 {
+.c40 {
   -webkit-box-pack: end;
   -webkit-justify-content: flex-end;
   -ms-flex-pack: end;
@@ -3763,7 +3863,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   padding: 8px 0px 0px 0px;
 }
 
-.c32 {
+.c33 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -3779,34 +3879,46 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   width: 100%;
 }
 
-.c37 {
+.c38 {
   margin: 0 0.25rem 0 0.35rem;
   height: 35%;
   margin-left: 8px;
 }
 
-.c37 path {
+.c38 path {
   stroke: #222222;
   stroke-width: 2px;
 }
 
-.c46 {
+.c47 {
   margin: 0 0.25rem 0 0.35rem;
   height: 35%;
   margin-left: 8px;
 }
 
-.c46 path {
+.c47 path {
   stroke: #FFFFFF;
   stroke-width: 2px;
 }
 
-.c36 {
+.c37 {
   margin: 0 0.25rem 0 0.25rem;
   font-size: 20px;
   font-weight: 535;
 }
 
+.c30 {
+  -webkit-filter: none;
+  filter: none;
+  opacity: 1;
+  -webkit-transition: opacity 250ms ease-in-out;
+  transition: opacity 250ms ease-in-out;
+  text-align: left;
+  font-size: 36px;
+  font-weight: 485;
+  max-height: 44px;
+}
+
 .c0 {
   padding: 72px 0px 0px 0px;
   width: 100%;
@@ -3824,7 +3936,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   overflow-x: hidden;
 }
 
-.c51 {
+.c52 {
   position: absolute;
   display: -webkit-box;
   display: -webkit-flex;
@@ -3848,7 +3960,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   height: calc(100vh - 48px);
 }
 
-.c52 {
+.c53 {
   position: absolute;
   display: -webkit-box;
   display: -webkit-flex;
@@ -3869,7 +3981,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   height: calc(100vh - 48px);
 }
 
-.c53 {
+.c54 {
   position: absolute;
   top: 68px;
   bottom: 0;
@@ -3882,7 +3994,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   height: 100%;
 }
 
-.c54 {
+.c55 {
   position: absolute;
   display: -webkit-box;
   display: -webkit-flex;
@@ -3910,11 +4022,11 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   pointer-events: none;
 }
 
-.c54 * {
+.c55 * {
   pointer-events: auto;
 }
 
-.c63 {
+.c64 {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
   display: -ms-inline-flexbox;
@@ -3934,11 +4046,11 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   align-items: center;
 }
 
-.c63:hover {
+.c64:hover {
   color: #CECECE;
 }
 
-.c55 {
+.c56 {
   color: transparent;
   font-size: 36px;
   line-height: 44px;
@@ -3950,7 +4062,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   -webkit-background-clip: text;
 }
 
-.c57 {
+.c58 {
   color: #7D7D7D;
   font-size: 16px;
   line-height: 24px;
@@ -3960,7 +4072,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   margin: 0 0 32px;
 }
 
-.c56 {
+.c57 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -3971,12 +4083,12 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   justify-content: center;
 }
 
-.c59 {
+.c60 {
   padding: 16px 0px;
   border-radius: 24px;
 }
 
-.c60 {
+.c61 {
   background: linear-gradient(93.06deg,#ff00c7 2.66%,#ff9ffb 98.99%);
   border: none;
   color: #FFFFFF;
@@ -3984,24 +4096,24 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   transition: all 250ms ease;
 }
 
-.c60:hover {
+.c61:hover {
   box-shadow: 0px 0px 16px 0px #ff00c7;
 }
 
-.c61 {
+.c62 {
   margin: 0px;
   font-size: 16px;
   font-weight: 535;
   white-space: nowrap;
 }
 
-.c58 {
+.c59 {
   max-width: 300px;
   width: 100%;
   pointer-events: auto;
 }
 
-.c62 {
+.c63 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
@@ -4021,11 +4133,11 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   transition: 250ms ease opacity;
 }
 
-.c62:hover {
+.c63:hover {
   opacity: 0.6;
 }
 
-.c64 {
+.c65 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -4042,7 +4154,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   background: linear-gradient(179.82deg,rgba(255,255,255,0) 0.16%,#eaeaea 99.85%);
 }
 
-.c65 {
+.c66 {
   display: grid;
   gap: 12px;
   width: 100%;
@@ -4055,7 +4167,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   grid-template-columns: 1fr;
 }
 
-.c72 {
+.c73 {
   display: grid;
   gap: 12px;
   width: 100%;
@@ -4098,6 +4210,10 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
   transition: transform 250ms ease;
 }
 
+.c5:hover {
+  border: 1px solid #FC72FF;
+}
+
 .c2 {
   -webkit-text-decoration: none;
   text-decoration: none;
@@ -4106,7 +4222,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
 }
 
 @media screen and (min-width:1024px) {
-  .c84 {
+  .c85 {
     -webkit-flex-direction: row;
     -ms-flex-direction: row;
     flex-direction: row;
@@ -4118,7 +4234,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
 }
 
 @media screen and (min-width:1024px) {
-  .c86 {
+  .c87 {
     display: -webkit-box;
     display: -webkit-flex;
     display: -ms-flexbox;
@@ -4127,75 +4243,75 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
 }
 
 @media screen and (min-width:1024px) {
-  .c101 {
+  .c102 {
     display: none;
   }
 }
 
 @media screen and (min-width:1024px) {
-  .c87 {
+  .c88 {
     display: block;
   }
 }
 
 @media screen and (min-width:1280px) {
-  .c94 {
+  .c95 {
     grid-template-columns: 1fr 1fr 1fr 1fr;
     gap: 24px;
   }
 }
 
 @media screen and (min-width:1280px) {
-  .c95 {
+  .c96 {
     margin: 0;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c66 {
+  .c67 {
     height: 360px;
   }
 }
 
 @media screen and (min-width:1280px) {
-  .c66 {
+  .c67 {
     padding: 32px;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c71 {
+  .c72 {
     height: 360px;
   }
 }
 
 @media screen and (min-width:1280px) {
-  .c71 {
+  .c72 {
     padding: 32px;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c73 {
+  .c74 {
     height: 260px;
   }
 }
 
 @media screen and (min-width:1280px) {
-  .c73 {
+  .c74 {
     padding: 32px;
   }
 }
 
 @media screen and (min-width:1024px) {
-  .c68 {
+  .c69 {
     font-size: 28px;
     line-height: 36px;
   }
 }
 
 @media screen and (min-width:1280px) {
-  .c69 {
+  .c70 {
     font-size: 20px;
     line-height: 28px;
     max-width: 480px;
@@ -4203,7 +4319,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
 }
 
 @media screen and (min-width:1280px) {
-  .c74 {
+  .c75 {
     font-size: 20px;
     line-height: 28px;
     max-width: 480px;
@@ -4211,7 +4327,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
 }
 
 @media screen and (min-width:1024px) {
-  .c76 {
+  .c77 {
     height: 140px;
     -webkit-flex-direction: row;
     -ms-flex-direction: row;
@@ -4220,21 +4336,21 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
 }
 
 @media screen and (min-width:1280px) {
-  .c78 {
+  .c79 {
     font-size: 28px;
     line-height: 36px;
   }
 }
 
 @media screen and (min-width:1280px) {
-  .c79 {
+  .c80 {
     font-size: 20px;
     line-height: 28px;
   }
 }
 
 @media screen and (min-width:1024px) {
-  .c80 {
+  .c81 {
     width: auto;
   }
 }
@@ -4252,79 +4368,79 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
 }
 
 @media screen and (min-width:768px) {
-  .c51 {
+  .c52 {
     height: 100vh;
   }
 }
 
 @media screen and (min-width:768px) {
-  .c52 {
+  .c53 {
     height: 100vh;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c55 {
+  .c56 {
     font-size: 48px;
     line-height: 56px;
   }
 }
 
 @media screen and (min-width:768px) {
-  .c55 {
+  .c56 {
     font-size: 64px;
     line-height: 72px;
   }
 }
 
 @media screen and (min-width:768px) {
-  .c57 {
+  .c58 {
     font-size: 20px;
     line-height: 28px;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c61 {
+  .c62 {
     font-size: 20px;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c62 {
+  .c63 {
     visibility: visible;
   }
 }
 
 @media screen and (min-width:768px) {
-  .c64 {
+  .c65 {
     padding: 0 96px 5rem;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c65 {
+  .c66 {
     grid-template-columns: 1fr 1fr;
     gap: 32px;
   }
 }
 
 @media screen and (min-width:1024px) {
-  .c65 {
+  .c66 {
     grid-template-columns: 1fr 1fr;
     gap: 32px;
   }
 }
 
 @media screen and (min-width:640px) {
-  .c72 {
+  .c73 {
     grid-template-columns: 1fr;
     gap: 32px;
   }
 }
 
 @media screen and (min-width:1024px) {
-  .c72 {
+  .c73 {
     grid-template-columns: 1fr 1fr 1fr;
     gap: 32px;
   }
@@ -4370,7 +4486,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
                   >
                     <div>
                       <button
-                        class="c13 c16"
+                        class="c16 c17 c18 c19"
                         data-testid="buy-fiat-button"
                       >
                         Buy
@@ -4382,19 +4498,19 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
                   class="c7 c8 c11"
                 >
                   <div
-                    class="c17"
+                    class="c20"
                   >
                     <button
                       aria-label="Transaction Settings"
-                      class="c18"
+                      class="c21"
                       data-testid="open-settings-dialog-button"
                       id="open-settings-dialog-button"
                     >
                       <div
-                        class="c7 c8 c19"
+                        class="c7 c8 c22"
                       >
                         <svg
-                          class="c20"
+                          class="c23"
                           fill="none"
                           height="24"
                           viewBox="0 0 24 24"
@@ -4415,23 +4531,23 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
                 style="display: relative;"
               >
                 <div
-                  class="c21"
+                  class="c24"
                 >
                   <div
-                    class="c22"
+                    class="c25"
                     id="swap-currency-input"
                   >
                     <div
-                      class="c23"
+                      class="c26"
                     >
                       <div
-                        class="c24 css-142zc9n"
+                        class="c27 css-142zc9n"
                         style="user-select: none;"
                       >
                         You pay
                       </div>
                       <div
-                        class="c25"
+                        class="c28"
                       >
                         <div
                           style="display: flex; flex-grow: 1;"
@@ -4439,7 +4555,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
                           <input
                             autocomplete="off"
                             autocorrect="off"
-                            class="c26 c27 token-amount-input"
+                            class="c29 c30 token-amount-input"
                             id="swap-currency-input"
                             inputmode="decimal"
                             maxlength="79"
@@ -4456,35 +4572,37 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
                             class="c15"
                           >
                             <button
-                              class="c28 c29 c30 c31 open-currency-select-button"
+                              class="c16 c17 c31 c32 open-currency-select-button"
                             >
                               <span
-                                class="c32"
+                                class="c33"
                               >
                                 <div
                                   class="c7 c8 c11"
                                 >
                                   <div
-                                    class="c33"
+                                    class="c34"
                                     style="height: 24px; width: 24px; margin-right: 2px;"
                                   >
                                     <div
-                                      class="c34"
+                                      class="c35"
                                     >
                                       <img
-                                        class="c35"
+                                        alt="ETH logo"
+                                        class="c36"
+                                        loading="lazy"
                                         src="ethereum-logo.png"
                                       />
                                     </div>
                                   </div>
                                   <span
-                                    class="c36 token-symbol-container"
+                                    class="c37 token-symbol-container"
                                   >
                                     ETH
                                   </span>
                                 </div>
                                 <svg
-                                  class="c37"
+                                  class="c38"
                                 >
                                   dropdown.svg
                                 </svg>
@@ -4494,13 +4612,13 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
                         </div>
                       </div>
                       <div
-                        class="c38 c39"
+                        class="c39 c40"
                       >
                         <div
                           class="c7 c8 c9"
                         >
                           <div
-                            class="c40"
+                            class="c41"
                           />
                           <span />
                         </div>
@@ -4509,10 +4627,10 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
                   </div>
                 </div>
                 <div
-                  class="c41"
+                  class="c42"
                 >
                   <div
-                    class="c42"
+                    class="c43"
                     color="#222222"
                     data-testid="swap-currency-button"
                   >
@@ -4541,27 +4659,27 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
                 </div>
               </div>
               <div
-                class="c43"
+                class="c44"
               >
                 <div>
                   <div
-                    class="c21 c44"
+                    class="c24 c45"
                   >
                     <div
-                      class="c22"
+                      class="c25"
                       id="swap-currency-output"
                     >
                       <div
-                        class="c23"
+                        class="c26"
                       >
                         <div
-                          class="c24 css-142zc9n"
+                          class="c27 css-142zc9n"
                           style="user-select: none;"
                         >
                           You receive
                         </div>
                         <div
-                          class="c25"
+                          class="c28"
                         >
                           <div
                             style="display: flex; flex-grow: 1;"
@@ -4569,7 +4687,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
                             <input
                               autocomplete="off"
                               autocorrect="off"
-                              class="c26 c27 token-amount-input"
+                              class="c29 c30 token-amount-input"
                               id="swap-currency-output"
                               inputmode="decimal"
                               maxlength="79"
@@ -4586,22 +4704,22 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
                               class="c15"
                             >
                               <button
-                                class="c28 c29 c30 c45 open-currency-select-button"
+                                class="c16 c17 c31 c46 open-currency-select-button"
                               >
                                 <span
-                                  class="c32"
+                                  class="c33"
                                 >
                                   <div
                                     class="c7 c8 c11"
                                   >
                                     <span
-                                      class="c36 token-symbol-container"
+                                      class="c37 token-symbol-container"
                                     >
                                       Select token
                                     </span>
                                   </div>
                                   <svg
-                                    class="c46"
+                                    class="c47"
                                   >
                                     dropdown.svg
                                   </svg>
@@ -4611,13 +4729,13 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
                           </div>
                         </div>
                         <div
-                          class="c38 c39"
+                          class="c39 c40"
                         >
                           <div
                             class="c7 c8 c9"
                           >
                             <div
-                              class="c40"
+                              class="c41"
                             />
                             <span />
                           </div>
@@ -4628,11 +4746,11 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
                 </div>
                 <div>
                   <button
-                    class="c47 c29 c48"
+                    class="c48 c17 c49"
                     font-weight="535"
                   >
                     <div
-                      class="c49 c50"
+                      class="c50 c51"
                     />
                     Connect wallet
                   </button>
@@ -4644,53 +4762,53 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
       </a>
     </div>
     <div
-      class="c51"
+      class="c52"
     />
     <div
-      class="c52"
+      class="c53"
     >
       <div
-        class="c53"
+        class="c54"
       />
     </div>
     <div
-      class="c54"
+      class="c55"
     >
       <h1
-        class="c55"
+        class="c56"
       >
         Trade crypto and NFTs with confidence
       </h1>
       <div
-        class="c56"
+        class="c57"
       >
         <div
-          class="c57"
+          class="c58"
         >
           Buy, sell, and explore tokens and NFTs
         </div>
       </div>
       <span
-        class="c58"
+        class="c59"
       >
         <a
-          class="c2 c29 c59 c60"
+          class="c2 c17 c60 c61"
           href="/swap"
         >
           <p
-            class="c61"
+            class="c62"
           >
             Get started
           </p>
         </a>
       </span>
       <div
-        class="c62"
+        class="c63"
       >
         Learn more
       </div>
       <a
-        class="c63"
+        class="c64"
         href="https://uniswapwallet.onelink.me/8q3y/79gveilz"
       >
         <svg
@@ -4703,32 +4821,32 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
       </a>
     </div>
     <div
-      class="c64"
+      class="c65"
     >
       <div
-        class="c65"
+        class="c66"
         cols="2"
       >
         <a
-          class="c66"
+          class="c67"
           href="/swap"
         >
           <div
-            class="c67"
+            class="c68"
           >
             <div
-              class="c68"
+              class="c69"
             >
               Swap tokens
             </div>
           </div>
           <div
-            class="c69"
+            class="c70"
             type="Primary"
           >
             Buy, sell, and explore tokens on Ethereum, Polygon, Optimism, and more.
             <div
-              class="c69 c70"
+              class="c70 c71"
               type="Primary"
             >
               Trade Tokens
@@ -4736,25 +4854,25 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
           </div>
         </a>
         <a
-          class="c71"
+          class="c72"
           href="/nfts"
         >
           <div
-            class="c67"
+            class="c68"
           >
             <div
-              class="c68"
+              class="c69"
             >
               Trade NFTs
             </div>
           </div>
           <div
-            class="c69"
+            class="c70"
             type="Primary"
           >
             Buy and sell NFTs across marketplaces to find more listings at better prices.
             <div
-              class="c69 c70"
+              class="c70 c71"
               type="Primary"
             >
               Explore NFTs
@@ -4763,20 +4881,20 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
         </a>
       </div>
       <div
-        class="c72"
+        class="c73"
         cols="3"
       >
         <a
-          class="c73"
+          class="c74"
           href="https://support.uniswap.org/hc/en-us/articles/11306574799117-How-to-use-Moon-Pay-on-the-Uniswap-web-app-"
           rel="noopenener noreferrer"
           target="_blank"
         >
           <div
-            class="c67"
+            class="c68"
           >
             <div
-              class="c68"
+              class="c69"
             >
               Buy crypto
             </div>
@@ -4803,12 +4921,12 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
             </svg>
           </div>
           <div
-            class="c74"
+            class="c75"
             type="Secondary"
           >
             Buy crypto with your credit card or bank account at the best rates.
             <div
-              class="c74 c70"
+              class="c75 c71"
               type="Secondary"
             >
               Buy now
@@ -4816,30 +4934,30 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
           </div>
         </a>
         <a
-          class="c73"
+          class="c74"
           href="/pools"
         >
           <div
-            class="c67"
+            class="c68"
           >
             <div
-              class="c68"
+              class="c69"
             >
               Earn
             </div>
             <img
               alt="Analytics"
-              class="c75"
+              class="c76"
               src="aboutArrowLight.png"
             />
           </div>
           <div
-            class="c74"
+            class="c75"
             type="Secondary"
           >
             Provide liquidity to pools on Uniswap and earn fees on swaps.
             <div
-              class="c74 c70"
+              class="c75 c71"
               type="Secondary"
             >
               Provide liquidity
@@ -4847,16 +4965,16 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
           </div>
         </a>
         <a
-          class="c73"
+          class="c74"
           href="https://docs.uniswap.org"
           rel="noopenener noreferrer"
           target="_blank"
         >
           <div
-            class="c67"
+            class="c68"
           >
             <div
-              class="c68"
+              class="c69"
             >
               Build dApps
             </div>
@@ -4883,12 +5001,12 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
             </svg>
           </div>
           <div
-            class="c74"
+            class="c75"
             type="Secondary"
           >
             Build apps and tools on the largest DeFi protocol on Ethereum.
             <div
-              class="c74 c70"
+              class="c75 c71"
               type="Secondary"
             >
               Developer docs
@@ -4897,27 +5015,27 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
         </a>
       </div>
       <div
-        class="c76"
+        class="c77"
       >
         <div
-          class="c77"
+          class="c78"
         >
           <div
-            class="c78"
+            class="c79"
           >
             Powered by the Uniswap Protocol
           </div>
           <div
-            class="c79"
+            class="c80"
           >
             The leading decentralized crypto trading protocol, governed by a global community.
           </div>
         </div>
         <div
-          class="c80"
+          class="c81"
         >
           <a
-            class="c81 c82 c83"
+            class="c82 c83 c84"
             href="https://uniswap.org"
             rel="noopener noreferrer"
             target="_blank"
@@ -4928,53 +5046,53 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
         </div>
       </div>
       <div
-        class="c84"
+        class="c85"
       >
         <div
-          class="c85 c86"
+          class="c86 c87"
         >
           <img
             alt="Uniswap Logo"
-            class="c87"
+            class="c88"
             src="unicornEmbossLight.png"
           />
           <div
-            class="c88"
+            class="c89"
           >
             <a
-              class="c89"
+              class="c90"
               href="https://discord.gg/FCfyBSbCU5"
               rel="noopener noreferrer"
               target="_blank"
             >
               <svg
-                class="c90"
+                class="c91"
                 size="32"
               >
                 discord.svg
               </svg>
             </a>
             <a
-              class="c89"
+              class="c90"
               href="https://twitter.com/uniswap"
               rel="noopener noreferrer"
               target="_blank"
             >
               <svg
-                class="c91"
+                class="c92"
                 size="32"
               >
                 twitter-safe.svg
               </svg>
             </a>
             <a
-              class="c89"
+              class="c90"
               href="https://github.com/Uniswap"
               rel="noopener noreferrer"
               target="_blank"
             >
               <svg
-                class="c92"
+                class="c93"
                 size="32"
               >
                 github.svg
@@ -4982,7 +5100,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
             </a>
           </div>
           <span
-            class="c93"
+            class="c94"
           >
             © 
             2024
@@ -4990,51 +5108,51 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
           </span>
         </div>
         <div
-          class="c94"
+          class="c95"
         >
           <div
-            class="c95"
+            class="c96"
           >
             <span
-              class="c96"
+              class="c97"
             >
               App
             </span>
             <a
-              class="c97 c98"
+              class="c98 c99"
               href="/swap"
             >
               Swap
             </a>
             <a
-              class="c97 c98"
+              class="c98 c99"
               href="/tokens"
             >
               Tokens
             </a>
             <a
-              class="c97 c98"
+              class="c98 c99"
               href="/nfts"
             >
               NFTs
             </a>
             <a
-              class="c97 c98"
+              class="c98 c99"
               href="/pools"
             >
               Pools
             </a>
           </div>
           <div
-            class="c95"
+            class="c96"
           >
             <span
-              class="c96"
+              class="c97"
             >
               Protocol
             </span>
             <a
-              class="c99 c100"
+              class="c100 c101"
               href="https://uniswap.org/community"
               rel="noopener noreferrer"
               target="_blank"
@@ -5042,7 +5160,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
               Community
             </a>
             <a
-              class="c99 c100"
+              class="c100 c101"
               href="https://uniswap.org/governance"
               rel="noopener noreferrer"
               target="_blank"
@@ -5050,7 +5168,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
               Governance
             </a>
             <a
-              class="c99 c100"
+              class="c100 c101"
               href="https://uniswap.org/developers"
               rel="noopener noreferrer"
               target="_blank"
@@ -5059,15 +5177,15 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
             </a>
           </div>
           <div
-            class="c95"
+            class="c96"
           >
             <span
-              class="c96"
+              class="c97"
             >
               Company
             </span>
             <a
-              class="c99 c100"
+              class="c100 c101"
               href="https://boards.greenhouse.io/uniswaplabs"
               rel="noopener noreferrer"
               target="_blank"
@@ -5075,7 +5193,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
               Careers
             </a>
             <a
-              class="c99 c100"
+              class="c100 c101"
               href="https://uniswap.org/blog"
               rel="noopener noreferrer"
               target="_blank"
@@ -5084,15 +5202,15 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
             </a>
           </div>
           <div
-            class="c95"
+            class="c96"
           >
             <span
-              class="c96"
+              class="c97"
             >
               Get Help
             </span>
             <a
-              class="c99 c100"
+              class="c100 c101"
               href="https://support.uniswap.org/hc/en-us/requests/new"
               rel="noopener noreferrer"
               target="_blank"
@@ -5100,7 +5218,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
               Contact Us
             </a>
             <a
-              class="c99 c100"
+              class="c100 c101"
               href="https://support.uniswap.org/hc/en-us"
               rel="noopener noreferrer"
               target="_blank"
@@ -5110,50 +5228,50 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
           </div>
         </div>
         <div
-          class="c85 c101"
+          class="c86 c102"
         >
           <img
             alt="Uniswap Logo"
-            class="c87"
+            class="c88"
             src="unicornEmbossLight.png"
           />
           <div
-            class="c88"
+            class="c89"
           >
             <a
-              class="c89"
+              class="c90"
               href="https://discord.gg/FCfyBSbCU5"
               rel="noopener noreferrer"
               target="_blank"
             >
               <svg
-                class="c90"
+                class="c91"
                 size="32"
               >
                 discord.svg
               </svg>
             </a>
             <a
-              class="c89"
+              class="c90"
               href="https://twitter.com/uniswap"
               rel="noopener noreferrer"
               target="_blank"
             >
               <svg
-                class="c91"
+                class="c92"
                 size="32"
               >
                 twitter-safe.svg
               </svg>
             </a>
             <a
-              class="c89"
+              class="c90"
               href="https://github.com/Uniswap"
               rel="noopener noreferrer"
               target="_blank"
             >
               <svg
-                class="c92"
+                class="c93"
                 size="32"
               >
                 github.svg
@@ -5161,7 +5279,7 @@ exports[`disable nft on landing page renders nft information and card 1`] = `
             </a>
           </div>
           <span
-            class="c93"
+            class="c94"
           >
             © 
             2024
diff --git a/apps/web/src/pages/Landing/assets/approvedTokens.ts b/apps/web/src/pages/Landing/assets/approvedTokens.ts
deleted file mode 100644
index 727e115447c..00000000000
--- a/apps/web/src/pages/Landing/assets/approvedTokens.ts
+++ /dev/null
@@ -1,360 +0,0 @@
-import ethereumLogo from 'assets/images/ethereum-logo.png'
-import { Chain } from 'graphql/data/__generated__/types-and-hooks'
-
-export enum TokenStandard {
-  ERC20,
-  ERC721,
-}
-
-export interface InteractiveToken {
-  name: string
-  symbol: string
-  address: string
-  chain: Chain
-  standard: TokenStandard
-  color: string
-  logoUrl: string
-}
-
-export const approvedERC20: InteractiveToken[] = [
-  {
-    name: 'Ethereum',
-    symbol: 'ETH',
-    address: 'NATIVE',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-    color: '#627EEA',
-    logoUrl: ethereumLogo,
-  },
-  {
-    name: 'USDCoin',
-    symbol: 'USDC',
-    address: '0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-    color: '#2775CA',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
-  },
-  {
-    name: 'Dai Stablecoin',
-    symbol: 'DAI',
-    address: '0x6B175474E89094C44Da98b954EedeAC495271d0F',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-    color: '#FFAA00',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png',
-  },
-  {
-    name: 'Wrapped BTC',
-    symbol: 'WBTC',
-    address: '0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-    color: '#F7931A',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png',
-  },
-  {
-    name: 'Euro Coin',
-    symbol: 'EUROC',
-    address: '0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-    color: '#60BFFE',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x1aBaEA1f7C830bD89Acc67eC4af516284b1bC33c/logo.png',
-  },
-  {
-    name: 'Pax Dollar',
-    symbol: 'USDP',
-    address: '0x8E870D67F660D95d5be530380D0eC0bd388289E1',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-    color: '#075229',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x8E870D67F660D95d5be530380D0eC0bd388289E1/logo.png',
-  },
-  {
-    name: 'Decentraland',
-    symbol: 'MANA',
-    address: '0x0F5D2fB29fb7d3CFeE444a200298f468908cC942',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-    color: '#FF144F',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x0F5D2fB29fb7d3CFeE444a200298f468908cC942/logo.png',
-  },
-  {
-    name: 'Matic',
-    symbol: 'MATIC',
-    address: '0x0000000000000000000000000000000000001010',
-    chain: Chain.Polygon,
-    standard: TokenStandard.ERC20,
-    color: '#833ADD',
-    logoUrl: 'https://app.uniswap.org/static/media/matic-token-icon.efed2ee4e843195b44bf68ffc7439403.svg',
-  },
-  {
-    name: 'Moss Carbon Credit',
-    symbol: 'MCO2',
-    address: '0xAa7DbD1598251f856C12f63557A4C4397c253Cea',
-    chain: Chain.Polygon,
-    standard: TokenStandard.ERC20,
-    color: '#E1F345',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/polygon/assets/0xAa7DbD1598251f856C12f63557A4C4397c253Cea/logo.png',
-  },
-  {
-    name: 'Optimism',
-    symbol: 'OP',
-    address: '0x4200000000000000000000000000000000000042',
-    chain: Chain.Optimism,
-    standard: TokenStandard.ERC20,
-    color: '#FF001A',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/optimism/assets/0x4200000000000000000000000000000000000042/logo.png',
-  },
-  {
-    name: 'Uniswap',
-    symbol: 'UNI',
-    color: '#FF007A',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984/logo.png',
-    address: '0x1f9840a85d5af5bf1d1762f925bdaddc4201f984',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-  },
-  {
-    name: 'Aave',
-    symbol: 'AAVE',
-    color: '#B6509E',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9/logo.png',
-    address: '0x7fc66500c84a76ad7e9c93437bfc5ac33e2ddae9',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-  },
-  {
-    name: 'Chainlink',
-    symbol: 'LINK',
-    color: '#2A5ADA',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x514910771AF9Ca656af840dff83E8264EcF986CA/logo.png',
-    address: '0x514910771af9ca656af840dff83e8264ecf986ca',
-    standard: TokenStandard.ERC20,
-    chain: Chain.Ethereum,
-  },
-  {
-    name: 'Shiba Inu',
-    symbol: 'SHIB',
-    color: '#E01A2B',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x95aD61b0a150d79219dCF64E1E6Cc01f0B64C4cE/logo.png',
-    address: '0x95ad61b0a150d79219dcf64e1e6cc01f0b64c4ce',
-    standard: TokenStandard.ERC20,
-    chain: Chain.Ethereum,
-  },
-  {
-    name: 'Pepe Token',
-    symbol: 'PEPE',
-    color: '#009E1E',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6982508145454Ce325dDbE47a25d4ec3d2311933/logo.png',
-    address: '0x6982508145454ce325ddbe47a25d4ec3d2311933',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-  },
-  {
-    name: 'Apecoin',
-    symbol: 'APE',
-    color: '#1046D5',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x4d224452801ACEd8B2F0aebE155379bb5D594381/logo.png',
-    address: '0x4d224452801aced8b2f0aebe155379bb5d594381',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-  },
-  {
-    name: 'Maker',
-    symbol: 'MKR',
-    color: '#6DAEA2',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2/logo.png',
-    address: '0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-  },
-  {
-    name: 'Tether',
-    symbol: 'USDT',
-    color: '#409192',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xdAC17F958D2ee523a2206206994597C13D831ec7/logo.png',
-    address: '0xdac17f958d2ee523a2206206994597c13d831ec7',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-  },
-  {
-    name: 'Blur',
-    symbol: 'BLUR',
-    color: '#EA672B',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x5283D291DBCF85356A21bA090E6db59121208b44/logo.png',
-    address: '0x5283D291DBCF85356A21bA090E6db59121208b44',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-  },
-  {
-    name: 'Compound',
-    symbol: 'COMP',
-    color: '#00D395',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xc00e94Cb662C3520282E6f5717214004A7f26888/logo.png',
-    address: '0xc00e94Cb662C3520282E6f5717214004A7f26888',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-  },
-  {
-    name: 'Curve DAO Token',
-    symbol: 'CRV',
-    color: '#930201',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xD533a949740bb3306d119CC777fa900bA034cd52/logo.png',
-    address: '0xD533a949740bb3306d119CC777fa900bA034cd52',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-  },
-  {
-    name: 'Ethereum Name Service',
-    symbol: 'ENS',
-    color: '#66A0F5',
-    logoUrl:
-      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72/logo.png',
-    address: '0xC18360217D8F7Ab5e7c516566761Ea12Ce7F9D72',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC20,
-  },
-]
-
-export const approvedERC721: InteractiveToken[] = [
-  {
-    name: 'Unisocks',
-    symbol: 'SOCKS',
-    address: '0x65770b5283117639760beA3F867b69b3697a91dd',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC721,
-    color: '#CD237A',
-    logoUrl:
-      'https://i.seadn.io/gae/70fhKktz1h38x5pHR-DGxL4zP820_kSe5iVR_dDFXEo-etqbU5H_S-qfnvot7bd2AO7VzsRlgiU1AHYVtLfKaJZx?auto=format&dpr=1&w=384',
-  },
-  {
-    name: 'Shields',
-    symbol: 'SHIELDS',
-    address: '0x0747118C9F44C7a23365b2476dCD05E03114C747',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC721,
-    color: '#FE007A',
-    logoUrl:
-      'https://i.seadn.io/gae/YPrTXYJJn4SiRupatfXX2dzDVbOsSh2yoRVXuFOCpRA70aOkvGlg2rzGRl_U5reKUIykOxJzbCNXlQnwg3MW5Agk5OnAzUFJVZ0J?auto=format&dpr=1&w=384',
-  },
-  {
-    name: 'mfers',
-    symbol: 'MFER',
-    address: '0x79FCDEF22feeD20eDDacbB2587640e45491b757f',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC721,
-    color: '#FEE162',
-    logoUrl:
-      'https://i.seadn.io/gae/J2iIgy5_gmA8IS6sXGKGZeFVZwhldQylk7w7fLepTE9S7ICPCn_dlo8kypX8Ju0N6wvLVOKsbP_7bNGd8cpKmWhFQmqMXOC8q2sOdqw?auto=format&dpr=1&w=512',
-  },
-  {
-    name: 'tubby cats',
-    symbol: 'TUBBY',
-    address: '0xCa7cA7BcC765F77339bE2d648BA53ce9c8a262bD',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC721,
-    color: '#FE7FBE',
-    logoUrl:
-      'https://i.seadn.io/gae/TyPJi06xkDXOWeK4wYBCIskRcSJpmtVfVcJbuxNXDVsC39IC_Ls5taMlxpZPYMoUtlPH7YkQ4my1nwUGDIB5C01r97TPlYhkolk-TA?auto=format&dpr=1&w=256',
-  },
-  {
-    name: 'HyperLoot',
-    symbol: 'HLOOT',
-    address: '0x0290d49f53A8d186973B82faaFdaFe696B29AcBb',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC721,
-    color: '#EFBE40',
-    logoUrl:
-      'https://i.seadn.io/gae/aVGIsSXcxaV-hsaez_Xud5yhUy-057ix-3wI1iT6xodntJnewyDQPerb_3Tz3pJea4S8MrbAcc6SixjTu_hOUKG2HnLkXD_eSzvb?auto=format&dpr=1&w=48',
-  },
-  {
-    name: 'Nouns',
-    symbol: 'NOUN',
-    address: '0x9C8fF314C9Bc7F6e59A9d9225Fb22946427eDC03',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC721,
-    color: '#E8265B',
-    logoUrl:
-      'https://i.seadn.io/gae/vfYB4RarIqixy2-wyfP4lIdK6fsOT8uNrmKxvYCJdjdRwAMj2ZjC2zTSxL-YKky0s-4Pb6eML7ze3Ouj54HrpUlfSWx52xF_ZK2TYw?auto=format&dpr=1&w=750',
-  },
-  {
-    name: 'Binkies',
-    symbol: 'B',
-    address: '0xa06FDA2CaA66148603314451BA0F30c9c5d539E3',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC721,
-    color: '#FFA580',
-    logoUrl:
-      'https://i.seadn.io/gae/Nhn_GZkns5Mo8Ks33Q9u_ER3wbiVZcBWHWDWc84JWXCceqhZNenqbl3RT_61AmHxzx9yc57Ke4eRs_VJl-1LY4LU075HDQp8cB2IPw?auto=format&dpr=1&w=750',
-  },
-  {
-    name: 'Chain Runners',
-    symbol: 'RUN',
-    address: '0x97597002980134beA46250Aa0510C9B90d87A587',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC721,
-    color: '#00FE56',
-    logoUrl:
-      'https://i.seadn.io/gae/3vScLGUcTB7yhItRYXuAFcPGFNJ3kgO0mXeUSUfEMBjGkGPKz__smtXyUlRxzZjr1Y5x8hz1QXoBQSEb8wm4oBByeQC_8WOCaDON4Go?auto=format&dpr=1&w=750',
-  },
-  {
-    name: 'OKPC',
-    symbol: 'OKPC',
-    address: '0x7183209867489E1047f3A7c23ea1Aed9c4E236E8',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC721,
-    color: '#F6B53F',
-    logoUrl:
-      'https://i.seadn.io/gae/s8XNoLgpMIdjmOuOYy4qNjLrg59WPd9HRUp31uG3FLlSDzE68_HQfFYeAotCHBLYwB8ugByqi8hTEiH-gRWhu2DcvkD6bVDGSY1RhQ?auto=format&dpr=1&w=48',
-  },
-  {
-    name: 'The Blitnauts',
-    symbol: 'NAUT',
-    address: '0x448f3219CF2A23b0527A7a0158e7264B87f635Db',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC721,
-    color: '#967CDC',
-    logoUrl:
-      'https://i.seadn.io/gae/0tU9duZZsSeVxpcCJTGiPzqGF47ghOf0_b2rVcURBX-EjnQNY2xlBB3d1AX_XvtQC6MOMihEY8miYv-bH-i49F4IY_pks5KPeB19bw?auto=format&dpr=1&w=64',
-  },
-  {
-    name: 'Froggy Friends',
-    symbol: 'FROGGY',
-    address: '0x7ad05c1b87e93BE306A9Eadf80eA60d7648F1B6F',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC721,
-    color: '#92CEA8',
-    logoUrl: 'https://i.seadn.io/gcs/files/fedec03593a44488bc31f6365781069a.png?auto=format&dpr=1&w=512',
-  },
-  {
-    name: 'Bibos',
-    symbol: 'BIBO',
-    color: '#6629C9',
-    logoUrl:
-      'https://assets.coingecko.com/nft_contracts/images/1290/large/8b3c65ff29a58dd59ae26503ad40ab72.png?1659692625',
-    address: '0xf528e3381372c43f5e8a55b3e6c252e32f1a26e4',
-    chain: Chain.Ethereum,
-    standard: TokenStandard.ERC721,
-  },
-]
diff --git a/apps/web/src/pages/Landing/assets/staticTokens.ts b/apps/web/src/pages/Landing/assets/staticTokens.ts
new file mode 100644
index 00000000000..f8d5aaa2390
--- /dev/null
+++ b/apps/web/src/pages/Landing/assets/staticTokens.ts
@@ -0,0 +1,214 @@
+import ethereumLogo from 'assets/images/ethereum-logo.png'
+
+export const defaultCoin = {
+  name: 'Ethereum',
+  symbol: 'ETH',
+  pricePercentChange: 0,
+  color: '#627EEA',
+  logoUrl: ethereumLogo,
+  address: 'NATIVE',
+  type: 'COIN',
+}
+
+export const staticCoins = [
+  {
+    name: 'Uniswap',
+    symbol: 'UNI',
+    pricePercentChange: 0,
+    color: '#FF007A',
+    logoUrl:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984/logo.png',
+    address: '0x1f9840a85d5aF5bf1D1762F925BDADdC4201F984',
+    type: 'COIN',
+  },
+  {
+    name: 'Aave',
+    symbol: 'AAVE',
+    pricePercentChange: 0,
+    color: '#B6509E',
+    logoUrl:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9/logo.png',
+    address: '0x7Fc66500c84A76Ad7e9c93437bFc5Ac33E2DDaE9',
+    type: 'COIN',
+  },
+  {
+    name: 'Ethereum',
+    symbol: 'ETH',
+    pricePercentChange: 0,
+    color: '#627EEA',
+    logoUrl: ethereumLogo,
+    address: 'NATIVE',
+    type: 'COIN',
+  },
+  {
+    name: 'Chainlink',
+    symbol: 'LINK',
+    pricePercentChange: 0,
+    color: '#2A5ADA',
+    logoUrl:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x514910771AF9Ca656af840dff83E8264EcF986CA/logo.png',
+    address: '0x514910771AF9Ca656af840dff83E8264EcF986CA',
+    type: 'COIN',
+  },
+  {
+    name: 'Shiba Inu',
+    symbol: 'SHIB',
+    pricePercentChange: 0,
+    color: '#E01A2B',
+    logoUrl:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x95aD61b0a150d79219dCF64E1E6Cc01f0B64C4cE/logo.png',
+    address: '0x95ad61b0a150d79219dcf64e1e6cc01f0b64c4ce',
+    type: 'COIN',
+  },
+  {
+    name: 'Pepe Token',
+    symbol: 'PEPE',
+    pricePercentChange: 0,
+    color: '#009E1E',
+    logoUrl:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6982508145454Ce325dDbE47a25d4ec3d2311933/logo.png',
+    address: '0x6982508145454Ce325dDbE47a25d4ec3d2311933',
+    type: 'COIN',
+  },
+  {
+    name: 'USD Coin',
+    symbol: 'USDC',
+    pricePercentChange: 0,
+    color: '#2775CA',
+    logoUrl:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png',
+    address: '0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48',
+    type: 'COIN',
+  },
+  {
+    name: 'Wrapped BTC',
+    symbol: 'WBTC',
+    pricePercentChange: 0,
+    color: '#F7931A',
+    logoUrl:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599/logo.png',
+    address: '0x2260fac5e5542a773aa44fbcfedf7c193bc2c599',
+    type: 'COIN',
+  },
+  {
+    name: 'Dai',
+    symbol: 'DAI',
+    pricePercentChange: 0,
+    color: '#FFAA00',
+    logoUrl:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png',
+    address: '0x6b175474e89094c44da98b954eedeac495271d0f',
+    type: 'COIN',
+  },
+  {
+    name: 'HarryPotterObamaSonic10Inu',
+    symbol: 'BITCOIN',
+    pricePercentChange: 0,
+    color: 'rgba(0, 20, 195, 1)',
+    logoUrl: 'https://assets.coingecko.com/coins/images/30323/large/hpos10i_logo_casino_night-dexview.png?1696529224',
+    address: '0x6b175474e89094c44da98b954eedeac495271d0f',
+    type: 'COIN',
+  },
+  {
+    name: 'Apecoin',
+    symbol: 'APE',
+    pricePercentChange: 0,
+    color: 'rgba(0, 20, 195, 1)',
+    logoUrl:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x4d224452801ACEd8B2F0aebE155379bb5D594381/logo.png',
+    address: '0x4d224452801ACEd8B2F0aebE155379bb5D594381',
+    type: 'COIN',
+  },
+  {
+    name: 'Maker',
+    symbol: 'MKR',
+    pricePercentChange: 0,
+    color: '#6DAEA2',
+    logoUrl:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2/logo.png',
+    address: '0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2',
+    type: 'COIN',
+  },
+  {
+    name: 'Tether',
+    symbol: 'USDT',
+    pricePercentChange: 0,
+    color: '#409192',
+    logoUrl:
+      'https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xdAC17F958D2ee523a2206206994597C13D831ec7/logo.png',
+    address: '0xdAC17F958D2ee523a2206206994597C13D831ec7',
+    type: 'COIN',
+  },
+]
+
+export const staticCollections = [
+  {
+    name: 'Bibos',
+    symbol: 'BIBO',
+    pricePercentChange: 0,
+    color: '#6629C9',
+    logoUrl:
+      'https://assets.coingecko.com/nft_contracts/images/1290/large/8b3c65ff29a58dd59ae26503ad40ab72.png?1659692625',
+    address: '0xf528e3381372c43f5e8a55b3e6c252e32f1a26e4',
+    type: 'COLLECTIBLE',
+  },
+  {
+    name: 'Mutant Ape Yacht Club',
+    symbol: 'MAYC',
+    pricePercentChange: 0,
+    color: '#CFDD40',
+    logoUrl:
+      'https://i.seadn.io/gae/lHexKRMpw-aoSyB1WdFBff5yfANLReFxHzt1DOj_sg7mS14yARpuvYcUtsyyx-Nkpk6WTcUPFoG53VnLJezYi8hAs0OxNZwlw6Y-dmI?w=500&auto=format',
+    address: '0x60e4d786628fea6478f785a6d7e704777c86a7c6',
+    type: 'COLLECTIBLE',
+  },
+  {
+    name: 'Pudgy Penguins',
+    symbol: 'PUDGY',
+    pricePercentChange: 0,
+    color: '#80AAFE',
+    logoUrl:
+      'https://i.seadn.io/gae/yNi-XdGxsgQCPpqSio4o31ygAV6wURdIdInWRcFIl46UjUQ1eV7BEndGe8L661OoG-clRi7EgInLX4LPu9Jfw4fq0bnVYHqg7RFi?w=500&auto=format',
+    address: '0xbd3531da5cf5857e7cfaa92426877b022e612cf8',
+    type: 'COLLECTIBLE',
+  },
+  {
+    name: 'Milady Maker',
+    symbol: 'MILADY',
+    pricePercentChange: 0,
+    color: '#69358A',
+    logoUrl:
+      'https://i.seadn.io/gae/a_frplnavZA9g4vN3SexO5rrtaBX_cBTaJYcgrPtwQIqPhzgzUendQxiwUdr51CGPE2QyPEa1DHnkW1wLrHAv5DgfC3BP-CWpFq6BA?w=500&auto=format',
+    address: '0x1a92f7381b9f03921564a437210bb9396471050c',
+    type: 'COLLECTIBLE',
+  },
+  {
+    name: 'Azuki',
+    symbol: 'AZUKI',
+    pricePercentChange: 0,
+    color: '#BC3748',
+    logoUrl:
+      'https://i.seadn.io/gae/H8jOCJuQokNqGBpkBN5wk1oZwO7LM8bNnrHCaekV2nKjnCqw6UB5oaH8XyNeBDj6bA_n1mjejzhFQUP3O1NfjFLHr3FOaeHcTOOT?w=500&auto=format',
+    address: '0x7b6ab32ca02b31485fbf7265437c2853792cc5d9',
+    type: 'COLLECTIBLE',
+  },
+  {
+    name: 'Bored Ape Yacht Club',
+    symbol: 'BAYC',
+    pricePercentChange: 0,
+    color: '#F4B000',
+    logoUrl: 'https://i.seadn.io/gae/2hQ3ZI6Kk',
+    address: '0xbc4ca0eda7647a8ab7c2061c2e118a18a936f13d',
+    type: 'COLLECTIBLE',
+  },
+  {
+    name: 'Mfers',
+    symbol: 'MFERS',
+    pricePercentChange: 0,
+    color: '#F4B000',
+    logoUrl:
+      'https://i.seadn.io/gae/J2iIgy5_gmA8IS6sXGKGZeFVZwhldQylk7w7fLepTE9S7ICPCn_dlo8kypX8Ju0N6wvLVOKsbP_7bNGd8cpKmWhFQmqMXOC8q2sOdqw?w=500&auto=format',
+    address: '0x7b6ab32ca02b31485fbf7265437c2853792cc5d9',
+    type: 'COLLECTIBLE',
+  },
+]
diff --git a/apps/web/src/pages/Landing/components/DownloadApp/GetTheAppButton.test.tsx b/apps/web/src/pages/Landing/components/DownloadApp/GetTheAppButton.test.tsx
deleted file mode 100644
index 49fb1faef37..00000000000
--- a/apps/web/src/pages/Landing/components/DownloadApp/GetTheAppButton.test.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { render, screen } from 'test-utils/render'
-
-beforeEach(() => {
-  window.matchMedia = jest.fn().mockImplementation(() => ({
-    addListener: jest.fn(),
-    removeListener: jest.fn(),
-  }))
-})
-
-import { GetTheAppButton } from './GetTheAppButton'
-
-describe('GetTheAppButton', () => {
-  it('displays a button with call to action text and icons', () => {
-    const { container } = render(<GetTheAppButton />)
-
-    expect(container).toMatchSnapshot()
-    expect(screen.getByText('Get the app')).toBeVisible()
-    expect(screen.getByTestId('apple-logo')).toBeVisible()
-    expect(screen.getByTestId('google-play-store-logo')).toBeVisible()
-  })
-})
diff --git a/apps/web/src/pages/Landing/components/DownloadApp/GetTheAppButton.tsx b/apps/web/src/pages/Landing/components/DownloadApp/GetTheAppButton.tsx
deleted file mode 100644
index 5030b3e99e9..00000000000
--- a/apps/web/src/pages/Landing/components/DownloadApp/GetTheAppButton.tsx
+++ /dev/null
@@ -1,60 +0,0 @@
-import { Trans } from '@lingui/macro'
-import { AppleLogo } from 'components/Icons/AppleLogo'
-import { GooglePlayStoreLogo } from 'components/Icons/GooglePlayStoreLogo'
-import Row from 'components/Row'
-import { useOpenModal } from 'state/application/hooks'
-import { ApplicationModal } from 'state/application/reducer'
-import styled, { useTheme } from 'styled-components'
-import { BREAKPOINTS } from 'theme'
-import { ThemedText } from 'theme/components'
-
-import { Wiggle } from '../animations'
-
-const StyledButton = styled.button`
-  height: 40px;
-  background: ${({ theme }) => theme.surface1};
-  border-radius: 20px;
-  border: 1px solid ${({ theme }) => theme.surface3};
-  padding: 8px 16px 8px 12px;
-  cursor: pointer;
-  &:hover {
-    background: ${({ theme }) => theme.surface2};
-  }
-`
-const CallToAction = styled(ThemedText.BodyPrimary)`
-  line-height: 20px;
-  white-space: nowrap;
-
-  @media screen and (max-width: ${BREAKPOINTS.sm}px) {
-    display: none;
-  }
-`
-
-const WiggleIcon = styled(Wiggle)`
-  flex: 0;
-  height: auto;
-  cursor: pointer;
-  display: flex;
-  justify-content: center;
-  align-items: center;
-`
-export function GetTheAppButton() {
-  const theme = useTheme()
-  const openModal = useOpenModal(ApplicationModal.GET_THE_APP)
-
-  return (
-    <StyledButton onClick={openModal}>
-      <Row width="fit-content" gap="12px" align="center" justify="center">
-        <CallToAction data-testid="get-the-app-cta">
-          <Trans>Get the app</Trans>
-        </CallToAction>
-        <WiggleIcon>
-          <AppleLogo fill={theme.neutral1} />
-        </WiggleIcon>
-        <WiggleIcon>
-          <GooglePlayStoreLogo />
-        </WiggleIcon>
-      </Row>
-    </StyledButton>
-  )
-}
diff --git a/apps/web/src/pages/Landing/components/DownloadApp/GetTheAppModal.tsx b/apps/web/src/pages/Landing/components/DownloadApp/GetTheAppModal.tsx
deleted file mode 100644
index 04f6dc8aec9..00000000000
--- a/apps/web/src/pages/Landing/components/DownloadApp/GetTheAppModal.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-import { Trans } from '@lingui/macro'
-import walletAppPromoBannerQR from 'assets/images/app-promo-banner/walletAnnouncementBannerQR.png'
-import { ReactComponent as AppStoreBadge } from 'assets/svg/app-store-badge.svg'
-import { ReactComponent as PlayStoreBadge } from 'assets/svg/play-store-badge.svg'
-import { ColumnCenter } from 'components/Column'
-import Modal from 'components/Modal'
-import Row from 'components/Row'
-import { useOnClickOutside } from 'hooks/useOnClickOutside'
-import { useRef } 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 { ExternalLink, ThemedText } from 'theme/components'
-
-const StyledModal = styled(Modal)`
-  display: block;
-`
-const Wrapper = styled.div`
-  position: relative;
-  padding: 60px 32px 32px 32px;
-  width: 100%;
-  user-select: none;
-`
-const CloseIcon = styled(X)`
-  width: 25px;
-  height: 25px;
-  stroke: ${({ theme }) => theme.neutral2};
-`
-const CloseButton = styled.div`
-  width: 32px;
-  height: 32px;
-  position: absolute;
-  top: 28px;
-  right: 23px;
-  border-radius: 160px;
-  padding: 4px;
-  cursor: pointer;
-  background: ${({ theme }) => theme.surface3};
-  :hover {
-    ${CloseIcon} {
-      stroke: ${({ theme }) => theme.neutral1};
-    }
-  }
-`
-const StyledQRCode = styled.img`
-  width: 150px;
-  height: 150px;
-  border: 1px solid ${({ theme }) => theme.surface3};
-  border-radius: 12px;
-`
-const BadgeLink = styled(ExternalLink)`
-  stroke: none;
-  :hover {
-    opacity: 1;
-  }
-`
-export function GetTheAppModal() {
-  const isOpen = useModalIsOpen(ApplicationModal.GET_THE_APP)
-  const closeModal = useCloseModal()
-  const ref = useRef<HTMLDivElement>(null)
-  useOnClickOutside(ref, () => (isOpen ? closeModal(ApplicationModal.GET_THE_APP) : undefined))
-
-  return (
-    <StyledModal isOpen={isOpen} maxWidth={486} slideIn>
-      <Wrapper ref={ref}>
-        <CloseButton onClick={() => closeModal(ApplicationModal.GET_THE_APP)} data-testid="get-the-app-close-button">
-          <CloseIcon />
-        </CloseButton>
-        <ColumnCenter gap="xl">
-          <ColumnCenter gap="sm">
-            <ThemedText.H1Medium textAlign="center">
-              <Trans>Download the Uniswap app</Trans>
-            </ThemedText.H1Medium>
-            <ThemedText.BodySecondary textAlign="center" maxWidth="400px">
-              <Trans>Scan the QR code with your phone to download the Uniswap app</Trans>
-            </ThemedText.BodySecondary>
-          </ColumnCenter>
-          <BadgeLink href="https://uniswapwallet.onelink.me/8q3y/m4i9qsez?af_qr=true">
-            <StyledQRCode src={walletAppPromoBannerQR} alt="App OneLink QR code" />
-          </BadgeLink>
-          <Row justify="center" gap="16px">
-            <BadgeLink href="https://apps.apple.com/us/app/uniswap-crypto-nft-wallet/id6443944476">
-              <AppStoreBadge />
-            </BadgeLink>
-            <BadgeLink href="https://play.google.com/store/apps/details?id=com.uniswap.mobile&pcampaignid=web_share">
-              <PlayStoreBadge />
-            </BadgeLink>
-          </Row>
-        </ColumnCenter>
-      </Wrapper>
-    </StyledModal>
-  )
-}
diff --git a/apps/web/src/pages/Landing/components/DownloadApp/__snapshots__/GetTheAppButton.test.tsx.snap b/apps/web/src/pages/Landing/components/DownloadApp/__snapshots__/GetTheAppButton.test.tsx.snap
deleted file mode 100644
index bca3168243d..00000000000
--- a/apps/web/src/pages/Landing/components/DownloadApp/__snapshots__/GetTheAppButton.test.tsx.snap
+++ /dev/null
@@ -1,154 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`GetTheAppButton displays a button with call to action text and icons 1`] = `
-.c1 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-}
-
-.c2 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 12px;
-}
-
-.c3 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c0 {
-  height: 40px;
-  background: #FFFFFF;
-  border-radius: 20px;
-  border: 1px solid #22222212;
-  padding: 8px 16px 8px 12px;
-  cursor: pointer;
-}
-
-.c0:hover {
-  background: #F9F9F9;
-}
-
-.c4 {
-  line-height: 20px;
-  white-space: nowrap;
-}
-
-.c5 {
-  -webkit-flex: 0;
-  -ms-flex: 0;
-  flex: 0;
-  height: auto;
-  cursor: pointer;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-@media screen and (max-width:640px) {
-  .c4 {
-    display: none;
-  }
-}
-
-<div>
-  <button
-    class="c0"
-  >
-    <div
-      class="c1 c2"
-      width="fit-content"
-    >
-      <div
-        class="c3 c4 css-1urox24"
-        data-testid="get-the-app-cta"
-      >
-        Get the app
-      </div>
-      <div
-        class="c5"
-        style="transform: none;"
-      >
-        <svg
-          data-testid="apple-logo"
-          fill="none"
-          height="16"
-          viewBox="0 0 14 16"
-          width="14"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M11.6662 8.50891C11.6741 7.89565 11.837 7.29436 12.1397 6.76098C12.4424 6.22759 12.8752 5.77945 13.3976 5.45824C13.0657 4.98422 12.6279 4.59412 12.1188 4.31892C11.6098 4.04372 11.0436 3.89101 10.4652 3.87292C9.23139 3.74341 8.03528 4.6112 7.40655 4.6112C6.76567 4.6112 5.79765 3.88578 4.75526 3.90722C4.08101 3.92901 3.4239 4.12507 2.84796 4.47632C2.27202 4.82757 1.79688 5.32201 1.46884 5.91149C0.0478641 8.37169 1.10779 11.9874 2.46897 13.976C3.14999 14.9498 3.94592 16.0375 4.98737 15.999C6.00649 15.9567 6.38712 15.3491 7.61728 15.3491C8.83603 15.3491 9.19314 15.999 10.2557 15.9744C11.3493 15.9567 12.0383 14.9963 12.6954 14.0133C13.1847 13.3195 13.5613 12.5526 13.8111 11.7411C13.1757 11.4724 12.6336 11.0226 12.2521 10.4479C11.8707 9.87307 11.6669 9.19873 11.6662 8.50891Z"
-            fill="#222222"
-          />
-          <path
-            d="M9.65929 2.56468C10.2555 1.8489 10.5493 0.928877 10.4782 0C9.56722 0.0956776 8.72575 0.531052 8.12144 1.21937C7.82597 1.55564 7.59968 1.94684 7.45549 2.37061C7.3113 2.79438 7.25205 3.24242 7.28112 3.68911C7.73676 3.6938 8.18752 3.59504 8.59946 3.40027C9.0114 3.2055 9.37377 2.9198 9.65929 2.56468Z"
-            fill="#222222"
-          />
-        </svg>
-      </div>
-      <div
-        class="c5"
-        style="transform: none;"
-      >
-        <svg
-          data-testid="google-play-store-logo"
-          fill="none"
-          height="16"
-          viewBox="0 0 16 16"
-          width="16"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M7.48727 7.63928L0.873077 14.6688C0.873077 14.6688 0.873077 14.6688 0.873077 14.675C1.07802 15.4401 1.7736 16 2.5996 16C2.92876 16 3.23928 15.9129 3.50633 15.7512L3.52496 15.7387L10.9652 11.4402L7.48727 7.63928Z"
-            fill="#EA4335"
-          />
-          <path
-            d="M14.1759 6.44484L14.1696 6.43862L10.9588 4.57239L7.33809 7.80097L10.9712 11.4401L14.1696 9.59255C14.7286 9.28773 15.1074 8.69676 15.1074 8.0187C15.1074 7.33441 14.7286 6.74966 14.1759 6.44484Z"
-            fill="#FBBC04"
-          />
-          <path
-            d="M0.873171 1.33118C0.835908 1.48048 0.811066 1.62977 0.811066 1.79151V14.2144C0.811066 14.3761 0.829697 14.5254 0.873171 14.6747L7.71094 7.82566L0.873171 1.33118Z"
-            fill="#4285F4"
-          />
-          <path
-            d="M7.53695 7.99992L10.9589 4.57227L3.52496 0.255052C3.25791 0.0933115 2.94118 0 2.5996 0C1.7736 0 1.07802 0.566091 0.873077 1.32503L7.53695 7.99992Z"
-            fill="#34A853"
-          />
-        </svg>
-      </div>
-    </div>
-  </button>
-</div>
-`;
diff --git a/apps/web/src/pages/Landing/components/Generics.tsx b/apps/web/src/pages/Landing/components/Generics.tsx
index bd3e62ede59..f990ac7845a 100644
--- a/apps/web/src/pages/Landing/components/Generics.tsx
+++ b/apps/web/src/pages/Landing/components/Generics.tsx
@@ -1,3 +1,4 @@
+import { Text } from 'rebass'
 import styled, { css } from 'styled-components'
 
 const H1Styles = css<{ color?: string }>`
@@ -11,17 +12,17 @@ const H1Styles = css<{ color?: string }>`
   font-weight: 500;
   line-height: 120%; /* 76.8px */
   white-space: pre-line;
-  letter-spacing: -0.02em;
   @media (max-width: 768px) {
     font-size: 36px;
   }
 `
-
-export const H1 = styled.span`
+export const H1 = styled.h1`
   ${H1Styles}
 `
 // Matches H1 in style but does not use h1 tag for SEO improvement
-
+export const ExtendedH1 = styled(Text)`
+  ${H1Styles}
+`
 export const H2 = styled.h2`
   padding: 0;
   margin: 0;
@@ -30,7 +31,6 @@ export const H2 = styled.h2`
   font-size: 52px;
   font-style: normal;
   font-weight: 500;
-  letter-spacing: -0.02em;
   line-height: 60px; /* 115.385% */
   @media (max-width: 1024px) {
     font-size: 36px;
@@ -43,7 +43,6 @@ export const H3 = styled.h3`
   font-size: 24px;
   font-style: normal;
   font-weight: 500;
-  letter-spacing: -0.02em;
   line-height: 32px; /* 133.333% */
   color: ${(props) => props.color || props.theme.neutral1};
 `
@@ -58,7 +57,19 @@ export const Body1 = styled.p`
   font-style: normal;
   font-weight: 500;
   line-height: 24px; /* 133.333% */
-  letter-spacing: -0.01em;
+`
+export const Body2 = styled.p`
+  padding: 0;
+  margin: 0;
+  color: ${(props) => props.color || props.theme.neutral2};
+  text-align: center;
+  /* Body/2 */
+  font-family: Basel;
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 500;
+  line-height: 24px; /* 150% */
+  text-decoration: none;
 `
 export const Subheading = styled.p`
   padding: 0;
@@ -71,10 +82,25 @@ export const Subheading = styled.p`
   font-style: normal;
   font-weight: 500;
   line-height: 24px; /* 133.333% */
-  max-width: 430px;
-  letter-spacing: -0.01em;
 `
+export const Button = styled.button`
+  padding: 12px 16px;
+  border-radius: 24px;
+  background-color: ${({ theme }) => theme.surface2};
+
+  font-family: Basel;
+  font-size: 18px;
+  font-style: normal;
+  font-weight: 535;
+  line-height: 24px; /* 133.333% */
 
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 8px;
+
+  color: ${({ theme }) => theme.neutral1};
+`
 export type BoxProps = {
   position?: 'relative' | 'absolute' | 'fixed'
   top?: string
diff --git a/apps/web/src/pages/Landing/components/Icons.tsx b/apps/web/src/pages/Landing/components/Icons.tsx
index 142a66d4808..5d0f720e587 100644
--- a/apps/web/src/pages/Landing/components/Icons.tsx
+++ b/apps/web/src/pages/Landing/components/Icons.tsx
@@ -3,6 +3,36 @@ type IconProps = {
   size?: string
 }
 
+export function PriceArrowUp() {
+  return (
+    <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M10.868 7.17012L13.7881 11.4985C14.2788 12.226 13.8628 13.3334 13.0988 13.3334H6.90123C6.1372 13.3334 5.72122 12.2252 6.21191 11.4985L9.13196 7.17012C9.58465 6.49928 10.4154 6.49928 10.868 7.17012Z"
+        fill="#40B66B"
+      />
+    </svg>
+  )
+}
+
+export function PriceArrowDown() {
+  return (
+    <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M10.868 12.8304L13.7881 8.50196C14.2788 7.77446 13.8628 6.66704 13.0988 6.66704H6.90123C6.1372 6.66704 5.72122 7.7753 6.21191 8.50196L9.13196 12.8304C9.58465 13.5012 10.4154 13.5012 10.868 12.8304Z"
+        fill="#FD766B"
+      />
+    </svg>
+  )
+}
+
+export function PriceNeutral() {
+  return (
+    <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <rect x="6" y="8" width="8" height="3" rx="1.5" fill="#7D7D7D" />
+    </svg>
+  )
+}
+
 export function Wallet(props: IconProps) {
   return (
     <svg width={props.size} height={props.size} viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -16,6 +46,17 @@ export function Wallet(props: IconProps) {
   )
 }
 
+export function ArrowRightCircle(props: IconProps) {
+  return (
+    <svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+      <path
+        d="M12 2.88574C6.477 2.88574 2 7.36274 2 12.8857C2 18.4087 6.477 22.8857 12 22.8857C17.523 22.8857 22 18.4087 22 12.8857C22 7.36274 17.523 2.88574 12 2.88574ZM16.6919 13.1729C16.6539 13.2649 16.599 13.3477 16.53 13.4167L13.53 16.4167C13.384 16.5627 13.192 16.6367 13 16.6367C12.808 16.6367 12.616 16.5637 12.47 16.4167C12.177 16.1237 12.177 15.6487 12.47 15.3557L14.1899 13.6357H8C7.586 13.6357 7.25 13.2997 7.25 12.8857C7.25 12.4717 7.586 12.1357 8 12.1357H14.189L12.469 10.4158C12.176 10.1228 12.176 9.64774 12.469 9.35474C12.762 9.06174 13.237 9.06174 13.53 9.35474L16.53 12.3547C16.599 12.4237 16.6539 12.5066 16.6919 12.5986C16.7679 12.7826 16.7679 12.9889 16.6919 13.1729Z"
+        fill={props.fill}
+      />
+    </svg>
+  )
+}
+
 export function HelpCircle(props: IconProps) {
   return (
     <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
@@ -38,11 +79,11 @@ export function BookOpen(props: IconProps) {
   )
 }
 
-export function ChatBubbles(props: IconProps) {
+export function File(props: IconProps) {
   return (
     <svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path
-        d="M20.8789 20.394C21.1189 20.594 20.9789 20.994 20.6689 20.994C19.6389 21.034 18.0591 20.894 17.0891 19.864C16.2991 20.144 15.419 20.2841 14.499 20.2841C12.481 20.2841 10.686 19.607 9.49902 18.368C9.31002 18.17 9.35802 17.785 9.79102 17.819C10.024 17.835 10.259 17.844 10.499 17.844C15.119 17.844 18.614 15.143 19.353 11.235C19.403 10.973 19.7291 10.886 19.8931 11.097C20.5931 12.003 20.998 13.1481 20.998 14.5031C20.998 16.0331 20.4679 17.314 19.5879 18.264C19.6989 18.964 20.0889 19.754 20.8789 20.394ZM17.998 9.67102C17.998 9.62402 17.992 9.58103 17.991 9.53503C17.917 5.44903 14.594 3 10.499 3C6.35802 3 3 5.50202 3 9.67102C3 11.439 3.608 12.915 4.625 14.015C4.5 14.816 4.05009 15.733 3.14209 16.467C2.86709 16.7 3.02503 17.159 3.38403 17.167C4.56703 17.209 6.39203 17.05 7.50903 15.858C7.73703 15.937 7.97094 16.006 8.21094 16.066C8.93194 16.247 9.69998 16.3409 10.501 16.3409C14.64 16.3419 17.998 13.84 17.998 9.67102Z"
+        d="M14.75 6V3.75L19.25 8.25H17C15.42 8.25 14.75 7.58 14.75 6ZM17 9.75C14.58 9.75 13.25 8.42 13.25 6V3H8C6 3 5 4 5 6V18C5 20 6 21 8 21H17C19 21 20 20 20 18V9.75H17Z"
         fill={props.fill}
       />
     </svg>
@@ -82,7 +123,7 @@ export function ArrowRight(props: IconProps) {
 
 export function Github(props: IconProps) {
   return (
-    <svg width={props.size ?? '41'} height={props.size ?? '41'} viewBox="0 0 41 41" xmlns="http://www.w3.org/2000/svg">
+    <svg width="41" height="41" viewBox="0 0 41 41" xmlns="http://www.w3.org/2000/svg">
       <path
         fillRule="evenodd"
         clipRule="evenodd"
@@ -95,7 +136,7 @@ export function Github(props: IconProps) {
 
 export function Twitter(props: IconProps) {
   return (
-    <svg width={props.size ?? '41'} height={props.size ?? '41'} viewBox="0 0 41 41" xmlns="http://www.w3.org/2000/svg">
+    <svg width="41" height="41" viewBox="0 0 41 41" xmlns="http://www.w3.org/2000/svg">
       <path
         d="M33.9523 14.2212C33.9689 14.5045 33.9689 14.8045 33.9689 15.1045C33.9689 24.0045 27.1022 34.2545 14.5356 34.2545C10.6689 34.2545 7.06891 33.1545 4.05225 31.2378C4.60225 31.3045 5.13559 31.3212 5.70226 31.3212C8.90226 31.3212 11.8356 30.2545 14.1856 28.4545C11.1856 28.3878 8.66891 26.4545 7.80225 23.7878C8.21891 23.8545 8.65225 23.8878 9.08559 23.8878C9.70225 23.8878 10.3189 23.8045 10.8856 23.6545C7.75226 23.0211 5.40224 20.3212 5.40224 17.0545V16.9712C6.31891 17.4712 7.36892 17.7878 8.48559 17.8211C6.65225 16.6045 5.43558 14.5545 5.43558 12.2211C5.43558 10.9711 5.76891 9.82115 6.36891 8.82115C9.73558 12.9045 14.7856 15.5711 20.4522 15.8711C20.3522 15.3711 20.2856 14.8545 20.2856 14.3378C20.2856 10.6211 23.3356 7.60449 27.1189 7.60449C29.0856 7.60449 30.8689 8.42114 32.1023 9.72114C33.6523 9.43781 35.1189 8.87116 36.4356 8.1045C35.9356 9.67116 34.8523 10.9878 33.4356 11.8045C34.8023 11.6545 36.1356 11.2878 37.3689 10.7711C36.4356 12.1045 35.2689 13.2878 33.9356 14.2545L33.9523 14.2212Z"
         fill={props.fill}
@@ -106,7 +147,7 @@ export function Twitter(props: IconProps) {
 
 export function Discord(props: IconProps) {
   return (
-    <svg width={props.size ?? '41'} height={props.size ?? '41'} viewBox="0 0 41 41" xmlns="http://www.w3.org/2000/svg">
+    <svg width="41" height="41" viewBox="0 0 41 41" xmlns="http://www.w3.org/2000/svg">
       <path
         d="M32.3019 11.3373C30.1352 10.354 27.8186 9.6373 25.4186 9.2373C25.1186 9.75397 24.7852 10.454 24.5519 11.004C21.9852 10.6373 19.4519 10.6373 16.9186 11.004C16.6852 10.454 16.3352 9.75397 16.0519 9.2373C13.6352 9.6373 11.3186 10.354 9.16857 11.3373C4.8019 17.704 3.61856 23.9206 4.21856 30.054C7.11856 32.1373 9.91858 33.404 12.6686 34.2373C13.3352 33.3373 13.9519 32.3706 14.4686 31.354C13.4686 30.9873 12.5186 30.5373 11.6186 30.004C11.8519 29.8373 12.0852 29.654 12.3019 29.4707C17.7852 31.954 23.7519 31.954 29.1686 29.4707C29.4019 29.654 29.6186 29.8373 29.8519 30.004C28.9519 30.5373 28.0019 30.9873 27.0019 31.354C27.5185 32.3706 28.1352 33.3373 28.8019 34.2373C31.5519 33.404 34.3686 32.1373 37.2519 30.054C37.9852 22.954 36.1019 16.7873 32.3352 11.3373H32.3019ZM15.1852 26.1873C13.5352 26.1873 12.1852 24.6873 12.1852 22.854C12.1852 21.0207 13.5019 19.5207 15.1852 19.5207C16.8685 19.5207 18.2186 21.0207 18.1852 22.854C18.1852 24.6873 16.8519 26.1873 15.1852 26.1873ZM26.2519 26.1873C24.6019 26.1873 23.2519 24.6873 23.2519 22.854C23.2519 21.0207 24.5686 19.5207 26.2519 19.5207C27.9352 19.5207 29.2852 21.0207 29.2519 22.854C29.2519 24.6873 27.9352 26.1873 26.2519 26.1873Z"
         fill={props.fill}
@@ -115,22 +156,22 @@ export function Discord(props: IconProps) {
   )
 }
 
-export function Bars(props: IconProps) {
+export function Instagram(props: IconProps) {
   return (
-    <svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <svg width="41" height="41" viewBox="0 0 41 41" xmlns="http://www.w3.org/2000/svg">
       <path
-        d="M12.7148 21.0011H11.7148C10.7148 21.0011 10.2148 20.5011 10.2148 19.5011V4.50108C10.2148 3.50108 10.7148 3.00108 11.7148 3.00108H12.7148C13.7148 3.00108 14.2148 3.50108 14.2148 4.50108V19.5011C14.2148 20.5011 13.7148 21.0011 12.7148 21.0011ZM21.2148 19.5011V9.50108C21.2148 8.50108 20.7148 8.00108 19.7148 8.00108H18.7148C17.7148 8.00108 17.2148 8.50108 17.2148 9.50108V19.5011C17.2148 20.5011 17.7148 21.0011 18.7148 21.0011H19.7148C20.7148 21.0011 21.2148 20.5011 21.2148 19.5011ZM7.21484 19.5011V13.5011C7.21484 12.5011 6.71484 12.0011 5.71484 12.0011H4.71484C3.71484 12.0011 3.21484 12.5011 3.21484 13.5011V19.5011C3.21484 20.5011 3.71484 21.0011 4.71484 21.0011H5.71484C6.71484 21.0011 7.21484 20.5011 7.21484 19.5011Z"
+        d="M35.6186 14.7209C35.502 12.3209 34.952 10.1876 33.202 8.43756C31.452 6.68756 29.3186 6.13757 26.9186 6.0209C24.4353 5.88757 17.0186 5.88757 14.552 6.0209C12.152 6.13757 10.0353 6.68756 8.26864 8.43756C6.50197 10.1876 5.96862 12.3209 5.85195 14.7209C5.71862 17.2042 5.71862 24.6209 5.85195 27.1042C5.96862 29.5042 6.51864 31.6376 8.26864 33.3876C10.0353 35.1376 12.152 35.6876 14.552 35.8042C17.0353 35.9376 24.452 35.9376 26.9186 35.8042C29.3186 35.6876 31.452 35.1376 33.202 33.3876C34.952 31.6376 35.502 29.5042 35.6186 27.1042C35.752 24.6209 35.752 17.2042 35.6186 14.7376V14.7209ZM20.7186 28.8209C16.352 28.8209 12.802 25.2709 12.802 20.9042C12.802 16.5376 16.352 12.9876 20.7186 12.9876C25.0853 12.9876 28.6353 16.5376 28.6353 20.9042C28.6353 25.2709 25.0853 28.8209 20.7186 28.8209ZM29.9186 13.4042C29.002 13.4042 28.252 12.6542 28.252 11.7376C28.252 10.8209 28.9853 10.0709 29.9186 10.0709C30.8353 10.0709 31.5853 10.8209 31.5853 11.7376C31.5853 12.6542 30.8353 13.4042 29.9186 13.4042ZM26.1353 20.9042C26.1353 23.8876 23.702 26.3209 20.7186 26.3209C17.7353 26.3209 15.302 23.8876 15.302 20.9042C15.302 17.9209 17.7353 15.4876 20.7186 15.4876C23.702 15.4876 26.1353 17.9209 26.1353 20.9042Z"
         fill={props.fill}
       />
     </svg>
   )
 }
 
-export function CodeBrackets(props: IconProps) {
+export function Bars(props: IconProps) {
   return (
-    <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+    <svg width="25" height="24" viewBox="0 0 25 24" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path
-        d="M7.00001 17C6.74401 17 6.48801 16.902 6.29301 16.707L2.29301 12.707C1.90201 12.317 1.90201 11.683 2.29301 11.293L6.29301 7.29299C6.68401 6.90199 7.31601 6.90199 7.70701 7.29299C8.09801 7.68299 8.09801 8.31699 7.70701 8.70699L4.41401 12L7.70701 15.293C8.09801 15.683 8.09801 16.317 7.70701 16.707C7.51201 16.902 7.25601 17 7.00001 17ZM17.707 16.707L21.707 12.707C22.098 12.317 22.098 11.683 21.707 11.293L17.707 7.29299C17.316 6.90199 16.684 6.90199 16.293 7.29299C15.902 7.68299 15.902 8.31699 16.293 8.70699L19.586 12L16.293 15.293C15.902 15.683 15.902 16.317 16.293 16.707C16.488 16.902 16.744 17 17 17C17.256 17 17.512 16.902 17.707 16.707ZM9.937 20.351L15.937 4.35101C16.131 3.83401 15.869 3.25699 15.352 3.06399C14.834 2.86999 14.259 3.13198 14.064 3.64898L8.064 19.649C7.87 20.166 8.13201 20.743 8.64901 20.936C8.76501 20.98 8.88301 21 9.00001 21C9.40501 21 9.786 20.752 9.937 20.351Z"
+        d="M12.7148 21.0011H11.7148C10.7148 21.0011 10.2148 20.5011 10.2148 19.5011V4.50108C10.2148 3.50108 10.7148 3.00108 11.7148 3.00108H12.7148C13.7148 3.00108 14.2148 3.50108 14.2148 4.50108V19.5011C14.2148 20.5011 13.7148 21.0011 12.7148 21.0011ZM21.2148 19.5011V9.50108C21.2148 8.50108 20.7148 8.00108 19.7148 8.00108H18.7148C17.7148 8.00108 17.2148 8.50108 17.2148 9.50108V19.5011C17.2148 20.5011 17.7148 21.0011 18.7148 21.0011H19.7148C20.7148 21.0011 21.2148 20.5011 21.2148 19.5011ZM7.21484 19.5011V13.5011C7.21484 12.5011 6.71484 12.0011 5.71484 12.0011H4.71484C3.71484 12.0011 3.21484 12.5011 3.21484 13.5011V19.5011C3.21484 20.5011 3.71484 21.0011 4.71484 21.0011H5.71484C6.71484 21.0011 7.21484 20.5011 7.21484 19.5011Z"
         fill={props.fill}
       />
     </svg>
diff --git a/apps/web/src/pages/Landing/components/StatCard.tsx b/apps/web/src/pages/Landing/components/StatCard.tsx
index 801155ce9f0..3f22ca89aa3 100644
--- a/apps/web/src/pages/Landing/components/StatCard.tsx
+++ b/apps/web/src/pages/Landing/components/StatCard.tsx
@@ -1,8 +1,5 @@
-import Row from 'components/Row'
 import { motion } from 'framer-motion'
-import { parseToRgb } from 'polished'
-import styled, { keyframes, useTheme } from 'styled-components'
-import { opacify } from 'theme/utils'
+import styled from 'styled-components'
 
 const Mask = motion(styled.div`
   position: relative;
@@ -18,32 +15,24 @@ const Mask = motion(styled.div`
     min-height: 32px;
   }
 `)
-const Char = motion(styled.div<{ color: string }>`
+const Char = motion(styled.div`
   font-variant-numeric: lining-nums tabular-nums;
   font-family: Basel;
   font-size: 52px;
   font-style: normal;
   font-weight: 500;
-  color: ${({ color }) => color};
+  color: ${({ theme }) => theme.neutral1};
   line-height: 52px;
-  @media (max-width: 1280px) {
+  @media (max-width: 1024px) {
     font-size: 40px;
     line-height: 40px;
   }
-  @media (max-width: 1050px) {
+  @media (max-width: 768px) {
     font-size: 32px;
     line-height: 32px;
   }
-  @media (max-width: 850px) {
-    font-size: 28px;
-    line-height: 28px;
-  }
-  @media (max-width: 396px) {
-    font-size: 22px;
-    line-height: 22px;
-  }
 `)
-const Container = styled.div<{ live?: boolean }>`
+const Container = styled.div`
   display: flex;
   flex-direction: column;
   align-items: flex-start;
@@ -52,11 +41,10 @@ const Container = styled.div<{ live?: boolean }>`
 
   width: 100%;
   height: 100%;
-  max-height: 230px;
 
   padding: 32px;
 
-  background-color: ${({ theme, live }) => (live ? '#2FBA610A' : theme.surface2)};
+  background-color: ${({ theme }) => theme.surface2};
   overflow: hidden;
 
   @media (max-width: 1024px) {
@@ -64,12 +52,6 @@ const Container = styled.div<{ live?: boolean }>`
   }
   @media (max-width: 768px) {
   }
-  background-image: radial-gradient(rgba(${({ theme }) => {
-    const { red, green, blue } = parseToRgb(theme.neutral2)
-    return `${red}, ${green}, ${blue}`
-  }}, 0.25) 0.5px, transparent 0)};
-  background-size: 12px 12px;
-  background-position: -8.5px -8.5px;
 `
 const SpriteContainer = motion(styled.div`
   pointer-events: none;
@@ -77,52 +59,27 @@ const SpriteContainer = motion(styled.div`
   flex-direction: column;
   color: ${({ theme }) => theme.neutral2};
 `)
-
-const pulsate = (color: string) => keyframes`
-  0% {
-    box-shadow: 0 0 0 0 ${opacify(24, color)};
-  }
-  100% {
-    box-shadow: 0 0 0 4px ${opacify(24, color)};
-  }
-`
-const LiveIcon = styled.div<{ display: string }>`
-  display: ${({ display }) => display};
-  width: 6px;
-  height: 6px;
-
-  border-radius: 50%;
-  background: ${({ theme }) => theme.success};
-
-  animation-name: ${({ theme }) => pulsate(theme.success)};
-  animation-fill-mode: forwards;
-  animation-direction: alternate;
-  animation-duration: 1000ms;
-  animation-iteration-count: infinite;
-  animation-timing-function: ease-in-out;
-`
-const Title = styled.h3<{ color: string }>`
+const Title = styled.h3`
   padding: 0;
   margin: 0;
   font-family: Basel;
   font-size: 24px;
   font-style: normal;
-  font-weight: 535;
+  font-weight: 500;
   line-height: 32px; /* 133.333% */
-  color: ${({ color }) => color};
+  color: ${({ theme }) => theme.neutral2};
   @media (max-width: 1024px) {
-    font-size: 18px;
+    font-size: 20px;
     line-height: 26px;
   }
   @media (max-width: 768px) {
-    font-size: 18px;
+    font-size: 20px;
     line-height: 20px;
   }
 `
 type StatCardProps = {
   title: string
   value: string
-  live?: boolean
   prefix?: string
   suffix?: string
   delay?: number
@@ -139,18 +96,13 @@ const suffixes = [' ', 'K', 'M', 'B', 'T']
 const delineators = [',', '.']
 
 export function StatCard(props: StatCardProps) {
-  const theme = useTheme()
   return (
-    <Container live={props.live}>
-      <Row align="center" gap="sm">
-        <LiveIcon display={props.live ? 'block' : 'none'} />
-        <Title color={props.live ? theme.success : theme.neutral2}>{props.title}</Title>
-      </Row>
+    <Container>
+      <Title>{props.title}</Title>
       <StringInterpolationWithMotion
         prefix={props.prefix}
         suffix={props.suffix}
         value={props.value}
-        live={props.live}
         delay={props.delay}
         inView={props.inView}
       />
@@ -158,9 +110,8 @@ export function StatCard(props: StatCardProps) {
   )
 }
 
-function StringInterpolationWithMotion({ value, delay, inView, live }: Omit<StatCardProps, 'title'>) {
+function StringInterpolationWithMotion({ value, delay, inView }: Omit<StatCardProps, 'title'>) {
   const chars = value.split('')
-  const theme = useTheme()
 
   return (
     <Mask
@@ -178,13 +129,13 @@ function StringInterpolationWithMotion({ value, delay, inView, live }: Omit<Stat
           ? currency
           : suffixes
 
-        return <NumberSprite char={char} key={index} charset={charset} color={live ? theme.success : theme.neutral1} />
+        return <NumberSprite char={char} key={index} charset={charset} />
       })}
     </Mask>
   )
 }
 
-function NumberSprite({ char, charset, color }: { char: string; charset: string[]; color: string }) {
+function NumberSprite({ char, charset }: { char: string; charset: string[] }) {
   const height = 60
 
   // rotate array so that the char is at the top
@@ -225,7 +176,7 @@ function NumberSprite({ char, charset, color }: { char: string; charset: string[
         }
 
         return (
-          <Char variants={charVariants} key={index} color={color}>
+          <Char variants={charVariants} key={index}>
             {char}
           </Char>
         )
diff --git a/apps/web/src/pages/Landing/components/TokenCloud/Ticker.tsx b/apps/web/src/pages/Landing/components/TokenCloud/Ticker.tsx
index 1a971abcd13..626fb9b40c9 100644
--- a/apps/web/src/pages/Landing/components/TokenCloud/Ticker.tsx
+++ b/apps/web/src/pages/Landing/components/TokenCloud/Ticker.tsx
@@ -1,65 +1,63 @@
-import { DeltaArrow } from 'components/Tokens/TokenDetails/Delta'
 import { motion } from 'framer-motion'
 import styled from 'styled-components'
-import { ThemedText } from 'theme/components'
-import { useFormatter } from 'utils/formatNumbers'
 
-import { TickerPosition } from '.'
+import { Box } from '../Generics'
+import { PriceArrowDown, PriceArrowUp, PriceNeutral } from '../Icons'
+import { isNegative } from './utils'
 
 const PriceContainer = styled(motion.div)`
   display: flex;
   flex-direction: column;
   justify-content: center;
 `
-const TickerText = styled(motion.div)<{ $tickerPosition: TickerPosition }>`
+const TickerText = styled(motion.div)`
   font-size: 14px;
   font-weight: 500;
   color: ${(props) => `${props.color}`};
-  text-align: ${({ $tickerPosition }) => ($tickerPosition === TickerPosition.RIGHT ? 'left' : 'right')};
 `
-const TickerContainer = styled(motion.div)<{ $tickerPosition: TickerPosition; size: number }>`
+const TickerContainer = styled(motion.div)`
   pointer-events: none;
   position: absolute;
   display: flex;
   flex-direction: row;
-  ${({ $tickerPosition, size }) =>
-    $tickerPosition === TickerPosition.RIGHT ? `left: ${size * 1.25}px` : `right: ${size * 0.6}px`};
   gap: 20px;
 `
+const PricePercentChangeText = styled(motion.div)`
+  font-size: 12px;
+  font-weight: 500;
+  color: ${(props) => `${props.color}`};
+`
+
 const PricePercentChange = styled(motion.div)`
   display: flex;
   flex-direction: row;
-  align-items: center;
 `
 export function Ticker(props: {
   color: string
-  pricePercentChange: number
+  PricePercentChange: number
   ticker: string
-  tickerPosition: TickerPosition
   size: number
   children?: React.ReactNode
   animate: string
 }) {
-  const { formatDelta } = useFormatter()
   const priceVariants = {
     rest: { opacity: 0, x: 0 },
     hover: { opacity: 1, x: 8 },
   }
   return (
-    <TickerContainer
-      initial="rest"
-      variants={priceVariants}
-      animate={props.animate}
-      $tickerPosition={props.tickerPosition}
-      size={props.size}
-    >
+    <TickerContainer initial="rest" variants={priceVariants} animate={props.animate}>
+      <Box flex="none" width={`${props.size}px`} height={`${props.size}px`} />
       <PriceContainer>
-        <TickerText color={props.color} $tickerPosition={props.tickerPosition}>
-          {props.ticker}
-        </TickerText>
+        <TickerText color={props.color}>{props.ticker}</TickerText>
         <PricePercentChange>
-          <DeltaArrow delta={props.pricePercentChange} />
-          <ThemedText.BodySecondary>{formatDelta(props.pricePercentChange)}</ThemedText.BodySecondary>
+          {(props.PricePercentChange | 0) === 0 ? (
+            <PriceNeutral />
+          ) : isNegative(props.PricePercentChange) ? (
+            <PriceArrowDown />
+          ) : (
+            <PriceArrowUp />
+          )}
+          <PricePercentChangeText>{props.PricePercentChange}</PricePercentChangeText>
         </PricePercentChange>
       </PriceContainer>
     </TickerContainer>
diff --git a/apps/web/src/pages/Landing/components/TokenCloud/Token.tsx b/apps/web/src/pages/Landing/components/TokenCloud/Token.tsx
index 31af057b028..0a771663117 100644
--- a/apps/web/src/pages/Landing/components/TokenCloud/Token.tsx
+++ b/apps/web/src/pages/Landing/components/TokenCloud/Token.tsx
@@ -1,9 +1,4 @@
-import { useInfoExplorePageEnabled } from 'featureFlags/flags/infoExplore'
 import { motion } from 'framer-motion'
-import { useCollectionPromoQuery, useTokenPromoQuery } from 'graphql/data/__generated__/types-and-hooks'
-import { getTokenDetailsURL } from 'graphql/data/util'
-import { TokenStandard } from 'pages/Landing/assets/approvedTokens'
-import { useMemo } from 'react'
 import { useNavigate } from 'react-router-dom'
 import styled, { keyframes } from 'styled-components'
 
@@ -61,10 +56,10 @@ const RotateContainer = styled.div<{ duration?: number }>`
 const TokenIconRing = styled(motion.div)<{
   size: number
   color: string
-  standard: TokenStandard
-  $borderRadius: number
+  type: string
+  borderRadius: number
 }>`
-  border-radius: ${(props) => (props.standard === TokenStandard.ERC20 ? '50%' : `${props.$borderRadius}px`)}};
+  border-radius: ${(props) => (props.type === 'COIN' ? '50%' : `${props.borderRadius}px`)}};
   width: ${(props) => `${props.size}px`};
   height: ${(props) => `${props.size}px`};
   background-color: rgba(0,0,0,0);
@@ -78,18 +73,18 @@ const TokenIcon = styled(motion.div)<{
   size: number
   blur: number
   color: string
-  standard: TokenStandard
+  type: string
   rotation: number
   opacity: number
-  $borderRadius: number
-  $logoUrl: string
+  borderRadius: number
+  logoUrl: string
 }>`
-    border-radius: ${(props) => (props.standard === TokenStandard.ERC20 ? '50%' : `${props.$borderRadius}px`)}};
+    border-radius: ${(props) => (props.type === 'COIN' ? '50%' : `${props.borderRadius}px`)}};
     width: ${(props) => `${props.size}px`};
     height: ${(props) => `${props.size}px`};
     background-color:${(props) => `${props.color}`};
     filter: blur(${(props) => `${props.blur}px`});
-    background-image: url(${(props) => props.$logoUrl});
+    background-image: url(${(props) => props.logoUrl});
     background-size: cover;
     background-position: center center;
     transition: filter 0.15s ease-in-out;
@@ -100,13 +95,7 @@ const TokenIcon = styled(motion.div)<{
         cursor: pointer;
     }
 `
-export function Token(props: {
-  point: TokenPoint
-  idx: number
-  cursor: number
-  transition?: boolean
-  setCursor: (idx: number) => void
-}) {
+export function Token(props: { point: TokenPoint; idx: number; cursor: number; setCursor: (idx: number) => void }) {
   const { cursor, setCursor, idx, point } = props
   const {
     x,
@@ -118,67 +107,18 @@ export function Token(props: {
     delay,
     floatDuration,
     logoUrl,
-    standard,
+    type,
+    PricePercentChange,
     ticker,
-    tickerPosition,
     color,
     address,
-    chain,
   } = point
 
-  const tokenPromoQuery = useTokenPromoQuery({
-    variables: {
-      address: address !== 'NATIVE' ? address : undefined,
-      chain,
-    },
-    skip: standard !== TokenStandard.ERC20,
-  })
-  const collectionPromoQuery = useCollectionPromoQuery({
-    variables: {
-      addresses: [address],
-    },
-    skip: standard !== TokenStandard.ERC721,
-  })
-  const pricePercentChange = useMemo(() => {
-    const value =
-      standard === TokenStandard.ERC20
-        ? tokenPromoQuery.data?.token?.market?.pricePercentChange?.value ?? 0
-        : collectionPromoQuery.data?.nftCollections?.edges?.[0].node.markets?.[0].floorPricePercentChange?.value
-    return value ?? 0
-  }, [
-    collectionPromoQuery.data?.nftCollections?.edges,
-    tokenPromoQuery.data?.token?.market?.pricePercentChange?.value,
-    standard,
-  ])
-
   const navigate = useNavigate()
-  const isInfoExplorePageEnabled = useInfoExplorePageEnabled()
-  const handleOnClick = useMemo(
-    () => () =>
-      navigate(
-        standard === TokenStandard.ERC20
-          ? getTokenDetailsURL({
-              address,
-              chain,
-              isInfoExplorePageEnabled,
-            })
-          : `/nfts/collection/${address}`
-      ),
-    [address, chain, isInfoExplorePageEnabled, navigate, standard]
-  )
+  const handleOnClick = () => navigate(type === 'COIN' ? `/tokens/ethereum/${address}` : `/nfts/collection/${address}`)
 
   const borderRadius = size / 8
 
-  const [targetX, targetY] = useMemo(() => {
-    const centerX = window.innerWidth / 2
-    const centerY = window.innerHeight / 2
-    const r = Math.sqrt(centerX ** 2 + centerY ** 2)
-    const theta = Math.atan2(y - centerY, x - centerX)
-    const targetX = centerX + 1.5 * r * Math.cos(theta)
-    const targetY = centerY + 1.5 * r * Math.sin(theta)
-    return [targetX, targetY]
-  }, [x, y])
-
   const positionerVariants = {
     initial: { scale: 0.5, opacity: 0, rotateX: 15, left: x, top: y + 30 },
     animate: {
@@ -188,13 +128,6 @@ export function Token(props: {
       left: x,
       top: y,
     },
-    exit: {
-      scale: 3,
-      opacity: 0,
-      rotateX: 15,
-      left: targetX,
-      top: targetY,
-    },
   }
 
   const coinVariants = {
@@ -244,21 +177,16 @@ export function Token(props: {
       key={`tokenIcon-${idx}`}
       variants={positionerVariants}
       initial="initial"
-      animate={props.transition ? 'exit' : 'animate'}
-      transition={
-        props.transition
-          ? { delay: 0, duration: 2.5, type: 'spring' }
-          : { delay, duration: 0.8, type: 'spring', bounce: 0.6 }
-      }
+      animate="animate"
+      transition={{ delay, duration: 0.8, type: 'spring', bounce: 0.6 }}
       size={size}
     >
       <FloatContainer duration={floatDuration} onMouseEnter={() => setCursor(idx)} onMouseLeave={() => setCursor(-1)}>
         <Ticker
           size={size}
           color={color}
-          pricePercentChange={pricePercentChange}
+          PricePercentChange={PricePercentChange}
           ticker={ticker}
-          tickerPosition={tickerPosition}
           animate={hovered ? 'hover' : 'animate'}
         />
         <RotateContainer duration={duration}>
@@ -266,13 +194,13 @@ export function Token(props: {
             size={size}
             blur={blur}
             color={color}
-            standard={standard}
+            type={type}
             rotation={rotation}
-            $logoUrl={logoUrl}
+            logoUrl={logoUrl}
             opacity={opacity}
             initial="rest"
             animate={hovered ? 'hover' : 'animate'}
-            $borderRadius={borderRadius}
+            borderRadius={borderRadius}
             variants={coinVariants}
             transition={{ delay: 0 }}
             onClick={() => handleOnClick()}
@@ -280,16 +208,16 @@ export function Token(props: {
             <TokenIconRing
               variants={iconRingVariant1}
               size={size}
-              standard={standard}
+              type={type}
               color={color}
-              $borderRadius={borderRadius * 1.3}
+              borderRadius={borderRadius * 1.3}
             />
             <TokenIconRing
               variants={iconRingVariant2}
               size={size}
-              standard={standard}
+              type={type}
               color={color}
-              $borderRadius={borderRadius * 1.6}
+              borderRadius={borderRadius * 1.6}
             />
           </TokenIcon>
         </RotateContainer>
diff --git a/apps/web/src/pages/Landing/components/TokenCloud/index.tsx b/apps/web/src/pages/Landing/components/TokenCloud/index.tsx
index 47700371b5c..63996a2be50 100644
--- a/apps/web/src/pages/Landing/components/TokenCloud/index.tsx
+++ b/apps/web/src/pages/Landing/components/TokenCloud/index.tsx
@@ -1,10 +1,10 @@
-import { approvedERC20, approvedERC721, InteractiveToken } from 'pages/Landing/assets/approvedTokens'
 import PoissonDiskSampling from 'poisson-disk-sampling'
 import { useMemo, useRef, useState } from 'react'
 import styled from 'styled-components'
 
+import { defaultCoin, staticCoins, staticCollections } from '../../assets/staticTokens'
 import { Token } from './Token'
-import { mixArrays, randomFloat, randomInt } from './utils'
+import { isInBounds, mixArrays, randomFloat, randomInt } from './utils'
 
 const Container = styled.div`
   width: 100%;
@@ -16,17 +16,23 @@ const Container = styled.div`
   top: 0;
 `
 const Inner = styled.div`
-  width: 100vw;
-  height: 100vh;
+  width: 3000px;
   flex-shrink: 0;
+  height: 800px;
   position: relative;
   overflow: visible;
 `
-export enum TickerPosition {
-  RIGHT,
-  LEFT,
+
+type Token = {
+  address: string
+  color: string
+  logoUrl: string
+  PricePercentChange: number
+  symbol: string
+  type: string
 }
-export type TokenPoint = InteractiveToken & {
+
+export type TokenPoint = Token & {
   x: number
   y: number
   blur: number
@@ -38,48 +44,56 @@ export type TokenPoint = InteractiveToken & {
   delay: number
   floatDuration: number
   ticker: string
-  tickerPosition: TickerPosition
 }
 
-export function TokenCloud({ transition }: { transition?: boolean }) {
+const w = 3000
+const h = 800 - 72
+
+const centerRect = {
+  x: w / 2 - 250,
+  y: 0,
+  w: w / 2 + 250,
+  h,
+}
+
+const poissonConfig = {
+  shape: [w, h],
+  minDistance: 225,
+  maxDistance: 350,
+  tries: 10,
+}
+
+export function TokenCloud() {
   const pts = useMemo(() => {
-    const tokenList: InteractiveToken[] = mixArrays(approvedERC20, approvedERC721, 0.33)
+    const tokenList = mixArrays(staticCoins, staticCollections, 0.33)
 
-    const w = window.innerWidth
-    const h = window.innerHeight - 72
-    const leftThreshold = w / 2 - 240
-    const rightThreshold = w / 2 + 240
-    const poissonConfig = {
-      shape: [w, h],
-      minDistance: 250,
-      maxDistance: 375,
-      tries: 10,
-    }
     const poissonDiskSampling = new PoissonDiskSampling(poissonConfig)
     const points = poissonDiskSampling
       .fill()
+      // Remove points inside center rectangle which is occupied by the headline and swap interface
+      .filter(([x, y]) => !isInBounds(x, y, centerRect.x, centerRect.y, centerRect.w, centerRect.h))
       // Order by distance from center, ie idx = 0 is closest to center
       .sort((a, b) => Math.abs(a[0] - w / 2) - Math.abs(b[0] - w / 2))
       .map(([x, y], idx: number) => {
-        const token: InteractiveToken = tokenList[idx % tokenList.length]
-        const size = randomInt(50, 96)
+        const token = !tokenList[idx] ? defaultCoin : tokenList[idx]
+
+        const size = randomInt(40, 96)
+
         return {
           x,
           y,
-          blur: (1 / size) * 500 * ((x > leftThreshold && x < rightThreshold) || y < 100 ? 5 : 1), // make blur bigger for smaller icons
+          blur: (1 / size) * 1000, // make blur bigger for smaller icons
           size,
           color: token.color,
           logoUrl: token.logoUrl,
-          opacity: randomFloat(0.5, 1.0) * ((x > leftThreshold && x < rightThreshold) || y < 100 ? 0.75 : 1),
+          opacity: randomFloat(0.5, 1.0),
           rotation: randomInt(-20, 20),
           delay: Math.abs(x - w / 2) / 800,
           floatDuration: randomFloat(3, 6),
           ticker: token.symbol,
-          tickerPosition:
-            (x < leftThreshold && x + 100 > leftThreshold) || x + 200 > w ? TickerPosition.LEFT : TickerPosition.RIGHT,
-          standard: token.standard,
+          PricePercentChange: token.PricePercentChange,
+          type: token.type,
           address: token.address,
-          chain: token.chain,
         }
       })
       .map((p) => {
@@ -100,16 +114,7 @@ export function TokenCloud({ transition }: { transition?: boolean }) {
     <Container ref={constraintsRef}>
       <Inner>
         {pts.map((point: TokenPoint, idx) => {
-          return (
-            <Token
-              key={`token-${idx}`}
-              point={point}
-              idx={idx}
-              cursor={cursor}
-              setCursor={setCursor}
-              transition={transition}
-            />
-          )
+          return <Token key={`token-${idx}`} point={point} idx={idx} cursor={cursor} setCursor={setCursor} />
         })}
       </Inner>
     </Container>
diff --git a/apps/web/src/pages/Landing/components/TokenCloud/utils.ts b/apps/web/src/pages/Landing/components/TokenCloud/utils.ts
index 861ad139f25..f52de631798 100644
--- a/apps/web/src/pages/Landing/components/TokenCloud/utils.ts
+++ b/apps/web/src/pages/Landing/components/TokenCloud/utils.ts
@@ -1,3 +1,7 @@
+export function isNegative(n: number) {
+  return n < 0
+}
+
 export function randomInt(min: number, max: number): number {
   return Math.floor(Math.random() * (max - min + 1) + min)
 }
@@ -10,6 +14,10 @@ export function randomChoice<T>(choices: T[]): T {
   return choices[Math.floor(Math.random() * choices.length)]
 }
 
+export function isInBounds(x: number, y: number, x1: number, y1: number, x2: number, y2: number) {
+  return x >= x1 && x <= x2 && y >= y1 && y <= y2
+}
+
 function shuffleArray(array: any[]) {
   const newArray = [...array]
   for (let i = newArray.length - 1; i > 0; i--) {
diff --git a/apps/web/src/pages/Landing/components/animations.tsx b/apps/web/src/pages/Landing/components/animations.tsx
index cf10c72f4db..3b1d131a632 100644
--- a/apps/web/src/pages/Landing/components/animations.tsx
+++ b/apps/web/src/pages/Landing/components/animations.tsx
@@ -59,11 +59,3 @@ export const Hover = (props: RiseInProps) => {
     </motion.div>
   )
 }
-
-export function Wiggle({ ...props }) {
-  const variants = {
-    initial: { rotate: 0, scale: 1 },
-    animate: { rotate: [20, 0], scale: 1.2, transition: { type: 'spring', stiffness: 200 } },
-  }
-  return <motion.div {...props} whileHover="animate" initial="initial" variants={variants} />
-}
diff --git a/apps/web/src/pages/Landing/components/cards/DocumentationCard.tsx b/apps/web/src/pages/Landing/components/cards/DocumentationCard.tsx
index 754f36951ca..691346931c6 100644
--- a/apps/web/src/pages/Landing/components/cards/DocumentationCard.tsx
+++ b/apps/web/src/pages/Landing/components/cards/DocumentationCard.tsx
@@ -1,15 +1,11 @@
 import { t } from '@lingui/macro'
-import { Alignment, Fit, Layout, useRive } from '@rive-app/react-canvas'
-import { useScreenSize } from 'hooks/useScreenSize'
 import styled from 'styled-components'
 
-import { CodeBrackets } from '../Icons'
+import { Bars } from '../Icons'
 import { PillButton } from './PillButton'
 import ValuePropCard from './ValuePropCard'
 
-const Contents = styled.div`
-  width: 100%;
-  height: 100%;
+const Anim = styled.div`
   display: flex;
   flex-direction: row-reverse;
   align-items: center;
@@ -19,9 +15,6 @@ const Contents = styled.div`
   bottom: 0;
 
   opacity: 1;
-  @media (max-width: 1280px) {
-    opacity: 0.32;
-  }
   @media (max-width: 768px) {
     opacity: 0;
   }
@@ -32,37 +25,21 @@ type WebappCardProps = {
   tagText?: string
 }
 
-const primary = '#00C3A0'
+const primary = '#1DA16A'
 
 export function DocumentationCard(props: WebappCardProps) {
-  const { rive, RiveComponent } = useRive({
-    src: '/rive/landing-page.riv',
-    artboard: 'Dev',
-    stateMachines: 'Animation',
-    layout: new Layout({ fit: Fit.Contain, alignment: Alignment.CenterRight }),
-  })
-
-  const isScreenSize = useScreenSize()
-  const screenIsLarge = isScreenSize['lg']
-  const screenIsXLarge = isScreenSize['xl']
-
   return (
     <ValuePropCard
-      height={screenIsLarge ? '340px' : '240px'}
+      height="320px"
       href="https://docs.uniswap.org/"
-      backgroundColor={{ dark: 'rgba(0, 195, 160, 0.08);', light: 'rgba(0, 195, 160, 0.06);' }}
+      backgroundColor={{ dark: 'rgba(22, 222, 139, 0.12)', light: 'rgba(22, 222, 139, 0.06)' }}
       isDarkMode={props.isDarkMode}
       textColor={primary}
-      button={
-        <PillButton color={primary} label={t`Developer docs`} icon={<CodeBrackets size="24px" fill={primary} />} />
-      }
-      titleText={t`Build the next generation of open applications and tools.`}
-      paddingRight={screenIsXLarge ? '16%' : '0%'}
-      alignTextToBottom
+      button={<PillButton color={primary} label="Developer docs" icon={<Bars size="24px" fill={primary} />} />}
+      titleText={t`Build open apps and tools that you want to see in the world.`}
+      paddingRight="15%"
     >
-      <Contents>
-        <RiveComponent onMouseEnter={() => rive && rive.play()} />
-      </Contents>
+      <Anim />
     </ValuePropCard>
   )
 }
diff --git a/apps/web/src/pages/Landing/components/cards/DownloadWalletCard.tsx b/apps/web/src/pages/Landing/components/cards/DownloadWalletCard.tsx
index c45f567708e..00267a4e568 100644
--- a/apps/web/src/pages/Landing/components/cards/DownloadWalletCard.tsx
+++ b/apps/web/src/pages/Landing/components/cards/DownloadWalletCard.tsx
@@ -1,6 +1,6 @@
 import { t } from '@lingui/macro'
-import { Alignment, Fit, Layout, useRive } from '@rive-app/react-canvas'
-import styled, { useTheme } from 'styled-components'
+import Rive, { Alignment, Fit, Layout } from '@rive-app/react-canvas'
+import styled from 'styled-components'
 import { useIsDarkMode } from 'theme/components/ThemeToggle'
 
 import { Wallet } from '../Icons'
@@ -8,58 +8,50 @@ import { PillButton } from './PillButton'
 import ValuePropCard from './ValuePropCard'
 
 const Contents = styled.div`
-  width: 100%;
-  height: 75%;
+  display: flex;
+  flex-direction: column-reverse;
+  align-items: center;
+
   position: absolute;
-  margin: auto;
+  width: 100%;
   bottom: 0;
-  z-index: 1;
-  @media (max-width: 980px) and (min-width: 768px) {
-    width: 125%;
-    transform: translateX(-10.25%);
-  }
+  padding: 16px;
+  padding-bottom: 0;
 `
 
-export function DownloadWalletCard() {
-  const theme = useTheme()
-  const isDarkMode = useIsDarkMode()
-
-  const { rive: lightAnimation, RiveComponent: LightAnimation } = useRive({
-    src: '/rive/landing-page.riv',
-    artboard: 'Mobile-Light',
-    stateMachines: 'Animation',
-    layout: new Layout({ fit: Fit.Contain, alignment: Alignment.BottomCenter }),
-  })
+type DownloadWalletCardProps = {
+  isDarkMode?: boolean
+  tagText?: string
+}
 
-  const { rive: darkAnimation, RiveComponent: DarkAnimation } = useRive({
-    src: '/rive/landing-page.riv',
-    artboard: 'Mobile-Dark',
-    stateMachines: 'Animation',
-    layout: new Layout({ fit: Fit.Contain, alignment: Alignment.BottomCenter }),
-  })
+const primary = '#FC72FF'
 
+export function DownloadWalletCard(props: DownloadWalletCardProps) {
+  const isDarkMode = useIsDarkMode()
   return (
     <ValuePropCard
       href="https://wallet.uniswap.org/"
+      height="696px"
       minHeight="500px"
-      isDarkMode={isDarkMode}
-      textColor={theme.accent1}
+      isDarkMode={props.isDarkMode}
+      textColor={primary}
       backgroundColor={{ dark: 'rgba(252, 114, 255, 0.12)', light: 'rgba(252, 114, 255, 0.12)' }}
-      button={
-        <PillButton
-          color={theme.accent1}
-          label={t`Uniswap wallet`}
-          icon={<Wallet size="24px" fill={theme.accent1} />}
-        />
-      }
-      titleText={t`The wallet built for swapping. Available on iOS and Android.`}
+      button={<PillButton color={primary} label="Download the wallet" icon={<Wallet size="24px" fill={primary} />} />}
+      titleText={t`The power of Uniswap in your pocket.`}
     >
       <Contents>
-        {isDarkMode ? (
-          <DarkAnimation onMouseEnter={() => darkAnimation?.play()} />
-        ) : (
-          <LightAnimation onMouseEnter={() => lightAnimation?.play()} />
-        )}
+        <Rive
+          style={{ width: '100%', height: '600px' }}
+          src="/rive/landingPageAnimations.riv"
+          artboard={isDarkMode ? 'Mobile-Dark' : 'Mobile-Light'}
+          stateMachines="HoverAnimation"
+          layout={
+            new Layout({
+              fit: Fit.Contain,
+              alignment: Alignment.BottomCenter,
+            })
+          }
+        />
       </Contents>
     </ValuePropCard>
   )
diff --git a/apps/web/src/pages/Landing/components/cards/LiquidityCard.tsx b/apps/web/src/pages/Landing/components/cards/LiquidityCard.tsx
index 7547aebac1f..0f5111df5bf 100644
--- a/apps/web/src/pages/Landing/components/cards/LiquidityCard.tsx
+++ b/apps/web/src/pages/Landing/components/cards/LiquidityCard.tsx
@@ -1,6 +1,5 @@
 import { t } from '@lingui/macro'
-import { Alignment, Fit, Layout, useRive } from '@rive-app/react-canvas'
-import { useScreenSize } from 'hooks/useScreenSize'
+import Rive, { Alignment, Fit, Layout } from '@rive-app/react-canvas'
 import styled from 'styled-components'
 
 import { Bars } from '../Icons'
@@ -8,8 +7,6 @@ import { PillButton } from './PillButton'
 import ValuePropCard from './ValuePropCard'
 
 const Contents = styled.div`
-  width: 100%;
-  height: 100%;
   display: flex;
   flex-direction: row-reverse;
   align-items: center;
@@ -19,9 +16,6 @@ const Contents = styled.div`
   bottom: 0;
 
   opacity: 1;
-  @media (max-width: 1280px) {
-    opacity: 0.24;
-  }
   @media (max-width: 768px) {
     opacity: 0;
   }
@@ -31,35 +25,34 @@ type LiquidityCardProps = {
   isDarkMode?: boolean
 }
 
-const primary = '#9E62FF'
+const primary = '#A457FF'
 
 export function LiquidityCard(props: LiquidityCardProps) {
-  const { rive, RiveComponent } = useRive({
-    src: '/rive/landing-page.riv',
-    artboard: 'LP',
-    stateMachines: 'Animation',
-    layout: new Layout({ fit: Fit.Contain, alignment: Alignment.CenterRight }),
-  })
-
-  const isScreenSize = useScreenSize()
-  const screenIsLarge = isScreenSize['lg']
-  const screenIsXLarge = isScreenSize['xl']
-
   return (
     <ValuePropCard
-      to="/pools"
-      tagText={t`Provide Liquidity`}
-      height={screenIsLarge ? '340px' : '240px'}
+      tagText="Provide Liquidity"
+      href="https://app.uniswap.org/pools"
+      height="320px"
       isDarkMode={props.isDarkMode}
       textColor={primary}
-      backgroundColor={{ dark: 'rgba(136, 63, 255, 0.12)', light: 'rgba(136, 63, 255, 0.06)' }}
-      button={<PillButton color={primary} label={t`Liquidity`} icon={<Bars size="24px" fill={primary} />} />}
-      titleText={t`Provide liquidity to pools on the Uniswap Protocol and earn fees on swaps.`}
-      paddingRight={screenIsXLarge ? '16%' : '0%'}
-      alignTextToBottom
+      backgroundColor={{ dark: 'rgba(164, 87, 255, 0.15)', light: 'rgba(164, 87, 255, 0.15)' }}
+      button={<PillButton color={primary} label="Liquidity" icon={<Bars size="24px" fill={primary} />} />}
+      titleText={t`Provide liquidity to pools on the Uniswap protocol and earn fees on swaps.`}
+      paddingRight="15%"
     >
       <Contents>
-        <RiveComponent onMouseEnter={() => rive && rive.play()} />
+        <Rive
+          style={{ width: '500px', height: '100%' }}
+          src="/rive/landingPageAnimations.riv"
+          artboard="LP"
+          animations="HoverAnimation"
+          layout={
+            new Layout({
+              fit: Fit.Contain,
+              alignment: Alignment.CenterRight,
+            })
+          }
+        />
       </Contents>
     </ValuePropCard>
   )
diff --git a/apps/web/src/pages/Landing/components/cards/PillButton.tsx b/apps/web/src/pages/Landing/components/cards/PillButton.tsx
index 78509f7517a..f6d37e982b2 100644
--- a/apps/web/src/pages/Landing/components/cards/PillButton.tsx
+++ b/apps/web/src/pages/Landing/components/cards/PillButton.tsx
@@ -28,9 +28,6 @@ const Label = styled.span`
   color: ${(props) => props.color};
   font-family: Basel;
   font-size: 20px;
-  @media (max-width: 1024px) {
-    font-size: 18px;
-  }
   font-style: normal;
   font-weight: 535;
   line-height: 24px; /* 120% */
diff --git a/apps/web/src/pages/Landing/components/cards/ValuePropCard.tsx b/apps/web/src/pages/Landing/components/cards/ValuePropCard.tsx
index f88984f1c4d..6ad78037e36 100644
--- a/apps/web/src/pages/Landing/components/cards/ValuePropCard.tsx
+++ b/apps/web/src/pages/Landing/components/cards/ValuePropCard.tsx
@@ -1,8 +1,8 @@
 import { motion } from 'framer-motion'
-import { useNavigate } from 'react-router-dom'
-import styled, { css } from 'styled-components'
+import styled from 'styled-components'
 
-import { Box, BoxProps } from '../Generics'
+import { BoxProps } from '../Generics'
+import { Box } from '../Generics'
 
 type ValuePropCardProps = {
   isDarkMode?: boolean
@@ -12,55 +12,39 @@ type ValuePropCardProps = {
   minHeight?: string
   tagText?: string
   titleText?: string
-  titleWidth?: string
-  alignTextToBottom?: boolean
   children?: React.ReactNode
   button?: React.ReactNode
   href?: string
-  to?: string
 }
 
 const Container = motion(styled(Box)<ValuePropCardProps & BoxProps>`
   position: relative;
-  border-radius: 32px;
+  border-radius: 24px;
   width: 100%;
   cursor: pointer;
-  height: ${(props) => props.height || '609px'};
+  height: ${(props) => props.height || 'auto'};
   background-color: ${(props) => (props.isDarkMode ? props.backgroundColor?.dark : props.backgroundColor?.light)};
   overflow: hidden;
-  text-decoration: none;
-  @media (max-width: 1024px) {
-    height: ${(props) => props.height || '516px'};
-    min-height: ${(props) => props.minHeight || '240px'};
-  }
-  @media (max-width: 768px) {
+    @media (max-width: 768px) {
     height: auto;
     min-height: ${(props) => props.minHeight || '240px'};
-  }
 `)
 
-const Inner = styled.div<{ alignTextToBottom?: boolean }>`
+const Inner = styled.div`
   width: 100%;
-  height: 100%;
   display: flex;
   flex-direction: column;
   align-items: flex-start;
-  ${({ alignTextToBottom }) =>
-    alignTextToBottom
-      ? css`
-          height: 100%;
-          justify-content: space-between;
-        `
-      : 'height: unset;'}
-  z-index: 5;
+
   gap: 24px;
   padding: 32px;
   @media (max-width: 1024px) {
     gap: 16px;
     padding: 24px;
   }
-  @media (max-width: 396px) {
-    padding: 20px;
+  @media (max-width: 768px) {
+    gap: 16px;
+    padding: 24px;
   }
 `
 const Title = styled.div`
@@ -70,9 +54,8 @@ const Title = styled.div`
   font-size: 36px;
   font-style: normal;
   font-weight: 500;
-  line-height: 44px;
+  line-height: 44px; /* 122.222% */
   white-space: pre-line;
-  text-wrap: pretty;
   @media (max-width: 1024px) {
     font-size: 28px;
     line-height: 32px;
@@ -83,13 +66,8 @@ const Title = styled.div`
   }
 `
 export default function ValuePropCard(props: ValuePropCardProps & BoxProps) {
-  const { isDarkMode, backgroundColor, height, textColor, minHeight, alignTextToBottom, href, to } = props
-  const navigate = useNavigate()
-  const handleClick = () => {
-    if (to) {
-      navigate(to)
-    }
-  }
+  const { isDarkMode, backgroundColor, height, textColor, minHeight } = props
+
   return (
     <Container
       initial="initial"
@@ -98,14 +76,9 @@ export default function ValuePropCard(props: ValuePropCardProps & BoxProps) {
       backgroundColor={backgroundColor}
       height={height}
       minHeight={minHeight}
-      as="a"
-      href={href}
-      target="_blank"
-      rel="noreferrer noopener"
-      onClick={handleClick}
       {...props}
     >
-      <Inner alignTextToBottom={alignTextToBottom}>
+      <Inner>
         {props.button}
         <Title color={textColor}>{props.titleText}</Title>
       </Inner>
diff --git a/apps/web/src/pages/Landing/components/cards/WebappCard.tsx b/apps/web/src/pages/Landing/components/cards/WebappCard.tsx
index ae0d9b23b46..3e84b6103c1 100644
--- a/apps/web/src/pages/Landing/components/cards/WebappCard.tsx
+++ b/apps/web/src/pages/Landing/components/cards/WebappCard.tsx
@@ -1,73 +1,44 @@
 import { t } from '@lingui/macro'
-import { ChainId } from '@uniswap/sdk-core'
-import { PortfolioLogo } from 'components/AccountDrawer/MiniPortfolio/PortfolioLogo'
-import { DeltaArrow } from 'components/Tokens/TokenDetails/Delta'
-import { OP, UNI, USDC_BASE } from 'constants/tokens'
-import { useInfoExplorePageEnabled } from 'featureFlags/flags/infoExplore'
-import { useTokenPromoQuery } from 'graphql/data/__generated__/types-and-hooks'
-import { chainIdToBackendName, getTokenDetailsURL } from 'graphql/data/util'
-import { useCurrency } from 'hooks/Tokens'
-import { useScreenSize } from 'hooks/useScreenSize'
-import { useNavigate } from 'react-router-dom'
+import tokenLogoLookup from 'constants/tokenLogoLookup'
 import styled from 'styled-components'
-import { NumberType, useFormatter } from 'utils/formatNumbers'
 
-import { useCallback } from 'react'
 import { Box } from '../Generics'
 import { Computer } from '../Icons'
+import { PriceArrowDown, PriceArrowUp } from '../Icons'
 import { PillButton } from './PillButton'
 import ValuePropCard from './ValuePropCard'
 
 const Contents = styled.div`
   display: flex;
   flex-direction: column;
-  gap: 6px;
+  gap: 4px;
   align-items: center;
   position: absolute;
   width: 100%;
   bottom: 0;
   padding: 32px;
   padding-bottom: 32px;
-  @media (max-width: 1024px) {
+  @media (max-width: 768px) {
     padding: 24px;
     padding-bottom: 32px;
   }
-  @media (max-width: 396px) {
-    padding: 16px;
-    padding-bottom: 24px;
-  }
 `
-
+const TokenImage = styled.img`
+  width: 48px;
+  height: 48px;
+  border-radius: 100%;
+  background-color: ${({ theme }) => theme.surface2};
+`
 const TokenRow = styled.div`
   width: 100%;
-  height: 72px;
-  overflow: hidden;
+  height: 80px;
   padding: 16px;
-  padding-right: 24px;
   display: flex;
   flex-direction: row;
   align-items: center;
-  gap: 16px;
+  justify-content: space-between;
   border-radius: 20px;
   background-color: ${({ theme }) => theme.surface1};
-  @media (max-width: 1024px) {
-    height: 64px;
-    padding-right: 16px;
-  }
-  @media (max-width: 768px) {
-    height: 56px;
-    padding-right: 16px;
-  }
-  @media (max-width: 468px) {
-    height: 48px;
-    padding: 12px;
-    border-radius: 16px;
-  }
-  transition: background-color 125ms ease-in, transform 125ms ease-in;
-  &:hover {
-    background-color: ${({ theme }) => theme.surface2};
-    transform: scale(1.03);
-  }
 `
 const TokenName = styled.h3`
   padding: 0;
@@ -76,22 +47,8 @@ const TokenName = styled.h3`
   font-size: 24px;
   font-style: normal;
   font-weight: 500;
-  line-height: 32px;
-  overflow: hidden;
-  white-space: nowrap;
-  text-overflow: ellipsis;
+  line-height: 32px; /* 133.333% */
   color: ${(props) => props.color || props.theme.neutral1};
-  @media (max-width: 1024px) {
-    font-size: 18px;
-    line-height: 24px;
-  }
-  @media (max-width: 468px) {
-    font-size: 16px;
-    line-height: 20px;
-  }
-  @media (max-width: ${({ theme }) => theme.breakpoint.xs}px) {
-    display: none;
-  }
 `
 const TokenTicker = styled.h3`
   padding: 0;
@@ -100,19 +57,8 @@ const TokenTicker = styled.h3`
   font-size: 24px;
   font-style: normal;
   font-weight: 500;
-  line-height: 32px;
+  line-height: 32px; /* 133.333% */
   color: ${(props) => props.color || props.theme.neutral2};
-  @media (max-width: 1024px) {
-    font-size: 18px;
-    line-height: 24px;
-  }
-  @media (max-width: 468px) {
-    font-size: 16px;
-    line-height: 20px;
-  }
-  @media (max-width: ${({ theme }) => theme.breakpoint.xs}px) {
-    color: ${(props) => props.color || props.theme.neutral1};
-  }
 `
 const TokenPrice = styled.h3`
   padding: 0;
@@ -121,47 +67,18 @@ const TokenPrice = styled.h3`
   font-size: 24px;
   font-style: normal;
   font-weight: 500;
-  font-variant-numeric: tabular-nums;
-  line-height: 32px;
+  line-height: 32px; /* 133.333% */
   color: ${(props) => props.color || props.theme.neutral1};
-  @media (max-width: 1024px) {
-    font-size: 18px;
-    line-height: 24px;
-  }
-  @media (max-width: 468px) {
-    font-size: 16px;
-    line-height: 20px;
-  }
 `
-const DeltaText = styled.h3`
-  text-align: right;
+const TokenDelta = styled.h3`
   padding: 0;
   margin: 0;
   font-family: Basel;
   font-size: 24px;
   font-style: normal;
   font-weight: 500;
-  font-variant-numeric: tabular-nums;
-  line-height: 32px;
+  line-height: 32px; /* 133.333% */
   color: ${(props) => (props.color === 'red' ? props.theme.critical : props.theme.success)};
-  @media (max-width: 1024px) {
-    font-size: 18px;
-    line-height: 24px;
-    width: 50px;
-  }
-  @media (max-width: 468px) {
-    font-size: 16px;
-    line-height: 20px;
-    width: 50px;
-  }
-`
-const DeltaContainer = styled(Box)`
-  @media (min-width: 1030px) and (max-width: 1150px) {
-    display: none;
-  }
-  @media (min-width: 767px) and (max-width: 915px) {
-    display: none;
-  }
 `
 
 type WebappCardProps = {
@@ -169,93 +86,76 @@ type WebappCardProps = {
   tagText?: string
 }
 
-const primary = '#2ABDFF'
-
-const tokens = [
-  {
-    chainId: ChainId.MAINNET,
-    address: 'ETH',
-  },
-  {
-    chainId: ChainId.BASE,
-    address: USDC_BASE.address,
-  },
-  {
-    chainId: ChainId.MAINNET,
-    address: UNI[ChainId.MAINNET].address,
-  },
-  {
-    chainId: ChainId.OPTIMISM,
-    address: OP.address,
-  },
-]
+const primary = '#627EEA'
 
-function Token({ chainId, address }: { chainId: ChainId; address: string }) {
-  const screenIsSmall = useScreenSize()['sm']
-  const navigate = useNavigate()
-  const { formatFiatPrice, formatDelta } = useFormatter()
-  const currency = useCurrency(address, chainId)
-  const isInfoExplorePageEnabled = useInfoExplorePageEnabled()
-  const tokenPromoQuery = useTokenPromoQuery({
-    variables: {
-      address: currency?.wrapped.address,
-      chain: chainIdToBackendName(chainId),
+export function WebappCard(props: WebappCardProps) {
+  const tokens = [
+    {
+      name: 'Ether',
+      image: tokenLogoLookup.getIcons('0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2')?.[0],
+      ticker: 'ETH',
+      currentPrice: 1234,
+      priceChange: 0.54,
+      sparkline: '',
     },
-  })
-  const price = tokenPromoQuery.data?.token?.market?.price?.value ?? 0
-  const pricePercentChange = tokenPromoQuery.data?.token?.market?.pricePercentChange?.value ?? 0
-  const handleClick = useCallback(
-    (e: React.MouseEvent<HTMLDivElement>) => {
-      e.stopPropagation()
-      navigate(
-        getTokenDetailsURL({
-          address: address === 'ETH' ? 'NATIVE' : address,
-          chain: chainIdToBackendName(chainId),
-          isInfoExplorePageEnabled,
-        })
-      )
+    {
+      name: 'USDC',
+      image: '',
+      ticker: 'USDC',
+      currentPrice: 1.01,
+      priceChange: 0.01,
+      sparkline: '',
     },
-    [address, chainId, isInfoExplorePageEnabled, navigate]
-  )
-  return (
-    <TokenRow onClick={handleClick}>
-      <PortfolioLogo currencies={[currency]} chainId={chainId} size={screenIsSmall ? '32px' : '24px'} />
-      <Box justify="space-between" gap="16px">
-        <Box width="auto" gap="8px" align="center" overflow="hidden">
-          <TokenName>{currency?.name}</TokenName>
-          <TokenTicker>{currency?.symbol}</TokenTicker>
-        </Box>
-        <Box width="auto" gap="8px" align="center">
-          <TokenPrice>
-            {formatFiatPrice({
-              price,
-              type: NumberType.FiatTokenPrice,
-            })}
-          </TokenPrice>
-          <DeltaContainer gap="4px" align="center" justify="flex-end">
-            <DeltaArrow delta={pricePercentChange} />
-            <DeltaText color={pricePercentChange < 0 ? 'red' : 'green'}>{formatDelta(pricePercentChange)}</DeltaText>
-          </DeltaContainer>
-        </Box>
-      </Box>
-    </TokenRow>
-  )
-}
-
-export function WebappCard(props: WebappCardProps) {
+    {
+      name: 'UNI',
+      image: '',
+      ticker: 'UNI',
+      currentPrice: 1.01,
+      priceChange: 0.01,
+      sparkline: '',
+    },
+    {
+      name: 'Dai',
+      image: '',
+      ticker: 'DAI',
+      currentPrice: 1.01,
+      priceChange: 0.01,
+      sparkline: '',
+    },
+    {
+      name: 'Dai',
+      image: '',
+      ticker: 'DAI',
+      currentPrice: 1.01,
+      priceChange: 0.01,
+      sparkline: '',
+    },
+  ]
   return (
     <ValuePropCard
-      to="/tokens/ethereum"
+      href="https://app.uniswap.org"
+      height="696px"
       minHeight="450px"
       isDarkMode={props.isDarkMode}
       textColor={primary}
-      backgroundColor={{ dark: 'rgba(0, 102, 255, 0.12)', light: 'rgba(0, 102, 255, 0.04)' }}
-      button={<PillButton color={primary} label={t`Web app`} icon={<Computer size="24px" fill={primary} />} />}
-      titleText={t`Swapping made simple. Access thousands of tokens on 8+ chains.`}
+      backgroundColor={{ dark: 'rgba(98, 126, 234, 0.20)', light: 'rgba(98, 126, 234, 0.10)' }}
+      button={<PillButton color={primary} label="Web app" icon={<Computer size="24px" fill={primary} />} />}
+      titleText={t`Swapping made simple. Access thousands of tokens on 7+ chains.`}
     >
       <Contents>
-        {tokens.map((token) => (
-          <Token key={`tokenRow-${token.address}`} chainId={token.chainId} address={token.address} />
+        {tokens.map((token, index) => (
+          <TokenRow key={`tokenRow-${index}-${token.name}`}>
+            <Box width="auto" gap="8px" align="center">
+              <TokenImage src={token.image} alt={token.name} />
+              <TokenName>{token.name}</TokenName>
+              <TokenTicker>{token.ticker}</TokenTicker>
+            </Box>
+            <Box width="auto" gap="8px" align="center">
+              <TokenPrice>{token.currentPrice}</TokenPrice>
+              {token.priceChange < 0 ? <PriceArrowDown /> : <PriceArrowUp />}
+              <TokenDelta color={token.priceChange < 0 ? 'red' : 'green'}>{token.priceChange}</TokenDelta>
+            </Box>
+          </TokenRow>
         ))}
       </Contents>
     </ValuePropCard>
diff --git a/apps/web/src/pages/Landing/index.tsx b/apps/web/src/pages/Landing/index.tsx
index b6f7647d5ba..6c43f9ca966 100644
--- a/apps/web/src/pages/Landing/index.tsx
+++ b/apps/web/src/pages/Landing/index.tsx
@@ -9,23 +9,20 @@ import { MAIN_CARDS, MORE_CARDS } from 'components/About/constants'
 import ProtocolBanner from 'components/About/ProtocolBanner'
 import { useAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
 import { BaseButton } from 'components/Button'
-import { getRecentConnectionMeta } from 'connection/meta'
-import { useExitAnimation, useNewLandingPage } from 'featureFlags/flags/landingPageV2'
+import { useNewLandingPage } from 'featureFlags/flags/landingPageV2'
 import { useDisableNFTRoutes } from 'hooks/useDisableNFTRoutes'
-import usePrevious from 'hooks/usePrevious'
 import Swap from 'pages/Swap'
 import { parse } from 'qs'
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
-import { Link as NativeLink, Navigate, useLocation, useNavigate } from 'react-router-dom'
+import { useEffect, useMemo, useRef } from 'react'
+import { Navigate, useLocation, useNavigate } from 'react-router-dom'
+import { Link as NativeLink } from 'react-router-dom'
 import styled, { css } from 'styled-components'
 import { BREAKPOINTS } from 'theme'
 import { useIsDarkMode } from 'theme/components/ThemeToggle'
+import { TRANSITION_DURATIONS } from 'theme/styles'
 import { Z_INDEX } from 'theme/zIndex'
 import { getDownloadAppLinkProps } from 'utils/openDownloadApp'
 
-import { useAppDispatch } from 'state/hooks'
-import { setRecentConnectionDisconnected } from 'state/user/reducer'
-import { TRANSITION_DURATIONS } from 'theme/styles'
 import LandingV2 from './LandingV2'
 
 const PageContainer = styled.div`
@@ -284,6 +281,9 @@ const LinkCss = css`
 `
 const LandingSwap = styled(Swap)`
   ${SwapCss}
+  &:hover {
+    border: 1px solid ${({ theme }) => theme.accent1};
+  }
 `
 const Link = styled(NativeLink)`
   ${LinkCss}
@@ -291,14 +291,7 @@ const Link = styled(NativeLink)`
 export default function Landing() {
   const isDarkMode = useIsDarkMode()
   const cardsRef = useRef<HTMLDivElement>(null)
-  const { account, connector } = useWeb3React()
-  const recentConnectionMeta = getRecentConnectionMeta()
-  const dispatch = useAppDispatch()
-  const disconnect = useCallback(() => {
-    connector.deactivate?.()
-    connector.resetState()
-    dispatch(setRecentConnectionDisconnected())
-  }, [connector, dispatch])
+  const { account } = useWeb3React()
 
   const shouldDisableNFTRoutes = useDisableNFTRoutes()
   const cards = useMemo(
@@ -306,55 +299,28 @@ export default function Landing() {
     [shouldDisableNFTRoutes]
   )
 
-  const isNewLandingPageEnabled = useNewLandingPage()
-  const isExitAnimationEnabled = useExitAnimation()
-  const [transition, setTransition] = useState(false)
-  const location = useLocation()
-  const queryParams = useMemo(() => parse(location.search, { ignoreQueryPrefix: true }), [location])
-  const navigate = useNavigate()
   const [accountDrawerOpen] = useAccountDrawer()
-  const prevAccount = usePrevious(account)
-  const redirectOnConnect = useRef(false)
-  // Smoothly redirect to swap page if user connects while on landing page
+  const navigate = useNavigate()
   useEffect(() => {
-    if (accountDrawerOpen && account && !prevAccount) {
-      redirectOnConnect.current = true
-      setTransition(true)
-    }
-    const timeoutId = setTimeout(
-      () => {
-        if (redirectOnConnect.current) {
-          navigate('/swap')
-        } else if (account && queryParams.intro) {
-          disconnect()
-        }
-      },
-      isExitAnimationEnabled ? TRANSITION_DURATIONS.slow : TRANSITION_DURATIONS.fast
-    )
+    const timeoutId = setTimeout(() => {
+      if (accountDrawerOpen) {
+        navigate('/swap')
+      }
+    }, TRANSITION_DURATIONS.fast)
     return () => clearTimeout(timeoutId)
-  }, [
-    account,
-    prevAccount,
-    accountDrawerOpen,
-    navigate,
-    queryParams.intro,
-    connector,
-    disconnect,
-    isExitAnimationEnabled,
-  ])
+  }, [accountDrawerOpen, navigate])
+
+  const location = useLocation()
+  const queryParams = parse(location.search, { ignoreQueryPrefix: true })
+
+  const isNewLandingPageEnabled = useNewLandingPage()
 
-  // Redirect to swap page if user is connected or has been recently
-  // The intro query parameter can be used to override this
-  if ((account || recentConnectionMeta) && !queryParams.intro) {
+  if (account && !queryParams.intro) {
     return <Navigate to={{ ...location, pathname: '/swap' }} replace />
   }
 
   if (isNewLandingPageEnabled) {
-    return (
-      <Trace page={InterfacePageName.LANDING_PAGE} shouldLogImpression>
-        <LandingV2 data-testid="landing-page" transition={isExitAnimationEnabled && transition} />
-      </Trace>
-    )
+    return <LandingV2 />
   }
 
   return (
diff --git a/apps/web/src/pages/Landing/sections/DirectToDefi.tsx b/apps/web/src/pages/Landing/sections/DirectToDefi.tsx
index 3768efcc047..6f5d5c13299 100644
--- a/apps/web/src/pages/Landing/sections/DirectToDefi.tsx
+++ b/apps/web/src/pages/Landing/sections/DirectToDefi.tsx
@@ -1,19 +1,18 @@
 import styled from 'styled-components'
 
-import { Trans } from '@lingui/macro'
-import { Box, H2 } from '../components/Generics'
 import { DocumentationCard } from '../components/cards/DocumentationCard'
 import { DownloadWalletCard } from '../components/cards/DownloadWalletCard'
 import { LiquidityCard } from '../components/cards/LiquidityCard'
 import { WebappCard } from '../components/cards/WebappCard'
+import { Box, H2 } from '../components/Generics'
 
 const SectionLayout = styled.div`
   display: flex;
   flex-direction: column;
   align-items: center;
-  padding: 0 40px;
+  padding: 0 24px;
   @media (max-width: 768px) {
-    padding: 0 48px;
+    padding: 0 64px;
   }
   @media (max-width: 468px) {
     padding: 0 24px;
@@ -28,8 +27,8 @@ const RowToCol = styled(Box)`
 `
 const SectionCol = styled(Box)`
   flex-direction: column;
-  max-width: 1280px;
-  gap: 32px;
+  max-width: 1328px;
+  gap: 48px;
   @media (max-width: 768px) {
     gap: 24px;
   }
@@ -37,16 +36,14 @@ const SectionCol = styled(Box)`
 export function DirectToDefi() {
   return (
     <SectionLayout>
-      <SectionCol direction="column" gap="40px" maxWidth="1280px">
-        <H2>
-          <Trans>Go direct to DeFi</Trans>
-        </H2>
-        <Box direction="column" gap="16px">
-          <RowToCol direction="row" gap="16px">
+      <SectionCol direction="column" gap="48px" maxWidth="1328px">
+        <H2>Go direct to DeFi</H2>
+        <Box direction="column" gap="24px">
+          <RowToCol direction="row" gap="24px">
             <WebappCard />
             <DownloadWalletCard />
           </RowToCol>
-          <RowToCol direction="row" gap="16px">
+          <RowToCol direction="row" gap="24px">
             <DocumentationCard />
             <LiquidityCard />
           </RowToCol>
diff --git a/apps/web/src/pages/Landing/sections/Footer.tsx b/apps/web/src/pages/Landing/sections/Footer.tsx
index c23f3e2d2cc..6b5f20cac72 100644
--- a/apps/web/src/pages/Landing/sections/Footer.tsx
+++ b/apps/web/src/pages/Landing/sections/Footer.tsx
@@ -1,13 +1,11 @@
 import { Trans } from '@lingui/macro'
-import { useScreenSize } from 'hooks/useScreenSize'
+import { motion } from 'framer-motion'
 import { Link } from 'react-router-dom'
-import { useTogglePrivacyPolicy } from 'state/application/hooks'
 import styled, { css } from 'styled-components'
 import { ExternalLink } from 'theme/components'
 
-import { Wiggle } from '../components/animations'
 import { Body1, Box, H3 } from '../components/Generics'
-import { Discord, Github, Twitter } from '../components/Icons'
+import { Discord, Github, Instagram, Twitter } from '../components/Icons'
 
 const SocialIcon = styled(Wiggle)`
   flex: 0;
@@ -16,7 +14,7 @@ const SocialIcon = styled(Wiggle)`
   transition: fill;
   transition-duration: 0.2s;
   &:hover {
-    fill: ${(props) => props.$hoverColor};
+    fill: ${(props) => props.hoverColor};
   }
 `
 const RowToCol = styled(Box)`
@@ -39,12 +37,13 @@ const HideWhenLarge = styled(Box)`
 const MenuItemStyles = css`
   padding: 0;
   margin: 0;
-  text-align: left;
+  text-align: center;
+  /* Body/2 */
   font-family: Basel;
   font-size: 16px;
   font-style: normal;
   font-weight: 500;
-  line-height: 24px;
+  line-height: 24px; /* 150% */
   color: ${({ theme }) => theme.neutral2};
   stroke: none;
   transition: color 0.1s ease-in-out;
@@ -60,30 +59,35 @@ const StyledInternalLink = styled(Link)`
 const StyledExternalLink = styled(ExternalLink)`
   ${MenuItemStyles}
 `
-const DownloadLink = styled.a`
-  ${MenuItemStyles}
-`
-const ModalItem = styled.div`
-  ${MenuItemStyles}
-  cursor: pointer;
-  user-select: none;
-`
-export function Socials({ iconSize }: { iconSize?: string }) {
+function Wiggle({ ...props }) {
+  const variants = {
+    initial: { rotate: 0, scale: 1 },
+    animate: { rotate: [20, 0], scale: 1.2, transition: { type: 'spring', stiffness: 200 } },
+  }
+  return <motion.div {...props} whileHover="animate" initial="initial" variants={variants} />
+}
+
+function Socials() {
   return (
     <Box gap="24px">
-      <SocialIcon $hoverColor="#00C32B">
+      <SocialIcon hoverColor="#00C32B">
         <StyledExternalLink href="https://github.com/Uniswap">
-          <Github size={iconSize} fill="inherit" />
+          <Github fill="inherit" />
         </StyledExternalLink>
       </SocialIcon>
-      <SocialIcon $hoverColor="#20BAFF">
+      <SocialIcon hoverColor="#20BAFF">
         <StyledExternalLink href="https://twitter.com/Uniswap">
-          <Twitter size={iconSize} fill="inherit" />
+          <Twitter fill="inherit" />
+        </StyledExternalLink>
+      </SocialIcon>
+      <SocialIcon hoverColor="#5F51FF">
+        <StyledExternalLink href="https://discord.gg/FCfyBSbCU5">
+          <Discord fill="inherit" />
         </StyledExternalLink>
       </SocialIcon>
-      <SocialIcon $hoverColor="#5F51FF">
-        <StyledExternalLink href="https://discord.com/invite/uniswap">
-          <Discord size={iconSize} fill="inherit" />
+      <SocialIcon hoverColor="#FF0DCA">
+        <StyledExternalLink href="https://www.instagram.com/uniswap">
+          <Instagram fill="inherit" />
         </StyledExternalLink>
       </SocialIcon>
     </Box>
@@ -91,12 +95,9 @@ export function Socials({ iconSize }: { iconSize?: string }) {
 }
 
 export function Footer() {
-  const screenIsLarge = useScreenSize()['lg']
-  const togglePrivacyPolicy = useTogglePrivacyPolicy()
-
   return (
-    <Box as="footer" direction="column" align="center" padding={screenIsLarge ? '0 40px' : '0 48px'}>
-      <Box direction="row" maxWidth="1280px" gap="24px">
+    <Box as="footer" direction="column" align="center" padding="0 24px">
+      <Box direction="row" maxWidth="1328px" gap="24px">
         <RowToCol direction="row" justify-content="space-between" gap="32px">
           <Box direction="column" height="100%" gap="64px">
             <Box direction="column" gap="10px">
@@ -108,7 +109,7 @@ export function Footer() {
             </HideWhenSmall>
           </Box>
           <RowToCol direction="row" height="100%" gap="16px">
-            <Box direction="row" gap="16px">
+            <Box direction="row">
               <Box direction="column" gap="10px">
                 <Body1>App</Body1>
                 <StyledInternalLink to="/swap">
@@ -136,7 +137,7 @@ export function Footer() {
                 </StyledExternalLink>
               </Box>
             </Box>
-            <Box direction="row" gap="16px">
+            <Box direction="row">
               <Box direction="column" gap="10px">
                 <Body1>
                   <Trans>Company</Trans>
@@ -147,12 +148,12 @@ export function Footer() {
                 <StyledExternalLink href="https://blog.uniswap.org/">
                   <Trans>Blog</Trans>
                 </StyledExternalLink>
-                <DownloadLink href="https://github.com/Uniswap/brand-assets/raw/main/Uniswap%20Brand%20Assets.zip">
+                <StyledExternalLink href="https://github.com/Uniswap/brand-assets">
                   <Trans>Brand Assets</Trans>
-                </DownloadLink>
-                <ModalItem onClick={togglePrivacyPolicy}>
-                  <Trans>Terms & Privacy</Trans>
-                </ModalItem>
+                </StyledExternalLink>
+                <StyledExternalLink href="https://uniswap.org/privacy-policy">
+                  <Trans>Privacy Policy</Trans>
+                </StyledExternalLink>
                 <StyledExternalLink href="https://uniswap.org/trademark">
                   <Trans>Trademark Policy</Trans>
                 </StyledExternalLink>
diff --git a/apps/web/src/pages/Landing/sections/Hero.tsx b/apps/web/src/pages/Landing/sections/Hero.tsx
index 93c63c6bcf5..1db08a2348d 100644
--- a/apps/web/src/pages/Landing/sections/Hero.tsx
+++ b/apps/web/src/pages/Landing/sections/Hero.tsx
@@ -1,29 +1,19 @@
 import { Trans } from '@lingui/macro'
-import { ColumnCenter } from 'components/Column'
 import { useCurrency } from 'hooks/Tokens'
 import { Swap } from 'pages/Swap'
 import { useEffect, useState } from 'react'
 import { ChevronDown } from 'react-feather'
-import styled, { css, keyframes } from 'styled-components'
-import { ThemedText } from 'theme/components'
+import styled from 'styled-components'
 
-import { BREAKPOINTS } from 'theme'
-import { Box, H1, Subheading } from '../components/Generics'
-import { TokenCloud } from '../components/TokenCloud/index'
 import { Hover, RiseIn, RiseInText } from '../components/animations'
+import { Body2, Box, ExtendedH1, H1, Subheading } from '../components/Generics'
+import { TokenCloud } from '../components/TokenCloud/index'
 
-const Container = styled(Box)<{ translateY: number; opacityY: number }>`
-  min-width: 100%;
-  padding-top: 72px;
-  transform: translate(0px, ${({ translateY }) => translateY}px);
-  opacity: ${({ opacityY }) => opacityY};
-`
 const LandingSwapContainer = styled(Box)`
-  width: 480px;
-  padding: 8px;
-  border-radius: 24px;
-  background: ${({ theme }) => theme.surface1};
+  width: 464px;
+  padding: 0px 16px;
   @media (max-width: 768px) {
+    max-width: 464px;
     width: 100%;
   }
 `
@@ -31,63 +21,11 @@ const LandingSwap = styled(Swap)`
   position: relative;
   width: 100%;
 
-  & > div:first-child {
-    padding: 0px;
-  }
   & > div:first-child > div:first-child {
     display: none;
   }
 `
-const StyledH1 = styled(H1)`
-  @media (max-width: 768px) {
-    font-size: 52px;
-  }
-  @media (max-width: 464px) {
-    font-size: 36px;
-  }
-`
-const shrinkAndFade = keyframes`
-  0% {
-    transform: scale(1);
-    opacity: 1;
-  }
-  100% {
-    transform: scale(0.8));
-    opacity: 0;
-  }
-`
-const Center = styled(Box)<{ translateY?: number; opacityY: number; transition?: boolean }>`
-  width: unset;
-  pointer-events: none;
-  transform: translate(0px, ${({ translateY }) => translateY}px);
-  opacity: ${({ opacityY }) => opacityY};
-  padding: 48px 0px;
-  @media (max-width: 464px), (max-height: 700px) {
-    padding: 0px;
-  }
-  gap: 20px;
-  @media (max-height: 800px) {
-    gap: 0px;
-  }
-  ${({ transition }) =>
-    transition &&
-    css`
-      animation: ${shrinkAndFade} 1s ease-in-out forwards;
-    `};
-`
-const LearnMoreContainer = styled(Box)`
-  bottom: 48px;
-  @media (max-width: ${BREAKPOINTS.md}px) {
-    bottom: 64px;
-  }
-`
-
-interface HeroProps {
-  scrollToRef: () => void
-  transition?: boolean
-}
-
-export function Hero({ scrollToRef, transition }: HeroProps) {
+export function Hero() {
   const [scrollPosition, setScrollPosition] = useState(0)
   const handleScroll = () => {
     const position = window.scrollY
@@ -103,33 +41,43 @@ export function Hero({ scrollToRef, transition }: HeroProps) {
     }
   }, [])
 
-  const translateY = -scrollPosition / 7
-  const opacityY = 1 - scrollPosition / 1000
+  const translateY = -scrollPosition / 3.5
+  const opacityY = 1 - scrollPosition / 800
 
   return (
-    <Container position="relative" height="100vh" justify="center" translateY={translateY} opacityY={opacityY}>
-      <TokenCloud transition={transition} />
-      <Center
+    <Box
+      position="relative"
+      height="900px"
+      style={{ minWidth: '100vw', paddingTop: 100, transform: `translate(0px, ${translateY}px)`, opacity: opacityY }}
+    >
+      <TokenCloud />
+      <Box
         direction="column"
         align="center"
-        maxWidth="75vw"
-        translateY={translateY}
-        opacityY={opacityY}
-        transition={transition}
+        style={{ pointerEvents: 'none', transform: `translate(0px, ${translateY}px)`, opacity: opacityY }}
       >
-        <Box direction="column" align="center">
-          <StyledH1>
-            <RiseInText delay={0.0}>
-              <Trans>Swap</Trans>
-            </RiseInText>{' '}
-            <RiseInText delay={0.1}>
-              <Trans>anytime,</Trans>
-            </RiseInText>
-          </StyledH1>
-          <RiseIn delay={0.2}>
-            <StyledH1>
-              <Trans>anywhere.</Trans>
-            </StyledH1>
+        <Box direction="column" gap="20px" maxWidth="430px" align="center" padding="48px 0">
+          <Box direction="column" align="center">
+            <H1>
+              <RiseInText delay={0.0}>
+                <Trans>Swap</Trans>
+              </RiseInText>{' '}
+              <RiseInText delay={0.1}>
+                <Trans>anytime,</Trans>
+              </RiseInText>
+            </H1>
+            <RiseIn delay={0.2}>
+              <ExtendedH1>
+                <Trans>Anywhere</Trans>
+              </ExtendedH1>
+            </RiseIn>
+          </Box>
+          <RiseIn delay={0.3}>
+            <Subheading>
+              <Trans>
+                The largest marketplace for onchain digital assets. Swap on Ethereum and 7+ additional chains.
+              </Trans>
+            </Subheading>
           </RiseIn>
         </Box>
 
@@ -138,15 +86,10 @@ export function Hero({ scrollToRef, transition }: HeroProps) {
             <LandingSwap initialInputCurrency={initialInputCurrency} />
           </LandingSwapContainer>
         </RiseIn>
-
-        <RiseIn delay={0.3}>
-          <Subheading>
-            <Trans>The largest onchain marketplace. Buy and sell crypto on Ethereum and 7+ other chains.</Trans>
-          </Subheading>
-        </RiseIn>
-      </Center>
-      <LearnMoreContainer
+      </Box>
+      <Box
         position="absolute"
+        bottom="48px"
         width="100%"
         align="center"
         justify="center"
@@ -154,25 +97,16 @@ export function Hero({ scrollToRef, transition }: HeroProps) {
         style={{ transform: `translate(0px, ${translateY}px)`, opacity: opacityY }}
       >
         <RiseIn delay={0.3}>
-          <Box
-            direction="column"
-            align="center"
-            justify="flex-start"
-            onClick={() => scrollToRef()}
-            style={{ cursor: 'pointer' }}
-            width="500px"
-          >
+          <Box direction="column" align="center" justify="flex-start">
+            <Body2>
+              <Trans>Scroll to Learn More</Trans>
+            </Body2>
             <Hover>
-              <ColumnCenter>
-                <ThemedText.BodySecondary>
-                  <Trans>Scroll to Learn More</Trans>
-                </ThemedText.BodySecondary>
-                <ChevronDown />
-              </ColumnCenter>
+              <ChevronDown />
             </Hover>
           </Box>
         </RiseIn>
-      </LearnMoreContainer>
-    </Container>
+      </Box>
+    </Box>
   )
 }
diff --git a/apps/web/src/pages/Landing/sections/NewsletterEtc.tsx b/apps/web/src/pages/Landing/sections/NewsletterEtc.tsx
index 4449917e3ee..c0dd6354f30 100644
--- a/apps/web/src/pages/Landing/sections/NewsletterEtc.tsx
+++ b/apps/web/src/pages/Landing/sections/NewsletterEtc.tsx
@@ -1,21 +1,18 @@
-import { t, Trans } from '@lingui/macro'
+import { Trans } from '@lingui/macro'
 import { motion } from 'framer-motion'
 import styled, { useTheme } from 'styled-components'
-import { useIsDarkMode } from 'theme/components/ThemeToggle'
 
 import { PillButton } from '../components/cards/PillButton'
 import { Box, H2, H3 } from '../components/Generics'
-import { BookOpen, ChatBubbles, HelpCircle } from '../components/Icons'
+import { BookOpen, File, HelpCircle } from '../components/Icons'
 
 const SectionLayout = styled.div`
-  width: 100%;
-  max-width: 1360px;
   display: flex;
   flex-direction: column;
   align-items: center;
-  padding: 0 40px;
+  padding: 0 24px;
   @media (max-width: 768px) {
-    padding: 0 48px;
+    padding: 0 64px;
   }
   @media (max-width: 468px) {
     padding: 0 24px;
@@ -23,26 +20,51 @@ const SectionLayout = styled.div`
 `
 const Layout = styled.div`
   width: 100%;
-  max-width: 1280px;
+  max-width: 1328px;
+
   display: grid;
   grid-template-columns: repeat(4, 1fr);
   grid-template-rows: repeat(4, 1fr);
   grid-column-gap: 16px;
   grid-row-gap: 16px;
   @media (max-width: 768px) {
-    grid-template-rows: repeat(2, 1fr);
-    grid-template-columns: repeat(2, 1fr);
+    grid-template-rows: repeat(3, 1fr);
   }
 `
 const SectionCol = styled(Box)`
   flex-direction: column;
   max-width: 1328px;
-  gap: 24px;
+  gap: 48px;
   @media (max-width: 768px) {
     gap: 24px;
   }
 `
-const Card = styled.a<{
+const PlaceHolderInput = styled.input`
+  position: relative;
+
+  height: 56px;
+  width: 100%;
+  border-radius: 99px;
+  border: none;
+  padding: 0 32px;
+
+  font-family: Basel;
+  font-size: 18px;
+  font-style: normal;
+  font-weight: 535;
+
+  color: ${({ theme }) => theme.neutral1};
+  background-color: ${({ theme }) => theme.surface1};
+
+  box-shadow: 0px 0px 0px 0px ${({ theme }) => theme.accent1};
+  transition: box-shadow 0.1s ease-in-out;
+
+  &:focus {
+    outline: none;
+    box-shadow: 0px 0px 0px 3px ${({ theme }) => theme.accent1};
+  }
+`
+const Card = styled.div<{
   backgroundColor?: string
 }>`
   display: flex;
@@ -50,11 +72,9 @@ const Card = styled.a<{
   align-items: flex-start;
   justify-content: space-between;
   position: relative;
-  height: 250px;
   border-radius: 20px;
   padding: 32px 28px;
   overflow: hidden;
-  text-decoration: none;
   background-color: ${(props) => props.backgroundColor || props.theme.surface2};
   @media (max-width: 1024px) {
     gap: 16px;
@@ -109,59 +129,39 @@ const RectCard = motion(styled(Card)`
     grid-row: span 1 / span 1;
   }
 `)
-
-const helpPrimary = '#FF4D00'
-const blogPrimary = '#8E8767'
-
 export function NewsletterEtc() {
   const theme = useTheme()
-  const isDarkMode = useIsDarkMode()
   return (
     <SectionLayout>
-      <Box direction="row" maxWidth="1328px" gap="24px" width="100%">
+      <Box direction="row" maxWidth="1328px" gap="24px">
         <SectionCol justify-content="space-between" height="100%">
           <H2>
-            <Trans>Connect with us</Trans>
+            <Trans>Learn more</Trans>
           </H2>
           <Layout>
-            <HelpCenterCard
-              initial="initial"
-              whileHover="hover"
-              href="https://help.uniswap.org/"
-              target="_blank"
-              rel="noopener noreferrer"
-              backgroundColor={isDarkMode ? 'rgba(255, 77, 0, 0.08)' : 'rgba(255, 77, 0, 0.04)'}
-            >
-              <PillButton icon={<HelpCircle fill={helpPrimary} />} color={helpPrimary} label={t`Help Center`} />
-              <H3 color={helpPrimary}>
+            <HelpCenterCard initial="initial" whileHover="hover" backgroundColor={theme.surface2}>
+              <PillButton icon={<HelpCircle fill={theme.neutral1} />} color={theme.neutral1} label="Help Center" />
+              <H3>
                 <Trans>Get support</Trans>
               </H3>
             </HelpCenterCard>
-            <BlogCard
-              initial="initial"
-              whileHover="hover"
-              href="https://blog.uniswap.org/"
-              target="_blank"
-              rel="noopener noreferrer"
-              backgroundColor={isDarkMode ? 'rgba(98, 84, 50, 0.16)' : 'rgba(98, 84, 50, 0.04)'}
-            >
-              <PillButton icon={<BookOpen fill={blogPrimary} />} color={blogPrimary} label={t`Blog`} />
-              <H3 color={blogPrimary}>
-                <Trans>Insights and news from the team</Trans>
+            <BlogCard initial="initial" whileHover="hover" backgroundColor={theme.surface2}>
+              <PillButton icon={<BookOpen fill={theme.neutral1} />} color={theme.neutral1} label="Blog" />
+              <H3>
+                <Trans>Insights and updates from the team</Trans>
               </H3>
             </BlogCard>
-            <RectCard
-              backgroundColor={theme.accent2}
-              initial="initial"
-              whileHover="hover"
-              href="https://twitter.com/Uniswap/"
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              <PillButton icon={<ChatBubbles fill={theme.accent1} />} color={theme.accent1} label={t`Stay connected`} />
+            <RectCard backgroundColor={theme.accent2}>
+              <PillButton
+                icon={<File fill={theme.neutral1} />}
+                color={theme.neutral1}
+                label="Newsletter"
+                cursor="default"
+              />
               <H3 color={theme.accent1}>
-                <Trans>Follow @Uniswap on X for the latest updates</Trans>
+                <Trans>Sign up for our newsletter to stay in touch with the latest updates, news, and events.</Trans>
               </H3>
+              <PlaceHolderInput placeholder="enter email address" />
             </RectCard>
           </Layout>
         </SectionCol>
diff --git a/apps/web/src/pages/Landing/sections/Stats.tsx b/apps/web/src/pages/Landing/sections/Stats.tsx
index cd961dde09c..fcc369df28f 100644
--- a/apps/web/src/pages/Landing/sections/Stats.tsx
+++ b/apps/web/src/pages/Landing/sections/Stats.tsx
@@ -1,40 +1,25 @@
 import { t, Trans } from '@lingui/macro'
-import Row from 'components/Row'
-import { ProtocolVersion, useDailyProtocolVolumeQuery } from 'graphql/data/__generated__/types-and-hooks'
-import { useMemo } from 'react'
-import { ArrowRightCircle } from 'react-feather'
-import styled from 'styled-components'
-import { ClickableStyle, ExternalLink } from 'theme/components'
-import { NumberType, useFormatter } from 'utils/formatNumbers'
+import styled, { useTheme } from 'styled-components'
 
-import { Body1, Box, H2 } from '../components/Generics'
+import { Body1, Box, Button, H2 } from '../components/Generics'
+import { ArrowRightCircle } from '../components/Icons'
 import { StatCard } from '../components/StatCard'
 import { useInView } from './useInView'
 
-const Container = styled.div`
+const SectionLayout = styled.div`
   width: 100%;
-  max-width: 1360px;
+  max-width: 1328px;
   display: flex;
   flex-direction: column;
   align-items: center;
-  padding: 0 40px;
-
-  @media (max-width: 960px) {
-    max-height: 360px;
-  }
-
+  padding: 0 24px;
   @media (max-width: 768px) {
-    max-height: none;
-    padding: 0 48px;
+    padding: 0 64px;
   }
   @media (max-width: 468px) {
     padding: 0 24px;
   }
 `
-const SectionLayout = styled(Box)`
-  width: 100%;
-  max-width: 1280px;
-`
 const HideWhenLarge = styled(Box)`
   @media (min-width: 768px) {
     display: none;
@@ -73,6 +58,7 @@ const CardLayout = styled.div`
   width: 100%;
   height: 100%;
 
+  aspect-ratio: 1;
   display: grid;
   grid-template-columns: repeat(4, 1fr);
   grid-template-rows: repeat(4, 1fr);
@@ -80,31 +66,14 @@ const CardLayout = styled.div`
   grid-row-gap: 16px;
 
   overflow: hidden;
-
-  @media (max-width: 768px) {
-    height: 320px;
-    grid-column-gap: 12px;
-    grid-row-gap: 12px;
-  }
-
-  @media (max-width: 468px) {
-    grid-column-gap: 8px;
-    grid-row-gap: 8px;
-  }
 `
 const Layout = styled.div`
   width: 100%;
   display: grid;
   grid-template-columns: repeat(2, 1fr);
-  grid-template-rows: repeat(2, 234px);
-  @media (max-width: 960px) {
-    grid-template-rows: repeat(2, 160px);
-  }
-  @media (max-width: 768px) {
-    grid-template-rows: repeat(2, 200px);
-  }
+  grid-template-rows: repeat(2, 1fr);
   grid-column-gap: 24px;
-  grid-row-gap: 16px;
+  grid-row-gap: 24px;
 `
 const Left = styled.div`
   grid-column-start: 1;
@@ -120,139 +89,65 @@ const Right = styled.div`
   grid-row-end: 3;
   height: 100%;
 `
-const LearnMoreButton = styled(ExternalLink)`
-  padding: 12px 16px;
-  border-radius: 24px;
-  border: 0;
-  background-color: ${({ theme }) => theme.surface2};
-  font-family: Basel;
-  font-size: 20px;
-  font-style: normal;
-  font-weight: 535;
-  line-height: 24px;
-  color: ${({ theme }) => theme.neutral1};
-  ${ClickableStyle}
-`
-const LearnMoreArrow = styled(ArrowRightCircle)`
-  size: 24px;
-  stroke: ${({ theme }) => theme.surface2};
-  fill: ${({ theme }) => theme.neutral1};
-`
-const ProtocolDescription = () => (
-  <Trans>
-    Uniswap products are powered by the Uniswap Protocol. The protocol is the largest onchain marketplace, with billions
-    of dollars in weekly volume across thousands of tokens on Ethereum and 7+ additional chains.
-  </Trans>
-)
-function LearnMore() {
-  return (
-    <LearnMoreButton href="https://info.uniswap.org">
-      <Row gap="sm" align="center">
-        <Trans>Learn more</Trans>
-        <LearnMoreArrow />
-      </Row>
-    </LearnMoreButton>
-  )
-}
+const copy = t`The Uniswap platform is powered by the Uniswap protocol. The largest, most trusted decentralized crypto
+          exchange on Ethereum. Uniswap is available on 7+ additional EVM compatible chains and governed by a global
+          community.`
+
 export function Stats() {
+  const theme = useTheme()
   const { ref, inView } = useInView()
 
   return (
-    <Container>
-      <SectionLayout ref={ref}>
-        <HideWhenSmall>
-          <Layout>
-            <Left>
-              <Box direction="column" justify-content="space-between" height="100%">
-                <H2>
-                  <Trans>Trusted by millions</Trans>
-                </H2>
-                <Box bottom="0" position="absolute" direction="column" maxWidth="480px" gap="24px">
-                  <Body1>
-                    <ProtocolDescription />
-                  </Body1>
-                  <LearnMore />
-                </Box>
+    <SectionLayout ref={ref}>
+      <HideWhenSmall>
+        <Layout>
+          <Left>
+            <Box direction="column" justify-content="space-between" height="100%">
+              <H2>
+                <Trans>Trusted by millions</Trans>
+              </H2>
+              <Box bottom="0" position="absolute" direction="column" maxWidth="480px" gap="24px">
+                <Body1>{copy}</Body1>
+                <Button as="a">
+                  <Trans>Learn more</Trans> <ArrowRightCircle size="24px" fill={theme.neutral1} />
+                </Button>
               </Box>
-            </Left>
-            <Right>
-              <Cards inView={inView} />
-            </Right>
-          </Layout>
-        </HideWhenSmall>
-        <HideWhenLarge maxWidth="1280px" direction="column" gap="32px">
-          <H2>
-            <Trans>Trusted by millions</Trans>
-          </H2>
-          <Cards inView={inView} />
-          <Body1>
-            <ProtocolDescription />
-          </Body1>
-          <LearnMore />
-        </HideWhenLarge>
-      </SectionLayout>
-    </Container>
+            </Box>
+          </Left>
+          <Right>
+            <Cards inView={inView} />
+          </Right>
+        </Layout>
+      </HideWhenSmall>
+      <HideWhenLarge maxWidth="1328px" direction="column" gap="32px">
+        <H2>
+          <Trans>Trusted by millions</Trans>
+        </H2>
+        <Cards inView={inView} />
+        <Body1>{copy}</Body1>
+        <Button as="a">
+          <Trans>Learn more</Trans> <ArrowRightCircle size="24px" fill={theme.neutral1} />
+        </Button>
+      </HideWhenLarge>
+    </SectionLayout>
   )
 }
 
+// TODO(WEB-3175): replace values with live stats
 function Cards({ inView }: { inView: boolean }) {
-  const { formatNumber } = useFormatter()
-  const dailyV2VolumeQuery = useDailyProtocolVolumeQuery({
-    variables: {
-      version: ProtocolVersion.V2,
-    },
-  })
-  const dailyV3VolumeQuery = useDailyProtocolVolumeQuery({
-    variables: {
-      version: ProtocolVersion.V3,
-    },
-  })
-  const totalVolume = useMemo(() => {
-    // Second to last data point is most recent 24H period
-    // Last data point is today's volume, which is still accumulating
-    const v2DataPoints = dailyV2VolumeQuery?.data?.historicalProtocolVolume
-    const v2Volume = v2DataPoints && v2DataPoints.length >= 2 ? v2DataPoints[v2DataPoints.length - 2].value : 0
-
-    const v3DataPoints = dailyV3VolumeQuery?.data?.historicalProtocolVolume
-    const v3Volume = v3DataPoints && v3DataPoints.length >= 2 ? v3DataPoints[v3DataPoints.length - 2].value : 0
-
-    return v2Volume + v3Volume
-  }, [dailyV2VolumeQuery?.data?.historicalProtocolVolume, dailyV3VolumeQuery?.data?.historicalProtocolVolume])
-
   return (
     <CardLayout>
       <LeftTop>
-        <StatCard
-          title={t`All time volume`}
-          value={formatNumber({ input: 1.8 * 10 ** 12, type: NumberType.FiatTokenStats })}
-          delay={0}
-          inView={inView}
-        />
+        <StatCard title={t`Lifetime volume`} value={t`$1.6T`} delay={0} inView={inView} />
       </LeftTop>
       <RightTop>
-        <StatCard
-          title={t`All time swappers`}
-          value={formatNumber({ input: 9 * 10 ** 7, type: NumberType.NFTToken })}
-          delay={0.2}
-          inView={inView}
-        />
+        <StatCard title={t`Assets`} value={t`81,036`} delay={0.2} inView={inView} />
       </RightTop>
       <LeftBottom>
-        <StatCard
-          title={t`All time LP fees `}
-          value={formatNumber({ input: 3.2 * 10 ** 9, type: NumberType.FiatTokenStats })}
-          delay={0.4}
-          inView={inView}
-        />
+        <StatCard title={t`Lifetime swappers`} value={t`38M`} delay={0.4} inView={inView} />
       </LeftBottom>
       <RightBottom>
-        <StatCard
-          title={t`24H volume`}
-          value={formatNumber({ input: totalVolume || 500000000, type: NumberType.FiatTokenStats })}
-          live
-          delay={0.6}
-          inView={inView}
-        />
+        <StatCard title={t`Trades today`} value={t`3,461`} delay={0.6} inView={inView} />
       </RightBottom>
     </CardLayout>
   )
diff --git a/apps/web/src/pages/MigrateV2/MigrateV2Pair.tsx b/apps/web/src/pages/MigrateV2/MigrateV2Pair.tsx
index 5008fdc46a2..d5ee8927079 100644
--- a/apps/web/src/pages/MigrateV2/MigrateV2Pair.tsx
+++ b/apps/web/src/pages/MigrateV2/MigrateV2Pair.tsx
@@ -37,7 +37,6 @@ import { useTheme } from 'styled-components'
 import { formatCurrencyAmount } from 'utils/formatCurrencyAmount'
 import { unwrappedToken } from 'utils/unwrappedToken'
 
-import { MigrateHeader } from '.'
 import { AutoColumn } from '../../components/Column'
 import FormattedCurrencyAmount from '../../components/FormattedCurrencyAmount'
 import CurrencyLogo from '../../components/Logo/CurrencyLogo'
@@ -55,6 +54,7 @@ import { calculateGasMargin } from '../../utils/calculateGasMargin'
 import { currencyId } from '../../utils/currencyId'
 import { ExplorerDataType, getExplorerLink } from '../../utils/getExplorerLink'
 import { BodyWrapper } from '../AppBody'
+import { MigrateHeader } from '.'
 
 const ZERO = JSBI.BigInt(0)
 
diff --git a/apps/web/src/pages/Pool/CTACards.tsx b/apps/web/src/pages/Pool/CTACards.tsx
index bec17889398..eb0d5b5a2a8 100644
--- a/apps/web/src/pages/Pool/CTACards.tsx
+++ b/apps/web/src/pages/Pool/CTACards.tsx
@@ -3,7 +3,8 @@ import { useWeb3React } from '@web3-react/core'
 import { AutoColumn } from 'components/Column'
 import { getChainInfoOrDefault } from 'constants/chainInfo'
 import styled from 'styled-components'
-import { ExternalLink, ThemedText } from 'theme/components'
+import { ThemedText } from 'theme/components'
+import { ExternalLink } from 'theme/components'
 
 const CTASection = styled.section`
   display: grid;
diff --git a/apps/web/src/pages/Pool/PositionPage.tsx b/apps/web/src/pages/Pool/PositionPage.tsx
index 937f3f749d4..2edab59b8cf 100644
--- a/apps/web/src/pages/Pool/PositionPage.tsx
+++ b/apps/web/src/pages/Pool/PositionPage.tsx
@@ -18,8 +18,7 @@ import { Dots } from 'components/swap/styled'
 import Toggle from 'components/Toggle'
 import TransactionConfirmationModal, { ConfirmationModalContent } from 'components/TransactionConfirmationModal'
 import { CHAIN_IDS_TO_NAMES, isSupportedChain } from 'constants/chains'
-import { useInfoExplorePageEnabled } from 'featureFlags/flags/infoExplore'
-import { chainIdToBackendName, getTokenDetailsURL, isGqlSupportedChain } from 'graphql/data/util'
+import { isGqlSupportedChain } from 'graphql/data/util'
 import { useToken } from 'hooks/Tokens'
 import { useV3NFTPositionManagerContract } from 'hooks/useContract'
 import useIsTickAtLimit from 'hooks/useIsTickAtLimit'
@@ -213,9 +212,8 @@ const TokenLink = ({
   chainId,
   address,
 }: PropsWithChildren<{ chainId: keyof typeof CHAIN_IDS_TO_NAMES; address: string }>) => {
-  const isInfoExplorePageEnabled = useInfoExplorePageEnabled()
-  const tokenLink = getTokenDetailsURL({ address, chain: chainIdToBackendName(chainId), isInfoExplorePageEnabled })
-  return <StyledRouterLink to={tokenLink}>{children}</StyledRouterLink>
+  const chainName = CHAIN_IDS_TO_NAMES[chainId]
+  return <StyledRouterLink to={`/tokens/${chainName}/${address}`}>{children}</StyledRouterLink>
 }
 
 const ExternalTokenLink = ({ children, chainId, address }: PropsWithChildren<{ chainId: number; address: string }>) => {
diff --git a/apps/web/src/pages/PoolDetails/__snapshots__/index.test.tsx.snap b/apps/web/src/pages/PoolDetails/__snapshots__/index.test.tsx.snap
index d4f9a572e35..b60fcc0f989 100644
--- a/apps/web/src/pages/PoolDetails/__snapshots__/index.test.tsx.snap
+++ b/apps/web/src/pages/PoolDetails/__snapshots__/index.test.tsx.snap
@@ -17,54 +17,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   width: max-content;
 }
 
-.c93 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  display: inline-block;
-  text-align: center;
-  line-height: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font-size: inherit;
-  padding-left: 16px;
-  padding-right: 16px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: white;
-  background-color: primary;
-  border: 0;
-  border-radius: 4px;
-}
-
-.c110 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  display: inline-block;
-  text-align: center;
-  line-height: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font-size: inherit;
-  padding-left: 16px;
-  padding-right: 16px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: white;
-  background-color: primary;
-  border: 0;
-  border-radius: 4px;
-  font-weight: 535;
-}
-
-.c125 {
+.c77 {
   box-sizing: border-box;
   margin: 0;
   min-width: 0;
@@ -146,7 +99,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   gap: 8px;
 }
 
-.c44 {
+.c43 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -164,7 +117,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   gap: 16px;
 }
 
-.c126 {
+.c78 {
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
@@ -184,7 +137,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   padding: 4px 0px;
 }
 
-.c131 {
+.c83 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -201,7 +154,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   justify-content: flex-start;
 }
 
-.c144 {
+.c98 {
   width: 100%;
   display: -webkit-box;
   display: -webkit-flex;
@@ -219,68 +172,15 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   gap: 4px;
 }
 
-.c75 {
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.c77 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-}
-
 .c18 {
   color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c20 {
+.c19 {
   color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c70 {
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
 }
 
-.c79 {
-  outline: none;
-  border: none;
-  font-size: inherit;
-  padding: 0;
-  margin: 0;
-  background: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  -webkit-transition-timing-function: ease-in-out;
-  transition-timing-function: ease-in-out;
-  -webkit-transition-property: opacity,color,background-color;
-  transition-property: opacity,color,background-color;
-}
-
-.c79:hover {
-  opacity: 0.6;
-}
-
-.c79:focus {
-  -webkit-text-decoration: underline;
-  text-decoration: underline;
-}
-
-.c140 {
+.c92 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -291,11 +191,11 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   font-weight: 500;
 }
 
-.c140:hover {
+.c92:hover {
   opacity: 0.6;
 }
 
-.c140:active {
+.c92:active {
   opacity: 0.4;
 }
 
@@ -328,13 +228,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   gap: 24px;
 }
 
-.c108 {
-  display: grid;
-  grid-auto-rows: auto;
-  grid-row-gap: 4px;
-}
-
-.c39 {
+.c38 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -346,7 +240,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   justify-content: flex-end;
 }
 
-.c40 {
+.c39 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -365,7 +259,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   width: fit-content;
 }
 
-.c41 {
+.c40 {
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -394,11 +288,11 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   transition-duration: 125ms;
 }
 
-.c41:hover {
+.c40:hover {
   opacity: 0.6;
 }
 
-.c42 {
+.c41 {
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -427,7 +321,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   transition-duration: 125ms;
 }
 
-.c127 {
+.c79 {
   color: #FF5F52;
 }
 
@@ -489,142 +383,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   white-space: nowrap;
 }
 
-.c73 {
-  position: relative;
-  z-index: 1;
-  -webkit-transition: -webkit-transform 250ms ease;
-  -webkit-transition: transform 250ms ease;
-  transition: transform 250ms ease;
-  border-radius: 24px;
-}
-
-.c74 {
-  border-radius: 24px;
-  z-index: -1;
-  padding-top: 12px;
-}
-
-.c106 {
-  border-radius: 12px;
-  height: 40px;
-  width: 40px;
-  position: relative;
-  margin-top: -18px;
-  margin-bottom: -18px;
-  margin-left: auto;
-  margin-right: auto;
-  background-color: #F9F9F9;
-  border: 4px solid;
-  border-color: #FFFFFF;
-  z-index: 2;
-}
-
-.c106:hover {
-  cursor: pointer;
-  opacity: 0.8;
-}
-
-.c87 {
-  background-color: #F9F9F9;
-  border-radius: 16px;
-  color: #7D7D7D;
-  font-size: 14px;
-  font-weight: 500;
-  height: 120px;
-  line-height: 20px;
-  padding: 16px;
-  position: relative;
-}
-
-.c87:before {
-  box-sizing: border-box;
-  background-size: 100%;
-  border-radius: inherit;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  pointer-events: none;
-  content: '';
-  border: 1px solid #F9F9F9;
-}
-
-.c87:hover:before {
-  border-color: #98A1C014;
-}
-
-.c87:focus-within:before {
-  border-color: #B8C0DC3d;
-}
-
-.c109 {
-  border-bottom: 1px solid #FFFFFF;
-}
-
-.c107 {
-  display: -webkit-inline-box;
-  display: -webkit-inline-flex;
-  display: -ms-inline-flexbox;
-  display: inline-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;
-  width: 100%;
-  height: 100%;
-}
-
-.c80 {
-  color: #222222;
-  background-color: #F9F9F9;
-  padding: 8px 16px;
-  border-radius: 20px;
-  gap: 4px;
-  font-weight: 485;
-}
-
-.c80:focus {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c80:active {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c82 {
-  color: #7D7D7D;
-  padding: 8px 16px;
-  border-radius: 20px;
-  gap: 4px;
-  font-weight: 485;
-}
-
-.c82:focus {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c82:active {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c105 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-}
-
-.c31 {
+.c30 {
   border-radius: 12px;
   border-radius: 12px;
   height: 24px;
@@ -639,52 +398,34 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   background-size: 400%;
 }
 
-.c81 {
-  display: inline-block;
-  height: inherit;
+.c97 {
+  opacity: 0;
+  -webkit-transition: opacity 250ms ease-in;
+  transition: opacity 250ms ease-in;
+  width: 20px;
+  height: 20px;
+  border-radius: 50%;
 }
 
-.c98 {
-  position: relative;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
+.c96 {
+  width: 20px;
+  height: 20px;
+  background: #22222212;
+  -webkit-transition: background-color 250ms ease-in;
+  transition: background-color 250ms ease-in;
+  box-shadow: 0 0 1px white;
+  border-radius: 50%;
 }
 
-.c99 {
+.c95 {
+  position: relative;
   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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c100 {
-  width: 24px;
-  height: 24px;
-  border-radius: 50%;
-}
-
-.c120 {
-  width: 16px;
-  height: 16px;
-  border-radius: 50%;
-}
-
-.c143 {
-  width: 20px;
-  height: 20px;
-  border-radius: 50%;
 }
 
-.c36 {
+.c35 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -702,22 +443,22 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   margin-bottom: 44px;
 }
 
-.c32 {
+.c31 {
   height: 16px;
   width: 180px;
 }
 
-.c33 {
+.c32 {
   height: 32px;
   border-radius: 8px;
 }
 
-.c34 {
+.c33 {
   margin-top: 4px;
   height: 40px;
 }
 
-.c37 {
+.c36 {
   -webkit-animation: wave 8s cubic-bezier(0.36,0.45,0.63,0.53) infinite;
   animation: wave 8s cubic-bezier(0.36,0.45,0.63,0.53) infinite;
   display: -webkit-box;
@@ -728,11 +469,11 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   margin-top: 90px;
 }
 
-.c35 {
+.c34 {
   height: 6px;
 }
 
-.c29 {
+.c28 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -748,7 +489,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   position: relative;
 }
 
-.c30 {
+.c29 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -766,40 +507,20 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   position: relative;
 }
 
-.c38 {
+.c37 {
   position: absolute;
   top: 4px;
   right: 72px;
   z-index: 3;
 }
 
-.c21 {
+.c20 {
   background: #F9F9F9;
   padding: 2px 6px;
   border-radius: 4px;
 }
 
-.c22 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  fill: #7D7D7D;
-}
-
-.c22:hover {
-  opacity: 0.6;
-}
-
-.c22:active {
-  opacity: 0.4;
-}
-
-.c19 {
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
+.c21 {
   -webkit-text-decoration: none;
   text-decoration: none;
   cursor: pointer;
@@ -807,11 +528,11 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   transition-duration: 125ms;
 }
 
-.c19:hover {
+.c21:hover {
   opacity: 0.6;
 }
 
-.c19:active {
+.c21:active {
   opacity: 0.4;
 }
 
@@ -848,7 +569,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   object-position: 100% 0;
 }
 
-.c133 {
+.c85 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -859,18 +580,18 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   left: 0;
 }
 
-.c133 img {
+.c85 img {
   width: 10px;
   height: 20px;
   object-fit: cover;
 }
 
-.c133 img:first-child {
+.c85 img:first-child {
   border-radius: 10px 0 0 10px;
   object-position: 0 0;
 }
 
-.c133 img:last-child {
+.c85 img:last-child {
   border-radius: 0 10px 10px 0;
   object-position: 100% 0;
 }
@@ -881,25 +602,25 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   border-radius: 50%;
 }
 
-.c134 {
+.c86 {
   width: 10px;
   height: 20px;
   border-radius: 50%;
 }
 
-.c135 {
+.c87 {
   display: none;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 
-.c132 {
+.c84 {
   gap: 8px;
   margin-right: 12px;
 }
 
-.c142 {
+.c94 {
   gap: 8px;
   margin-right: 12px;
   -webkit-text-decoration: none;
@@ -909,15 +630,15 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   transition-duration: 125ms;
 }
 
-.c142:hover {
+.c94:hover {
   opacity: 0.6;
 }
 
-.c142:active {
+.c94:active {
   opacity: 0.4;
 }
 
-.c136 {
+.c88 {
   -webkit-flex-shrink: 0;
   -ms-flex-negative: 0;
   flex-shrink: 0;
@@ -926,7 +647,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   text-overflow: ellipsis;
 }
 
-.c138 {
+.c90 {
   gap: 8px;
   padding: 8px 12px;
   border-radius: 20px;
@@ -947,15 +668,15 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   transition-duration: 125ms;
 }
 
-.c138:hover {
+.c90:hover {
   opacity: 0.6;
 }
 
-.c138:active {
+.c90:active {
   opacity: 0.4;
 }
 
-.c139 {
+.c91 {
   width: 16px;
   height: 16px;
   color: #7D7D7D;
@@ -964,7 +685,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   flex-shrink: 0;
 }
 
-.c141 {
+.c93 {
   padding: 8px;
   border-radius: 20px;
   background-color: #22222212;
@@ -979,15 +700,15 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   transition-duration: 125ms;
 }
 
-.c141:hover {
+.c93:hover {
   opacity: 0.6;
 }
 
-.c141:active {
+.c93:active {
   opacity: 0.4;
 }
 
-.c137 {
+.c89 {
   gap: 8px;
   -webkit-flex-shrink: 0;
   -ms-flex-negative: 0;
@@ -997,23 +718,21 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   width: max-content;
 }
 
-.c115 {
+.c69 {
   font-weight: 485;
   font-size: 24px;
   line-height: 36px;
 }
 
-.c114 {
+.c68 {
   gap: 24px;
   padding: 20px;
   border-radius: 20px;
   background: #F9F9F9;
   width: 100%;
-  z-index: 1;
-  margin-top: -24px;
 }
 
-.c116 {
+.c70 {
   gap: 8px;
   -webkit-flex: 1;
   -ms-flex: 1;
@@ -1021,48 +740,23 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   min-width: 180px;
 }
 
-.c117 {
+.c71 {
   -webkit-box-pack: justify;
   -webkit-justify-content: space-between;
   -ms-flex-pack: justify;
   justify-content: space-between;
 }
 
-.c118 {
+.c72 {
   font-weight: 485;
-  font-size: 16px;
+  font-size: 18px;
   line-height: 24px;
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
 }
 
-.c119 {
-  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;
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c119:hover {
-  opacity: 0.6;
-}
-
-.c119:active {
-  opacity: 0.4;
-}
-
-.c121 {
+.c73 {
   height: 8px;
   width: 40.698463777008904%;
   background: #FC72FF;
@@ -1071,7 +765,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   border-right: 1px solid #F9F9F9;
 }
 
-.c122 {
+.c74 {
   height: 8px;
   width: 59.3015362229911%;
   background: #4C82FB;
@@ -1080,7 +774,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   border-left: 1px solid #F9F9F9;
 }
 
-.c123 {
+.c75 {
   gap: 4px;
   width: 100%;
   -webkit-align-items: flex-end;
@@ -1089,14 +783,14 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   align-items: flex-end;
 }
 
-.c124 {
+.c76 {
   color: #222222;
   font-size: 36px;
   font-weight: 485;
   line-height: 44px;
 }
 
-.c113 {
+.c67 {
   background-color: transparent;
   bottom: 0;
   border-radius: inherit;
@@ -1110,473 +804,104 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   width: 100%;
 }
 
-.c94 {
-  padding: 16px;
-  width: 100%;
-  line-height: 24px;
-  font-weight: 535;
-  text-align: center;
-  border-radius: 16px;
-  outline: none;
-  border: 1px solid transparent;
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-flex-wrap: nowrap;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
+.c64 {
   -webkit-align-items: center;
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-  will-change: transform;
-  -webkit-transition: -webkit-transform 450ms ease;
-  -webkit-transition: transform 450ms ease;
-  transition: transform 450ms ease;
-  -webkit-transform: perspective(1px) translateZ(0);
-  -ms-transform: perspective(1px) translateZ(0);
-  transform: perspective(1px) translateZ(0);
-}
-
-.c94:disabled {
-  opacity: 50%;
-  cursor: auto;
-  pointer-events: none;
-}
-
-.c94 > * {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c94 > a {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c111 {
   background-color: #FFEFFF;
+  border-radius: 16px;
+  border: 0;
   color: #FC72FF;
-  font-size: 20px;
-  font-weight: 535;
-}
-
-.c111:focus {
-  box-shadow: 0 0 0 1pt #FFEFFF;
-  background-color: #FFEFFF;
-}
-
-.c111:hover {
-  background-color: #FFEFFF;
-}
-
-.c111:active {
-  box-shadow: 0 0 0 1pt #FFEFFF;
-  background-color: #FFEFFF;
-}
-
-.c111:hover .c112 {
-  background-color: #98A1C014;
-}
-
-.c111:active .c112 {
-  background-color: #B8C0DC3d;
-}
-
-.c111:disabled {
-  opacity: 0.4;
-}
-
-.c111:disabled:hover {
-  cursor: auto;
-  background-color: transparent;
-  box-shadow: none;
-  border: 1px solid transparent;
-  outline: none;
-}
-
-.c95 {
-  background-color: #FFFFFF;
-  color: #7D7D7D;
-  border: 1px solid #22222212;
-  font-size: 16px;
-  font-weight: 535;
-}
-
-.c95:hover {
-  background-color: #ececec;
-}
-
-.c95:active {
-  background-color: #e0e0e0;
-}
-
-.c64 {
-  height: 16px;
-  width: 16px;
-}
-
-.c64 path {
-  stroke: #FC72FF;
-  background: #7D7D7D;
-  fill: none;
-}
-
-.c65 {
-  -webkit-animation: 2s fvtopB linear infinite;
-  animation: 2s fvtopB linear infinite;
-}
-
-.c86 {
-  height: 24px;
-  width: 24px;
-}
-
-.c86 > * {
-  fill: #7D7D7D;
-}
-
-.c84 {
-  border: none;
-  background-color: transparent;
-  margin: 0;
-  padding: 0;
   cursor: pointer;
-  outline: none;
-}
-
-.c84:not([disabled]):hover {
-  opacity: 0.7;
-}
-
-.c85 {
-  padding: 6px 12px;
-  border-radius: 16px;
-}
-
-.c83 {
-  position: relative;
-}
-
-.c76 {
-  margin-bottom: 4px;
-  color: #7D7D7D;
-}
-
-.c78 {
-  gap: 16px;
-  padding-bottom: 8px;
-}
-
-.c91 {
-  color: #222222;
-  pointer-events: auto;
-  width: 0;
-  position: relative;
-  font-weight: 485;
-  outline: none;
-  border: none;
-  -webkit-flex: 1 1 auto;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-  background-color: transparent;
-  font-size: 28px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 0px;
-  -webkit-appearance: textfield;
-  text-align: right;
-}
-
-.c91::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-.c91 [type='number'] {
-  -moz-appearance: textfield;
-}
-
-.c91::-webkit-outer-spin-button,
-.c91::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-}
-
-.c91::-webkit-input-placeholder {
-  color: #CECECE;
-}
-
-.c91::-moz-placeholder {
-  color: #CECECE;
-}
-
-.c91:-ms-input-placeholder {
-  color: #CECECE;
-}
-
-.c91::placeholder {
-  color: #CECECE;
-}
-
-.c92 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-  text-align: left;
-  font-size: 36px;
-  font-weight: 485;
-  max-height: 44px;
-}
-
-.c24 {
-  -webkit-transition: display 125ms ease-in-out, -webkit-transform 125ms ease-in-out;
-  -webkit-transition: display 125ms ease-in-out, transform 125ms ease-in-out;
-  transition: display 125ms ease-in-out, transform 125ms ease-in-out;
-  -webkit-animation: iCPeaJ 125ms ease-in-out;
-  animation: iCPeaJ 125ms ease-in-out;
-}
-
-.c24.exiting {
-  -webkit-animation: bbnGid 125ms ease-in-out;
-  animation: bbnGid 125ms ease-in-out;
-}
-
-.c88 {
   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;
+  font-size: 16px;
+  font-weight: 535;
+  gap: 12px;
+  -webkit-box-pack: center;
+  -webkit-justify-content: center;
+  -ms-flex-pack: center;
+  justify-content: center;
+  line-height: 20px;
+  padding: 10px 12px;
   position: relative;
-  border-radius: 20px;
-  z-index: 1;
-  width: initial;
-  -webkit-transition: height 1s ease;
-  transition: height 1s ease;
-  will-change: height;
-}
-
-.c89 {
-  min-height: 44px;
-  border-radius: 20px;
-  width: initial;
-}
-
-.c96 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #FFFFFF;
-  opacity: 1;
-  color: #222222;
-  cursor: pointer;
-  height: 36px;
-  border-radius: 18px;
-  outline: none;
+  -webkit-transition: 150ms ease opacity;
+  transition: 150ms ease opacity;
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
-  border: 1px solid #22222212;
-  font-size: 24px;
-  font-weight: 485;
-  width: initial;
-  padding: 4px 8px 4px 4px;
-  gap: 8px;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  margin-left: 12px;
-  box-shadow: 0px 0px 10px 0px rgba(34,34,34,0.04);
-  visibility: visible;
-  -webkit-animation: none;
-  animation: none;
 }
 
-.c96:hover,
-.c96:active {
-  background-color: #F9F9F9;
-}
-
-.c96:before {
-  background-size: 100%;
-  border-radius: inherit;
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  content: '';
-}
-
-.c96:hover:before {
-  background-color: #98A1C014;
-}
-
-.c96:active:before {
+.c64:active .c66 {
   background-color: #B8C0DC3d;
 }
 
-.c90 {
-  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: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.c103 {
-  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;
-  color: #7D7D7D;
-  font-size: 0.75rem;
-  line-height: 1rem;
-}
-
-.c103 span:hover {
-  cursor: pointer;
-  color: #4a4a4a;
-}
-
-.c104 {
-  -webkit-box-pack: end;
-  -webkit-justify-content: flex-end;
-  -ms-flex-pack: end;
-  justify-content: flex-end;
-  min-height: 24px;
-  padding: 8px 0px 0px 0px;
-}
-
-.c97 {
-  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: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-  width: 100%;
+.c64:focus .c66 {
+  background-color: #B8C0DC3d;
 }
 
-.c102 {
-  margin: 0 0.25rem 0 0.35rem;
-  height: 35%;
-  margin-left: 8px;
+.c64:hover .c66 {
+  background-color: #98A1C014;
 }
 
-.c102 path {
-  stroke: #222222;
-  stroke-width: 2px;
+.c64:disabled {
+  cursor: default;
+  opacity: 0.6;
 }
 
-.c101 {
-  margin: 0 0.25rem 0 0.25rem;
-  font-size: 20px;
-  font-weight: 535;
+.c64:disabled:active .c66,
+.c64:disabled:focus .c66,
+.c64:disabled:hover .c66 {
+  background-color: transparent;
 }
 
-.c67 {
+.c63 {
   gap: 12px;
-  z-index: 1;
 }
 
-.c68 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
+.c65 {
   padding: 12px 16px 12px 12px;
-  border: unset;
   border-radius: 900px;
   width: 50%;
-  gap: 8px;
-  color: #FC72FF;
-  background-color: #FC72FF1f;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-transition: width 250ms ease-in-out;
-  transition: width 250ms ease-in-out;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
 }
 
-.c68:hover {
-  opacity: 0.6;
+.c60 {
+  height: 16px;
+  width: 16px;
 }
 
-.c68:active {
-  opacity: 0.4;
+.c60 path {
+  stroke: #FC72FF;
+  background: #7D7D7D;
+  fill: none;
 }
 
-.c69 {
-  fill: #FC72FF;
-  rotate: 90deg;
+.c61 {
+  -webkit-animation: 2s fvtopB linear infinite;
+  animation: 2s fvtopB linear infinite;
 }
 
-.c71 {
-  z-index: 0;
-  max-height: 0;
-  -webkit-transition: max-height 250ms ease;
-  transition: max-height 250ms ease;
-  padding-bottom: 0;
+.c23 {
+  -webkit-transition: display 125ms ease-in-out, -webkit-transform 125ms ease-in-out;
+  -webkit-transition: display 125ms ease-in-out, transform 125ms ease-in-out;
+  transition: display 125ms ease-in-out, transform 125ms ease-in-out;
+  -webkit-animation: iCPeaJ 125ms ease-in-out;
+  animation: iCPeaJ 125ms ease-in-out;
 }
 
-.c71 .c72:before {
-  background-color: unset;
+.c23.exiting {
+  -webkit-animation: bbnGid 125ms ease-in-out;
+  animation: bbnGid 125ms ease-in-out;
 }
 
-.c46 {
+.c45 {
   max-width: 1200px;
   max-height: 600px;
   -webkit-box-pack: center;
@@ -1590,7 +915,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   margin: 0px auto 24px auto;
 }
 
-.c47 {
+.c46 {
   width: 100%;
   height: 72px;
   position: relative;
@@ -1608,7 +933,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   background: #FFFFFF;
 }
 
-.c60 {
+.c56 {
   width: 100%;
   position: relative;
   overflow-x: auto;
@@ -1625,11 +950,11 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   scrollbar-width: none;
 }
 
-.c60::-webkit-scrollbar {
+.c56::-webkit-scrollbar {
   display: none;
 }
 
-.c62 {
+.c58 {
   position: -webkit-sticky;
   position: sticky;
   -webkit-box-pack: center;
@@ -1640,7 +965,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   visibility: hidden;
 }
 
-.c63 {
+.c59 {
   background: #FFEFFF;
   border-radius: 8px;
   width: -webkit-fit-content;
@@ -1655,8 +980,8 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   z-index: 990;
 }
 
-.c48 {
-  padding: 0px 12px;
+.c47 {
+  padding: 0px 20px;
   width: -webkit-fit-content;
   width: -moz-fit-content;
   width: fit-content;
@@ -1668,11 +993,11 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   min-height: 64px;
 }
 
-.c61:hover {
+.c57:hover {
   background: #22222212;
 }
 
-.c49 {
+.c48 {
   border: 1px solid #22222212;
   border-top-right-radius: 20px;
   border-top-left-radius: 20px;
@@ -1688,11 +1013,11 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   overscroll-behavior: none;
 }
 
-.c49::-webkit-scrollbar {
+.c48::-webkit-scrollbar {
   display: none;
 }
 
-.c50 {
+.c49 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1703,76 +1028,17 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   flex-grow: 1;
 }
 
-.c50:last-child {
+.c49:last-child {
   -webkit-box-pack: end;
   -webkit-justify-content: flex-end;
   -ms-flex-pack: end;
   justify-content: flex-end;
 }
 
-.c50:first-child {
-  -webkit-box-flex: 0;
-  -webkit-flex-grow: 0;
-  -ms-flex-positive: 0;
-  flex-grow: 0;
-}
-
-.c52 {
-  -webkit-box-pack: start;
-  -webkit-justify-content: flex-start;
-  -ms-flex-pack: start;
-  justify-content: flex-start;
-  cursor: pointer;
-  width: 100%;
-  gap: 4px;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c52:hover {
-  opacity: 0.6;
-}
-
-.c52:active {
-  opacity: 0.4;
-}
-
-.c53 {
-  height: 16px;
-  width: 16px;
-  color: #7D7D7D;
-  -webkit-transform: rotate(0deg);
-  -ms-transform: rotate(0deg);
-  transform: rotate(0deg);
-}
-
-.c55 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  cursor: pointer;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-  gap: 4px;
-}
-
-.c55:hover {
-  opacity: 0.6;
-}
-
-.c55:active {
-  opacity: 0.4;
-}
-
-.c51 {
-  min-width: 164px;
+.c50 {
+  width: undefinedpx;
+  min-width: 150px;
+  min-width: undefinedpx;
   -webkit-flex: 0;
   -ms-flex: 0;
   flex: 0;
@@ -1788,13 +1054,15 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c54 {
+.c51 {
+  width: undefinedpx;
   min-width: 100px;
+  min-width: undefinedpx;
   -webkit-flex: 0;
   -ms-flex: 0;
   flex: 0;
@@ -1810,13 +1078,15 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c57 {
+.c52 {
+  width: undefinedpx;
   min-width: 125px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -1832,13 +1102,15 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c59 {
+.c54 {
+  width: undefinedpx;
   min-width: 100px;
+  min-width: undefinedpx;
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -1854,28 +1126,48 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   -webkit-box-align: center;
   -ms-flex-align: center;
   align-items: center;
-  font-variant-numeric: lining-nums tabular-nums;
+  font-variant-numeric: tabular-nums;
   overflow: hidden;
   padding: 12px 8px;
 }
 
-.c58 {
-  width: 75%;
-  height: 16px;
+.c55 {
+  width: undefinedpx;
+  min-width: 32px;
+  min-width: undefinedpx;
+  -webkit-flex: 0;
+  -ms-flex: 0;
+  flex: 0;
+  display: -webkit-box;
+  display: -webkit-flex;
+  display: -ms-flexbox;
+  display: flex;
+  -webkit-box-pack: end;
+  -webkit-justify-content: flex-end;
+  -ms-flex-pack: end;
+  justify-content: flex-end;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -ms-flex-align: center;
+  align-items: center;
+  font-variant-numeric: tabular-nums;
+  overflow: hidden;
+  padding: 12px 8px;
 }
 
-.c56 {
-  position: relative;
+.c53 {
+  width: 75%;
+  height: 16px;
 }
 
-.c45 {
+.c44 {
   -webkit-user-select: none;
   -moz-user-select: none;
   -ms-user-select: none;
   user-select: none;
 }
 
-.c25 {
+.c24 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1895,7 +1187,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   width: fit-content;
 }
 
-.c26 {
+.c25 {
   position: absolute;
   height: 30px;
   background-color: #22222212;
@@ -1904,7 +1196,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   transition: left 0.3s ease,width 0.3s ease;
 }
 
-.c27 {
+.c26 {
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -1933,7 +1225,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   transition-duration: 125ms;
 }
 
-.c28 {
+.c27 {
   -webkit-flex: 1;
   -ms-flex: 1;
   flex: 1;
@@ -1962,7 +1254,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   transition-duration: 125ms;
 }
 
-.c28:hover {
+.c27:hover {
   opacity: 0.6;
 }
 
@@ -1986,7 +1278,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   justify-content: flex-start;
 }
 
-.c23 {
+.c22 {
   display: -webkit-box;
   display: -webkit-flex;
   display: -ms-flexbox;
@@ -1998,38 +1290,38 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
   align-items: center;
 }
 
-.c43 {
+.c42 {
   border: 0.5px solid #22222212;
   margin: 16px 0px;
   width: 100%;
 }
 
-.c66 {
+.c62 {
   gap: 24px;
   margin: 0 48px 0 auto;
   width: 22vw;
   min-width: 360px;
 }
 
-.c128 {
+.c80 {
   gap: 24px;
   padding: 20px;
 }
 
-.c129 {
+.c81 {
   width: 100%;
   font-size: 24px;
   font-weight: 485;
   line-height: 32px;
 }
 
-.c130 {
+.c82 {
   gap: 16px;
   width: 100%;
 }
 
 @media only screen and (max-width:720px) {
-  .c40 {
+  .c39 {
     width: 100%;
     -webkit-box-pack: justify;
     -webkit-justify-content: space-between;
@@ -2040,42 +1332,42 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
 }
 
 @media only screen and (max-width:1024px) {
-  .c38 {
+  .c37 {
     position: static;
     margin-top: 4px;
   }
 }
 
 @media only screen and (max-width:396px) {
-  .c38 {
+  .c37 {
     width: 100%;
   }
 }
 
 @media (max-width:1023px) and (min-width:395px) {
-  .c135 {
+  .c87 {
     display: block;
   }
 }
 
 @media (max-width:1023px) and (min-width:395px) {
-  .c136 {
+  .c88 {
     color: #7D7D7D;
   }
 }
 
 @media (max-width:1023px) {
-  .c115 {
+  .c69 {
     width: 100%;
   }
 }
 
 @media (max-width:1023px) {
-  .c114 {
+  .c68 {
     -webkit-flex-direction: row;
     -ms-flex-direction: row;
     flex-direction: row;
-    background: transparent;
+    background: #FFFFFF;
     -webkit-flex-wrap: wrap;
     -ms-flex-wrap: wrap;
     flex-wrap: wrap;
@@ -2084,18 +1376,17 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
     -webkit-justify-content: space-between;
     -ms-flex-pack: justify;
     justify-content: space-between;
-    margin-top: 0px;
   }
 }
 
 @media (max-width:640px) {
-  .c116 {
+  .c70 {
     min-width: 150px;
   }
 }
 
 @media (max-width:1023px) {
-  .c117 {
+  .c71 {
     -webkit-flex-direction: column;
     -ms-flex-direction: column;
     flex-direction: column;
@@ -2103,7 +1394,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
 }
 
 @media (max-width:1023px) {
-  .c118 {
+  .c72 {
     font-size: 20px;
     line-height: 28px;
     width: 100%;
@@ -2111,7 +1402,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
 }
 
 @media (max-width:1023px) {
-  .c123 {
+  .c75 {
     -webkit-flex-direction: column;
     -ms-flex-direction: column;
     flex-direction: column;
@@ -2124,20 +1415,14 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
 }
 
 @media (max-width:1023px) {
-  .c124 {
+  .c76 {
     font-size: 20px;
     line-height: 28px;
   }
 }
 
 @media (max-width:1023px) {
-  .c67 {
-    display: none;
-  }
-}
-
-@media (max-width:1023px) {
-  .c71 {
+  .c63 {
     display: none;
   }
 }
@@ -2164,7 +1449,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
 }
 
 @media (max-width:1023px) {
-  .c66 {
+  .c62 {
     margin: 44px 0px;
     width: 100%;
     min-width: unset;
@@ -2172,7 +1457,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
 }
 
 @media (max-width:1023px) and (min-width:640px) {
-  .c128 {
+  .c80 {
     -webkit-flex-direction: row;
     -ms-flex-direction: row;
     flex-direction: row;
@@ -2184,7 +1469,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
 }
 
 @media (max-width:639px) {
-  .c128 {
+  .c80 {
     padding: unset;
   }
 }
@@ -2295,28 +1580,16 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
               <div
                 class="c18 css-1jyz67g"
               >
-                <a
-                  class="c19"
-                  href="/explore/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
-                >
-                  USDC
-                </a>
-                 / 
-                <a
-                  class="c19"
-                  href="/explore/tokens/ethereum/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
-                >
-                  WETH
-                </a>
+                USDC / WETH
               </div>
             </div>
             <div
-              class="c20 c21 css-1m65e73"
+              class="c19 c20 css-1m65e73"
             >
               0.05%
             </div>
             <svg
-              class="c22"
+              class="c21"
               data-testid="toggle-tokens-reverse-arrows"
               fill="none"
               height="20"
@@ -2325,32 +1598,33 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
               xmlns="http://www.w3.org/2000/svg"
             >
               <path
-                d="M2.05836 6.27468C2.00086 6.21718 1.95514 6.14789 1.92348 6.07123C1.86014 5.91873 1.86014 5.74623 1.92348 5.59373C1.95514 5.51706 2.00086 5.44798 2.05836 5.39048L5.3917 2.05715C5.63586 1.81298 6.03173 1.81298 6.27589 2.05715C6.52006 2.30132 6.52006 2.69718 6.27589 2.94134L4.00925 5.20799H14.1667C14.5117 5.20799 14.7917 5.48799 14.7917 5.83299C14.7917 6.17799 14.5117 6.45799 14.1667 6.45799H4.00925L6.27589 8.72463C6.52006 8.9688 6.52006 9.36466 6.27589 9.60882C6.15423 9.73049 5.9942 9.79213 5.8342 9.79213C5.6742 9.79213 5.51418 9.73132 5.39251 9.60882L2.05836 6.27468ZM18.0766 13.9271C18.045 13.8504 17.9992 13.7813 17.9417 13.7238L14.6084 10.3905C14.3642 10.1463 13.9684 10.1463 13.7242 10.3905C13.4801 10.6346 13.4801 11.0305 13.7242 11.2747L15.9909 13.5413H5.83339C5.48839 13.5413 5.20839 13.8213 5.20839 14.1663C5.20839 14.5113 5.48839 14.7913 5.83339 14.7913H15.9909L13.7242 17.058C13.4801 17.3021 13.4801 17.698 13.7242 17.9422C13.8459 18.0638 14.0059 18.1255 14.1659 18.1255C14.3259 18.1255 14.4859 18.0647 14.6076 17.9422L17.9409 14.6088C17.9984 14.5513 18.0442 14.4822 18.0758 14.4056C18.14 14.2522 18.14 14.0804 18.0766 13.9271Z"
+                d="M18.125 10V12.5C18.125 14.2233 16.7225 15.625 15 15.625H4.0092L5.4425 17.0583C5.68667 17.3025 5.68667 17.6983 5.4425 17.9425C5.32084 18.0642 5.16081 18.1258 5.00081 18.1258C4.84081 18.1258 4.68079 18.065 4.55912 17.9425L2.05912 15.4425C2.00162 15.385 1.9559 15.3159 1.92424 15.2393C1.8609 15.0868 1.8609 14.9143 1.92424 14.7618C1.9559 14.6851 2.00162 14.6158 2.05912 14.5583L4.55912 12.0583C4.80329 11.8141 5.19915 11.8141 5.44332 12.0583C5.68749 12.3025 5.68749 12.6983 5.44332 12.9425L4.01001 14.3758H15C16.0333 14.3758 16.875 13.535 16.875 12.5008V10.0008C16.875 9.65581 17.155 9.37581 17.5 9.37581C17.845 9.37581 18.125 9.655 18.125 10ZM2.5 10.625C2.845 10.625 3.125 10.345 3.125 10V7.5C3.125 6.46583 3.96667 5.625 5 5.625H15.9908L14.5575 7.05831C14.3133 7.30247 14.3133 7.69834 14.5575 7.9425C14.6792 8.06417 14.8392 8.12581 14.9992 8.12581C15.1592 8.12581 15.3192 8.065 15.4409 7.9425L17.9409 5.4425C17.9984 5.385 18.0441 5.31592 18.0758 5.23926C18.1391 5.08676 18.1391 4.91426 18.0758 4.76176C18.0441 4.68509 17.9984 4.61581 17.9409 4.55831L15.4409 2.05831C15.1967 1.81414 14.8008 1.81414 14.5567 2.05831C14.3125 2.30247 14.3125 2.69834 14.5567 2.9425L15.99 4.37581H5C3.2775 4.37581 1.875 5.77748 1.875 7.50081V10.0008C1.875 10.345 2.155 10.625 2.5 10.625Z"
+                fill="#5E5E5E"
               />
             </svg>
           </div>
           <div
-            class="c23"
+            class="c22"
           >
             <div
-              class="c24"
+              class="c23"
             >
               <div
-                class="c25"
+                class="c24"
               >
                 <div
-                  class="c26"
+                  class="c25"
                   style="width: 0px; left: 0px;"
                 />
                 <button
-                  class="c27"
+                  class="c26"
                 >
                   <svg>
                     line-chart-icon.svg
                   </svg>
                 </button>
                 <button
-                  class="c28"
+                  class="c27"
                 >
                   <svg>
                     candlestick-chart-icon.svg
@@ -2359,24 +1633,24 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
               </div>
             </div>
             <div
-              class="c25"
+              class="c24"
             >
               <div
-                class="c26"
+                class="c25"
                 style="width: 0px; left: 0px;"
               />
               <button
-                class="c27"
+                class="c26"
               >
                 Price
               </button>
               <button
-                class="c28"
+                class="c27"
               >
                 Volume
               </button>
               <button
-                class="c28"
+                class="c27"
               >
                 Liquidity
               </button>
@@ -2384,28 +1658,28 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
           </div>
         </div>
         <div
-          class="c29"
+          class="c28"
           data-testid="pdp-chart-container"
         >
           <div
-            class="c30"
+            class="c29"
           >
             <div
               class="c18 css-15popx1"
             >
               <div
-                class="c31 c32 c33 c34"
+                class="c30 c31 c32 c33"
               />
             </div>
             <div
-              class="c35"
+              class="c34"
             />
             <div
-              class="c36"
+              class="c35"
             >
               <div>
                 <div
-                  class="c37"
+                  class="c36"
                 >
                   <svg
                     height="160"
@@ -2472,2097 +1746,2362 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
             </div>
           </div>
           <div
-            class="c38"
+            class="c37"
           >
             <div
-              class="c39"
+              class="c38"
             >
               <div
-                class="c40"
+                class="c39"
               >
                 <button
-                  class="c41"
+                  class="c40"
                 >
                   1H
                 </button>
                 <button
-                  class="c42"
+                  class="c41"
                 >
                   1D
                 </button>
                 <button
-                  class="c41"
+                  class="c40"
                 >
                   1W
                 </button>
                 <button
-                  class="c41"
+                  class="c40"
                 >
                   1M
                 </button>
                 <button
-                  class="c41"
+                  class="c40"
                 >
                   1Y
                 </button>
               </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <hr
-        class="c43"
-      />
-      <div
-        class="c5"
-      >
-        <div
-          class="c0 c44"
-        >
-          <div
-            class="c18 c45 css-4kpdx7"
-            disabled=""
-          >
-            Transactions
-          </div>
-        </div>
-        <div
-          data-testid="pool-details-transactions-table"
-        >
-          <div>
-            <div
-              class="c3 c46"
-            >
+            </div>
+          </div>
+        </div>
+      </div>
+      <hr
+        class="c42"
+      />
+      <div
+        class="c5"
+      >
+        <div
+          class="c0 c43"
+        >
+          <div
+            class="c18 c44 css-4kpdx7"
+            disabled=""
+          >
+            Transactions
+          </div>
+        </div>
+        <div
+          data-testid="pool-details-transactions-table"
+        >
+          <div>
+            <div
+              class="c3 c45"
+            >
+              <div
+                class="c46"
+              >
+                <div
+                  class="c0 c1 c47 c48"
+                >
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c50"
+                    >
+                      <div
+                        class="c19 css-1urox24"
+                      >
+                        Time
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c51"
+                    >
+                      <div
+                        class="c19 css-1urox24"
+                      >
+                        Type
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c52"
+                    >
+                      <div
+                        class="c19 css-1urox24"
+                      >
+                        USD
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c52"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c52"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c54"
+                    >
+                      <div
+                        class="c19 css-1urox24"
+                      >
+                        Wallet
+                      </div>
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c55"
+                    >
+                      <div
+                        class="c19 css-1urox24"
+                      >
+                        Tx
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              </div>
               <div
-                class="c47"
+                class="c3 c56"
               >
                 <div
-                  class="c0 c1 c48 c49"
+                  class="c0 c1 c47 c57"
                 >
                   <div
-                    class="c50"
+                    class="c49"
+                  >
+                    <div
+                      class="c50"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c0 c1 c52"
-                      >
-                        <svg
-                          class="c53"
-                          direction="desc"
-                          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="12"
-                            x2="12"
-                            y1="5"
-                            y2="19"
-                          />
-                          <polyline
-                            points="19 12 12 19 5 12"
-                          />
-                        </svg>
-                        <div
-                          class="c20 css-1urox24"
-                        >
-                          Time
-                        </div>
-                      </div>
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c0 c1 c55"
-                      >
-                        <svg
-                          class="c56"
-                          fill="none"
-                          height="17"
-                          viewBox="0 0 16 17"
-                          width="16"
-                          xmlns="http://www.w3.org/2000/svg"
-                        >
-                          <path
-                            d="M7.99954 13.1667C7.82887 13.1667 7.65818 13.1014 7.52818 12.9714L4.86152 10.3047C4.60085 10.044 4.60085 9.62267 4.86152 9.362C5.12218 9.10134 5.54356 9.10134 5.80422 9.362L7.99954 11.5573L10.1948 9.362C10.4555 9.10134 10.8769 9.10134 11.1376 9.362C11.3982 9.62267 11.3982 10.044 11.1376 10.3047L8.47089 12.9714C8.34089 13.1014 8.1702 13.1667 7.99954 13.1667Z"
-                            fill="#9B9B9B"
-                          />
-                          <path
-                            d="M10.6662 7.83336C10.4955 7.83336 10.3248 7.76805 10.1948 7.63805L7.99954 5.44274L5.80422 7.63805C5.54356 7.89872 5.12218 7.89872 4.86152 7.63805C4.60085 7.37738 4.60085 6.95601 4.86152 6.69534L7.52818 4.02868C7.78885 3.76801 8.21022 3.76801 8.47089 4.02868L11.1376 6.69534C11.3982 6.95601 11.3982 7.37738 11.1376 7.63805C11.0076 7.76805 10.8369 7.83336 10.6662 7.83336Z"
-                            fill="#9B9B9B"
-                          />
-                        </svg>
-                        <div
-                          class="c20 css-1urox24"
-                        >
-                          Type
-                        </div>
-                      </div>
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c20 css-1urox24"
-                      >
-                        USD
-                      </div>
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c55"
                     >
                       <div
-                        class="c20 css-1urox24"
-                      >
-                        Wallet
-                      </div>
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
                     </div>
                   </div>
                 </div>
-              </div>
-              <div
-                class="c3 c60"
-              >
                 <div
-                  class="c0 c1 c48 c61"
+                  class="c0 c1 c47 c57"
                 >
                   <div
-                    class="c50"
+                    class="c49"
+                  >
+                    <div
+                      class="c50"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                 </div>
                 <div
-                  class="c0 c1 c48 c61"
+                  class="c0 c1 c47 c57"
                 >
                   <div
-                    class="c50"
+                    class="c49"
+                  >
+                    <div
+                      class="c50"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                 </div>
                 <div
-                  class="c0 c1 c48 c61"
+                  class="c0 c1 c47 c57"
                 >
                   <div
-                    class="c50"
+                    class="c49"
+                  >
+                    <div
+                      class="c50"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                 </div>
                 <div
-                  class="c0 c1 c48 c61"
+                  class="c0 c1 c47 c57"
                 >
                   <div
-                    class="c50"
+                    class="c49"
+                  >
+                    <div
+                      class="c50"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                 </div>
                 <div
-                  class="c0 c1 c48 c61"
+                  class="c0 c1 c47 c57"
                 >
                   <div
-                    class="c50"
+                    class="c49"
+                  >
+                    <div
+                      class="c50"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                 </div>
                 <div
-                  class="c0 c1 c48 c61"
+                  class="c0 c1 c47 c57"
                 >
                   <div
-                    class="c50"
+                    class="c49"
+                  >
+                    <div
+                      class="c50"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                 </div>
                 <div
-                  class="c0 c1 c48 c61"
+                  class="c0 c1 c47 c57"
                 >
                   <div
-                    class="c50"
+                    class="c49"
+                  >
+                    <div
+                      class="c50"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                 </div>
                 <div
-                  class="c0 c1 c48 c61"
+                  class="c0 c1 c47 c57"
                 >
                   <div
-                    class="c50"
+                    class="c49"
+                  >
+                    <div
+                      class="c50"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                 </div>
                 <div
-                  class="c0 c1 c48 c61"
+                  class="c0 c1 c47 c57"
                 >
                   <div
-                    class="c50"
+                    class="c49"
+                  >
+                    <div
+                      class="c50"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                 </div>
                 <div
-                  class="c0 c1 c48 c61"
+                  class="c0 c1 c47 c57"
                 >
                   <div
-                    class="c50"
+                    class="c49"
+                  >
+                    <div
+                      class="c50"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c52"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c52"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c52"
+                    >
+                      <div
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
                       class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c55"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                </div>
+                <div
+                  class="c0 c1 c47 c57"
+                >
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c50"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c51"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c52"
+                    >
+                      <div
+                        class="c30 c53"
+                        data-testid="cell-loading-bubble"
+                      />
+                    </div>
+                  </div>
+                  <div
+                    class="c49"
+                  >
+                    <div
+                      class="c52"
+                    >
+                      <div
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
+                </div>
+                <div
+                  class="c0 c1 c47 c57"
+                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c50"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
-                </div>
-                <div
-                  class="c0 c1 c48 c61"
-                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                 </div>
                 <div
-                  class="c0 c1 c48 c61"
+                  class="c0 c1 c47 c57"
                 >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c51"
+                      class="c50"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
-                </div>
-                <div
-                  class="c0 c1 c48 c61"
-                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c51"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
+                </div>
+                <div
+                  class="c0 c1 c47 c57"
+                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c50"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
-                </div>
-                <div
-                  class="c0 c1 c48 c61"
-                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c51"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
+                </div>
+                <div
+                  class="c0 c1 c47 c57"
+                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c50"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
-                </div>
-                <div
-                  class="c0 c1 c48 c61"
-                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c51"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
                       class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
+                </div>
+                <div
+                  class="c0 c1 c47 c57"
+                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c50"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
-                </div>
-                <div
-                  class="c0 c1 c48 c61"
-                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c51"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
+                </div>
+                <div
+                  class="c0 c1 c47 c57"
+                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c50"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
-                </div>
-                <div
-                  class="c0 c1 c48 c61"
-                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c51"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
+                </div>
+                <div
+                  class="c0 c1 c47 c57"
+                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c50"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
-                </div>
-                <div
-                  class="c0 c1 c48 c61"
-                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                 </div>
                 <div
-                  class="c0 c1 c48 c61"
+                  class="c0 c1 c47 c57"
                 >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c51"
+                      class="c50"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
-                </div>
-                <div
-                  class="c0 c1 c48 c61"
-                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c51"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
+                </div>
+                <div
+                  class="c0 c1 c47 c57"
+                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c50"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
-                </div>
-                <div
-                  class="c0 c1 c48 c61"
-                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c51"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
+                </div>
+                <div
+                  class="c0 c1 c47 c57"
+                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c50"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
-                </div>
-                <div
-                  class="c0 c1 c48 c61"
-                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c51"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
                       class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
+                </div>
+                <div
+                  class="c0 c1 c47 c57"
+                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c50"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
-                </div>
-                <div
-                  class="c0 c1 c48 c61"
-                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c51"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
+                </div>
+                <div
+                  class="c0 c1 c47 c57"
+                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c50"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
-                </div>
-                <div
-                  class="c0 c1 c48 c61"
-                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c51"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
+                </div>
+                <div
+                  class="c0 c1 c47 c57"
+                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c50"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
-                </div>
-                <div
-                  class="c0 c1 c48 c61"
-                >
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
                       class="c51"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c54"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c52"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c57"
+                      class="c54"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
                   </div>
                   <div
-                    class="c50"
+                    class="c49"
                   >
                     <div
-                      class="c59"
+                      class="c55"
                     >
                       <div
-                        class="c31 c58"
+                        class="c30 c53"
                         data-testid="cell-loading-bubble"
                       />
                     </div>
@@ -4570,13 +4109,13 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
                 </div>
               </div>
               <div
-                class="c0 c1 c62"
+                class="c0 c1 c58"
               >
                 <div
-                  class="c0 c1 c63"
+                  class="c0 c1 c59"
                 >
                   <svg
-                    class="c64 c65"
+                    class="c60 c61"
                     fill="none"
                     stroke="#FC72FF"
                     viewBox="0 0 24 24"
@@ -4598,451 +4137,60 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
       </div>
     </div>
     <div
-      class="c3 c66"
+      class="c3 c62"
     >
       <div
-        class="c5"
+        class="c0 c1 c63"
       >
-        <div
-          class="c0 c1 c67"
+        <button
+          class="c64 c65"
+          data-testid="pool-details-add-liquidity-button"
+          size="1"
         >
-          <button
-            class="c68"
-            data-testid="pool-details-swap-button"
-          >
-            <svg
-              class="c69"
-              fill="none"
-              height="20"
-              viewBox="0 0 20 20"
-              width="20"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <path
-                d="M2.05836 6.27468C2.00086 6.21718 1.95514 6.14789 1.92348 6.07123C1.86014 5.91873 1.86014 5.74623 1.92348 5.59373C1.95514 5.51706 2.00086 5.44798 2.05836 5.39048L5.3917 2.05715C5.63586 1.81298 6.03173 1.81298 6.27589 2.05715C6.52006 2.30132 6.52006 2.69718 6.27589 2.94134L4.00925 5.20799H14.1667C14.5117 5.20799 14.7917 5.48799 14.7917 5.83299C14.7917 6.17799 14.5117 6.45799 14.1667 6.45799H4.00925L6.27589 8.72463C6.52006 8.9688 6.52006 9.36466 6.27589 9.60882C6.15423 9.73049 5.9942 9.79213 5.8342 9.79213C5.6742 9.79213 5.51418 9.73132 5.39251 9.60882L2.05836 6.27468ZM18.0766 13.9271C18.045 13.8504 17.9992 13.7813 17.9417 13.7238L14.6084 10.3905C14.3642 10.1463 13.9684 10.1463 13.7242 10.3905C13.4801 10.6346 13.4801 11.0305 13.7242 11.2747L15.9909 13.5413H5.83339C5.48839 13.5413 5.20839 13.8213 5.20839 14.1663C5.20839 14.5113 5.48839 14.7913 5.83339 14.7913H15.9909L13.7242 17.058C13.4801 17.3021 13.4801 17.698 13.7242 17.9422C13.8459 18.0638 14.0059 18.1255 14.1659 18.1255C14.3259 18.1255 14.4859 18.0647 14.6076 17.9422L17.9409 14.6088C17.9984 14.5513 18.0442 14.4822 18.0758 14.4056C18.14 14.2522 18.14 14.0804 18.0766 13.9271Z"
-              />
-            </svg>
-            <div
-              class="c70 css-1guhfcl"
-            >
-              Swap
-            </div>
-          </button>
-          <button
-            class="c68"
-            data-testid="pool-details-add-liquidity-button"
-          >
-            <svg
-              fill="none"
-              height="20"
-              stroke="currentColor"
-              stroke-linecap="round"
-              stroke-linejoin="round"
-              stroke-width="2"
-              viewBox="0 0 24 24"
-              width="20"
-              xmlns="http://www.w3.org/2000/svg"
-            >
-              <line
-                x1="12"
-                x2="12"
-                y1="5"
-                y2="19"
-              />
-              <line
-                x1="5"
-                x2="19"
-                y1="12"
-                y2="12"
-              />
-            </svg>
-            <div
-              class="c70 css-1guhfcl"
-            >
-              Add liquidity
-            </div>
-          </button>
-        </div>
-        <div
-          class="c71"
-          data-testid="pool-details-swap-modal"
+          <div
+            class="c66 c67"
+          />
+          Add liquidity
+        </button>
+        <button
+          class="c64 c65"
+          data-testid="pool-details-swap-button"
+          size="1"
         >
-          <main
-            class="c72 c73"
-            id="swap-page"
-          >
-            <div
-              class="c74"
-            >
-              <div
-                class="c0 c1 c75 c76"
-              >
-                <div
-                  class="c0 c1 c77 c78"
-                >
-                  <h1
-                    class="c79 c80"
-                    role="button"
-                    tabindex="0"
-                  >
-                    Swap
-                  </h1>
-                  <div
-                    class="c81"
-                  >
-                    <div>
-                      <button
-                        class="c79 c82"
-                        data-testid="buy-fiat-button"
-                      >
-                        Buy
-                      </button>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="c0 c1 c77"
-                >
-                  <div
-                    class="c83"
-                  >
-                    <button
-                      aria-label="Transaction Settings"
-                      class="c84"
-                      data-testid="open-settings-dialog-button"
-                      id="open-settings-dialog-button"
-                    >
-                      <div
-                        class="c0 c1 c85"
-                      >
-                        <svg
-                          class="c86"
-                          fill="none"
-                          height="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>
-                      </div>
-                    </button>
-                  </div>
-                </div>
-              </div>
-              <div
-                style="display: relative;"
-              >
-                <div
-                  class="c87"
-                >
-                  <div
-                    class="c88"
-                    id="swap-currency-input"
-                  >
-                    <div
-                      class="c89"
-                    >
-                      <div
-                        class="c20 css-142zc9n"
-                        style="user-select: none;"
-                      >
-                        You pay
-                      </div>
-                      <div
-                        class="c90"
-                      >
-                        <div
-                          style="display: flex; flex-grow: 1;"
-                        >
-                          <input
-                            autocomplete="off"
-                            autocorrect="off"
-                            class="c91 c92 token-amount-input"
-                            id="swap-currency-input"
-                            inputmode="decimal"
-                            maxlength="79"
-                            minlength="1"
-                            pattern="^[0-9]*[.,]?[0-9]*$"
-                            placeholder="0"
-                            spellcheck="false"
-                            type="text"
-                            value=""
-                          />
-                        </div>
-                        <div>
-                          <div
-                            class="c81"
-                          >
-                            <button
-                              class="c93 c94 c95 c96 open-currency-select-button"
-                            >
-                              <span
-                                class="c97"
-                              >
-                                <div
-                                  class="c0 c1 c77"
-                                >
-                                  <div
-                                    class="c98"
-                                    style="height: 24px; width: 24px; margin-right: 2px;"
-                                  >
-                                    <div
-                                      class="c99"
-                                    >
-                                      <img
-                                        class="c100"
-                                        src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
-                                      />
-                                    </div>
-                                  </div>
-                                  <span
-                                    class="c101 token-symbol-container"
-                                  >
-                                    USDC
-                                  </span>
-                                </div>
-                                <svg
-                                  class="c102"
-                                >
-                                  dropdown.svg
-                                </svg>
-                              </span>
-                            </button>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        class="c103 c104"
-                      >
-                        <div
-                          class="c0 c1 c75"
-                        >
-                          <div
-                            class="c105"
-                          />
-                          <span />
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div
-                  class="c106"
-                >
-                  <div
-                    class="c107"
-                    color="#222222"
-                    data-testid="swap-currency-button"
-                  >
-                    <svg
-                      fill="none"
-                      height="16"
-                      stroke="#222222"
-                      stroke-linecap="round"
-                      stroke-linejoin="round"
-                      stroke-width="2"
-                      viewBox="0 0 24 24"
-                      width="16"
-                      xmlns="http://www.w3.org/2000/svg"
-                    >
-                      <line
-                        x1="12"
-                        x2="12"
-                        y1="5"
-                        y2="19"
-                      />
-                      <polyline
-                        points="19 12 12 19 5 12"
-                      />
-                    </svg>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="c108"
-              >
-                <div>
-                  <div
-                    class="c87 c109"
-                  >
-                    <div
-                      class="c88"
-                      id="swap-currency-output"
-                    >
-                      <div
-                        class="c89"
-                      >
-                        <div
-                          class="c20 css-142zc9n"
-                          style="user-select: none;"
-                        >
-                          You receive
-                        </div>
-                        <div
-                          class="c90"
-                        >
-                          <div
-                            style="display: flex; flex-grow: 1;"
-                          >
-                            <input
-                              autocomplete="off"
-                              autocorrect="off"
-                              class="c91 c92 token-amount-input"
-                              id="swap-currency-output"
-                              inputmode="decimal"
-                              maxlength="79"
-                              minlength="1"
-                              pattern="^[0-9]*[.,]?[0-9]*$"
-                              placeholder="0"
-                              spellcheck="false"
-                              type="text"
-                              value=""
-                            />
-                          </div>
-                          <div>
-                            <div
-                              class="c81"
-                            >
-                              <button
-                                class="c93 c94 c95 c96 open-currency-select-button"
-                              >
-                                <span
-                                  class="c97"
-                                >
-                                  <div
-                                    class="c0 c1 c77"
-                                  >
-                                    <div
-                                      class="c98"
-                                      style="height: 24px; width: 24px; margin-right: 2px;"
-                                    >
-                                      <div
-                                        class="c99"
-                                      >
-                                        <img
-                                          class="c100"
-                                          src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png"
-                                        />
-                                      </div>
-                                    </div>
-                                    <span
-                                      class="c101 token-symbol-container"
-                                    >
-                                      WETH
-                                    </span>
-                                  </div>
-                                  <svg
-                                    class="c102"
-                                  >
-                                    dropdown.svg
-                                  </svg>
-                                </span>
-                              </button>
-                            </div>
-                          </div>
-                        </div>
-                        <div
-                          class="c103 c104"
-                        >
-                          <div
-                            class="c0 c1 c75"
-                          >
-                            <div
-                              class="c105"
-                            />
-                            <span />
-                          </div>
-                        </div>
-                      </div>
-                    </div>
-                  </div>
-                </div>
-                <div>
-                  <button
-                    class="c110 c94 c111"
-                    font-weight="535"
-                  >
-                    <div
-                      class="c112 c113"
-                    />
-                    Connect wallet
-                  </button>
-                </div>
-              </div>
-            </div>
-          </main>
-        </div>
+          <div
+            class="c66 c67"
+          />
+          Swap
+        </button>
       </div>
       <div
-        class="c3 c114"
+        class="c3 c68"
       >
         <div
-          class="c115 css-vurnku"
+          class="c69 css-vurnku"
         >
           Stats
         </div>
         <div
-          class="c3 c116"
+          class="c3 c70"
         >
           <div
-            class="c20 css-1urox24"
+            class="c19 css-1urox24"
           >
             Pool balances
           </div>
           <div
-            class="c0 c1 c117"
+            class="c0 c1 c71"
           >
             <div
-              class="c0 c1 c118"
+              class="c0 c1 c72"
             >
-              90.9M 
-              <a
-                class="c119"
-                href="/explore/tokens/ethereum/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
-              >
-                <div
-                  class="c98"
-                  style="height: 16px; width: 16px; margin-right: 4px; margin-left: 4px;"
-                >
-                  <div
-                    class="c99"
-                  >
-                    <img
-                      class="c120"
-                      src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
-                    />
-                  </div>
-                </div>
-                USDC
-              </a>
+              90.93M USDC
             </div>
             <div
-              class="c0 c1 c118"
+              class="c0 c1 c72"
             >
-              82.5K 
-              <a
-                class="c119"
-                href="/explore/tokens/ethereum/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
-              >
-                <div
-                  class="c98"
-                  style="height: 16px; width: 16px; margin-right: 4px; margin-left: 4px;"
-                >
-                  <div
-                    class="c99"
-                  >
-                    <img
-                      class="c120"
-                      src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png"
-                    />
-                  </div>
-                </div>
-                WETH
-              </a>
+              82,526.49 WETH
             </div>
           </div>
           <div
@@ -5050,36 +4198,36 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
             data-testid="pool-balance-chart"
           >
             <div
-              class="c121"
+              class="c73"
             />
             <div
-              class="c122"
+              class="c74"
             />
           </div>
         </div>
         <div
-          class="c3 c116"
+          class="c3 c70"
         >
           <div
-            class="c20 css-1urox24"
+            class="c19 css-1urox24"
           >
             TVL
           </div>
           <div
-            class="c0 c1 c123"
+            class="c0 c1 c75"
           >
             <div
-              class="c124 css-vurnku"
+              class="c76 css-vurnku"
             >
               $223.2M
             </div>
             <div
-              class="c125 c126"
+              class="c77 c78"
               width="max-content"
             >
               <svg
                 aria-label="down"
-                class="c127"
+                class="c79"
                 fill="none"
                 height="16"
                 viewBox="0 0 24 24"
@@ -5092,7 +4240,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
                 />
               </svg>
               <div
-                class="c20 css-1urox24"
+                class="c19 css-1urox24"
               >
                 0.37%
               </div>
@@ -5100,28 +4248,28 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
           </div>
         </div>
         <div
-          class="c3 c116"
+          class="c3 c70"
         >
           <div
-            class="c20 css-1urox24"
+            class="c19 css-1urox24"
           >
             24H volume
           </div>
           <div
-            class="c0 c1 c123"
+            class="c0 c1 c75"
           >
             <div
-              class="c124 css-vurnku"
+              class="c76 css-vurnku"
             >
               $233.4M
             </div>
             <div
-              class="c125 c126"
+              class="c77 c78"
               width="max-content"
             >
               <svg
                 aria-label="down"
-                class="c127"
+                class="c79"
                 fill="none"
                 height="16"
                 viewBox="0 0 24 24"
@@ -5134,7 +4282,7 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
                 />
               </svg>
               <div
-                class="c20 css-1urox24"
+                class="c19 css-1urox24"
               >
                 17.75%
               </div>
@@ -5142,18 +4290,18 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
           </div>
         </div>
         <div
-          class="c3 c116"
+          class="c3 c70"
         >
           <div
-            class="c20 css-1urox24"
+            class="c19 css-1urox24"
           >
             24H fees
           </div>
           <div
-            class="c0 c1 c123"
+            class="c0 c1 c75"
           >
             <div
-              class="c124 css-vurnku"
+              class="c76 css-vurnku"
             >
               $116.7K
             </div>
@@ -5161,63 +4309,63 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
         </div>
       </div>
       <div
-        class="c3 c128"
+        class="c3 c80"
       >
         <div
-          class="c129 css-vurnku"
+          class="c81 css-vurnku"
         >
           Links
         </div>
         <div
-          class="c3 c130"
+          class="c3 c82"
         >
           <div
-            class="c0 c131"
+            class="c0 c83"
           >
             <div
-              class="c0 c1 c132"
+              class="c0 c1 c84"
               data-testid="pdp-pool-logo-USDC-WETH"
             >
               <div
                 class="c15"
               >
                 <div
-                  class="c133"
+                  class="c85"
                   size="20"
                 >
                   <img
-                    class="c134"
+                    class="c86"
                     size="20"
                     src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
                   />
                   <img
-                    class="c134"
+                    class="c86"
                     size="20"
                     src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png"
                   />
                 </div>
               </div>
               <div
-                class="c18 c135 css-1urox24"
+                class="c18 c87 css-1urox24"
               >
                 Pool
               </div>
               <div
-                class="c18 c136 css-1urox24"
+                class="c18 c88 css-1urox24"
               >
                 USDC / WETH
               </div>
             </div>
             <div
-              class="c0 c1 c137"
+              class="c0 c1 c89"
             >
               <div
-                class="c0 c1 c138"
+                class="c0 c1 c90"
                 data-testid="copy-address-0x88e6a0c2ddd26feeb64f039a2c41296fcb3f5640"
               >
                 0x88e6...5640
                 <svg
-                  class="c139"
+                  class="c91"
                   fill="none"
                   height="24"
                   stroke="currentColor"
@@ -5242,14 +4390,14 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
                 </svg>
               </div>
               <a
-                class="c140"
+                class="c92"
                 data-testid="explorer-url-https://etherscan.io/address/0x88e6a0c2ddd26feeb64f039a2c41296fcb3f5640"
                 href="https://etherscan.io/address/0x88e6a0c2ddd26feeb64f039a2c41296fcb3f5640"
                 rel="noopener noreferrer"
                 target="_blank"
               >
                 <div
-                  class="c141"
+                  class="c93"
                 >
                   <svg
                     fill="#7D7D7D"
@@ -5273,35 +4421,37 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
             </div>
           </div>
           <div
-            class="c0 c131"
+            class="c0 c83"
           >
             <div
-              class="c0 c1 c142"
+              class="c0 c1 c94"
               data-testid="pdp-token-logo-USDC"
             >
               <div
-                class="c98"
+                class="c95"
                 style="height: 20px; width: 20px;"
               >
                 <div
-                  class="c99"
+                  class="c96"
                 >
                   <img
-                    class="c143"
+                    alt="USDC logo"
+                    class="c97"
+                    loading="lazy"
                     src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48/logo.png"
                   />
                 </div>
               </div>
               <div
-                class="c18 c135 css-1urox24"
+                class="c18 c87 css-1urox24"
               >
                 USD Coin
               </div>
               <div
-                class="c18 c136 css-1urox24"
+                class="c18 c88 css-1urox24"
               >
                 <div
-                  class="c0 c144"
+                  class="c0 c98"
                 >
                   USDC 
                   <svg
@@ -5323,15 +4473,15 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
               </div>
             </div>
             <div
-              class="c0 c1 c137"
+              class="c0 c1 c89"
             >
               <div
-                class="c0 c1 c138"
+                class="c0 c1 c90"
                 data-testid="copy-address-0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
               >
                 0xA0b8...eB48
                 <svg
-                  class="c139"
+                  class="c91"
                   fill="none"
                   height="24"
                   stroke="currentColor"
@@ -5356,14 +4506,14 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
                 </svg>
               </div>
               <a
-                class="c140"
+                class="c92"
                 data-testid="explorer-url-https://etherscan.io/token/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
                 href="https://etherscan.io/token/0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
                 rel="noopener noreferrer"
                 target="_blank"
               >
                 <div
-                  class="c141"
+                  class="c93"
                 >
                   <svg
                     fill="#7D7D7D"
@@ -5387,35 +4537,37 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
             </div>
           </div>
           <div
-            class="c0 c131"
+            class="c0 c83"
           >
             <div
-              class="c0 c1 c142"
+              class="c0 c1 c94"
               data-testid="pdp-token-logo-WETH"
             >
               <div
-                class="c98"
+                class="c95"
                 style="height: 20px; width: 20px;"
               >
                 <div
-                  class="c99"
+                  class="c96"
                 >
                   <img
-                    class="c143"
+                    alt="WETH logo"
+                    class="c97"
+                    loading="lazy"
                     src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2/logo.png"
                   />
                 </div>
               </div>
               <div
-                class="c18 c135 css-1urox24"
+                class="c18 c87 css-1urox24"
               >
                 Wrapped Ether
               </div>
               <div
-                class="c18 c136 css-1urox24"
+                class="c18 c88 css-1urox24"
               >
                 <div
-                  class="c0 c144"
+                  class="c0 c98"
                 >
                   WETH 
                   <svg
@@ -5437,15 +4589,15 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
               </div>
             </div>
             <div
-              class="c0 c1 c137"
+              class="c0 c1 c89"
             >
               <div
-                class="c0 c1 c138"
+                class="c0 c1 c90"
                 data-testid="copy-address-0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
               >
                 0xC02a...6Cc2
                 <svg
-                  class="c139"
+                  class="c91"
                   fill="none"
                   height="24"
                   stroke="currentColor"
@@ -5470,14 +4622,14 @@ exports[`PoolDetailsPage pool header is displayed when data is received from the
                 </svg>
               </div>
               <a
-                class="c140"
+                class="c92"
                 data-testid="explorer-url-https://etherscan.io/token/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
                 href="https://etherscan.io/token/0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2"
                 rel="noopener noreferrer"
                 target="_blank"
               >
                 <div
-                  class="c141"
+                  class="c93"
                 >
                   <svg
                     fill="#7D7D7D"
diff --git a/apps/web/src/pages/PoolDetails/index.test.tsx b/apps/web/src/pages/PoolDetails/index.test.tsx
index 938bc3dccca..54ea54d9ca1 100644
--- a/apps/web/src/pages/PoolDetails/index.test.tsx
+++ b/apps/web/src/pages/PoolDetails/index.test.tsx
@@ -21,14 +21,6 @@ jest.mock('graphql/thegraph/PoolData', () => {
   }
 })
 
-jest.mock('hooks/useColor', () => {
-  const originalModule = jest.requireActual('hooks/useColor')
-  return {
-    ...originalModule,
-    useColor: jest.fn().mockReturnValue('#FFFFFF'),
-  }
-})
-
 describe('PoolDetailsPage', () => {
   beforeEach(() => {
     jest.spyOn(Router, 'useParams').mockReturnValue(validParams)
diff --git a/apps/web/src/pages/PoolDetails/index.tsx b/apps/web/src/pages/PoolDetails/index.tsx
index 621f5e55d81..53cf4dcd4aa 100644
--- a/apps/web/src/pages/PoolDetails/index.tsx
+++ b/apps/web/src/pages/PoolDetails/index.tsx
@@ -1,10 +1,7 @@
 import { Trans } from '@lingui/macro'
 import { ChartType, PriceChartType } from 'components/Charts/utils'
 import Column from 'components/Column'
-import ChartSection, {
-  PDP_CHART_SELECTOR_OPTIONS,
-  PoolsDetailsChartType,
-} from 'components/Pools/PoolDetails/ChartSection'
+import ChartSection from 'components/Pools/PoolDetails/ChartSection'
 import { PoolDetailsBreadcrumb, PoolDetailsHeader } from 'components/Pools/PoolDetails/PoolDetailsHeader'
 import { PoolDetailsLink } from 'components/Pools/PoolDetails/PoolDetailsLink'
 import { PoolDetailsStats } from 'components/Pools/PoolDetails/PoolDetailsStats'
@@ -15,14 +12,12 @@ import { AdvancedPriceChartToggle } from 'components/Tokens/TokenDetails/ChartTy
 import ChartTypeSelector from 'components/Tokens/TokenDetails/ChartTypeSelectors/ChartTypeSelector'
 import { getValidUrlChainName, supportedChainIdFromGQLChain } from 'graphql/data/util'
 import { usePoolData } from 'graphql/thegraph/PoolData'
-import { useCurrency } from 'hooks/Tokens'
-import { useColor } from 'hooks/useColor'
 import NotFound from 'pages/NotFound'
 import { useReducer, useState } from 'react'
 import { useParams } from 'react-router-dom'
 import { Text } from 'rebass'
-import styled, { useTheme } from 'styled-components'
-import { BREAKPOINTS, ThemeProvider } from 'theme'
+import styled from 'styled-components'
+import { BREAKPOINTS } from 'theme'
 import { isAddress } from 'utils'
 
 const PageWrapper = styled(Row)`
@@ -111,97 +106,81 @@ export default function PoolDetailsPage() {
   }>()
   const chain = getValidUrlChainName(chainName)
   const chainId = chain && supportedChainIdFromGQLChain(chain)
-  const { data: poolData, loading } = usePoolData(poolAddress?.toLowerCase() ?? '', chainId)
+  const { data: poolData, loading } = usePoolData(poolAddress ?? '', chainId)
   const [isReversed, toggleReversed] = useReducer((x) => !x, false)
   const token0 = isReversed ? poolData?.token1 : poolData?.token0
   const token1 = isReversed ? poolData?.token0 : poolData?.token1
-
-  const { darkMode, surface2, accent1 } = useTheme()
-  const color0 = useColor(useCurrency(token0?.id, chainId), {
-    backgroundColor: surface2,
-    darkMode,
-  })
-  const color1 = useColor(useCurrency(token1?.id, chainId), {
-    backgroundColor: surface2,
-    darkMode,
-  })
-
   const isInvalidPool = !chainName || !poolAddress || !getValidUrlChainName(chainName) || !isAddress(poolAddress)
   const poolNotFound = (!loading && !poolData) || isInvalidPool
 
-  const [chartType, setChartType] = useState<PoolsDetailsChartType>(ChartType.PRICE)
+  const [chartType, setChartType] = useState<ChartType>(ChartType.PRICE)
   const [priceChartType, setPriceChartType] = useState<PriceChartType>(PriceChartType.LINE)
 
-  // TODO(WEB-3483): Add support for v2 Pairs when BE adds support
   if (poolNotFound) return <NotFound />
   return (
-    <ThemeProvider token0={color0 !== accent1 ? color0 : undefined} token1={color1 !== accent1 ? color1 : undefined}>
-      <PageWrapper>
-        <LeftColumn>
-          <Column gap="lg">
-            <PoolDetailsBreadcrumb
+    <PageWrapper>
+      <LeftColumn>
+        <Column gap="lg">
+          <PoolDetailsBreadcrumb
+            chainId={chainId}
+            poolAddress={poolAddress}
+            token0={token0}
+            token1={token1}
+            loading={loading}
+          />
+          <Row justify="space-between">
+            <PoolDetailsHeader
               chainId={chainId}
-              poolAddress={poolAddress}
-              token0={token0}
-              token1={token1}
-              loading={loading}
-            />
-            <Row justify="space-between">
-              <PoolDetailsHeader
-                chainId={chainId}
-                token0={token0}
-                token1={token1}
-                feeTier={poolData?.feeTier}
-                toggleReversed={toggleReversed}
-                loading={loading}
-              />
-              <ChartTypeSelectorContainer>
-                {chartType === ChartType.PRICE && (
-                  <AdvancedPriceChartToggle currentChartType={priceChartType} onChartTypeChange={setPriceChartType} />
-                )}
-                <ChartTypeSelector
-                  options={PDP_CHART_SELECTOR_OPTIONS}
-                  currentChartType={chartType}
-                  onChartTypeChange={(c) => {
-                    setChartType(c)
-                    if (c === ChartType.PRICE) setPriceChartType(PriceChartType.LINE)
-                  }}
-                />
-              </ChartTypeSelectorContainer>
-            </Row>
-            <ChartSection
               token0={token0}
               token1={token1}
-              chartType={chartType}
-              priceChartType={priceChartType}
               feeTier={poolData?.feeTier}
+              toggleReversed={toggleReversed}
               loading={loading}
             />
-          </Column>
-          <HR />
-          <PoolDetailsTableTab poolAddress={poolAddress} token0={token0} token1={token1} />
-        </LeftColumn>
-        <RightColumn>
-          <PoolDetailsStatsButtons
-            chainId={chainId}
-            token0={token0}
-            token1={token1}
+            <ChartTypeSelectorContainer>
+              {chartType === ChartType.PRICE && (
+                <AdvancedPriceChartToggle currentChartType={priceChartType} onChartTypeChange={setPriceChartType} />
+              )}
+              <ChartTypeSelector
+                options={[{ value: ChartType.PRICE }, { value: ChartType.VOLUME }, { value: ChartType.LIQUIDITY }]}
+                currentChartType={chartType}
+                onChartTypeChange={(c: ChartType) => {
+                  setChartType(c)
+                  if (c === ChartType.PRICE) setPriceChartType(PriceChartType.LINE)
+                }}
+              />
+            </ChartTypeSelectorContainer>
+          </Row>
+          <ChartSection
+            chartType={chartType}
+            priceChartType={priceChartType}
             feeTier={poolData?.feeTier}
             loading={loading}
           />
-          <PoolDetailsStats poolData={poolData} isReversed={isReversed} chainId={chainId} loading={loading} />
-          <TokenDetailsWrapper>
-            <TokenDetailsHeader>
-              <Trans>Links</Trans>
-            </TokenDetailsHeader>
-            <LinksContainer>
-              <PoolDetailsLink address={poolAddress} chainId={chainId} tokens={[token0, token1]} loading={loading} />
-              <PoolDetailsLink address={token0?.id} chainId={chainId} tokens={[token0]} loading={loading} />
-              <PoolDetailsLink address={token1?.id} chainId={chainId} tokens={[token1]} loading={loading} />
-            </LinksContainer>
-          </TokenDetailsWrapper>
-        </RightColumn>
-      </PageWrapper>
-    </ThemeProvider>
+        </Column>
+        <HR />
+        <PoolDetailsTableTab poolAddress={poolAddress} token0={token0} token1={token1} />
+      </LeftColumn>
+      <RightColumn>
+        <PoolDetailsStatsButtons
+          chainId={chainId}
+          token0={token0}
+          token1={token1}
+          feeTier={poolData?.feeTier}
+          loading={loading}
+        />
+        <PoolDetailsStats poolData={poolData} isReversed={isReversed} chainId={chainId} loading={loading} />
+        <TokenDetailsWrapper>
+          <TokenDetailsHeader>
+            <Trans>Links</Trans>
+          </TokenDetailsHeader>
+          <LinksContainer>
+            <PoolDetailsLink address={poolAddress} chainId={chainId} tokens={[token0, token1]} loading={loading} />
+            <PoolDetailsLink address={token0?.id} chainId={chainId} tokens={[token0]} loading={loading} />
+            <PoolDetailsLink address={token1?.id} chainId={chainId} tokens={[token1]} loading={loading} />
+          </LinksContainer>
+        </TokenDetailsWrapper>
+      </RightColumn>
+    </PageWrapper>
   )
 }
diff --git a/apps/web/src/pages/PoolFinder/index.tsx b/apps/web/src/pages/PoolFinder/index.tsx
index acd0055625d..cd674461226 100644
--- a/apps/web/src/pages/PoolFinder/index.tsx
+++ b/apps/web/src/pages/PoolFinder/index.tsx
@@ -10,11 +10,12 @@ import { useCallback, useEffect, useState } from 'react'
 import { Plus } from 'react-feather'
 import { useLocation } from 'react-router-dom'
 import { Text } from 'rebass'
-import { StyledInternalLink, ThemedText } from 'theme/components'
+import { StyledInternalLink } from 'theme/components'
+import { ThemedText } from 'theme/components'
 
-import { CurrencySearchFilters } from 'components/SearchModal/CurrencySearch'
 import { ButtonDropdownLight } from '../../components/Button'
-import { BlueCard, LightCard } from '../../components/Card'
+import { LightCard } from '../../components/Card'
+import { BlueCard } from '../../components/Card'
 import { AutoColumn, ColumnCenter } from '../../components/Column'
 import CurrencyLogo from '../../components/Logo/CurrencyLogo'
 import { FindPoolTabs } from '../../components/NavigationTabs'
@@ -39,10 +40,6 @@ function useQuery() {
   return new URLSearchParams(useLocation().search)
 }
 
-const POOLFINDER_CURRENCY_SEARCH_FILTERS: CurrencySearchFilters = {
-  showCommonBases: true,
-}
-
 export default function PoolFinder() {
   const query = useQuery()
 
@@ -234,8 +231,8 @@ export default function PoolFinder() {
             isOpen={showSearch}
             onCurrencySelect={handleCurrencySelect}
             onDismiss={handleSearchDismiss}
+            showCommonBases
             selectedCurrency={(activeField === Fields.TOKEN0 ? currency1 : currency0) ?? undefined}
-            currencySearchFilters={POOLFINDER_CURRENCY_SEARCH_FILTERS}
           />
         </AppBody>
         <SwitchLocaleLink />
diff --git a/apps/web/src/pages/RouteDefinitions.tsx b/apps/web/src/pages/RouteDefinitions.tsx
index dbb81769d77..6ac10f27a95 100644
--- a/apps/web/src/pages/RouteDefinitions.tsx
+++ b/apps/web/src/pages/RouteDefinitions.tsx
@@ -8,10 +8,9 @@ import { shouldDisableNFTRoutesAtom } from 'state/application/atoms'
 import { SpinnerSVG } from 'theme/components'
 import { isBrowserRouterEnabled } from 'utils/env'
 
-import { getDefaultTokensTitle } from './getDefaultTokensTitle'
-import { getExploreTitle } from './getExploreTitle'
 // High-traffic pages (index and /swap) should not be lazy-loaded.
 import Landing from './Landing'
+import { getDefaultTokensTitle, getExploreTitle } from './paths'
 import Swap from './Swap'
 
 const NftExplore = lazy(() => import('nft/pages/explore'))
diff --git a/apps/web/src/pages/Swap/Limit/LimitExpirySection.test.tsx b/apps/web/src/pages/Swap/Limit/LimitExpirySection.test.tsx
deleted file mode 100644
index 81a7df091ce..00000000000
--- a/apps/web/src/pages/Swap/Limit/LimitExpirySection.test.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { Expiry, LimitContext } from 'state/limit/LimitContext'
-import { render } from 'test-utils/render'
-
-import { LimitExpirySection } from './LimitExpirySection'
-
-const mockLimitContextValue = {
-  limitState: {
-    inputAmount: '',
-    limitPrice: '100',
-    limitPriceEdited: false,
-    outputAmount: '',
-    expiry: Expiry.Day,
-    isInputAmountFixed: true,
-  },
-  setLimitState: jest.fn(),
-  derivedLimitInfo: {
-    currencyBalances: {},
-    parsedAmounts: {},
-  },
-}
-
-describe('LimitExpirySection', () => {
-  it('should render the correct label', () => {
-    const result = render(
-      <LimitContext.Provider value={mockLimitContextValue}>
-        <LimitExpirySection />
-      </LimitContext.Provider>
-    )
-    expect(result.getByText('Expiry')).toBeInTheDocument()
-    expect(result.getByText('1 Day')).toBeInTheDocument()
-    expect(result.getByText('1 Week')).toBeInTheDocument()
-    expect(result.getByText('1 Month')).toBeInTheDocument()
-    expect(result.getByText('1 Year')).toBeInTheDocument()
-  })
-
-  it('should call the callback when clicking unselected option', () => {
-    const callback = jest.fn()
-    const result = render(
-      <LimitContext.Provider value={{ ...mockLimitContextValue, setLimitState: callback }}>
-        <LimitExpirySection />
-      </LimitContext.Provider>
-    )
-    result.getByText('1 Month').click()
-    expect(callback).toHaveBeenCalled()
-  })
-
-  it('should not call the callback when clicking selected option', () => {
-    const callback = jest.fn()
-    const result = render(
-      <LimitContext.Provider value={{ ...mockLimitContextValue, setLimitState: callback }}>
-        <LimitExpirySection />
-      </LimitContext.Provider>
-    )
-    result.getByText('1 Day').click()
-    expect(callback).not.toHaveBeenCalled()
-  })
-})
diff --git a/apps/web/src/pages/Swap/Limit/LimitExpirySection.tsx b/apps/web/src/pages/Swap/Limit/LimitExpirySection.tsx
deleted file mode 100644
index 6334f4322a2..00000000000
--- a/apps/web/src/pages/Swap/Limit/LimitExpirySection.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-import { t, Trans } from '@lingui/macro'
-import Row from 'components/Row'
-import { Expiry, useLimitContext } from 'state/limit/LimitContext'
-import styled from 'styled-components'
-import { ClickableStyle, ThemedText } from 'theme/components'
-
-const ExpirySection = styled(Row)`
-  width: 100%;
-  padding: 12px 16px;
-  justify-content: space-between;
-`
-
-const LimitExpiryButton = styled.button<{ $selected: boolean }>`
-  display: flex;
-  padding: 4px 8px;
-  justify-content: flex-end;
-  align-items: center;
-  gap: 4px;
-  border: 1px solid ${({ theme }) => theme.surface3};
-  border-radius: 999px;
-  background-color: ${({ theme, $selected }) => ($selected ? theme.surface3 : 'unset')};
-  ${ClickableStyle}
-`
-
-const ExpiryButtonLabel = styled(ThemedText.LabelSmall)`
-  color: ${({ theme }) => theme.neutral1};
-`
-
-const EXPIRY_OPTIONS = [Expiry.Day, Expiry.Week, Expiry.Month, Expiry.Year]
-
-function getExpiryLabelText(expiry: Expiry) {
-  switch (expiry) {
-    case Expiry.Day:
-      return t`1 Day`
-    case Expiry.Week:
-      return t`1 Week`
-    case Expiry.Month:
-      return t`1 Month`
-    case Expiry.Year:
-      return t`1 Year`
-  }
-}
-
-export function LimitExpirySection() {
-  const { limitState, setLimitState } = useLimitContext()
-
-  return (
-    <ExpirySection>
-      <ThemedText.SubHeaderSmall>
-        <Trans>Expiry</Trans>
-      </ThemedText.SubHeaderSmall>
-      <Row justify="flex-end" gap="xs">
-        {EXPIRY_OPTIONS.map((expiry) => (
-          <LimitExpiryButton
-            key={expiry}
-            $selected={expiry === limitState.expiry}
-            onClick={() => {
-              if (expiry === limitState.expiry) return
-              setLimitState((prev) => ({
-                ...prev,
-                expiry,
-              }))
-            }}
-          >
-            <ExpiryButtonLabel>{getExpiryLabelText(expiry)}</ExpiryButtonLabel>
-          </LimitExpiryButton>
-        ))}
-      </Row>
-    </ExpirySection>
-  )
-}
diff --git a/apps/web/src/pages/Swap/Limit/LimitForm.tsx b/apps/web/src/pages/Swap/Limit/LimitForm.tsx
index c3f20ad2ea9..9dbd877b145 100644
--- a/apps/web/src/pages/Swap/Limit/LimitForm.tsx
+++ b/apps/web/src/pages/Swap/Limit/LimitForm.tsx
@@ -1,117 +1,45 @@
-import { t, Trans } from '@lingui/macro'
-import { BrowserEvent, InterfaceElementName, InterfaceSectionName, SwapEventName } from '@uniswap/analytics-events'
-import { Currency, CurrencyAmount, Token } from '@uniswap/sdk-core'
-import { UNIVERSAL_ROUTER_ADDRESS } from '@uniswap/universal-router-sdk'
-import { useWeb3React } from '@web3-react/core'
-import { Trace, TraceEvent } from 'analytics'
-import { useAccountDrawer, useToggleAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
-import { ButtonError, ButtonLight } from 'components/Button'
-import Column from 'components/Column'
-import ConfirmSwapModalV2 from 'components/ConfirmSwapModalV2'
-import { LimitPriceInputPanel } from 'components/CurrencyInputPanel/LimitPriceInputPanel/LimitPriceInputPanel'
+import { Trans } from '@lingui/macro'
+import { InterfaceSectionName } from '@uniswap/analytics-events'
+import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
+import { Trace } from 'analytics'
 import SwapCurrencyInputPanel from 'components/CurrencyInputPanel/SwapCurrencyInputPanel'
 import { Field } from 'components/swap/constants'
-import { ArrowContainer, ArrowWrapper, SwapSection } from 'components/swap/styled'
-import { isSupportedChain } from 'constants/chains'
-import { ZERO_PERCENT } from 'constants/misc'
-import usePermit2Allowance, { AllowanceState } from 'hooks/usePermit2Allowance'
-import { SwapResult, useSwapCallback } from 'hooks/useSwapCallback'
-import { useUSDPrice } from 'hooks/useUSDPrice'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { ArrowDown } from 'react-feather'
+import { SwapSection } from 'components/swap/styled'
+import { useCallback, useMemo } from 'react'
 import { LimitContextProvider, LimitState, useLimitContext } from 'state/limit/LimitContext'
-import { LimitOrderTrade, TradeFillType } from 'state/routing/types'
-import { useSwapActionHandlers } from 'state/swap/hooks'
 import { CurrencyState, useSwapAndLimitContext } from 'state/swap/SwapContext'
-import styled, { useTheme } from 'styled-components'
-import { ThemedText } from 'theme/components'
-import { NumberType, useFormatter } from 'utils/formatNumbers'
+import styled from 'styled-components'
 import { maxAmountSpend } from 'utils/maxAmountSpend'
 
-import { MenuState, miniPortfolioMenuStateAtom } from 'components/AccountDrawer/DefaultMenu'
-import { OpenLimitOrdersButton } from 'components/AccountDrawer/MiniPortfolio/Limits/OpenLimitOrdersButton'
-import { CurrencySearchFilters } from 'components/SearchModal/CurrencySearch'
-import { useAtom } from 'jotai'
-import { LimitExpirySection } from './LimitExpirySection'
-
-const CustomHeightSwapSection = styled(SwapSection)`
-  height: unset;
-  padding-bottom: 26px;
-`
-
-const ShortArrowWrapper = styled(ArrowWrapper)`
-  margin-top: -22px;
-  margin-bottom: -22px;
-`
-
-const LIMIT_FORM_CURRENCY_SEARCH_FILTERS: CurrencySearchFilters = {
-  showCommonBases: true,
-  onlyShowDefaultList: true,
-  onlyShowDefaultListReason: t`Not available for limits`,
-}
-
 type LimitFormProps = {
   onCurrencyChange?: (selected: CurrencyState) => void
 }
 
 function LimitForm({ onCurrencyChange }: LimitFormProps) {
-  const { chainId, account } = useWeb3React()
   const {
     currencyState: { inputCurrency, outputCurrency },
     setCurrencyState,
   } = useSwapAndLimitContext()
-
   const { limitState, setLimitState, derivedLimitInfo } = useLimitContext()
-  const { currencyBalances, parsedAmounts, parsedLimitPrice, limitOrderTrade, marketPrice } = derivedLimitInfo
-  const [showConfirm, setShowConfirm] = useState(false)
-  const [swapResult, setSwapResult] = useState<SwapResult>()
-  const [swapError, setSwapError] = useState()
-
-  const theme = useTheme()
-  const { onSwitchTokens } = useSwapActionHandlers()
-  const { formatCurrencyAmount } = useFormatter()
-  const [accountDrawerOpen, toggleAccountDrawer] = useAccountDrawer()
-  const [, setMenu] = useAtom(miniPortfolioMenuStateAtom)
-
-  useEffect(() => {
-    if (limitState.limitPriceEdited || !marketPrice || !inputCurrency || !outputCurrency) return
-
-    const marketPriceString = formatCurrencyAmount({
-      amount: marketPrice.quote(CurrencyAmount.fromRawAmount(inputCurrency, 10 ** inputCurrency.decimals)),
-      type: NumberType.SwapTradeAmount,
-      placeholder: '',
-    })
-
-    setLimitState((prev) => ({
-      ...prev,
-      limitPrice: marketPriceString,
-    }))
-  }, [formatCurrencyAmount, inputCurrency, limitState.limitPriceEdited, marketPrice, outputCurrency, setLimitState])
+  const { currencyBalances, parsedAmounts } = derivedLimitInfo
 
   const onTypeInput = useCallback(
     (type: keyof LimitState) => (newValue: string) => {
       setLimitState((prev) => ({
         ...prev,
         [type]: newValue,
-        limitPriceEdited: type === 'limitPrice',
-        isInputAmountFixed: type !== 'outputAmount',
       }))
     },
     [setLimitState]
   )
 
   const onSelectCurrency = (type: keyof CurrencyState) => (newCurrency: Currency) => {
-    if ((type === 'inputCurrency' ? outputCurrency : inputCurrency)?.equals(newCurrency)) {
-      onSwitchTokens({ newOutputHasTax: false, previouslyEstimatedOutput: limitState.outputAmount })
-      return
-    }
     const [newInput, newOutput] =
       type === 'inputCurrency' ? [newCurrency, outputCurrency] : [inputCurrency, newCurrency]
     const newCurrencyState = {
       inputCurrency: newInput,
       outputCurrency: newOutput,
     }
-    setLimitState((prev) => ({ ...prev, limitPriceEdited: false }))
     onCurrencyChange?.(newCurrencyState)
     setCurrencyState(newCurrencyState)
   }
@@ -126,211 +54,48 @@ function LimitForm({ onCurrencyChange }: LimitFormProps) {
     maxInputAmount && onTypeInput('inputAmount')(maxInputAmount.toExact())
   }, [maxInputAmount, onTypeInput])
 
-  const hasInsufficientFunds =
-    parsedAmounts.INPUT && currencyBalances.INPUT ? currencyBalances.INPUT.lessThan(parsedAmounts.INPUT) : false
-
-  const allowance = usePermit2Allowance(
-    parsedAmounts.INPUT?.currency?.isNative ? undefined : (parsedAmounts.INPUT as CurrencyAmount<Token>),
-    isSupportedChain(chainId) ? UNIVERSAL_ROUTER_ADDRESS(chainId) : undefined,
-    TradeFillType.UniswapX
-  )
-
-  const fiatValueTradeInput = useUSDPrice(parsedAmounts.INPUT)
-  const fiatValueTradeOutput = useUSDPrice(parsedAmounts.OUTPUT)
-
-  const formattedAmounts = useMemo(() => {
-    // if there is no Price field, then just default to user-typed amounts
-    if (!limitState.limitPrice) {
-      return {
-        [Field.INPUT]: limitState.inputAmount,
-        [Field.OUTPUT]: limitState.outputAmount,
-      }
-    }
-
-    const formattedInput = limitState.isInputAmountFixed
-      ? limitState.inputAmount
-      : formatCurrencyAmount({
-          amount: derivedLimitInfo.parsedAmounts[Field.INPUT],
-          type: NumberType.SwapTradeAmount,
-          placeholder: '',
-        })
-    const formattedOutput = limitState.isInputAmountFixed
-      ? formatCurrencyAmount({
-          amount: derivedLimitInfo.parsedAmounts[Field.OUTPUT],
-          type: NumberType.SwapTradeAmount,
-          placeholder: '',
-        })
-      : limitState.outputAmount
-
-    return {
-      [Field.INPUT]: formattedInput,
-      [Field.OUTPUT]: formattedOutput,
-    }
-  }, [
-    limitState.limitPrice,
-    limitState.isInputAmountFixed,
-    limitState.inputAmount,
-    limitState.outputAmount,
-    formatCurrencyAmount,
-    derivedLimitInfo.parsedAmounts,
-  ])
-
-  const swapCallback = useSwapCallback(
-    limitOrderTrade,
-    { amountIn: undefined, amountOut: undefined },
-    ZERO_PERCENT,
-    allowance.state === AllowanceState.ALLOWED ? allowance.permitSignature : undefined
-  )
-
-  const handleSubmit = useCallback(async () => {
-    if (!swapCallback) {
-      return
-    }
-    try {
-      const result = await swapCallback()
-      setSwapResult(result)
-    } catch (error) {
-      setSwapError(error)
-    }
-  }, [swapCallback])
-
   return (
-    <Column gap="xs">
+    <Container>
       <SwapSection>
         <Trace section={InterfaceSectionName.CURRENCY_INPUT_PANEL}>
           <SwapCurrencyInputPanel
             label={<Trans>You pay</Trans>}
-            value={formattedAmounts[Field.INPUT]}
+            value={limitState.inputAmount}
             showMaxButton={showMaxButton}
             currency={inputCurrency ?? null}
             onUserInput={onTypeInput('inputAmount')}
             onCurrencySelect={onSelectCurrency('inputCurrency')}
             otherCurrency={outputCurrency}
             onMax={handleMaxInput}
-            currencySearchFilters={LIMIT_FORM_CURRENCY_SEARCH_FILTERS}
+            showCommonBases
             id={InterfaceSectionName.CURRENCY_INPUT_PANEL}
           />
         </Trace>
       </SwapSection>
-      <CustomHeightSwapSection>
-        <LimitPriceInputPanel />
-      </CustomHeightSwapSection>
-      <ShortArrowWrapper clickable={isSupportedChain(chainId)}>
-        <TraceEvent
-          events={[BrowserEvent.onClick]}
-          name={SwapEventName.SWAP_TOKENS_REVERSED}
-          element={InterfaceElementName.SWAP_TOKENS_REVERSE_ARROW_BUTTON}
-        >
-          <ArrowContainer
-            data-testid="swap-currency-button"
-            onClick={() => {
-              onSwitchTokens({ newOutputHasTax: false, previouslyEstimatedOutput: limitState.outputAmount })
-            }}
-            color={theme.neutral1}
-          >
-            <ArrowDown size="16" color={theme.neutral1} />
-          </ArrowContainer>
-        </TraceEvent>
-      </ShortArrowWrapper>
       <SwapSection>
         <Trace section={InterfaceSectionName.CURRENCY_OUTPUT_PANEL}>
           <SwapCurrencyInputPanel
             label={<Trans>You receive</Trans>}
-            value={formattedAmounts[Field.OUTPUT]}
+            value={limitState.outputAmount}
             showMaxButton={false}
             currency={outputCurrency ?? null}
             onUserInput={onTypeInput('outputAmount')}
             onCurrencySelect={onSelectCurrency('outputCurrency')}
             otherCurrency={inputCurrency}
-            currencySearchFilters={LIMIT_FORM_CURRENCY_SEARCH_FILTERS}
+            showCommonBases
             id={InterfaceSectionName.CURRENCY_OUTPUT_PANEL}
           />
         </Trace>
       </SwapSection>
-      {parsedLimitPrice && <LimitExpirySection />}
-      <SubmitOrderButton
-        handleContinueToReview={() => {
-          setShowConfirm(true)
-        }}
-        trade={limitOrderTrade}
-        hasInsufficientFunds={hasInsufficientFunds}
-      />
-      {limitOrderTrade && showConfirm && (
-        <ConfirmSwapModalV2
-          allowance={allowance}
-          trade={limitOrderTrade}
-          inputCurrency={inputCurrency}
-          allowedSlippage={ZERO_PERCENT}
-          clearSwapState={() => {
-            setSwapError(undefined)
-            setSwapResult(undefined)
-          }}
-          fiatValueInput={fiatValueTradeInput}
-          fiatValueOutput={fiatValueTradeOutput}
-          onCurrencySelection={(field: Field, currency) => {
-            onSelectCurrency(field === Field.INPUT ? 'inputCurrency' : 'outputCurrency')(currency)
-          }}
-          onConfirm={handleSubmit}
-          onDismiss={() => setShowConfirm(false)}
-          swapResult={swapResult}
-          swapError={swapError}
-        />
-      )}
-      {account && (
-        <OpenLimitOrdersButton
-          account={account}
-          disabled={accountDrawerOpen}
-          openLimitsMenu={() => {
-            setMenu(MenuState.LIMITS)
-            toggleAccountDrawer()
-          }}
-        />
-      )}
-    </Column>
+    </Container>
   )
 }
 
-function SubmitOrderButton({
-  trade,
-  handleContinueToReview,
-  hasInsufficientFunds,
-}: {
-  trade?: LimitOrderTrade
-  handleContinueToReview: () => void
-  hasInsufficientFunds: boolean
-}) {
-  const toggleWalletDrawer = useToggleAccountDrawer()
-  const { account } = useWeb3React()
-
-  if (!account) {
-    return (
-      <ButtonLight onClick={toggleWalletDrawer} fontWeight={535} $borderRadius="16px">
-        <Trans>Connect wallet</Trans>
-      </ButtonLight>
-    )
-  }
-
-  if (hasInsufficientFunds) {
-    return (
-      <ButtonError disabled>
-        <ThemedText.HeadlineSmall fontSize={20}>Insufficient balance</ThemedText.HeadlineSmall>
-      </ButtonError>
-    )
-  }
-
-  return (
-    <ButtonError
-      onClick={handleContinueToReview}
-      id="submit-order-button"
-      data-testid="submit-order-button"
-      disabled={!trade}
-    >
-      <ThemedText.HeadlineSmall color="white" fontSize={20}>
-        Submit order
-      </ThemedText.HeadlineSmall>
-    </ButtonError>
-  )
-}
+const Container = styled.div`
+  display: flex;
+  flex-flow: column;
+  gap: 4px;
+`
 
 export function LimitFormWrapper(props: LimitFormProps) {
   return (
diff --git a/apps/web/src/pages/Swap/Send/NewAddressSpeedBump.test.tsx b/apps/web/src/pages/Swap/Send/NewAddressSpeedBump.test.tsx
deleted file mode 100644
index 99d20aa0a8e..00000000000
--- a/apps/web/src/pages/Swap/Send/NewAddressSpeedBump.test.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { DAI } from 'constants/tokens'
-import { NewAddressSpeedBumpModal } from 'pages/Swap/Send/NewAddressSpeedBump'
-import { SendContext, SendContextType } from 'state/send/SendContext'
-import { render, screen } from 'test-utils/render'
-
-const mockSendContext: SendContextType = {
-  sendState: {
-    exactAmountToken: '1',
-    exactAmountFiat: undefined,
-    recipient: '0x9984b4b4E408e8D618A879e5315BD30952c89103',
-    inputCurrency: DAI,
-    inputInFiat: false,
-    validatedRecipientData: {
-      address: '0x9984b4b4E408e8D618A879e5315BD30952c89103',
-    },
-  },
-  derivedSendInfo: {
-    recipientData: {
-      address: '0x9984b4b4E408e8D618A879e5315BD30952c89103',
-    },
-  },
-  setSendState: jest.fn(),
-}
-
-describe('NewAddressSpeedBumpModal', () => {
-  it('should render correctly', () => {
-    const mockOnCancel = jest.fn()
-    const mockOnConfirm = jest.fn()
-    render(
-      <SendContext.Provider value={mockSendContext}>
-        <NewAddressSpeedBumpModal onCancel={mockOnCancel} onConfirm={mockOnConfirm} />
-      </SendContext.Provider>
-    )
-
-    expect(document.body).toMatchSnapshot()
-    expect(screen.getByText('New address')).toBeInTheDocument()
-  })
-})
diff --git a/apps/web/src/pages/Swap/Send/NewAddressSpeedBump.tsx b/apps/web/src/pages/Swap/Send/NewAddressSpeedBump.tsx
deleted file mode 100644
index ac01ccbcf0f..00000000000
--- a/apps/web/src/pages/Swap/Send/NewAddressSpeedBump.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { Trans } from '@lingui/macro'
-import { ColumnCenter } from 'components/Column'
-import { Dialog } from 'components/Dialog/Dialog'
-import { UserIcon } from 'components/Icons/UserIcon'
-import Row from 'components/Row'
-import { Unicon } from 'components/Unicon'
-import { useSendContext } from 'state/send/SendContext'
-import styled, { useTheme } from 'styled-components'
-import { ThemedText } from 'theme/components'
-
-const StyledUserIcon = styled(UserIcon)`
-  width: 28px;
-  height: 28px;
-`
-
-const RecipientInfo = styled(ColumnCenter)`
-  padding: 20px 16px;
-  border: 1px solid ${({ theme }) => theme.surface3};
-  gap: 8px;
-  border-radius: 20px;
-`
-
-export const NewAddressSpeedBumpModal = ({ onCancel, onConfirm }: { onCancel: () => void; onConfirm: () => void }) => {
-  const theme = useTheme()
-  const {
-    derivedSendInfo: { recipientData },
-  } = useSendContext()
-
-  return (
-    <Dialog
-      isVisible={true}
-      icon={<StyledUserIcon fill={theme.neutral2} />}
-      title={<Trans>New address</Trans>}
-      description={
-        <Trans>
-          You haven&apos;t transacted with this address before. Make sure it&apos;s the correct address before
-          continuing.
-        </Trans>
-      }
-      body={
-        <RecipientInfo>
-          <Row justify="center" align="center" gap="xs">
-            <Unicon size={16} address={recipientData?.address ?? ''} />
-            <ThemedText.BodyPrimary lineHeight="24px">
-              {recipientData?.ensName ?? recipientData?.address}
-            </ThemedText.BodyPrimary>
-          </Row>
-          {recipientData?.ensName && (
-            <ThemedText.LabelMicro lineHeight="16px">{recipientData?.address}</ThemedText.LabelMicro>
-          )}
-        </RecipientInfo>
-      }
-      onCancel={onCancel}
-      buttonsConfig={{
-        left: {
-          title: <Trans>Cancel</Trans>,
-          onClick: onCancel,
-        },
-        right: {
-          title: <Trans>Continue</Trans>,
-          onClick: onConfirm,
-        },
-      }}
-    />
-  )
-}
diff --git a/apps/web/src/pages/Swap/Send/SendCurrencyInputForm.test.tsx b/apps/web/src/pages/Swap/Send/SendCurrencyInputForm.test.tsx
deleted file mode 100644
index 24feda54765..00000000000
--- a/apps/web/src/pages/Swap/Send/SendCurrencyInputForm.test.tsx
+++ /dev/null
@@ -1,101 +0,0 @@
-import { SwapTab } from 'components/swap/constants'
-import { DAI } from 'constants/tokens'
-import { SendContext, SendContextType } from 'state/send/SendContext'
-import { SwapAndLimitContext } from 'state/swap/SwapContext'
-import { render, screen } from 'test-utils/render'
-import SendCurrencyInputForm from './SendCurrencyInputForm'
-
-const mockSwapAndLimitContextValue = {
-  currencyState: {
-    inputCurrency: DAI,
-    outputCurrency: undefined,
-  },
-  prefilledState: {},
-  setCurrencyState: jest.fn(),
-  currentTab: SwapTab.Limit,
-  setCurrentTab: jest.fn(),
-}
-
-const mockedSendContextDefault: SendContextType = {
-  sendState: {
-    exactAmountToken: undefined,
-    exactAmountFiat: '',
-    recipient: '',
-    inputCurrency: DAI,
-    inputInFiat: true,
-  },
-  derivedSendInfo: {},
-  setSendState: jest.fn(),
-}
-
-const mockedSendContextFiatInput: SendContextType = {
-  sendState: {
-    exactAmountToken: undefined,
-    exactAmountFiat: '1000',
-    recipient: '',
-    inputCurrency: DAI,
-    inputInFiat: true,
-  },
-  derivedSendInfo: {
-    exactAmountOut: '100',
-  },
-  setSendState: jest.fn(),
-}
-
-const mockedSendContextTokenInput: SendContextType = {
-  sendState: {
-    exactAmountToken: '1',
-    exactAmountFiat: undefined,
-    recipient: '',
-    inputCurrency: DAI,
-    inputInFiat: false,
-  },
-  derivedSendInfo: {
-    exactAmountOut: '100',
-  },
-  setSendState: jest.fn(),
-}
-
-describe('SendCurrencyInputform', () => {
-  it('should render placeholder values', () => {
-    const { container } = render(
-      <SwapAndLimitContext.Provider value={mockSwapAndLimitContextValue}>
-        <SendContext.Provider value={mockedSendContextDefault}>
-          <SendCurrencyInputForm />
-        </SendContext.Provider>
-      </SwapAndLimitContext.Provider>
-    )
-    expect(screen.getByPlaceholderText('$0')).toBeVisible()
-    expect(screen.getByText('0 DAI')).toBeVisible()
-    expect(screen.getByText('DAI')).toBeVisible()
-    expect(container.firstChild).toMatchSnapshot()
-  })
-
-  it('renders input in fiat correctly', () => {
-    const { container } = render(
-      <SwapAndLimitContext.Provider value={mockSwapAndLimitContextValue}>
-        <SendContext.Provider value={mockedSendContextFiatInput}>
-          <SendCurrencyInputForm />
-        </SendContext.Provider>
-      </SwapAndLimitContext.Provider>
-    )
-    expect(screen.getByDisplayValue('$1000')).toBeVisible()
-    expect(screen.getByText('100.00 DAI')).toBeVisible()
-    expect(screen.getByText('DAI')).toBeVisible()
-    expect(container.firstChild).toMatchSnapshot()
-  })
-
-  it('renders input in token amount correctly', () => {
-    const { container } = render(
-      <SwapAndLimitContext.Provider value={mockSwapAndLimitContextValue}>
-        <SendContext.Provider value={mockedSendContextTokenInput}>
-          <SendCurrencyInputForm />
-        </SendContext.Provider>
-      </SwapAndLimitContext.Provider>
-    )
-    expect(screen.getByDisplayValue('1')).toBeVisible()
-    expect(screen.getByText('$100.00 USD')).toBeVisible()
-    expect(screen.getByText('DAI')).toBeVisible()
-    expect(container.firstChild).toMatchSnapshot()
-  })
-})
diff --git a/apps/web/src/pages/Swap/Send/SendCurrencyInputForm.tsx b/apps/web/src/pages/Swap/Send/SendCurrencyInputForm.tsx
deleted file mode 100644
index aa30d2a84a6..00000000000
--- a/apps/web/src/pages/Swap/Send/SendCurrencyInputForm.tsx
+++ /dev/null
@@ -1,351 +0,0 @@
-import { Trans } from '@lingui/macro'
-import { ChainId, Currency } from '@uniswap/sdk-core'
-import { useWeb3React } from '@web3-react/core'
-import { PortfolioLogo } from 'components/AccountDrawer/MiniPortfolio/PortfolioLogo'
-import { ButtonLight } from 'components/Button'
-import Column from 'components/Column'
-import { ReverseArrow } from 'components/Icons/ReverseArrow'
-import { LoadingOpacityContainer } from 'components/Loader/styled'
-import { Input as NumericalInput } from 'components/NumericalInput'
-import PrefetchBalancesWrapper from 'components/PrefetchBalancesWrapper/PrefetchBalancesWrapper'
-import Row, { RowBetween } from 'components/Row'
-import CurrencySearchModal from 'components/SearchModal/CurrencySearchModal'
-import { useActiveLocalCurrency, useActiveLocalCurrencyComponents } from 'hooks/useActiveLocalCurrency'
-import { STABLECOIN_AMOUNT_OUT } from 'hooks/useStablecoinPrice'
-import { useUSDPrice } from 'hooks/useUSDPrice'
-import { useCallback, useMemo, useState } from 'react'
-import { SendInputError } from 'state/send/hooks'
-import { useSendContext } from 'state/send/SendContext'
-import { CurrencyState, useSwapAndLimitContext } from 'state/swap/SwapContext'
-import styled, { css } from 'styled-components'
-import { ClickableStyle, ThemedText } from 'theme/components'
-import { NumberType, useFormatter } from 'utils/formatNumbers'
-import { maxAmountSpend } from 'utils/maxAmountSpend'
-
-import { ReactComponent as DropDown } from '../../../assets/images/dropdown.svg'
-
-const Wrapper = styled(Column)<{ $disabled: boolean }>`
-  opacity: ${({ $disabled }) => (!$disabled ? 1 : 0.4)};
-  pointer-events: ${({ $disabled }) => (!$disabled ? 'initial' : 'none')};
-  gap: 1px;
-`
-
-const CurrencyInputWrapper = styled(PrefetchBalancesWrapper)`
-  display: flex;
-  background-color: ${({ theme }) => theme.surface2};
-  padding: 16px 16px;
-  border-radius: 0px 0px 16px 16px;
-  height: 64px;
-  align-items: center;
-  justify-content: space-between;
-  position: relative;
-`
-const ClickableRowBetween = styled(RowBetween)`
-  ${ClickableStyle};
-`
-
-const InputWrapper = styled(Column)`
-  position: relative;
-  background-color: ${({ theme }) => theme.surface2};
-  padding: 0px 12px 60px 12px;
-  height: 256px;
-  align-items: center;
-  justify-content: flex-end;
-  gap: 4px;
-  border-radius: 16px 16px 0px 0px;
-`
-const InputLabelContainer = styled.div`
-  position: absolute;
-  top: 16px;
-  left: 16px;
-`
-
-const StyledNumericalInput = styled(NumericalInput)<{ usePercent?: boolean }>`
-  max-height: 84px;
-  width: 100%;
-  text-align: center;
-  font-size: 70px;
-  font-weight: 500;
-  line-height: 60px;
-`
-
-const StyledUpAndDownArrowIcon = styled(ReverseArrow)`
-  width: 16px;
-  height: 16px;
-  fill: ${({ theme }) => theme.neutral3};
-  transform: rotate(90deg);
-`
-
-const MaxButton = styled(ButtonLight)`
-  position: absolute;
-  right: 40px;
-  height: min-content;
-  width: min-content;
-  padding: 2px 8px;
-  font-size: 14px;
-  line-height: 20px;
-`
-const StyledDropDown = styled(DropDown)`
-  ${ClickableStyle}
-  width: 20px;
-  height: 8px;
-  path {
-    stroke: ${({ theme }) => theme.neutral3};
-    stroke-width: 2px;
-  }
-`
-
-const CurrencySelectorRow = styled(Row)`
-  ${ClickableStyle}
-`
-
-const ErrorContainer = styled(Row)`
-  position: absolute;
-  width: 100%;
-  justify-content: center;
-  align-items: center;
-  left: 0px;
-  bottom: 32px;
-`
-
-const AlternateCurrencyDisplayRow = styled(Row)<{ $disabled: boolean }>`
-  ${({ $disabled }) =>
-    !$disabled &&
-    css`
-      ${ClickableStyle}
-    `}
-`
-
-const AlternateCurrencyDisplay = ({ disabled, onToggle }: { disabled: boolean; onToggle: () => void }) => {
-  const { formatConvertedFiatNumberOrString, formatNumberOrString } = useFormatter()
-  const activeCurrency = useActiveLocalCurrency()
-
-  const { sendState, derivedSendInfo } = useSendContext()
-  const { inputCurrency, inputInFiat } = sendState
-  const { exactAmountOut } = derivedSendInfo
-
-  const formattedAmountOut = inputInFiat
-    ? formatNumberOrString({
-        input: exactAmountOut || '0',
-        type: NumberType.TokenNonTx,
-      })
-    : formatConvertedFiatNumberOrString({
-        input: exactAmountOut || '0',
-        type: NumberType.PortfolioBalance,
-      })
-
-  const displayCurrency = inputInFiat ? inputCurrency?.symbol ?? '' : activeCurrency
-  const formattedAlternateCurrency = formattedAmountOut + ' ' + displayCurrency
-
-  if (!inputCurrency) {
-    return null
-  }
-
-  return (
-    <LoadingOpacityContainer $loading={false}>
-      <AlternateCurrencyDisplayRow
-        align="center"
-        justify="center"
-        gap="xs"
-        $disabled={disabled}
-        onClick={disabled ? undefined : onToggle}
-      >
-        <ThemedText.BodySecondary fontSize="16px" lineHeight="24px" color="neutral3">
-          {formattedAlternateCurrency}
-        </ThemedText.BodySecondary>
-        <StyledUpAndDownArrowIcon />
-      </AlternateCurrencyDisplayRow>
-    </LoadingOpacityContainer>
-  )
-}
-
-const StyledErrorText = styled(ThemedText.Caption)`
-  color: ${({ theme }) => theme.critical};
-  line-height: 16px;
-`
-
-const InputErrorLookup = {
-  [SendInputError.INSUFFICIENT_FUNDS]: <Trans>Insufficient funds</Trans>,
-  [SendInputError.INSUFFICIENT_FUNDS_FOR_GAS]: <Trans>Insufficient funds to cover network fee</Trans>,
-}
-
-const InputError = () => {
-  const { derivedSendInfo } = useSendContext()
-  const { inputError } = derivedSendInfo
-
-  if (!inputError) {
-    return null
-  }
-
-  return (
-    <ErrorContainer justify="center">
-      <StyledErrorText>{InputErrorLookup[inputError]}</StyledErrorText>
-    </ErrorContainer>
-  )
-}
-
-export default function SendCurrencyInputForm({
-  disabled = false,
-  onCurrencyChange,
-}: {
-  disabled?: boolean
-  onCurrencyChange?: (selected: CurrencyState) => void
-}) {
-  const { chainId } = useSwapAndLimitContext()
-  const { account } = useWeb3React()
-  const { formatCurrencyAmount } = useFormatter()
-  const { symbol: fiatSymbol } = useActiveLocalCurrencyComponents()
-  const { formatNumber } = useFormatter()
-
-  const { sendState, setSendState, derivedSendInfo } = useSendContext()
-  const { inputInFiat, exactAmountToken, exactAmountFiat, inputCurrency } = sendState
-  const { currencyBalance, exactAmountOut, parsedTokenAmount } = derivedSendInfo
-  const maxInputAmount = maxAmountSpend(currencyBalance)
-  const showMaxButton = Boolean(maxInputAmount?.greaterThan(0) && !parsedTokenAmount?.equalTo(maxInputAmount))
-
-  const [tokenSelectorOpen, setTokenSelectorOpen] = useState(false)
-  const fiatCurrency = useMemo(() => STABLECOIN_AMOUNT_OUT[chainId ?? ChainId.MAINNET].currency, [chainId])
-  const fiatCurrencyEqualsTransferCurrency = !!inputCurrency && fiatCurrency.equals(inputCurrency)
-
-  const formattedBalance = formatCurrencyAmount({
-    amount: currencyBalance,
-    type: NumberType.TokenNonTx,
-  })
-
-  const fiatBalanceValue = useUSDPrice(currencyBalance, inputCurrency)
-
-  const handleUserInput = useCallback(
-    (newValue: string) => {
-      setSendState((prev) => ({
-        ...prev,
-        [inputInFiat ? 'exactAmountFiat' : 'exactAmountToken']: newValue,
-      }))
-    },
-    [inputInFiat, setSendState]
-  )
-
-  const handleSelectCurrency = useCallback(
-    (currency: Currency) => {
-      onCurrencyChange?.({ inputCurrency: currency, outputCurrency: undefined })
-
-      if (fiatCurrency.equals(currency)) {
-        setSendState((prev) => ({
-          ...prev,
-          exactAmountToken: exactAmountToken ?? exactAmountFiat,
-          exactAmountFiat: undefined,
-          inputInFiat: false,
-          inputCurrency: currency,
-        }))
-        return
-      }
-
-      setSendState((prev) => ({
-        ...prev,
-        inputCurrency: currency,
-      }))
-    },
-    [exactAmountFiat, exactAmountToken, fiatCurrency, onCurrencyChange, setSendState]
-  )
-
-  const toggleFiatInputAmountEnabled = useCallback(() => {
-    if (inputInFiat) {
-      setSendState((prev) => ({
-        ...prev,
-        exactAmountToken: exactAmountOut ?? '',
-        exactAmountFiat: undefined,
-        inputInFiat: false,
-      }))
-    } else {
-      setSendState((prev) => ({
-        ...prev,
-        exactAmountToken: undefined,
-        exactAmountFiat: exactAmountOut ?? '',
-        inputInFiat: true,
-      }))
-    }
-  }, [exactAmountOut, inputInFiat, setSendState])
-
-  const handleMaxInput = useCallback(() => {
-    if (maxInputAmount) {
-      setSendState((prev) => ({
-        ...prev,
-        exactAmountToken: maxInputAmount.toExact(),
-        exactAmountFiat: undefined,
-        inputInFiat: false,
-      }))
-    }
-  }, [maxInputAmount, setSendState])
-
-  const currencyFilters = useMemo(
-    () => ({
-      onlyShowCurrenciesWithBalance: Boolean(account),
-    }),
-    [account]
-  )
-
-  return (
-    <Wrapper $disabled={disabled}>
-      <InputWrapper>
-        <InputLabelContainer>
-          <ThemedText.SubHeaderSmall color="neutral2">
-            <Trans>You&apos;re sending</Trans>
-          </ThemedText.SubHeaderSmall>
-        </InputLabelContainer>
-        <StyledNumericalInput
-          value={inputInFiat ? exactAmountFiat : exactAmountToken}
-          disabled={disabled}
-          onUserInput={handleUserInput}
-          placeholder={inputInFiat ? fiatSymbol + '0' : '0'}
-          prependSymbol={inputInFiat ? fiatSymbol : undefined}
-        />
-        <AlternateCurrencyDisplay
-          disabled={fiatCurrencyEqualsTransferCurrency}
-          onToggle={toggleFiatInputAmountEnabled}
-        />
-        <InputError />
-      </InputWrapper>
-      <CurrencyInputWrapper shouldFetchOnAccountUpdate={tokenSelectorOpen}>
-        <ClickableRowBetween onClick={() => setTokenSelectorOpen(true)}>
-          <Row width="100%" gap="md">
-            <CurrencySelectorRow width="100%" gap="md" onClick={() => setTokenSelectorOpen(true)}>
-              {inputCurrency && (
-                <PortfolioLogo currencies={[inputCurrency]} size="36px" chainId={chainId ?? ChainId.MAINNET} />
-              )}
-              <Row width="100%">
-                <Column>
-                  <ThemedText.BodyPrimary lineHeight="24px">
-                    {inputCurrency?.symbol ?? inputCurrency?.name}
-                  </ThemedText.BodyPrimary>
-                  <Row gap="xs" width="100%">
-                    {currencyBalance && (
-                      <ThemedText.LabelMicro lineHeight="16px">{`Balance: ${formattedBalance}`}</ThemedText.LabelMicro>
-                    )}
-                    {Boolean(fiatBalanceValue.data) && (
-                      <ThemedText.LabelMicro lineHeight="16px" color="neutral3">{`(${formatNumber({
-                        input: fiatBalanceValue.data,
-                        type: NumberType.FiatTokenPrice,
-                      })})`}</ThemedText.LabelMicro>
-                    )}
-                  </Row>
-                </Column>
-              </Row>
-            </CurrencySelectorRow>
-          </Row>
-          <StyledDropDown />
-        </ClickableRowBetween>
-        {showMaxButton && (
-          <MaxButton onClick={handleMaxInput}>
-            <Trans>Max</Trans>
-          </MaxButton>
-        )}
-      </CurrencyInputWrapper>
-      <CurrencySearchModal
-        isOpen={tokenSelectorOpen}
-        onDismiss={() => setTokenSelectorOpen(false)}
-        onCurrencySelect={handleSelectCurrency}
-        selectedCurrency={inputCurrency}
-        currencySearchFilters={currencyFilters}
-      />
-    </Wrapper>
-  )
-}
diff --git a/apps/web/src/pages/Swap/Send/SendForm.tsx b/apps/web/src/pages/Swap/Send/SendForm.tsx
deleted file mode 100644
index 22e36eaf306..00000000000
--- a/apps/web/src/pages/Swap/Send/SendForm.tsx
+++ /dev/null
@@ -1,252 +0,0 @@
-import { Trans } from '@lingui/macro'
-import { BrowserEvent, InterfaceElementName, InterfaceEventName } from '@uniswap/analytics-events'
-import { useWeb3React } from '@web3-react/core'
-import { TraceEvent } from 'analytics'
-import { useToggleAccountDrawer } from 'components/AccountDrawer/MiniPortfolio/hooks'
-import { ButtonLight, ButtonPrimary } from 'components/Button'
-import Column from 'components/Column'
-import { useConnectionReady } from 'connection/eagerlyConnect'
-import { getChainInfo } from 'constants/chainInfo'
-import { useGroupedRecentTransfers } from 'hooks/useGroupedRecentTransfers'
-import { useSendCallback } from 'hooks/useSendCallback'
-import { useSwitchChain } from 'hooks/useSwitchChain'
-import { useCallback, useEffect, useMemo, useState } from 'react'
-import { SendContextProvider, useSendContext } from 'state/send/SendContext'
-import { CurrencyState, useSwapAndLimitContext } from 'state/swap/SwapContext'
-import { didUserReject } from 'utils/swapErrorToUserReadableMessage'
-import { useIsSmartContractAddress } from 'utils/transfer'
-
-import { NewAddressSpeedBumpModal } from './NewAddressSpeedBump'
-import SendCurrencyInputForm from './SendCurrencyInputForm'
-import { SendRecipientForm } from './SendRecipientForm'
-import { SendReviewModal } from './SendReviewModal'
-import { SmartContractSpeedBumpModal } from './SmartContractSpeedBump'
-
-type SendFormProps = {
-  onCurrencyChange?: (selected: CurrencyState) => void
-  disableTokenInputs?: boolean
-}
-
-function useSendButtonState() {
-  const { sendState, derivedSendInfo } = useSendContext()
-  const { recipient } = sendState
-  const { parsedTokenAmount, recipientData } = derivedSendInfo
-
-  return useMemo(() => {
-    if (recipient && !recipientData) {
-      return {
-        label: <Trans>Invalid recipient</Trans>,
-        disabled: true,
-      }
-    }
-
-    if (!parsedTokenAmount) {
-      return {
-        label: <Trans>Input amount</Trans>,
-        disabled: true,
-      }
-    }
-
-    if (!recipient && !recipientData) {
-      return {
-        label: <Trans>Select recipient</Trans>,
-        disabled: true,
-      }
-    }
-
-    return {
-      label: <Trans>Send</Trans>,
-      disabled: false,
-    }
-  }, [parsedTokenAmount, recipient, recipientData])
-}
-
-enum SendFormModalState {
-  None = 'None',
-  SMART_CONTRACT_SPEED_BUMP = 'SMART_CONTRACT_SPEED_BUMP',
-  NEW_ADDRESS_SPEED_BUMP = 'NEW_ADDRESS_SPEED_BUMP',
-  REVIEW = 'REVIEW',
-}
-
-enum SendSpeedBump {
-  SMART_CONTRACT_SPEED_BUMP = 'SMART_CONTRACT_SPEED_BUMP',
-  NEW_ADDRESS_SPEED_BUMP = 'NEW_ADDRESS_SPEED_BUMP',
-}
-
-function SendFormInner({ disableTokenInputs = false, onCurrencyChange }: SendFormProps) {
-  const { account, chainId: connectedChainId, connector } = useWeb3React()
-  const switchChain = useSwitchChain()
-  const connectionReady = useConnectionReady()
-  const toggleWalletDrawer = useToggleAccountDrawer()
-
-  const [sendFormModalState, setSendFormModalState] = useState(SendFormModalState.None)
-  const [sendFormSpeedBumpState, setSendFormSpeedBumpState] = useState({
-    [SendSpeedBump.NEW_ADDRESS_SPEED_BUMP]: false,
-    [SendSpeedBump.SMART_CONTRACT_SPEED_BUMP]: false,
-  })
-  const { chainId } = useSwapAndLimitContext()
-  const { setSendState, derivedSendInfo } = useSendContext()
-  const { inputError, parsedTokenAmount, recipientData, transaction } = derivedSendInfo
-
-  const { isSmartContractAddress, loading: loadingSmartContractAddress } = useIsSmartContractAddress(
-    recipientData?.address
-  )
-  const { transfers: recentTransfers, loading: transfersLoading } = useGroupedRecentTransfers(account)
-  const isRecentAddress = useMemo(() => {
-    if (!recipientData?.address) {
-      return undefined
-    }
-
-    return !!recentTransfers?.[recipientData.address]
-  }, [recentTransfers, recipientData?.address])
-
-  const sendButtonState = useSendButtonState()
-  const sendCallback = useSendCallback({
-    currencyAmount: parsedTokenAmount,
-    recipient: recipientData?.address,
-    transactionRequest: transaction,
-  })
-
-  const handleModalState = useCallback((newState?: SendFormModalState) => {
-    setSendFormModalState(newState ?? SendFormModalState.None)
-  }, [])
-
-  useEffect(() => {
-    setSendFormSpeedBumpState(() => ({
-      [SendSpeedBump.SMART_CONTRACT_SPEED_BUMP]: isSmartContractAddress,
-      [SendSpeedBump.NEW_ADDRESS_SPEED_BUMP]: !isRecentAddress,
-    }))
-  }, [isRecentAddress, isSmartContractAddress, recipientData?.address])
-
-  const handleSendButton = useCallback(
-    (prevSpeedBump?: SendSpeedBump) => {
-      if (
-        prevSpeedBump !== SendSpeedBump.SMART_CONTRACT_SPEED_BUMP &&
-        sendFormSpeedBumpState[SendSpeedBump.SMART_CONTRACT_SPEED_BUMP]
-      ) {
-        handleModalState(SendFormModalState.SMART_CONTRACT_SPEED_BUMP)
-        return
-      }
-
-      if (
-        prevSpeedBump !== SendSpeedBump.NEW_ADDRESS_SPEED_BUMP &&
-        sendFormSpeedBumpState[SendSpeedBump.NEW_ADDRESS_SPEED_BUMP]
-      ) {
-        handleModalState(SendFormModalState.NEW_ADDRESS_SPEED_BUMP)
-        return
-      }
-
-      handleModalState(SendFormModalState.REVIEW)
-    },
-    [handleModalState, sendFormSpeedBumpState]
-  )
-
-  const handleConfirmSmartContractSpeedBump = useCallback(() => {
-    setSendFormSpeedBumpState((prev) => ({
-      ...prev,
-      [SendSpeedBump.SMART_CONTRACT_SPEED_BUMP]: false,
-    }))
-    handleModalState(SendFormModalState.None)
-    handleSendButton(SendSpeedBump.SMART_CONTRACT_SPEED_BUMP)
-  }, [handleModalState, handleSendButton])
-  const handleCancelSmartContractSpeedBump = useCallback(
-    () => handleModalState(SendFormModalState.None),
-    [handleModalState]
-  )
-
-  const handleConfirmNewAddressSpeedBump = useCallback(() => {
-    setSendFormSpeedBumpState((prev) => ({
-      ...prev,
-      [SendSpeedBump.NEW_ADDRESS_SPEED_BUMP]: false,
-    }))
-    handleModalState(SendFormModalState.None)
-    handleSendButton(SendSpeedBump.NEW_ADDRESS_SPEED_BUMP)
-  }, [handleModalState, handleSendButton])
-  const handleCancelNewAddressSpeedBump = useCallback(
-    () => handleModalState(SendFormModalState.None),
-    [handleModalState]
-  )
-
-  const handleSend = useCallback(() => {
-    sendCallback()
-      .then(() => {
-        handleModalState(SendFormModalState.None)
-        setSendState((prev) => ({
-          ...prev,
-          exactAmountToken: undefined,
-          exactAmountFiat: '',
-          recipient: '',
-          validatedRecipient: undefined,
-          inputInFiat: true,
-        }))
-      })
-      .catch(() => undefined)
-  }, [handleModalState, sendCallback, setSendState])
-
-  return (
-    <>
-      <Column gap="xs">
-        <SendCurrencyInputForm disabled={disableTokenInputs} onCurrencyChange={onCurrencyChange} />
-        <SendRecipientForm disabled={disableTokenInputs} />
-        {connectionReady && !account ? (
-          <TraceEvent
-            events={[BrowserEvent.onClick]}
-            name={InterfaceEventName.CONNECT_WALLET_BUTTON_CLICKED}
-            element={InterfaceElementName.CONNECT_WALLET_BUTTON}
-          >
-            <ButtonLight onClick={toggleWalletDrawer} fontWeight={535} $borderRadius="16px">
-              <Trans>Connect wallet</Trans>
-            </ButtonLight>
-          </TraceEvent>
-        ) : chainId && chainId !== connectedChainId ? (
-          <ButtonPrimary
-            $borderRadius="16px"
-            onClick={async () => {
-              try {
-                await switchChain(connector, chainId)
-              } catch (error) {
-                if (didUserReject(error)) {
-                  // Ignore error, which keeps the user on the previous chain.
-                } else {
-                  // TODO(WEB-3306): This UX could be improved to show an error state.
-                  throw error
-                }
-              }
-            }}
-          >
-            <Trans>Connect to {getChainInfo(chainId)?.label}</Trans>
-          </ButtonPrimary>
-        ) : (
-          <ButtonPrimary
-            fontWeight={535}
-            disabled={!!inputError || loadingSmartContractAddress || transfersLoading || sendButtonState.disabled}
-            onClick={() => handleSendButton()}
-          >
-            {sendButtonState.label}
-          </ButtonPrimary>
-        )}
-      </Column>
-      {sendFormModalState === SendFormModalState.REVIEW ? (
-        <SendReviewModal onConfirm={handleSend} onDismiss={() => handleModalState(SendFormModalState.None)} />
-      ) : sendFormModalState === SendFormModalState.SMART_CONTRACT_SPEED_BUMP ? (
-        <SmartContractSpeedBumpModal
-          onCancel={handleCancelSmartContractSpeedBump}
-          onConfirm={handleConfirmSmartContractSpeedBump}
-        />
-      ) : sendFormModalState === SendFormModalState.NEW_ADDRESS_SPEED_BUMP ? (
-        <NewAddressSpeedBumpModal
-          onCancel={handleCancelNewAddressSpeedBump}
-          onConfirm={handleConfirmNewAddressSpeedBump}
-        />
-      ) : null}
-    </>
-  )
-}
-
-export function SendForm(props: SendFormProps) {
-  return (
-    <SendContextProvider>
-      <SendFormInner {...props} />
-    </SendContextProvider>
-  )
-}
diff --git a/apps/web/src/pages/Swap/Send/SendRecipientForm.test.tsx b/apps/web/src/pages/Swap/Send/SendRecipientForm.test.tsx
deleted file mode 100644
index 86f9769a32b..00000000000
--- a/apps/web/src/pages/Swap/Send/SendRecipientForm.test.tsx
+++ /dev/null
@@ -1,102 +0,0 @@
-import { SwapTab } from 'components/swap/constants'
-import { DAI } from 'constants/tokens'
-import { SendContext, SendContextType } from 'state/send/SendContext'
-import { SwapAndLimitContext } from 'state/swap/SwapContext'
-import { render, screen } from 'test-utils/render'
-import { shortenAddress } from 'utils'
-import { SendRecipientForm } from './SendRecipientForm'
-
-const mockSwapAndLimitContextValue = {
-  currencyState: {
-    inputCurrency: DAI,
-    outputCurrency: undefined,
-  },
-  prefilledState: {},
-  setCurrencyState: jest.fn(),
-  currentTab: SwapTab.Limit,
-  setCurrentTab: jest.fn(),
-}
-
-const mockedSendContextDefault: SendContextType = {
-  sendState: {
-    exactAmountToken: undefined,
-    exactAmountFiat: '',
-    recipient: '',
-    inputCurrency: DAI,
-    inputInFiat: true,
-  },
-  derivedSendInfo: {},
-  setSendState: jest.fn(),
-}
-
-const mockedSendContextRecipientInput: SendContextType = {
-  sendState: {
-    exactAmountToken: undefined,
-    exactAmountFiat: '',
-    recipient: 'hayden.eth',
-    inputCurrency: DAI,
-    inputInFiat: true,
-  },
-  derivedSendInfo: {},
-  setSendState: jest.fn(),
-}
-
-const mockedSendContextWithVerifiedRecipientInput: SendContextType = {
-  sendState: {
-    exactAmountToken: '1',
-    exactAmountFiat: undefined,
-    recipient: 'hayden.eth',
-    inputCurrency: DAI,
-    inputInFiat: false,
-    validatedRecipientData: {
-      address: '0x9984b4b4E408e8D618A879e5315BD30952c89103',
-      ensName: 'hayden.eth',
-    },
-  },
-  derivedSendInfo: {
-    recipientData: {
-      address: '0x9984b4b4E408e8D618A879e5315BD30952c89103',
-      ensName: 'hayden.eth',
-    },
-  },
-  setSendState: jest.fn(),
-}
-
-describe('SendCurrencyInputform', () => {
-  it('should render placeholder values', () => {
-    const { container } = render(
-      <SwapAndLimitContext.Provider value={mockSwapAndLimitContextValue}>
-        <SendContext.Provider value={mockedSendContextDefault}>
-          <SendRecipientForm />
-        </SendContext.Provider>
-      </SwapAndLimitContext.Provider>
-    )
-    expect(screen.getByPlaceholderText('Wallet Address or ENS name')).toBeVisible()
-    expect(container.firstChild).toMatchSnapshot()
-  })
-
-  it('should render correctly with no verified recipient', () => {
-    const { container } = render(
-      <SwapAndLimitContext.Provider value={mockSwapAndLimitContextValue}>
-        <SendContext.Provider value={mockedSendContextRecipientInput}>
-          <SendRecipientForm />
-        </SendContext.Provider>
-      </SwapAndLimitContext.Provider>
-    )
-    expect(screen.getByDisplayValue('hayden.eth')).toBeVisible()
-    expect(container.firstChild).toMatchSnapshot()
-  })
-
-  it('should render correctly with verified recipient', () => {
-    const { container } = render(
-      <SwapAndLimitContext.Provider value={mockSwapAndLimitContextValue}>
-        <SendContext.Provider value={mockedSendContextWithVerifiedRecipientInput}>
-          <SendRecipientForm />
-        </SendContext.Provider>
-      </SwapAndLimitContext.Provider>
-    )
-    expect(screen.getByText('hayden.eth')).toBeVisible()
-    expect(screen.getByText(shortenAddress('0x9984b4b4E408e8D618A879e5315BD30952c89103'))).toBeVisible()
-    expect(container.firstChild).toMatchSnapshot()
-  })
-})
diff --git a/apps/web/src/pages/Swap/Send/SendRecipientForm.tsx b/apps/web/src/pages/Swap/Send/SendRecipientForm.tsx
deleted file mode 100644
index 8fdf714612f..00000000000
--- a/apps/web/src/pages/Swap/Send/SendRecipientForm.tsx
+++ /dev/null
@@ -1,335 +0,0 @@
-import { Plural, t, Trans } from '@lingui/macro'
-import { useWeb3React } from '@web3-react/core'
-import Column, { AutoColumn } from 'components/Column'
-import Identicon from 'components/Identicon'
-import Row from 'components/Row'
-import { Unicon } from 'components/Unicon'
-import useENSName from 'hooks/useENSName'
-import { useGroupedRecentTransfers } from 'hooks/useGroupedRecentTransfers'
-import { useOnClickOutside } from 'hooks/useOnClickOutside'
-import { useUnmountingAnimation } from 'hooks/useUnmountingAnimation'
-import { ChangeEvent, ForwardedRef, forwardRef, KeyboardEvent, useCallback, useRef, useState } from 'react'
-import { X } from 'react-feather'
-import { RecipientData } from 'state/send/hooks'
-import { useSendContext } from 'state/send/SendContext'
-import styled, { css, keyframes } from 'styled-components'
-import { ClickableStyle, ThemedText } from 'theme/components'
-import { AnimationType } from 'theme/components/FadePresence'
-import { shortenAddress } from 'utils'
-
-const StyledConfirmedRecipientRow = styled(Row)`
-  padding: 6px 0px;
-  justify-content: space-between;
-`
-
-const StyledConfirmedRecipientDisplayRow = styled(Row)`
-  ${ClickableStyle}
-`
-
-const StyledCloseIcon = styled(X)`
-  color: ${({ theme }) => theme.neutral3};
-  ${ClickableStyle}
-`
-
-const RecipientWrapper = styled(Column)<{ $disabled?: boolean }>`
-  position: relative;
-  background-color: ${({ theme }) => theme.surface2};
-  border-radius: 16px;
-  padding: 12px 16px;
-  gap: 4px;
-  opacity: ${({ $disabled }) => (!$disabled ? 1 : 0.4)};
-  pointer-events: ${({ $disabled }) => (!$disabled ? 'initial' : 'none')};
-`
-
-const StyledRecipientInputRow = styled(Row)`
-  color: ${({ theme }) => theme.neutral2};
-`
-
-const StyledRecipientInput = styled.input`
-  background: none;
-  width: 100%;
-  color: ${({ theme }) => theme.neutral1};
-  outline: none;
-  border: none;
-  font-size: 16px;
-  font-weight: 500;
-  line-height: 24px;
-
-  ::placeholder {
-    color: ${({ theme }) => theme.neutral3};
-  }
-`
-
-const slideIn = keyframes`
-  from { opacity: 0; transform: translateY(-40px) }
-  to { opacity: 1; transform: translateY(0px) }
-`
-const slideInAnimation = css`
-  animation: ${slideIn} ${({ theme }) => `${theme.transition.duration.medium} ${theme.transition.timing.inOut}`};
-`
-
-const slideOut = keyframes`
-  from { opacity: 1; transform: translateY(0px) }
-  to { opacity: 0; transform: translateY(-40px) }
-`
-const slideOutAnimation = css`
-  animation: ${slideOut} ${({ theme }) => `${theme.transition.duration.medium} ${theme.transition.timing.inOut}`};
-`
-
-const MenuFlyout = styled(AutoColumn)`
-  width: calc(100% - 8px);
-  background-color: ${({ theme }) => theme.surface2};
-  border: 1px solid ${({ theme }) => theme.surface3};
-  box-shadow: 0px 0px 1px rgba(0, 0, 0, 0.01), 0px 4px 8px rgba(0, 0, 0, 0.04), 0px 16px 24px rgba(0, 0, 0, 0.04),
-    0px 24px 32px rgba(0, 0, 0, 0.01);
-  border-radius: 12px;
-  position: absolute;
-  top: 76px;
-  left: 4px;
-  z-index: 100;
-  padding: 16px;
-  transition: display ${({ theme }) => `${theme.transition.duration.fast} ${theme.transition.timing.inOut}`};
-  ${slideInAnimation}
-  &.${AnimationType.EXITING} {
-    ${slideOutAnimation}
-  }
-`
-
-const StyledTransferText = styled(ThemedText.BodySecondary)`
-  flex-shrink: 0;
-`
-
-const StyledAutocompleteRow = styled(Row)`
-  ${ClickableStyle}
-`
-
-const AutocompleteRow = ({
-  address,
-  validatedEnsName,
-  numberOfTransfers,
-  selectRecipient,
-}: {
-  address: string
-  validatedEnsName?: string
-  numberOfTransfers: number
-  selectRecipient: (recipient: RecipientData) => void
-}) => {
-  const { account } = useWeb3React()
-  const { ENSName } = useENSName(address)
-  const cachedEnsName = ENSName || validatedEnsName
-  const formattedAddress = shortenAddress(address)
-  const boundSelectRecipient = useCallback(
-    () =>
-      selectRecipient({
-        address,
-        ensName: cachedEnsName,
-      }),
-    [address, cachedEnsName, selectRecipient]
-  )
-
-  return (
-    <StyledAutocompleteRow justify="space-between" padding="8px 0px" onClick={boundSelectRecipient}>
-      <Row gap="sm">
-        {cachedEnsName ? <Identicon account={address} size={36} /> : <Unicon address={address} size={36} />}
-        <Column>
-          <ThemedText.BodyPrimary lineHeight="24px">{cachedEnsName ?? formattedAddress}</ThemedText.BodyPrimary>
-          {cachedEnsName && <ThemedText.LabelSmall lineHeight="20px">{formattedAddress}</ThemedText.LabelSmall>}
-        </Column>
-      </Row>
-      {account && (
-        <StyledTransferText>
-          {numberOfTransfers} <Plural value={numberOfTransfers} _1="transfer" other="transfers" />
-        </StyledTransferText>
-      )}
-    </StyledAutocompleteRow>
-  )
-}
-
-interface AutocompleteFlyoutProps {
-  transfers?: { [address: string]: number }
-  validatedRecipientData?: RecipientData
-  selectRecipient: (recipient: RecipientData) => void
-}
-
-const AutocompleteFlyout = forwardRef((props: AutocompleteFlyoutProps, ref: ForwardedRef<HTMLDivElement>) => {
-  const { transfers, validatedRecipientData, selectRecipient } = props
-
-  if (validatedRecipientData) {
-    return (
-      <MenuFlyout ref={ref}>
-        <AutocompleteRow
-          address={validatedRecipientData.address}
-          validatedEnsName={validatedRecipientData.ensName}
-          numberOfTransfers={transfers?.[validatedRecipientData.address] ?? 0}
-          selectRecipient={selectRecipient}
-        />
-      </MenuFlyout>
-    )
-  }
-
-  if (!transfers) {
-    return null
-  }
-
-  return (
-    <MenuFlyout ref={ref}>
-      <ThemedText.SubHeaderSmall>
-        <Trans>Recents</Trans>
-      </ThemedText.SubHeaderSmall>
-      {Object.keys(transfers)
-        .slice(0, 3)
-        .map((address) => (
-          <AutocompleteRow
-            key={address}
-            address={address}
-            numberOfTransfers={transfers[address]}
-            selectRecipient={selectRecipient}
-          />
-        ))}
-    </MenuFlyout>
-  )
-})
-
-AutocompleteFlyout.displayName = 'AutocompleteFlyout'
-
-export function SendRecipientForm({ disabled }: { disabled?: boolean }) {
-  const { account } = useWeb3React()
-  const { sendState, setSendState, derivedSendInfo } = useSendContext()
-  const { recipient } = sendState
-  const { recipientData } = derivedSendInfo
-
-  const { transfers: recentTransfers } = useGroupedRecentTransfers(account)
-
-  const [[isFocusing, isForcingFocus], setFocus] = useState([false, false])
-  const handleFocus = useCallback((focus: boolean) => setFocus([focus, false]), [])
-  const handleForceFocus = useCallback((focus: boolean) => setFocus([focus, true]), [])
-
-  const inputNode = useRef<HTMLInputElement | null>(null)
-  const inputWrapperNode = useRef<HTMLDivElement | null>(null)
-  useOnClickOutside(inputWrapperNode, isFocusing ? () => handleFocus(false) : undefined)
-
-  const showFlyout = isFocusing && (!!recipientData || !recipient)
-  const flyoutRef = useRef<HTMLDivElement>(null)
-  useUnmountingAnimation(flyoutRef, () => AnimationType.EXITING)
-
-  const handleInputValidatedRecipient = useCallback(
-    (value?: RecipientData) => {
-      setSendState((prev) => ({
-        ...prev,
-        recipient: value?.address ?? '',
-        validatedRecipient: value,
-      }))
-    },
-    [setSendState]
-  )
-
-  const handleInput = useCallback(
-    (event: ChangeEvent<HTMLInputElement>) => {
-      const input = event.target.value
-      const inputWithoutSpaces = input.replace(/\s+/g, '')
-      setSendState((prev) => ({
-        ...prev,
-        recipient: inputWithoutSpaces,
-        validatedRecipient: undefined,
-      }))
-    },
-    [setSendState]
-  )
-
-  const selectValidatedRecipient = useCallback(
-    (value: RecipientData) => {
-      if (!recipientData) {
-        handleInputValidatedRecipient(value)
-      }
-
-      handleFocus(false)
-      inputNode.current?.blur()
-    },
-    [handleFocus, handleInputValidatedRecipient, recipientData]
-  )
-
-  const clearValidatedRecipient = useCallback(
-    (e: React.MouseEvent<SVGElement>) => {
-      e.preventDefault()
-      e.stopPropagation()
-      handleForceFocus(true)
-      handleInputValidatedRecipient(undefined)
-    },
-    [handleForceFocus, handleInputValidatedRecipient]
-  )
-
-  const editValidatedRecipient = useCallback(() => {
-    handleForceFocus(true)
-  }, [handleForceFocus])
-
-  const handleEnter = useCallback(
-    (e: KeyboardEvent<HTMLInputElement>) => {
-      if (e.key === 'Enter') {
-        if (recipientData) {
-          inputNode.current?.blur()
-          handleFocus(false)
-        }
-      }
-    },
-    [handleFocus, recipientData]
-  )
-
-  const showInputField = !recipientData || isFocusing || isForcingFocus
-  return (
-    <RecipientWrapper $disabled={disabled}>
-      {showInputField ? (
-        <>
-          <ThemedText.SubHeaderSmall lineHeight="24px">
-            <Trans>To</Trans>
-          </ThemedText.SubHeaderSmall>
-          <StyledRecipientInputRow justify="space-between">
-            <Row ref={inputWrapperNode}>
-              <StyledRecipientInput
-                ref={inputNode}
-                type="text"
-                autoComplete="off"
-                autoCorrect="off"
-                autoCapitalize="off"
-                spellCheck="false"
-                placeholder={recipientData ? '' : t`Wallet Address or ENS name`}
-                pattern="^(0x[a-fA-F0-9]{40})$"
-                onChange={handleInput}
-                onFocus={() => handleFocus(true)}
-                value={recipient}
-                onKeyDown={handleEnter}
-                autoFocus={isForcingFocus}
-              />
-              {showFlyout && (
-                <AutocompleteFlyout
-                  ref={flyoutRef}
-                  transfers={recentTransfers}
-                  validatedRecipientData={recipientData}
-                  selectRecipient={selectValidatedRecipient}
-                />
-              )}
-            </Row>
-          </StyledRecipientInputRow>
-        </>
-      ) : (
-        <StyledConfirmedRecipientRow>
-          <StyledConfirmedRecipientDisplayRow gap="md" onClick={editValidatedRecipient}>
-            {recipientData.ensName ? (
-              <Identicon account={recipientData.address} size={36} />
-            ) : (
-              <Unicon address={recipientData.address} size={36} />
-            )}
-            <Column>
-              <ThemedText.BodyPrimary lineHeight="24px">
-                {recipientData.ensName ?? shortenAddress(recipientData.address)}
-              </ThemedText.BodyPrimary>
-              {Boolean(recipientData.ensName) && (
-                <ThemedText.LabelMicro lineHeight="16px">{shortenAddress(recipientData.address)}</ThemedText.LabelMicro>
-              )}
-            </Column>
-          </StyledConfirmedRecipientDisplayRow>
-          <StyledCloseIcon size={20} onClick={clearValidatedRecipient} />
-        </StyledConfirmedRecipientRow>
-      )}
-    </RecipientWrapper>
-  )
-}
diff --git a/apps/web/src/pages/Swap/Send/SendReviewModal.test.tsx b/apps/web/src/pages/Swap/Send/SendReviewModal.test.tsx
deleted file mode 100644
index ad455372209..00000000000
--- a/apps/web/src/pages/Swap/Send/SendReviewModal.test.tsx
+++ /dev/null
@@ -1,91 +0,0 @@
-import { SwapTab } from 'components/swap/constants'
-import { DAI } from 'constants/tokens'
-import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
-import { SendContext, SendContextType } from 'state/send/SendContext'
-import { SwapAndLimitContext } from 'state/swap/SwapContext'
-import { render, screen } from 'test-utils/render'
-import { shortenAddress } from 'utils'
-import { SendReviewModal } from './SendReviewModal'
-
-const mockSwapAndLimitContextValue = {
-  currencyState: {
-    inputCurrency: DAI,
-    outputCurrency: undefined,
-  },
-  prefilledState: {},
-  setCurrencyState: jest.fn(),
-  currentTab: SwapTab.Limit,
-  setCurrentTab: jest.fn(),
-}
-
-const mockedSendContextFiatInput: SendContextType = {
-  sendState: {
-    exactAmountToken: undefined,
-    exactAmountFiat: '1000',
-    recipient: 'hayden.eth',
-    inputCurrency: DAI,
-    inputInFiat: true,
-  },
-  derivedSendInfo: {
-    exactAmountOut: '100',
-    parsedTokenAmount: tryParseCurrencyAmount('100', DAI),
-    recipientData: {
-      address: '0x9984b4b4E408e8D618A879e5315BD30952c89103',
-      ensName: 'hayden.eth',
-    },
-  },
-  setSendState: jest.fn(),
-}
-
-const mockedSendContextTokenInput: SendContextType = {
-  sendState: {
-    exactAmountToken: '1',
-    exactAmountFiat: undefined,
-    recipient: '',
-    inputCurrency: DAI,
-    inputInFiat: false,
-  },
-  derivedSendInfo: {
-    exactAmountOut: '100',
-    parsedTokenAmount: tryParseCurrencyAmount('1', DAI),
-    recipientData: {
-      address: '0x9984b4b4E408e8D618A879e5315BD30952c89103',
-      ensName: 'hayden.eth',
-    },
-  },
-  setSendState: jest.fn(),
-}
-
-describe('SendCurrencyInputform', () => {
-  it('should render input in fiat correctly', () => {
-    render(
-      <SwapAndLimitContext.Provider value={mockSwapAndLimitContextValue}>
-        <SendContext.Provider value={mockedSendContextFiatInput}>
-          <SendReviewModal onDismiss={jest.fn()} onConfirm={jest.fn()} />
-        </SendContext.Provider>
-      </SwapAndLimitContext.Provider>
-    )
-    expect(screen.getByText('$1,000.00')).toBeVisible()
-    expect(screen.getByText('100.00 DAI')).toBeVisible()
-    expect(screen.getByText('hayden.eth')).toBeVisible()
-    expect(screen.getByText(shortenAddress('0x9984b4b4E408e8D618A879e5315BD30952c89103'))).toBeVisible()
-    const modalComponent = screen.getByTestId('send-review-modal')
-    expect(modalComponent).toMatchSnapshot()
-  })
-
-  it('should render input in token amount correctly', () => {
-    render(
-      <SwapAndLimitContext.Provider value={mockSwapAndLimitContextValue}>
-        <SendContext.Provider value={mockedSendContextTokenInput}>
-          <SendReviewModal onDismiss={jest.fn()} onConfirm={jest.fn()} />
-        </SendContext.Provider>
-      </SwapAndLimitContext.Provider>
-    )
-    expect(screen.getByText('$100.00')).toBeVisible()
-    expect(screen.getByText('1.00 DAI')).toBeVisible()
-    expect(screen.getByText('hayden.eth')).toBeVisible()
-    expect(screen.getByText(shortenAddress('0x9984b4b4E408e8D618A879e5315BD30952c89103'))).toBeVisible()
-    const modalComponent = screen.getByTestId('send-review-modal')
-    expect(modalComponent).toMatchSnapshot()
-  })
-})
diff --git a/apps/web/src/pages/Swap/Send/SendReviewModal.tsx b/apps/web/src/pages/Swap/Send/SendReviewModal.tsx
deleted file mode 100644
index 2955592b5f5..00000000000
--- a/apps/web/src/pages/Swap/Send/SendReviewModal.tsx
+++ /dev/null
@@ -1,153 +0,0 @@
-import { Trans } from '@lingui/macro'
-import { ChainId } from '@uniswap/sdk-core'
-import { useWeb3React } from '@web3-react/core'
-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 Row from 'components/Row'
-import { Unicon } from 'components/Unicon'
-import { useStablecoinValue } from 'hooks/useStablecoinPrice'
-import { ReactNode } from 'react'
-import { useSendContext } from 'state/send/SendContext'
-import styled from 'styled-components'
-import { ClickableStyle, CloseIcon, Separator, ThemedText } from 'theme/components'
-import { shortenAddress } from 'utils'
-import { NumberType, useFormatter } from 'utils/formatNumbers'
-
-const ModalWrapper = styled(ColumnCenter)`
-  background-color: ${({ theme }) => theme.surface1};
-  border-radius: 20px;
-  outline: 1px solid ${({ theme }) => theme.surface3};
-  width: 100%;
-  padding: 8px;
-`
-
-const StyledReviewCloseIcon = styled(CloseIcon)`
-  ${ClickableStyle}
-`
-
-const ReviewContentContainer = styled(Column)`
-  width: 100%;
-  padding: 12px 16px;
-  gap: 16px;
-`
-
-const SendModalHeader = ({
-  label,
-  header,
-  subheader,
-  image,
-}: {
-  label: ReactNode
-  header: ReactNode
-  subheader: ReactNode
-  image: ReactNode
-}) => {
-  return (
-    <Row justify="space-between" align="center">
-      <Column gap="xs">
-        <ThemedText.BodySmall color="neutral2" lineHeight="20px">
-          {label}
-        </ThemedText.BodySmall>
-        <ThemedText.HeadlineLarge lineHeight="44px">{header}</ThemedText.HeadlineLarge>
-        <ThemedText.BodySmall lineHeight="20px" color="neutral2">
-          {subheader}
-        </ThemedText.BodySmall>
-      </Column>
-      <div style={{ height: '36px' }}>{image}</div>
-    </Row>
-  )
-}
-
-export function SendReviewModal({ onConfirm, onDismiss }: { onConfirm: () => void; onDismiss: () => void }) {
-  const { chainId } = useWeb3React()
-  const {
-    sendState: { inputCurrency, inputInFiat, exactAmountFiat },
-    derivedSendInfo: { parsedTokenAmount, exactAmountOut, gasFeeCurrencyAmount, recipientData },
-  } = useSendContext()
-
-  const { formatConvertedFiatNumberOrString, formatCurrencyAmount } = useFormatter()
-  const formattedInputAmount = formatCurrencyAmount({
-    amount: parsedTokenAmount,
-    type: NumberType.TokenNonTx,
-  })
-  const formattedFiatInputAmount = formatConvertedFiatNumberOrString({
-    input: (inputInFiat ? exactAmountFiat : exactAmountOut) || '0',
-    type: NumberType.PortfolioBalance,
-  })
-
-  const gasFeeUSD = useStablecoinValue(gasFeeCurrencyAmount)
-  const gasFeeFormatted = formatCurrencyAmount({
-    amount: gasFeeUSD,
-    type: NumberType.PortfolioBalance,
-  })
-
-  const currencySymbolAmount = `${formattedInputAmount} ${inputCurrency?.symbol ?? inputCurrency?.name}`
-
-  const [primaryInputView, secondaryInputView] = inputInFiat
-    ? [formattedFiatInputAmount, currencySymbolAmount]
-    : [currencySymbolAmount, formattedFiatInputAmount]
-
-  return (
-    <Modal $scrollOverlay isOpen onDismiss={onDismiss} maxHeight={90}>
-      <ModalWrapper data-testid="send-review-modal" gap="md">
-        <Row width="100%" padding="8px 12px 4px" align="center">
-          <Row justify="left">
-            <ThemedText.SubHeader>
-              <Trans>Review send</Trans>
-            </ThemedText.SubHeader>
-          </Row>
-          <Row justify="right" gap="10px">
-            <GetHelp />
-            <StyledReviewCloseIcon onClick={onDismiss} />
-          </Row>
-        </Row>
-        <ReviewContentContainer>
-          <Column gap="lg">
-            <SendModalHeader
-              label={<Trans>You&apos;re sending</Trans>}
-              header={primaryInputView}
-              subheader={secondaryInputView}
-              image={<PortfolioLogo currencies={[inputCurrency]} size="36px" chainId={chainId ?? ChainId.MAINNET} />}
-            />
-            <SendModalHeader
-              label={<Trans>To</Trans>}
-              header={
-                recipientData?.ensName ? (
-                  <ThemedText.HeadlineLarge>{recipientData.ensName}</ThemedText.HeadlineLarge>
-                ) : (
-                  shortenAddress(recipientData?.address)
-                )
-              }
-              subheader={recipientData?.ensName && shortenAddress(recipientData.address)}
-              image={
-                recipientData?.ensName ? (
-                  <Identicon account={recipientData.address} size={36} />
-                ) : (
-                  <Unicon address={recipientData?.address ?? ''} size={36} />
-                )
-              }
-            />
-          </Column>
-          <Separator />
-          <Row width="100%" justify="space-between">
-            <ThemedText.BodySmall color="neutral2" lineHeight="20px">
-              <Trans>Network cost</Trans>
-            </ThemedText.BodySmall>
-            <Row width="min-content" gap="xs">
-              <ChainLogo chainId={chainId ?? ChainId.MAINNET} size={16} />
-              <ThemedText.BodySmall>{gasFeeFormatted}</ThemedText.BodySmall>
-            </Row>
-          </Row>
-        </ReviewContentContainer>
-        <ButtonPrimary onClick={onConfirm}>
-          <Trans>Confirm send</Trans>
-        </ButtonPrimary>
-      </ModalWrapper>
-    </Modal>
-  )
-}
diff --git a/apps/web/src/pages/Swap/Send/SmartContractSpeedBump.tsx b/apps/web/src/pages/Swap/Send/SmartContractSpeedBump.tsx
deleted file mode 100644
index c7761add93a..00000000000
--- a/apps/web/src/pages/Swap/Send/SmartContractSpeedBump.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { Trans } from '@lingui/macro'
-import { Dialog } from 'components/Dialog/Dialog'
-import AlertTriangleFilled from 'components/Icons/AlertTriangleFilled'
-import styled from 'styled-components'
-
-const StyledAlertIcon = styled(AlertTriangleFilled)`
-  path {
-    fill: ${({ theme }) => theme.neutral2};
-  }
-`
-
-export const SmartContractSpeedBumpModal = ({
-  onCancel,
-  onConfirm,
-}: {
-  onCancel: () => void
-  onConfirm: () => void
-}) => {
-  return (
-    <Dialog
-      isVisible={true}
-      icon={<StyledAlertIcon size="28px" />}
-      title={<Trans>Is this a wallet address?</Trans>}
-      description={
-        <Trans>
-          You&apos;re about to send tokens to a special type of address - a smart contract. Double-check it&apos;s the
-          address you intended to send to. If it&apos;s wrong, your tokens could be lost forever.
-        </Trans>
-      }
-      onCancel={onCancel}
-      buttonsConfig={{
-        left: {
-          title: <Trans>Cancel</Trans>,
-          onClick: onCancel,
-        },
-        right: {
-          title: <Trans>Continue</Trans>,
-          onClick: onConfirm,
-        },
-      }}
-    />
-  )
-}
diff --git a/apps/web/src/pages/Swap/Send/SmartContractSpeedbump.test.tsx b/apps/web/src/pages/Swap/Send/SmartContractSpeedbump.test.tsx
deleted file mode 100644
index 2a08f3ffc91..00000000000
--- a/apps/web/src/pages/Swap/Send/SmartContractSpeedbump.test.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-import { DAI } from 'constants/tokens'
-import { SmartContractSpeedBumpModal } from 'pages/Swap/Send/SmartContractSpeedBump'
-import { SendContext, SendContextType } from 'state/send/SendContext'
-import { render, screen } from 'test-utils/render'
-
-const mockSendContext: SendContextType = {
-  sendState: {
-    exactAmountToken: '1',
-    exactAmountFiat: undefined,
-    recipient: '0x9984b4b4E408e8D618A879e5315BD30952c89103',
-    inputCurrency: DAI,
-    inputInFiat: false,
-    validatedRecipientData: {
-      address: '0x9984b4b4E408e8D618A879e5315BD30952c89103',
-    },
-  },
-  derivedSendInfo: {
-    recipientData: {
-      address: '0x9984b4b4E408e8D618A879e5315BD30952c89103',
-    },
-  },
-  setSendState: jest.fn(),
-}
-
-describe('SmartContractSpeedBumpModal', () => {
-  it('should render correctly', () => {
-    const mockOnCancel = jest.fn()
-    const mockOnConfirm = jest.fn()
-    render(
-      <SendContext.Provider value={mockSendContext}>
-        <SmartContractSpeedBumpModal onCancel={mockOnCancel} onConfirm={mockOnConfirm} />
-      </SendContext.Provider>
-    )
-
-    expect(document.body).toMatchSnapshot()
-    expect(screen.getByText('Is this a wallet address?')).toBeInTheDocument()
-  })
-})
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
deleted file mode 100644
index 686dd0a7aee..00000000000
--- a/apps/web/src/pages/Swap/Send/__snapshots__/NewAddressSpeedBump.test.tsx.snap
+++ /dev/null
@@ -1,733 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`NewAddressSpeedBumpModal should render 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;
-}
-
-.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;
-}
-
-.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;
-}
-
-.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;
-  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;
-}
-
-.c21 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 4px;
-}
-
-.c22 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 12px;
-}
-
-.c15 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c17 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c11 {
-  color: #222222;
-  cursor: pointer;
-}
-
-.c7 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c7:hover {
-  opacity: 0.6;
-}
-
-.c7:active {
-  opacity: 0.4;
-}
-
-.c26 {
-  background-color: transparent;
-  bottom: 0;
-  border-radius: inherit;
-  height: 100%;
-  left: 0;
-  position: absolute;
-  right: 0;
-  top: 0;
-  -webkit-transition: 150ms ease background-color;
-  transition: 150ms ease background-color;
-  width: 100%;
-}
-
-.c23 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #22222212;
-  border-radius: 16px;
-  border: 0;
-  color: #222222;
-  cursor: pointer;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  font-size: 14px;
-  font-weight: 535;
-  gap: 12px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  line-height: 16px;
-  padding: 8px;
-  position: relative;
-  -webkit-transition: 150ms ease opacity;
-  transition: 150ms ease opacity;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c23:active .c25 {
-  background-color: #B8C0DC3d;
-}
-
-.c23:focus .c25 {
-  background-color: #B8C0DC3d;
-}
-
-.c23:hover .c25 {
-  background-color: #98A1C014;
-}
-
-.c23:disabled {
-  cursor: default;
-  opacity: 0.6;
-}
-
-.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 6px;
-  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;
-}
-
-.c0[data-reach-dialog-overlay] {
-  z-index: 1040;
-  background-color: transparent;
-  overflow: hidden;
-  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;
-  overflow-y: scroll;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  background-color: rgba(0,0,0,0.60);
-}
-
-.c1 {
-  overflow-y: auto;
-}
-
-.c1[data-reach-dialog-content] {
-  margin: auto;
-  background-color: #F9F9F9;
-  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);
-  padding: 0px;
-  width: 50vw;
-  overflow-y: auto;
-  overflow-x: hidden;
-  max-width: 420px;
-  max-height: 90vh;
-  display: inline-table;
-  border-radius: 20px;
-}
-
-.c4 {
-  background-color: #FFFFFF;
-  outline: 1px solid #22222212;
-  border-radius: 20px;
-  padding: 16px 24px 24px 24px;
-  width: 100%;
-}
-
-.c14 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  background-color: #22222212;
-  width: 48px;
-  height: 48px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  border-radius: 12px;
-}
-
-.c16 {
-  font-size: 24px;
-  line-height: 32px;
-  text-align: center;
-  font-weight: 500;
-}
-
-.c18 {
-  font-size: 16px;
-  font-weight: 500;
-  line-height: 24px;
-  -webkit-letter-spacing: 0em;
-  -moz-letter-spacing: 0em;
-  -ms-letter-spacing: 0em;
-  letter-spacing: 0em;
-  text-align: center;
-}
-
-.c24 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-  height: 40px;
-}
-
-.c12 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c12:hover {
-  opacity: 0.6;
-}
-
-.c12:active {
-  opacity: 0.4;
-}
-
-.c20 {
-  padding: 20px 16px;
-  border: 1px solid #22222212;
-  gap: 8px;
-  border-radius: 20px;
-}
-
-@media screen and (max-width:640px) {
-  .c0[data-reach-dialog-overlay] {
-    -webkit-align-items: flex-end;
-    -webkit-box-align: flex-end;
-    -ms-flex-align: flex-end;
-    align-items: flex-end;
-  }
-}
-
-@media screen and (max-width:768px) {
-  .c1[data-reach-dialog-content] {
-    width: 65vw;
-  }
-}
-
-@media screen and (max-width:640px) {
-  .c1[data-reach-dialog-content] {
-    margin: 0;
-    width: 100vw;
-    border-radius: 20px;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-}
-
-<body>
-  <div
-    aria-hidden="true"
-  />
-  <reach-portal>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="0"
-    />
-    <div
-      data-focus-lock-disabled="false"
-    >
-      <div>
-        <div
-          class="c0"
-          data-reach-dialog-overlay=""
-          style="opacity: 0;"
-        >
-          <div
-            aria-label="dialog"
-            aria-modal="true"
-            class="c1"
-            data-reach-dialog-content=""
-            role="dialog"
-            tabindex="-1"
-          >
-            <div
-              class="c2 c3 c4"
-            >
-              <div
-                class="c5 c6"
-                width="100%"
-              >
-                <a
-                  class="c7 c8"
-                  href="https://support.uniswap.org/hc/en-us"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  <div
-                    class="c9 c10"
-                  >
-                    <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="c11 c12"
-                  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="c13 c3"
-              >
-                <div
-                  class="c14"
-                >
-                  <svg
-                    fill="none"
-                    height="28"
-                    viewBox="0 0 28 28"
-                    width="28"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M20.5625 3.5H7.4375C4.8125 3.5 3.5 4.8125 3.5 7.4375V20.5625C3.5 23.1875 4.8125 24.5 7.4375 24.5H20.5625C23.1875 24.5 24.5 23.1875 24.5 20.5625V7.4375C24.5 4.8125 23.1875 3.5 20.5625 3.5ZM14.0094 8.16667C15.9426 8.16667 17.5094 9.7335 17.5094 11.6667C17.5094 13.5998 15.9426 15.1667 14.0094 15.1667C12.0762 15.1667 10.5094 13.5998 10.5094 11.6667C10.5094 9.7335 12.0762 8.16667 14.0094 8.16667ZM20.5567 22.75H7.44334C7.29167 22.75 7.15168 22.75 7.01168 22.7383C7.16334 20.755 8.28338 18.1649 12.005 18.1649H15.995C19.705 18.1649 20.8367 20.7783 20.9883 22.7383C20.8483 22.75 20.7083 22.75 20.5567 22.75Z"
-                      fill="#7D7D7D"
-                    />
-                  </svg>
-                </div>
-                <div
-                  class="c15 c16 css-4kpdx7"
-                >
-                  New address
-                </div>
-                <div
-                  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="c19 c3 c20"
-                >
-                  <div
-                    class="c9 c21"
-                  >
-                    <div
-                      style="height: 16px; width: 16px; position: relative;"
-                    >
-                      <div
-                        style="height: 16px; width: 16px; overflow: visible; position: absolute;"
-                      >
-                        <svg
-                          viewBox="0 0 16 16"
-                        >
-                          <defs>
-                            <defs>
-                              <mask
-                                id="container-mask0x9984b4b4E408e8D618A879e5315BD30952c8910316"
-                              >
-                                <rect
-                                  fill="white"
-                                  height="100%"
-                                  width="100%"
-                                  x="0"
-                                  y="0"
-                                />
-                                <g
-                                  transform="scale(0.4444444444444444) 
- translate(0, 0)"
-                                >
-                                  <path
-                                    clip-rule="evenodd"
-                                    d="M31 33V16C31 8.8203 25.1797 3 18 3C10.8203 3 5 8.8203 5 16V33H31ZM18 0C9.16344 0 2 7.16344 2 16V35.807C2 35.9136 2.08642 36 2.19303 36H33.807C33.9136 36 34 35.9136 34 35.807V16C34 7.16344 26.8366 0 18 0Z"
-                                    fill="black"
-                                    fill-rule="evenodd"
-                                  />
-                                </g>
-                              </mask>
-                              <mask
-                                id="shape-mask0x9984b4b4E408e8D618A879e5315BD30952c8910316"
-                              >
-                                <rect
-                                  fill="white"
-                                  height="100%"
-                                  width="100%"
-                                  x="0"
-                                  y="0"
-                                />
-                                <g
-                                  transform="scale(0.4444444444444444) 
- translate(10, 10)"
-                                >
-                                  <path
-                                    clip-rule="evenodd"
-                                    d="M11.923 8.78487L15.8477 9.5613C15.9476 9.05633 16 8.53428 16 8C16 7.46572 15.9476 6.94367 15.8477 6.4387L11.923 7.21513C11.8192 6.6932 11.6138 6.20786 11.3283 5.78059L14.6525 3.55507C14.0685 2.68266 13.3173 1.93154 12.4449 1.34748L10.2194 4.6717C9.79214 4.38621 9.3068 4.18081 8.78487 4.07697L9.5613 0.152272C9.05633 0.0523755 8.53428 0 8 0C7.46572 0 6.94367 0.0523755 6.4387 0.152272L7.21513 4.07697C6.6932 4.18082 6.20786 4.38621 5.78059 4.6717L3.55507 1.34748C2.68266 1.93154 1.93154 2.68266 1.34748 3.55508L4.6717 5.78059C4.38621 6.20786 4.18081 6.6932 4.07697 7.21513L0.152272 6.4387C0.0523755 6.94367 0 7.46572 0 8C0 8.53428 0.0523756 9.05633 0.152272 9.5613L4.07697 8.78487C4.18082 9.3068 4.38621 9.79214 4.6717 10.2194L1.34748 12.4449C1.93154 13.3173 2.68266 14.0685 3.55508 14.6525L5.78059 11.3283C6.20786 11.6138 6.6932 11.8192 7.21513 11.923L6.4387 15.8477C6.94367 15.9476 7.46572 16 8 16C8.53428 16 9.05633 15.9476 9.5613 15.8477L8.78487 11.923C9.3068 11.8192 9.79214 11.6138 10.2194 11.3283L12.4449 14.6525C13.3173 14.0685 14.0685 13.3173 14.6525 12.4449L11.3283 10.2194C11.6138 9.79214 11.8192 9.3068 11.923 8.78487ZM11.923 8.78487C11.9735 8.53108 12 8.26863 12 8C12 7.73137 11.9735 7.46892 11.923 7.21513L8.03733 7.98383L11.3283 5.78059C11.0353 5.34206 10.6579 4.9647 10.2194 4.6717L8.01617 7.96267L8.78487 4.07697C8.53108 4.02648 8.26863 4 8 4C7.73137 4 7.46892 4.02648 7.21513 4.07697L7.98383 7.96267L5.78059 4.6717C5.34206 4.9647 4.9647 5.34207 4.6717 5.78059L7.96267 7.98383L4.07697 7.21513C4.02648 7.46892 4 7.73137 4 8C4 8.26863 4.02648 8.53108 4.07697 8.78487L7.96267 8.01617L4.6717 10.2194C4.9647 10.6579 5.34207 11.0353 5.78059 11.3283L7.98383 8.03733L7.21513 11.923C7.46892 11.9735 7.73137 12 8 12C8.26863 12 8.53108 11.9735 8.78487 11.923L8.01617 8.03733L10.2194 11.3283C10.6579 11.0353 11.0353 10.6579 11.3283 10.2194L8.03733 8.01617L11.923 8.78487Z"
-                                    fill="black"
-                                    fill-rule="evenodd"
-                                  />
-                                </g>
-                              </mask>
-                              <mask
-                                id="mask0x9984b4b4E408e8D618A879e5315BD30952c8910316"
-                              >
-                                <g
-                                  fill="white"
-                                >
-                                  <g
-                                    mask="url(#shape-mask0x9984b4b4E408e8D618A879e5315BD30952c8910316)"
-                                  >
-                                    <g
-                                      transform="scale(0.4444444444444444)"
-                                    >
-                                      <path
-                                        clip-rule="evenodd"
-                                        d="M31 33V16C31 8.8203 25.1797 3 18 3C10.8203 3 5 8.8203 5 16V33H31ZM18 0C9.16344 0 2 7.16344 2 16V35.807C2 35.9136 2.08642 36 2.19303 36H33.807C33.9136 36 34 35.9136 34 35.807V16C34 7.16344 26.8366 0 18 0Z"
-                                        fill-rule="evenodd"
-                                      />
-                                    </g>
-                                  </g>
-                                  <g
-                                    mask="url(#container-mask0x9984b4b4E408e8D618A879e5315BD30952c8910316)"
-                                  >
-                                    <g
-                                      transform="scale(0.4444444444444444)
-        translate(10, 10)"
-                                    >
-                                      <path
-                                        clip-rule="evenodd"
-                                        d="M11.923 8.78487L15.8477 9.5613C15.9476 9.05633 16 8.53428 16 8C16 7.46572 15.9476 6.94367 15.8477 6.4387L11.923 7.21513C11.8192 6.6932 11.6138 6.20786 11.3283 5.78059L14.6525 3.55507C14.0685 2.68266 13.3173 1.93154 12.4449 1.34748L10.2194 4.6717C9.79214 4.38621 9.3068 4.18081 8.78487 4.07697L9.5613 0.152272C9.05633 0.0523755 8.53428 0 8 0C7.46572 0 6.94367 0.0523755 6.4387 0.152272L7.21513 4.07697C6.6932 4.18082 6.20786 4.38621 5.78059 4.6717L3.55507 1.34748C2.68266 1.93154 1.93154 2.68266 1.34748 3.55508L4.6717 5.78059C4.38621 6.20786 4.18081 6.6932 4.07697 7.21513L0.152272 6.4387C0.0523755 6.94367 0 7.46572 0 8C0 8.53428 0.0523756 9.05633 0.152272 9.5613L4.07697 8.78487C4.18082 9.3068 4.38621 9.79214 4.6717 10.2194L1.34748 12.4449C1.93154 13.3173 2.68266 14.0685 3.55508 14.6525L5.78059 11.3283C6.20786 11.6138 6.6932 11.8192 7.21513 11.923L6.4387 15.8477C6.94367 15.9476 7.46572 16 8 16C8.53428 16 9.05633 15.9476 9.5613 15.8477L8.78487 11.923C9.3068 11.8192 9.79214 11.6138 10.2194 11.3283L12.4449 14.6525C13.3173 14.0685 14.0685 13.3173 14.6525 12.4449L11.3283 10.2194C11.6138 9.79214 11.8192 9.3068 11.923 8.78487ZM11.923 8.78487C11.9735 8.53108 12 8.26863 12 8C12 7.73137 11.9735 7.46892 11.923 7.21513L8.03733 7.98383L11.3283 5.78059C11.0353 5.34206 10.6579 4.9647 10.2194 4.6717L8.01617 7.96267L8.78487 4.07697C8.53108 4.02648 8.26863 4 8 4C7.73137 4 7.46892 4.02648 7.21513 4.07697L7.98383 7.96267L5.78059 4.6717C5.34206 4.9647 4.9647 5.34207 4.6717 5.78059L7.96267 7.98383L4.07697 7.21513C4.02648 7.46892 4 7.73137 4 8C4 8.26863 4.02648 8.53108 4.07697 8.78487L7.96267 8.01617L4.6717 10.2194C4.9647 10.6579 5.34207 11.0353 5.78059 11.3283L7.98383 8.03733L7.21513 11.923C7.46892 11.9735 7.73137 12 8 12C8.26863 12 8.53108 11.9735 8.78487 11.923L8.01617 8.03733L10.2194 11.3283C10.6579 11.0353 11.0353 10.6579 11.3283 10.2194L8.03733 8.01617L11.923 8.78487Z"
-                                        fill-rule="evenodd"
-                                      />
-                                    </g>
-                                  </g>
-                                </g>
-                              </mask>
-                            </defs>
-                            <lineargradient
-                              id="gradient0x9984b4b4E408e8D618A879e5315BD30952c8910316"
-                            >
-                              <stop
-                                offset="0%"
-                                stop-color="#5CFE9D"
-                              />
-                              <stop
-                                offset="100%"
-                                stop-color="#63CDE8"
-                              />
-                            </lineargradient>
-                            <filter
-                              height="200%"
-                              id="blur0x9984b4b4E408e8D618A879e5315BD30952c8910316"
-                              width="200%"
-                              x="-50%"
-                              y="-50%"
-                            >
-                              <fegaussianblur
-                                in="SourceGraphic"
-                                stdDeviation="5.333333333333333"
-                              />
-                            </filter>
-                          </defs>
-                          <g
-                            mask="url(#mask0x9984b4b4E408e8D618A879e5315BD30952c8910316)"
-                          >
-                            <rect
-                              fill="url(#gradient0x9984b4b4E408e8D618A879e5315BD30952c8910316)"
-                              height="100%"
-                              width="100%"
-                              x="0"
-                              y="0"
-                            />
-                            <rect
-                              fill="black"
-                              height="100%"
-                              opacity="0.08"
-                              width="100%"
-                              x="0"
-                              y="0"
-                            />
-                            <ellipse
-                              cx="8"
-                              cy="0"
-                              fill="#EDE590"
-                              filter="url(#blur0x9984b4b4E408e8D618A879e5315BD30952c8910316)"
-                              rx="8"
-                              ry="8"
-                            />
-                          </g>
-                        </svg>
-                      </div>
-                    </div>
-                    <div
-                      class="c15 css-n8z49y"
-                    >
-                      0x9984b4b4E408e8D618A879e5315BD30952c89103
-                    </div>
-                  </div>
-                </div>
-              </div>
-              <div
-                class="c9 c22"
-              >
-                <button
-                  class="c23 c24"
-                >
-                  <div
-                    class="c25 c26"
-                  />
-                  Cancel
-                </button>
-                <button
-                  class="c23 c24"
-                >
-                  <div
-                    class="c25 c26"
-                  />
-                  Continue
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="0"
-    />
-  </reach-portal>
-</body>
-`;
diff --git a/apps/web/src/pages/Swap/Send/__snapshots__/SendCurrencyInputForm.test.tsx.snap b/apps/web/src/pages/Swap/Send/__snapshots__/SendCurrencyInputForm.test.tsx.snap
deleted file mode 100644
index 6cd3b92f88b..00000000000
--- a/apps/web/src/pages/Swap/Send/__snapshots__/SendCurrencyInputForm.test.tsx.snap
+++ /dev/null
@@ -1,1357 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`SendCurrencyInputform renders input in fiat correctly 1`] = `
-.c8 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c17 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: 100%;
-}
-
-.c9 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 4px;
-}
-
-.c14 {
-  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;
-}
-
-.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: 12px;
-}
-
-.c23 {
-  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;
-}
-
-.c15 {
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.c4 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c11 {
-  color: #CECECE;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c22 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c20 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c21 {
-  width: 36px;
-  height: 36px;
-  border-radius: 50%;
-}
-
-.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;
-}
-
-.c7 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-}
-
-.c5 {
-  color: #222222;
-  pointer-events: auto;
-  width: 0;
-  position: relative;
-  font-weight: 485;
-  outline: none;
-  border: none;
-  -webkit-flex: 1 1 auto;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-  background-color: transparent;
-  font-size: 28px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 0px;
-  -webkit-appearance: textfield;
-  text-align: right;
-}
-
-.c5::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-.c5 [type='number'] {
-  -moz-appearance: textfield;
-}
-
-.c5::-webkit-outer-spin-button,
-.c5::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-}
-
-.c5::-webkit-input-placeholder {
-  color: #CECECE;
-}
-
-.c5::-moz-placeholder {
-  color: #CECECE;
-}
-
-.c5:-ms-input-placeholder {
-  color: #CECECE;
-}
-
-.c5::placeholder {
-  color: #CECECE;
-}
-
-.c1 {
-  opacity: 1;
-  pointer-events: initial;
-  gap: 1px;
-}
-
-.c13 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  background-color: #F9F9F9;
-  padding: 16px 16px;
-  border-radius: 0px 0px 16px 16px;
-  height: 64px;
-  -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;
-  position: relative;
-}
-
-.c16 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c16:hover {
-  opacity: 0.6;
-}
-
-.c16:active {
-  opacity: 0.4;
-}
-
-.c2 {
-  position: relative;
-  background-color: #F9F9F9;
-  padding: 0px 12px 60px 12px;
-  height: 256px;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: end;
-  -webkit-justify-content: flex-end;
-  -ms-flex-pack: end;
-  justify-content: flex-end;
-  gap: 4px;
-  border-radius: 16px 16px 0px 0px;
-}
-
-.c3 {
-  position: absolute;
-  top: 16px;
-  left: 16px;
-}
-
-.c6 {
-  max-height: 84px;
-  width: 100%;
-  text-align: center;
-  font-size: 70px;
-  font-weight: 500;
-  line-height: 60px;
-}
-
-.c12 {
-  width: 16px;
-  height: 16px;
-  fill: #CECECE;
-  -webkit-transform: rotate(90deg);
-  -ms-transform: rotate(90deg);
-  transform: rotate(90deg);
-}
-
-.c24 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  width: 20px;
-  height: 8px;
-}
-
-.c24:hover {
-  opacity: 0.6;
-}
-
-.c24:active {
-  opacity: 0.4;
-}
-
-.c24 path {
-  stroke: #CECECE;
-  stroke-width: 2px;
-}
-
-.c19 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c19:hover {
-  opacity: 0.6;
-}
-
-.c19:active {
-  opacity: 0.4;
-}
-
-.c10 {
-  -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;
-}
-
-<div
-  class="c0 c1"
->
-  <div
-    class="c0 c2"
-  >
-    <div
-      class="c3"
-    >
-      <div
-        class="c4 css-142zc9n"
-      >
-        You're sending
-      </div>
-    </div>
-    <input
-      autocomplete="off"
-      autocorrect="off"
-      class="c5 c6"
-      inputmode="decimal"
-      maxlength="79"
-      minlength="1"
-      pattern="^[0-9]*[.,]?[0-9]*$"
-      placeholder="$0"
-      spellcheck="false"
-      type="text"
-      value="$1000"
-    />
-    <div
-      class="c7"
-    >
-      <div
-        class="c8 c9 c10"
-      >
-        <div
-          class="c11 css-n8z49y"
-        >
-          100.00 DAI
-        </div>
-        <svg
-          class="c12"
-          fill="none"
-          height="20"
-          viewBox="0 0 20 20"
-          width="20"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M2.05836 6.27468C2.00086 6.21718 1.95514 6.14789 1.92348 6.07123C1.86014 5.91873 1.86014 5.74623 1.92348 5.59373C1.95514 5.51706 2.00086 5.44798 2.05836 5.39048L5.3917 2.05715C5.63586 1.81298 6.03173 1.81298 6.27589 2.05715C6.52006 2.30132 6.52006 2.69718 6.27589 2.94134L4.00925 5.20799H14.1667C14.5117 5.20799 14.7917 5.48799 14.7917 5.83299C14.7917 6.17799 14.5117 6.45799 14.1667 6.45799H4.00925L6.27589 8.72463C6.52006 8.9688 6.52006 9.36466 6.27589 9.60882C6.15423 9.73049 5.9942 9.79213 5.8342 9.79213C5.6742 9.79213 5.51418 9.73132 5.39251 9.60882L2.05836 6.27468ZM18.0766 13.9271C18.045 13.8504 17.9992 13.7813 17.9417 13.7238L14.6084 10.3905C14.3642 10.1463 13.9684 10.1463 13.7242 10.3905C13.4801 10.6346 13.4801 11.0305 13.7242 11.2747L15.9909 13.5413H5.83339C5.48839 13.5413 5.20839 13.8213 5.20839 14.1663C5.20839 14.5113 5.48839 14.7913 5.83339 14.7913H15.9909L13.7242 17.058C13.4801 17.3021 13.4801 17.698 13.7242 17.9422C13.8459 18.0638 14.0059 18.1255 14.1659 18.1255C14.3259 18.1255 14.4859 18.0647 14.6076 17.9422L17.9409 14.6088C17.9984 14.5513 18.0442 14.4822 18.0758 14.4056C18.14 14.2522 18.14 14.0804 18.0766 13.9271Z"
-          />
-        </svg>
-      </div>
-    </div>
-  </div>
-  <div
-    class="c13"
-  >
-    <div
-      class="c8 c14 c15 c16"
-    >
-      <div
-        class="c17 c18"
-        width="100%"
-      >
-        <div
-          class="c17 c18 c19"
-          width="100%"
-        >
-          <div
-            class="c20"
-          >
-            <img
-              class="c21"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
-            />
-          </div>
-          <div
-            class="c17 c14"
-            width="100%"
-          >
-            <div
-              class="c0"
-            >
-              <div
-                class="c22 css-n8z49y"
-              >
-                DAI
-              </div>
-              <div
-                class="c17 c23"
-                width="100%"
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-      <svg
-        class="c24"
-      >
-        dropdown.svg
-      </svg>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`SendCurrencyInputform renders input in token amount correctly 1`] = `
-.c8 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c17 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: 100%;
-}
-
-.c9 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 4px;
-}
-
-.c14 {
-  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;
-}
-
-.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: 12px;
-}
-
-.c23 {
-  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;
-}
-
-.c15 {
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.c4 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c11 {
-  color: #CECECE;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c22 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c20 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c21 {
-  width: 36px;
-  height: 36px;
-  border-radius: 50%;
-}
-
-.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;
-}
-
-.c7 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-}
-
-.c5 {
-  color: #222222;
-  pointer-events: auto;
-  width: 0;
-  position: relative;
-  font-weight: 485;
-  outline: none;
-  border: none;
-  -webkit-flex: 1 1 auto;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-  background-color: transparent;
-  font-size: 28px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 0px;
-  -webkit-appearance: textfield;
-  text-align: right;
-}
-
-.c5::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-.c5 [type='number'] {
-  -moz-appearance: textfield;
-}
-
-.c5::-webkit-outer-spin-button,
-.c5::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-}
-
-.c5::-webkit-input-placeholder {
-  color: #CECECE;
-}
-
-.c5::-moz-placeholder {
-  color: #CECECE;
-}
-
-.c5:-ms-input-placeholder {
-  color: #CECECE;
-}
-
-.c5::placeholder {
-  color: #CECECE;
-}
-
-.c1 {
-  opacity: 1;
-  pointer-events: initial;
-  gap: 1px;
-}
-
-.c13 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  background-color: #F9F9F9;
-  padding: 16px 16px;
-  border-radius: 0px 0px 16px 16px;
-  height: 64px;
-  -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;
-  position: relative;
-}
-
-.c16 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c16:hover {
-  opacity: 0.6;
-}
-
-.c16:active {
-  opacity: 0.4;
-}
-
-.c2 {
-  position: relative;
-  background-color: #F9F9F9;
-  padding: 0px 12px 60px 12px;
-  height: 256px;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: end;
-  -webkit-justify-content: flex-end;
-  -ms-flex-pack: end;
-  justify-content: flex-end;
-  gap: 4px;
-  border-radius: 16px 16px 0px 0px;
-}
-
-.c3 {
-  position: absolute;
-  top: 16px;
-  left: 16px;
-}
-
-.c6 {
-  max-height: 84px;
-  width: 100%;
-  text-align: center;
-  font-size: 70px;
-  font-weight: 500;
-  line-height: 60px;
-}
-
-.c12 {
-  width: 16px;
-  height: 16px;
-  fill: #CECECE;
-  -webkit-transform: rotate(90deg);
-  -ms-transform: rotate(90deg);
-  transform: rotate(90deg);
-}
-
-.c24 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  width: 20px;
-  height: 8px;
-}
-
-.c24:hover {
-  opacity: 0.6;
-}
-
-.c24:active {
-  opacity: 0.4;
-}
-
-.c24 path {
-  stroke: #CECECE;
-  stroke-width: 2px;
-}
-
-.c19 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c19:hover {
-  opacity: 0.6;
-}
-
-.c19:active {
-  opacity: 0.4;
-}
-
-.c10 {
-  -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;
-}
-
-<div
-  class="c0 c1"
->
-  <div
-    class="c0 c2"
-  >
-    <div
-      class="c3"
-    >
-      <div
-        class="c4 css-142zc9n"
-      >
-        You're sending
-      </div>
-    </div>
-    <input
-      autocomplete="off"
-      autocorrect="off"
-      class="c5 c6"
-      inputmode="decimal"
-      maxlength="79"
-      minlength="1"
-      pattern="^[0-9]*[.,]?[0-9]*$"
-      placeholder="0"
-      spellcheck="false"
-      type="text"
-      value="1"
-    />
-    <div
-      class="c7"
-    >
-      <div
-        class="c8 c9 c10"
-      >
-        <div
-          class="c11 css-n8z49y"
-        >
-          $100.00 USD
-        </div>
-        <svg
-          class="c12"
-          fill="none"
-          height="20"
-          viewBox="0 0 20 20"
-          width="20"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M2.05836 6.27468C2.00086 6.21718 1.95514 6.14789 1.92348 6.07123C1.86014 5.91873 1.86014 5.74623 1.92348 5.59373C1.95514 5.51706 2.00086 5.44798 2.05836 5.39048L5.3917 2.05715C5.63586 1.81298 6.03173 1.81298 6.27589 2.05715C6.52006 2.30132 6.52006 2.69718 6.27589 2.94134L4.00925 5.20799H14.1667C14.5117 5.20799 14.7917 5.48799 14.7917 5.83299C14.7917 6.17799 14.5117 6.45799 14.1667 6.45799H4.00925L6.27589 8.72463C6.52006 8.9688 6.52006 9.36466 6.27589 9.60882C6.15423 9.73049 5.9942 9.79213 5.8342 9.79213C5.6742 9.79213 5.51418 9.73132 5.39251 9.60882L2.05836 6.27468ZM18.0766 13.9271C18.045 13.8504 17.9992 13.7813 17.9417 13.7238L14.6084 10.3905C14.3642 10.1463 13.9684 10.1463 13.7242 10.3905C13.4801 10.6346 13.4801 11.0305 13.7242 11.2747L15.9909 13.5413H5.83339C5.48839 13.5413 5.20839 13.8213 5.20839 14.1663C5.20839 14.5113 5.48839 14.7913 5.83339 14.7913H15.9909L13.7242 17.058C13.4801 17.3021 13.4801 17.698 13.7242 17.9422C13.8459 18.0638 14.0059 18.1255 14.1659 18.1255C14.3259 18.1255 14.4859 18.0647 14.6076 17.9422L17.9409 14.6088C17.9984 14.5513 18.0442 14.4822 18.0758 14.4056C18.14 14.2522 18.14 14.0804 18.0766 13.9271Z"
-          />
-        </svg>
-      </div>
-    </div>
-  </div>
-  <div
-    class="c13"
-  >
-    <div
-      class="c8 c14 c15 c16"
-    >
-      <div
-        class="c17 c18"
-        width="100%"
-      >
-        <div
-          class="c17 c18 c19"
-          width="100%"
-        >
-          <div
-            class="c20"
-          >
-            <img
-              class="c21"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
-            />
-          </div>
-          <div
-            class="c17 c14"
-            width="100%"
-          >
-            <div
-              class="c0"
-            >
-              <div
-                class="c22 css-n8z49y"
-              >
-                DAI
-              </div>
-              <div
-                class="c17 c23"
-                width="100%"
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-      <svg
-        class="c24"
-      >
-        dropdown.svg
-      </svg>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`SendCurrencyInputform should render placeholder values 1`] = `
-.c8 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c17 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: 100%;
-}
-
-.c9 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 4px;
-}
-
-.c14 {
-  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;
-}
-
-.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: 12px;
-}
-
-.c23 {
-  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;
-}
-
-.c15 {
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.c4 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c11 {
-  color: #CECECE;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c22 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c20 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c21 {
-  width: 36px;
-  height: 36px;
-  border-radius: 50%;
-}
-
-.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;
-}
-
-.c7 {
-  -webkit-filter: none;
-  filter: none;
-  opacity: 1;
-  -webkit-transition: opacity 250ms ease-in-out;
-  transition: opacity 250ms ease-in-out;
-}
-
-.c5 {
-  color: #222222;
-  pointer-events: auto;
-  width: 0;
-  position: relative;
-  font-weight: 485;
-  outline: none;
-  border: none;
-  -webkit-flex: 1 1 auto;
-  -ms-flex: 1 1 auto;
-  flex: 1 1 auto;
-  background-color: transparent;
-  font-size: 28px;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  padding: 0px;
-  -webkit-appearance: textfield;
-  text-align: right;
-}
-
-.c5::-webkit-search-decoration {
-  -webkit-appearance: none;
-}
-
-.c5 [type='number'] {
-  -moz-appearance: textfield;
-}
-
-.c5::-webkit-outer-spin-button,
-.c5::-webkit-inner-spin-button {
-  -webkit-appearance: none;
-}
-
-.c5::-webkit-input-placeholder {
-  color: #CECECE;
-}
-
-.c5::-moz-placeholder {
-  color: #CECECE;
-}
-
-.c5:-ms-input-placeholder {
-  color: #CECECE;
-}
-
-.c5::placeholder {
-  color: #CECECE;
-}
-
-.c1 {
-  opacity: 1;
-  pointer-events: initial;
-  gap: 1px;
-}
-
-.c13 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  background-color: #F9F9F9;
-  padding: 16px 16px;
-  border-radius: 0px 0px 16px 16px;
-  height: 64px;
-  -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;
-  position: relative;
-}
-
-.c16 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c16:hover {
-  opacity: 0.6;
-}
-
-.c16:active {
-  opacity: 0.4;
-}
-
-.c2 {
-  position: relative;
-  background-color: #F9F9F9;
-  padding: 0px 12px 60px 12px;
-  height: 256px;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  -webkit-box-pack: end;
-  -webkit-justify-content: flex-end;
-  -ms-flex-pack: end;
-  justify-content: flex-end;
-  gap: 4px;
-  border-radius: 16px 16px 0px 0px;
-}
-
-.c3 {
-  position: absolute;
-  top: 16px;
-  left: 16px;
-}
-
-.c6 {
-  max-height: 84px;
-  width: 100%;
-  text-align: center;
-  font-size: 70px;
-  font-weight: 500;
-  line-height: 60px;
-}
-
-.c12 {
-  width: 16px;
-  height: 16px;
-  fill: #CECECE;
-  -webkit-transform: rotate(90deg);
-  -ms-transform: rotate(90deg);
-  transform: rotate(90deg);
-}
-
-.c24 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  width: 20px;
-  height: 8px;
-}
-
-.c24:hover {
-  opacity: 0.6;
-}
-
-.c24:active {
-  opacity: 0.4;
-}
-
-.c24 path {
-  stroke: #CECECE;
-  stroke-width: 2px;
-}
-
-.c19 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c19:hover {
-  opacity: 0.6;
-}
-
-.c19:active {
-  opacity: 0.4;
-}
-
-.c10 {
-  -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;
-}
-
-<div
-  class="c0 c1"
->
-  <div
-    class="c0 c2"
-  >
-    <div
-      class="c3"
-    >
-      <div
-        class="c4 css-142zc9n"
-      >
-        You're sending
-      </div>
-    </div>
-    <input
-      autocomplete="off"
-      autocorrect="off"
-      class="c5 c6"
-      inputmode="decimal"
-      maxlength="79"
-      minlength="1"
-      pattern="^[0-9]*[.,]?[0-9]*$"
-      placeholder="$0"
-      spellcheck="false"
-      type="text"
-      value=""
-    />
-    <div
-      class="c7"
-    >
-      <div
-        class="c8 c9 c10"
-      >
-        <div
-          class="c11 css-n8z49y"
-        >
-          0 DAI
-        </div>
-        <svg
-          class="c12"
-          fill="none"
-          height="20"
-          viewBox="0 0 20 20"
-          width="20"
-          xmlns="http://www.w3.org/2000/svg"
-        >
-          <path
-            d="M2.05836 6.27468C2.00086 6.21718 1.95514 6.14789 1.92348 6.07123C1.86014 5.91873 1.86014 5.74623 1.92348 5.59373C1.95514 5.51706 2.00086 5.44798 2.05836 5.39048L5.3917 2.05715C5.63586 1.81298 6.03173 1.81298 6.27589 2.05715C6.52006 2.30132 6.52006 2.69718 6.27589 2.94134L4.00925 5.20799H14.1667C14.5117 5.20799 14.7917 5.48799 14.7917 5.83299C14.7917 6.17799 14.5117 6.45799 14.1667 6.45799H4.00925L6.27589 8.72463C6.52006 8.9688 6.52006 9.36466 6.27589 9.60882C6.15423 9.73049 5.9942 9.79213 5.8342 9.79213C5.6742 9.79213 5.51418 9.73132 5.39251 9.60882L2.05836 6.27468ZM18.0766 13.9271C18.045 13.8504 17.9992 13.7813 17.9417 13.7238L14.6084 10.3905C14.3642 10.1463 13.9684 10.1463 13.7242 10.3905C13.4801 10.6346 13.4801 11.0305 13.7242 11.2747L15.9909 13.5413H5.83339C5.48839 13.5413 5.20839 13.8213 5.20839 14.1663C5.20839 14.5113 5.48839 14.7913 5.83339 14.7913H15.9909L13.7242 17.058C13.4801 17.3021 13.4801 17.698 13.7242 17.9422C13.8459 18.0638 14.0059 18.1255 14.1659 18.1255C14.3259 18.1255 14.4859 18.0647 14.6076 17.9422L17.9409 14.6088C17.9984 14.5513 18.0442 14.4822 18.0758 14.4056C18.14 14.2522 18.14 14.0804 18.0766 13.9271Z"
-          />
-        </svg>
-      </div>
-    </div>
-  </div>
-  <div
-    class="c13"
-  >
-    <div
-      class="c8 c14 c15 c16"
-    >
-      <div
-        class="c17 c18"
-        width="100%"
-      >
-        <div
-          class="c17 c18 c19"
-          width="100%"
-        >
-          <div
-            class="c20"
-          >
-            <img
-              class="c21"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
-            />
-          </div>
-          <div
-            class="c17 c14"
-            width="100%"
-          >
-            <div
-              class="c0"
-            >
-              <div
-                class="c22 css-n8z49y"
-              >
-                DAI
-              </div>
-              <div
-                class="c17 c23"
-                width="100%"
-              />
-            </div>
-          </div>
-        </div>
-      </div>
-      <svg
-        class="c24"
-      >
-        dropdown.svg
-      </svg>
-    </div>
-  </div>
-</div>
-`;
diff --git a/apps/web/src/pages/Swap/Send/__snapshots__/SendRecipientForm.test.tsx.snap b/apps/web/src/pages/Swap/Send/__snapshots__/SendRecipientForm.test.tsx.snap
deleted file mode 100644
index 68895ef562d..00000000000
--- a/apps/web/src/pages/Swap/Send/__snapshots__/SendRecipientForm.test.tsx.snap
+++ /dev/null
@@ -1,494 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`SendCurrencyInputform should render correctly with no verified recipient 1`] = `
-.c3 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.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: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.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;
-}
-
-.c2 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  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;
-}
-
-.c1 {
-  position: relative;
-  background-color: #F9F9F9;
-  border-radius: 16px;
-  padding: 12px 16px;
-  gap: 4px;
-  opacity: 1;
-  pointer-events: initial;
-}
-
-.c5 {
-  color: #7D7D7D;
-}
-
-.c7 {
-  background: none;
-  width: 100%;
-  color: #222222;
-  outline: none;
-  border: none;
-  font-size: 16px;
-  font-weight: 500;
-  line-height: 24px;
-}
-
-.c7::-webkit-input-placeholder {
-  color: #CECECE;
-}
-
-.c7::-moz-placeholder {
-  color: #CECECE;
-}
-
-.c7:-ms-input-placeholder {
-  color: #CECECE;
-}
-
-.c7::placeholder {
-  color: #CECECE;
-}
-
-<div
-  class="c0 c1"
->
-  <div
-    class="c2 css-fy6j1c"
-  >
-    To
-  </div>
-  <div
-    class="c3 c4 c5"
-  >
-    <div
-      class="c3 c6"
-    >
-      <input
-        autocapitalize="off"
-        autocomplete="off"
-        autocorrect="off"
-        class="c7"
-        pattern="^(0x[a-fA-F0-9]{40})$"
-        placeholder="Wallet Address or ENS name"
-        spellcheck="false"
-        type="text"
-        value="hayden.eth"
-      />
-    </div>
-  </div>
-</div>
-`;
-
-exports[`SendCurrencyInputform should render correctly with verified recipient 1`] = `
-.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;
-}
-
-.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: 12px;
-}
-
-.c8 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c9 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  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;
-}
-
-.c7 {
-  height: 36px;
-  width: 36px;
-  border-radius: 50%;
-  background-color: #22222212;
-  font-size: initial;
-}
-
-.c4 {
-  padding: 6px 0px;
-  -webkit-box-pack: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.c6 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c6:hover {
-  opacity: 0.6;
-}
-
-.c6:active {
-  opacity: 0.4;
-}
-
-.c10 {
-  color: #CECECE;
-  -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;
-}
-
-.c1 {
-  position: relative;
-  background-color: #F9F9F9;
-  border-radius: 16px;
-  padding: 12px 16px;
-  gap: 4px;
-  opacity: 1;
-  pointer-events: initial;
-}
-
-<div
-  class="c0 c1"
->
-  <div
-    class="c2 c3 c4"
-  >
-    <div
-      class="c2 c5 c6"
-    >
-      <div
-        class="c7"
-      >
-        <span>
-          <div
-            style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 36px; height: 36px; display: inline-block; background: rgb(200, 20, 83);"
-          >
-            <svg
-              height="36"
-              width="36"
-              x="0"
-              y="0"
-            >
-              <rect
-                fill="#F29602"
-                height="36"
-                transform="translate(-1.3639893162257823 0.27350588462642744) rotate(171.3 18 18)"
-                width="36"
-                x="0"
-                y="0"
-              />
-              <rect
-                fill="#FA6C00"
-                height="36"
-                transform="translate(7.665150362825969 -12.44820359430869) rotate(394.5 18 18)"
-                width="36"
-                x="0"
-                y="0"
-              />
-              <rect
-                fill="#FB1868"
-                height="36"
-                transform="translate(23.55150004628138 -6.949396678861342) rotate(445.6 18 18)"
-                width="36"
-                x="0"
-                y="0"
-              />
-            </svg>
-          </div>
-        </span>
-      </div>
-      <div
-        class="c0"
-      >
-        <div
-          class="c8 css-n8z49y"
-        >
-          hayden.eth
-        </div>
-        <div
-          class="c9 css-obwv3p"
-        >
-          0x9984...9103
-        </div>
-      </div>
-    </div>
-    <svg
-      class="c10"
-      fill="none"
-      height="20"
-      stroke="currentColor"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-      stroke-width="2"
-      viewBox="0 0 24 24"
-      width="20"
-      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>
-`;
-
-exports[`SendCurrencyInputform should render placeholder values 1`] = `
-.c3 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.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: justify;
-  -webkit-justify-content: space-between;
-  -ms-flex-pack: justify;
-  justify-content: space-between;
-}
-
-.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;
-}
-
-.c2 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  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;
-}
-
-.c1 {
-  position: relative;
-  background-color: #F9F9F9;
-  border-radius: 16px;
-  padding: 12px 16px;
-  gap: 4px;
-  opacity: 1;
-  pointer-events: initial;
-}
-
-.c5 {
-  color: #7D7D7D;
-}
-
-.c7 {
-  background: none;
-  width: 100%;
-  color: #222222;
-  outline: none;
-  border: none;
-  font-size: 16px;
-  font-weight: 500;
-  line-height: 24px;
-}
-
-.c7::-webkit-input-placeholder {
-  color: #CECECE;
-}
-
-.c7::-moz-placeholder {
-  color: #CECECE;
-}
-
-.c7:-ms-input-placeholder {
-  color: #CECECE;
-}
-
-.c7::placeholder {
-  color: #CECECE;
-}
-
-<div
-  class="c0 c1"
->
-  <div
-    class="c2 css-fy6j1c"
-  >
-    To
-  </div>
-  <div
-    class="c3 c4 c5"
-  >
-    <div
-      class="c3 c6"
-    >
-      <input
-        autocapitalize="off"
-        autocomplete="off"
-        autocorrect="off"
-        class="c7"
-        pattern="^(0x[a-fA-F0-9]{40})$"
-        placeholder="Wallet Address or ENS name"
-        spellcheck="false"
-        type="text"
-        value=""
-      />
-    </div>
-  </div>
-</div>
-`;
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
deleted file mode 100644
index f1e084b06be..00000000000
--- a/apps/web/src/pages/Swap/Send/__snapshots__/SendReviewModal.test.tsx.snap
+++ /dev/null
@@ -1,1409 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`SendCurrencyInputform should render input in fiat correctly 1`] = `
-.c3 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: 100%;
-  padding: 8px 12px 4px;
-}
-
-.c5 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c24 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: 100%;
-}
-
-.c25 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: -webkit-min-content;
-  width: -moz-min-content;
-  width: min-content;
-}
-
-.c27 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  display: inline-block;
-  text-align: center;
-  line-height: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font-size: inherit;
-  padding-left: 16px;
-  padding-right: 16px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: white;
-  background-color: primary;
-  border: 0;
-  border-radius: 4px;
-}
-
-.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;
-  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;
-}
-
-.c17 {
-  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;
-}
-
-.c26 {
-  width: -webkit-min-content;
-  width: -moz-min-content;
-  width: min-content;
-  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;
-}
-
-.c7 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c19 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c12 {
-  color: #222222;
-  cursor: pointer;
-}
-
-.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 {
-  opacity: 0.6;
-}
-
-.c9:active {
-  opacity: 0.4;
-}
-
-.c23 {
-  width: 100%;
-  height: 1px;
-  background-color: #22222212;
-}
-
-.c20 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c21 {
-  width: 36px;
-  height: 36px;
-  border-radius: 50%;
-}
-
-.c28 {
-  padding: 16px;
-  width: 100%;
-  line-height: 24px;
-  font-weight: 535;
-  text-align: center;
-  border-radius: 16px;
-  outline: none;
-  border: 1px solid transparent;
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-flex-wrap: nowrap;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-  will-change: transform;
-  -webkit-transition: -webkit-transform 450ms ease;
-  -webkit-transition: transform 450ms ease;
-  transition: transform 450ms ease;
-  -webkit-transform: perspective(1px) translateZ(0);
-  -ms-transform: perspective(1px) translateZ(0);
-  transform: perspective(1px) translateZ(0);
-}
-
-.c28:disabled {
-  opacity: 50%;
-  cursor: auto;
-  pointer-events: none;
-}
-
-.c28 > * {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c28 > a {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c29 {
-  background-color: #FC72FF;
-  font-size: 20px;
-  font-weight: 535;
-  padding: 16px;
-  color: #FFFFFF;
-}
-
-.c29:focus {
-  box-shadow: 0 0 0 1pt #fb58ff;
-  background-color: #fb58ff;
-}
-
-.c29:hover {
-  background-color: #fb58ff;
-}
-
-.c29:active {
-  box-shadow: 0 0 0 1pt #fb3fff;
-  background-color: #fb3fff;
-}
-
-.c29:disabled {
-  background-color: #22222212;
-  color: #7D7D7D;
-  cursor: auto;
-  box-shadow: none;
-  border: 1px solid transparent;
-  outline: none;
-}
-
-.c10 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  border-radius: 16px;
-  padding: 4px 6px;
-  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;
-  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;
-}
-
-.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;
-}
-
-.c16 {
-  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;
-}
-
-.c18 {
-  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;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c22 {
-  height: 36px;
-  width: 36px;
-  border-radius: 50%;
-  background-color: #22222212;
-  font-size: initial;
-}
-
-.c2 {
-  background-color: #FFFFFF;
-  border-radius: 20px;
-  outline: 1px solid #22222212;
-  width: 100%;
-  padding: 8px;
-}
-
-.c13 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c13:hover {
-  opacity: 0.6;
-}
-
-.c13:active {
-  opacity: 0.4;
-}
-
-.c15 {
-  width: 100%;
-  padding: 12px 16px;
-  gap: 16px;
-}
-
-@media screen and (max-width:640px) {
-
-}
-
-@media screen and (max-width:768px) {
-
-}
-
-@media screen and (max-width:640px) {
-
-}
-
-<div
-  class="c0 c1 c2"
-  data-testid="send-review-modal"
->
-  <div
-    class="c3 c4"
-    width="100%"
-  >
-    <div
-      class="c5 c6"
-    >
-      <div
-        class="c7 css-n8z49y"
-      >
-        Review send
-      </div>
-    </div>
-    <div
-      class="c5 c8"
-    >
-      <a
-        class="c9 c10"
-        href="https://support.uniswap.org/hc/en-us"
-        rel="noopener noreferrer"
-        target="_blank"
-      >
-        <div
-          class="c5 c11"
-        >
-          <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="c12 c13"
-        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>
-  <div
-    class="c14 c15"
-  >
-    <div
-      class="c16"
-    >
-      <div
-        class="c5 c17"
-      >
-        <div
-          class="c18"
-        >
-          <div
-            class="c19 css-1a4qi6e"
-          >
-            You're sending
-          </div>
-          <div
-            class="c7 css-15popx1"
-          >
-            $1,000.00
-          </div>
-          <div
-            class="c19 css-1a4qi6e"
-          >
-            100.00 DAI
-          </div>
-        </div>
-        <div
-          style="height: 36px;"
-        >
-          <div
-            class="c20"
-          >
-            <img
-              class="c21"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
-            />
-          </div>
-        </div>
-      </div>
-      <div
-        class="c5 c17"
-      >
-        <div
-          class="c18"
-        >
-          <div
-            class="c19 css-1a4qi6e"
-          >
-            To
-          </div>
-          <div
-            class="c7 css-15popx1"
-          >
-            <div
-              class="c7 css-15popx1"
-            >
-              hayden.eth
-            </div>
-          </div>
-          <div
-            class="c19 css-1a4qi6e"
-          >
-            0x9984...9103
-          </div>
-        </div>
-        <div
-          style="height: 36px;"
-        >
-          <div
-            class="c22"
-          >
-            <span>
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 36px; height: 36px; display: inline-block; background: rgb(200, 20, 83);"
-              >
-                <svg
-                  height="36"
-                  width="36"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#F29602"
-                    height="36"
-                    transform="translate(-1.3639893162257823 0.27350588462642744) rotate(171.3 18 18)"
-                    width="36"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FA6C00"
-                    height="36"
-                    transform="translate(7.665150362825969 -12.44820359430869) rotate(394.5 18 18)"
-                    width="36"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FB1868"
-                    height="36"
-                    transform="translate(23.55150004628138 -6.949396678861342) rotate(445.6 18 18)"
-                    width="36"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="c23"
-    />
-    <div
-      class="c24 c17"
-      width="100%"
-    >
-      <div
-        class="c19 css-1a4qi6e"
-      >
-        Network cost
-      </div>
-      <div
-        class="c25 c26"
-        width="min-content"
-      >
-        <svg
-          aria-labelledby="titleID"
-          height="16"
-          style="width: 16px; height: 16px;"
-          width="16"
-        >
-          <title
-            id="titleID"
-          >
-            Ethereum logo
-          </title>
-          <rect
-            fill="#F9F9F9"
-            height="16"
-            rx="4"
-            width="16"
-          />
-          <rect
-            fill="#6B8AFF33"
-            height="16"
-            rx="4"
-            width="16"
-          />
-          <svg
-            height="16"
-            width="16"
-          >
-            ethereum.svg
-          </svg>
-        </svg>
-        <div
-          class="c7 css-142zc9n"
-        >
-          -
-        </div>
-      </div>
-    </div>
-  </div>
-  <button
-    class="c27 c28 c29"
-  >
-    Confirm send
-  </button>
-</div>
-`;
-
-exports[`SendCurrencyInputform should render input in token amount correctly 1`] = `
-.c3 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: 100%;
-  padding: 8px 12px 4px;
-}
-
-.c5 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-}
-
-.c24 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: 100%;
-}
-
-.c25 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  width: -webkit-min-content;
-  width: -moz-min-content;
-  width: min-content;
-}
-
-.c27 {
-  box-sizing: border-box;
-  margin: 0;
-  min-width: 0;
-  -webkit-appearance: none;
-  -moz-appearance: none;
-  appearance: none;
-  display: inline-block;
-  text-align: center;
-  line-height: inherit;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  font-size: inherit;
-  padding-left: 16px;
-  padding-right: 16px;
-  padding-top: 8px;
-  padding-bottom: 8px;
-  color: white;
-  background-color: primary;
-  border: 0;
-  border-radius: 4px;
-}
-
-.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;
-  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;
-}
-
-.c17 {
-  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;
-}
-
-.c26 {
-  width: -webkit-min-content;
-  width: -moz-min-content;
-  width: min-content;
-  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;
-}
-
-.c7 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c19 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c12 {
-  color: #222222;
-  cursor: pointer;
-}
-
-.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 {
-  opacity: 0.6;
-}
-
-.c9:active {
-  opacity: 0.4;
-}
-
-.c23 {
-  width: 100%;
-  height: 1px;
-  background-color: #22222212;
-}
-
-.c20 {
-  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;
-  position: relative;
-  top: 0;
-  left: 0;
-}
-
-.c21 {
-  width: 36px;
-  height: 36px;
-  border-radius: 50%;
-}
-
-.c28 {
-  padding: 16px;
-  width: 100%;
-  line-height: 24px;
-  font-weight: 535;
-  text-align: center;
-  border-radius: 16px;
-  outline: none;
-  border: 1px solid transparent;
-  color: #222222;
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-flex-wrap: nowrap;
-  -ms-flex-wrap: nowrap;
-  flex-wrap: nowrap;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-  will-change: transform;
-  -webkit-transition: -webkit-transform 450ms ease;
-  -webkit-transition: transform 450ms ease;
-  transition: transform 450ms ease;
-  -webkit-transform: perspective(1px) translateZ(0);
-  -ms-transform: perspective(1px) translateZ(0);
-  transform: perspective(1px) translateZ(0);
-}
-
-.c28:disabled {
-  opacity: 50%;
-  cursor: auto;
-  pointer-events: none;
-}
-
-.c28 > * {
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c28 > a {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-}
-
-.c29 {
-  background-color: #FC72FF;
-  font-size: 20px;
-  font-weight: 535;
-  padding: 16px;
-  color: #FFFFFF;
-}
-
-.c29:focus {
-  box-shadow: 0 0 0 1pt #fb58ff;
-  background-color: #fb58ff;
-}
-
-.c29:hover {
-  background-color: #fb58ff;
-}
-
-.c29:active {
-  box-shadow: 0 0 0 1pt #fb3fff;
-  background-color: #fb3fff;
-}
-
-.c29:disabled {
-  background-color: #22222212;
-  color: #7D7D7D;
-  cursor: auto;
-  box-shadow: none;
-  border: 1px solid transparent;
-  outline: none;
-}
-
-.c10 {
-  width: -webkit-fit-content;
-  width: -moz-fit-content;
-  width: fit-content;
-  border-radius: 16px;
-  padding: 4px 6px;
-  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;
-  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;
-}
-
-.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;
-}
-
-.c16 {
-  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;
-}
-
-.c18 {
-  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;
-}
-
-.c1 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c22 {
-  height: 36px;
-  width: 36px;
-  border-radius: 50%;
-  background-color: #22222212;
-  font-size: initial;
-}
-
-.c2 {
-  background-color: #FFFFFF;
-  border-radius: 20px;
-  outline: 1px solid #22222212;
-  width: 100%;
-  padding: 8px;
-}
-
-.c13 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c13:hover {
-  opacity: 0.6;
-}
-
-.c13:active {
-  opacity: 0.4;
-}
-
-.c15 {
-  width: 100%;
-  padding: 12px 16px;
-  gap: 16px;
-}
-
-@media screen and (max-width:640px) {
-
-}
-
-@media screen and (max-width:768px) {
-
-}
-
-@media screen and (max-width:640px) {
-
-}
-
-<div
-  class="c0 c1 c2"
-  data-testid="send-review-modal"
->
-  <div
-    class="c3 c4"
-    width="100%"
-  >
-    <div
-      class="c5 c6"
-    >
-      <div
-        class="c7 css-n8z49y"
-      >
-        Review send
-      </div>
-    </div>
-    <div
-      class="c5 c8"
-    >
-      <a
-        class="c9 c10"
-        href="https://support.uniswap.org/hc/en-us"
-        rel="noopener noreferrer"
-        target="_blank"
-      >
-        <div
-          class="c5 c11"
-        >
-          <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="c12 c13"
-        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>
-  <div
-    class="c14 c15"
-  >
-    <div
-      class="c16"
-    >
-      <div
-        class="c5 c17"
-      >
-        <div
-          class="c18"
-        >
-          <div
-            class="c19 css-1a4qi6e"
-          >
-            You're sending
-          </div>
-          <div
-            class="c7 css-15popx1"
-          >
-            1.00 DAI
-          </div>
-          <div
-            class="c19 css-1a4qi6e"
-          >
-            $100.00
-          </div>
-        </div>
-        <div
-          style="height: 36px;"
-        >
-          <div
-            class="c20"
-          >
-            <img
-              class="c21"
-              src="https://raw.githubusercontent.com/Uniswap/assets/master/blockchains/ethereum/assets/0x6B175474E89094C44Da98b954EedeAC495271d0F/logo.png"
-            />
-          </div>
-        </div>
-      </div>
-      <div
-        class="c5 c17"
-      >
-        <div
-          class="c18"
-        >
-          <div
-            class="c19 css-1a4qi6e"
-          >
-            To
-          </div>
-          <div
-            class="c7 css-15popx1"
-          >
-            <div
-              class="c7 css-15popx1"
-            >
-              hayden.eth
-            </div>
-          </div>
-          <div
-            class="c19 css-1a4qi6e"
-          >
-            0x9984...9103
-          </div>
-        </div>
-        <div
-          style="height: 36px;"
-        >
-          <div
-            class="c22"
-          >
-            <span>
-              <div
-                style="border-radius: 50px; overflow: hidden; padding: 0px; margin: 0px; width: 36px; height: 36px; display: inline-block; background: rgb(200, 20, 83);"
-              >
-                <svg
-                  height="36"
-                  width="36"
-                  x="0"
-                  y="0"
-                >
-                  <rect
-                    fill="#F29602"
-                    height="36"
-                    transform="translate(-1.3639893162257823 0.27350588462642744) rotate(171.3 18 18)"
-                    width="36"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FA6C00"
-                    height="36"
-                    transform="translate(7.665150362825969 -12.44820359430869) rotate(394.5 18 18)"
-                    width="36"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="#FB1868"
-                    height="36"
-                    transform="translate(23.55150004628138 -6.949396678861342) rotate(445.6 18 18)"
-                    width="36"
-                    x="0"
-                    y="0"
-                  />
-                </svg>
-              </div>
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      class="c23"
-    />
-    <div
-      class="c24 c17"
-      width="100%"
-    >
-      <div
-        class="c19 css-1a4qi6e"
-      >
-        Network cost
-      </div>
-      <div
-        class="c25 c26"
-        width="min-content"
-      >
-        <svg
-          aria-labelledby="titleID"
-          height="16"
-          style="width: 16px; height: 16px;"
-          width="16"
-        >
-          <title
-            id="titleID"
-          >
-            Ethereum logo
-          </title>
-          <rect
-            fill="#F9F9F9"
-            height="16"
-            rx="4"
-            width="16"
-          />
-          <rect
-            fill="#6B8AFF33"
-            height="16"
-            rx="4"
-            width="16"
-          />
-          <svg
-            height="16"
-            width="16"
-          >
-            ethereum.svg
-          </svg>
-        </svg>
-        <div
-          class="c7 css-142zc9n"
-        >
-          -
-        </div>
-      </div>
-    </div>
-  </div>
-  <button
-    class="c27 c28 c29"
-  >
-    Confirm send
-  </button>
-</div>
-`;
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
deleted file mode 100644
index 4a123b231fe..00000000000
--- a/apps/web/src/pages/Swap/Send/__snapshots__/SmartContractSpeedbump.test.tsx.snap
+++ /dev/null
@@ -1,547 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`SmartContractSpeedBumpModal should render correctly 1`] = `
-.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;
-  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;
-}
-
-.c21 {
-  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: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  gap: 12px;
-}
-
-.c17 {
-  color: #222222;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c19 {
-  color: #7D7D7D;
-  -webkit-letter-spacing: -0.01em;
-  -moz-letter-spacing: -0.01em;
-  -ms-letter-spacing: -0.01em;
-  letter-spacing: -0.01em;
-}
-
-.c11 {
-  color: #222222;
-  cursor: pointer;
-}
-
-.c7 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-  color: #FC72FF;
-  stroke: #FC72FF;
-  font-weight: 500;
-}
-
-.c7:hover {
-  opacity: 0.6;
-}
-
-.c7:active {
-  opacity: 0.4;
-}
-
-.c25 {
-  background-color: transparent;
-  bottom: 0;
-  border-radius: inherit;
-  height: 100%;
-  left: 0;
-  position: absolute;
-  right: 0;
-  top: 0;
-  -webkit-transition: 150ms ease background-color;
-  transition: 150ms ease background-color;
-  width: 100%;
-}
-
-.c22 {
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  background-color: #22222212;
-  border-radius: 16px;
-  border: 0;
-  color: #222222;
-  cursor: pointer;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: row;
-  -ms-flex-direction: row;
-  flex-direction: row;
-  font-size: 14px;
-  font-weight: 535;
-  gap: 12px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  line-height: 16px;
-  padding: 8px;
-  position: relative;
-  -webkit-transition: 150ms ease opacity;
-  transition: 150ms ease opacity;
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-}
-
-.c22:active .c24 {
-  background-color: #B8C0DC3d;
-}
-
-.c22:focus .c24 {
-  background-color: #B8C0DC3d;
-}
-
-.c22:hover .c24 {
-  background-color: #98A1C014;
-}
-
-.c22:disabled {
-  cursor: default;
-  opacity: 0.6;
-}
-
-.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 6px;
-  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;
-}
-
-.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;
-}
-
-.c3 {
-  width: 100%;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-}
-
-.c0 {
-  will-change: transform,opacity;
-}
-
-.c0[data-reach-dialog-overlay] {
-  z-index: 1040;
-  background-color: transparent;
-  overflow: hidden;
-  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;
-  overflow-y: scroll;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  background-color: rgba(0,0,0,0.60);
-}
-
-.c1 {
-  overflow-y: auto;
-}
-
-.c1[data-reach-dialog-content] {
-  margin: auto;
-  background-color: #F9F9F9;
-  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);
-  padding: 0px;
-  width: 50vw;
-  overflow-y: auto;
-  overflow-x: hidden;
-  max-width: 420px;
-  max-height: 90vh;
-  display: inline-table;
-  border-radius: 20px;
-}
-
-.c4 {
-  background-color: #FFFFFF;
-  outline: 1px solid #22222212;
-  border-radius: 20px;
-  padding: 16px 24px 24px 24px;
-  width: 100%;
-}
-
-.c14 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  background-color: #22222212;
-  width: 48px;
-  height: 48px;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  border-radius: 12px;
-}
-
-.c18 {
-  font-size: 24px;
-  line-height: 32px;
-  text-align: center;
-  font-weight: 500;
-}
-
-.c20 {
-  font-size: 16px;
-  font-weight: 500;
-  line-height: 24px;
-  -webkit-letter-spacing: 0em;
-  -moz-letter-spacing: 0em;
-  -ms-letter-spacing: 0em;
-  letter-spacing: 0em;
-  text-align: center;
-}
-
-.c23 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-box-flex: 1;
-  -webkit-flex-grow: 1;
-  -ms-flex-positive: 1;
-  flex-grow: 1;
-  height: 40px;
-}
-
-.c12 {
-  -webkit-text-decoration: none;
-  text-decoration: none;
-  cursor: pointer;
-  -webkit-transition-duration: 125ms;
-  transition-duration: 125ms;
-}
-
-.c12:hover {
-  opacity: 0.6;
-}
-
-.c12:active {
-  opacity: 0.4;
-}
-
-.c15 {
-  height: 28px;
-  width: 28px;
-}
-
-.c15 path {
-  background: #7D7D7D;
-  fill: #EEB317;
-}
-
-.c16 path {
-  fill: #7D7D7D;
-}
-
-@media screen and (max-width:640px) {
-  .c0[data-reach-dialog-overlay] {
-    -webkit-align-items: flex-end;
-    -webkit-box-align: flex-end;
-    -ms-flex-align: flex-end;
-    align-items: flex-end;
-  }
-}
-
-@media screen and (max-width:768px) {
-  .c1[data-reach-dialog-content] {
-    width: 65vw;
-  }
-}
-
-@media screen and (max-width:640px) {
-  .c1[data-reach-dialog-content] {
-    margin: 0;
-    width: 100vw;
-    border-radius: 20px;
-    border-bottom-left-radius: 0;
-    border-bottom-right-radius: 0;
-  }
-}
-
-<body>
-  <div
-    aria-hidden="true"
-  />
-  <reach-portal>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="0"
-    />
-    <div
-      data-focus-lock-disabled="false"
-    >
-      <div>
-        <div
-          class="c0"
-          data-reach-dialog-overlay=""
-          style="opacity: 0;"
-        >
-          <div
-            aria-label="dialog"
-            aria-modal="true"
-            class="c1"
-            data-reach-dialog-content=""
-            role="dialog"
-            tabindex="-1"
-          >
-            <div
-              class="c2 c3 c4"
-            >
-              <div
-                class="c5 c6"
-                width="100%"
-              >
-                <a
-                  class="c7 c8"
-                  href="https://support.uniswap.org/hc/en-us"
-                  rel="noopener noreferrer"
-                  target="_blank"
-                >
-                  <div
-                    class="c9 c10"
-                  >
-                    <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="c11 c12"
-                  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="c13 c3"
-              >
-                <div
-                  class="c14"
-                >
-                  <svg
-                    class="c15 c16"
-                    fill="#EEB317"
-                    viewBox="0 0 16 16"
-                    xmlns="http://www.w3.org/2000/svg"
-                  >
-                    <path
-                      d="M8.982 1.566a1.13 1.13 0 0 0-1.96 0L.165 13.233c-.457.778.091 1.767.98 1.767h13.713c.889 0 1.438-.99.98-1.767L8.982 1.566zM8 5c.535 0 .954.462.9.995l-.35 3.507a.552.552 0 0 1-1.1 0L7.1 5.995A.905.905 0 0 1 8 5zm.002 6a1 1 0 1 1 0 2a1 1 0 0 1 0-2z"
-                    />
-                  </svg>
-                </div>
-                <div
-                  class="c17 c18 css-4kpdx7"
-                >
-                  Is this a wallet address?
-                </div>
-                <div
-                  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
-                class="c9 c21"
-              >
-                <button
-                  class="c22 c23"
-                >
-                  <div
-                    class="c24 c25"
-                  />
-                  Cancel
-                </button>
-                <button
-                  class="c22 c23"
-                >
-                  <div
-                    class="c24 c25"
-                  />
-                  Continue
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div
-      data-focus-guard="true"
-      style="width: 1px; height: 0px; padding: 0px; overflow: hidden; position: fixed; top: 1px; left: 1px;"
-      tabindex="0"
-    />
-  </reach-portal>
-</body>
-`;
diff --git a/apps/web/src/pages/Swap/SwapForm.tsx b/apps/web/src/pages/Swap/SwapForm.tsx
index 3403ed816de..6e76fe93a08 100644
--- a/apps/web/src/pages/Swap/SwapForm.tsx
+++ b/apps/web/src/pages/Swap/SwapForm.tsx
@@ -56,7 +56,6 @@ import { ThemedText } from 'theme/components'
 import { maybeLogFirstSwapAction } from 'tracing/swapFlowLoggers'
 import { computeFiatValuePriceImpact } from 'utils/computeFiatValuePriceImpact'
 import { NumberType, useFormatter } from 'utils/formatNumbers'
-import { isEmptyObject } from 'utils/isEmpty'
 import { maxAmountSpend } from 'utils/maxAmountSpend'
 import { largerPercentValue } from 'utils/percent'
 import { computeRealizedPriceImpact, warningSeverity } from 'utils/prices'
@@ -65,10 +64,6 @@ import { didUserReject } from 'utils/swapErrorToUserReadableMessage'
 import { getIsReviewableQuote } from '.'
 import { OutputTaxTooltipBody } from './TaxTooltipBody'
 
-const SWAP_FORM_CURRENCY_SEARCH_FILTERS = {
-  showCommonBases: true,
-}
-
 interface SwapFormProps {
   disableTokenInputs?: boolean
   onCurrencyChange?: (selected: CurrencyState) => void
@@ -112,23 +107,22 @@ export function SwapForm({ disableTokenInputs = false, onCurrencyChange }: SwapF
 
   // dismiss warning if all imported tokens are in active lists
   const defaultTokens = useDefaultActiveTokens(chainId)
-  const urlTokensNotInDefault = useMemo(
+  const importTokensNotInDefault = useMemo(
     () =>
-      urlLoadedTokens && !isEmptyObject(defaultTokens)
-        ? urlLoadedTokens
-            .filter((token: Token) => {
-              return !(token.address in defaultTokens)
-            })
-            .filter((token: Token) => {
-              // Any token addresses that are loaded from the shorthands map do not need to show the import URL
-              const supported = asSupportedChain(chainId)
-              if (!supported) return true
-              return !Object.keys(TOKEN_SHORTHANDS).some((shorthand) => {
-                const shorthandTokenAddress = TOKEN_SHORTHANDS[shorthand][supported]
-                return shorthandTokenAddress && shorthandTokenAddress === token.address
-              })
-            })
-        : [],
+      urlLoadedTokens &&
+      urlLoadedTokens
+        .filter((token: Token) => {
+          return !(token.address in defaultTokens)
+        })
+        .filter((token: Token) => {
+          // Any token addresses that are loaded from the shorthands map do not need to show the import URL
+          const supported = asSupportedChain(chainId)
+          if (!supported) return true
+          return !Object.keys(TOKEN_SHORTHANDS).some((shorthand) => {
+            const shorthandTokenAddress = TOKEN_SHORTHANDS[shorthand][supported]
+            return shorthandTokenAddress && shorthandTokenAddress === token.address
+          })
+        }),
     [chainId, defaultTokens, urlLoadedTokens]
   )
 
@@ -479,9 +473,9 @@ export function SwapForm({ disableTokenInputs = false, onCurrencyChange }: SwapF
   return (
     <>
       <TokenSafetyModal
-        isOpen={urlTokensNotInDefault.length > 0 && !dismissTokenWarning}
-        tokenAddress={urlTokensNotInDefault[0]?.address}
-        secondTokenAddress={urlTokensNotInDefault[1]?.address}
+        isOpen={importTokensNotInDefault.length > 0 && !dismissTokenWarning}
+        tokenAddress={importTokensNotInDefault[0]?.address}
+        secondTokenAddress={importTokensNotInDefault[1]?.address}
         onContinue={handleConfirmTokenWarning}
         onCancel={handleDismissTokenWarning}
         showCancel={true}
@@ -546,7 +540,7 @@ export function SwapForm({ disableTokenInputs = false, onCurrencyChange }: SwapF
               fiatValue={showFiatValueInput ? fiatValueInput : undefined}
               onCurrencySelect={handleInputSelect}
               otherCurrency={currencies[Field.OUTPUT]}
-              currencySearchFilters={SWAP_FORM_CURRENCY_SEARCH_FILTERS}
+              showCommonBases
               id={InterfaceSectionName.CURRENCY_INPUT_PANEL}
               loading={independentField === Field.OUTPUT && routeIsSyncing}
               ref={inputCurrencyNumericalInputRef}
@@ -563,10 +557,7 @@ export function SwapForm({ disableTokenInputs = false, onCurrencyChange }: SwapF
               data-testid="swap-currency-button"
               onClick={() => {
                 if (disableTokenInputs) return
-                onSwitchTokens({
-                  newOutputHasTax: inputTokenHasTax,
-                  previouslyEstimatedOutput: formattedAmounts[dependentField],
-                })
+                onSwitchTokens(inputTokenHasTax, formattedAmounts[dependentField])
                 maybeLogFirstSwapAction(trace)
               }}
               color={theme.neutral1}
@@ -592,7 +583,7 @@ export function SwapForm({ disableTokenInputs = false, onCurrencyChange }: SwapF
                 currency={currencies[Field.OUTPUT] ?? null}
                 onCurrencySelect={handleOutputSelect}
                 otherCurrency={currencies[Field.INPUT]}
-                currencySearchFilters={SWAP_FORM_CURRENCY_SEARCH_FILTERS}
+                showCommonBases
                 id={InterfaceSectionName.CURRENCY_OUTPUT_PANEL}
                 loading={independentField === Field.INPUT && routeIsSyncing}
                 numericalInputSettings={{
@@ -610,7 +601,14 @@ export function SwapForm({ disableTokenInputs = false, onCurrencyChange }: SwapF
             </Trace>
           </OutputSwapSection>
         </div>
-
+        {showDetailsDropdown && (
+          <SwapDetailsDropdown
+            trade={trade}
+            syncing={routeIsSyncing}
+            loading={routeIsLoading}
+            allowedSlippage={allowedSlippage}
+          />
+        )}
         {showPriceImpactWarning && <PriceImpactWarning priceImpact={largerPriceImpact} />}
         <div>
           {swapIsUnsupported ? (
@@ -703,14 +701,6 @@ export function SwapForm({ disableTokenInputs = false, onCurrencyChange }: SwapF
               </ButtonError>
             </TraceEvent>
           )}
-          {showDetailsDropdown && (
-            <SwapDetailsDropdown
-              trade={trade}
-              syncing={routeIsSyncing}
-              loading={routeIsLoading}
-              allowedSlippage={allowedSlippage}
-            />
-          )}
         </div>
       </AutoColumn>
     </>
diff --git a/apps/web/src/pages/Swap/index.tsx b/apps/web/src/pages/Swap/index.tsx
index ea894d88286..491e33bfbaf 100644
--- a/apps/web/src/pages/Swap/index.tsx
+++ b/apps/web/src/pages/Swap/index.tsx
@@ -10,7 +10,6 @@ import { SwitchLocaleLink } from 'components/SwitchLocaleLink'
 import { asSupportedChain } from 'constants/chains'
 import { useCurrency } from 'hooks/Tokens'
 import useParsedQueryString from 'hooks/useParsedQueryString'
-import { SendForm } from 'pages/Swap/Send/SendForm'
 import { ReactNode, useMemo } from 'react'
 import { useLocation } from 'react-router-dom'
 import { InterfaceTrade, TradeState } from 'state/routing/types'
@@ -111,9 +110,6 @@ export function Swap({
                 <SwapForm onCurrencyChange={onCurrencyChange} disableTokenInputs={disableTokenInputs} />
               )}
               {currentTab === SwapTab.Limit && <LimitFormWrapper onCurrencyChange={onCurrencyChange} />}
-              {currentTab === SwapTab.Send && (
-                <SendForm disableTokenInputs={disableTokenInputs} onCurrencyChange={onCurrencyChange} />
-              )}
             </SwapWrapper>
           </SwapContextProvider>
         )}
diff --git a/apps/web/src/pages/TokenDetails/index.tsx b/apps/web/src/pages/TokenDetails/index.tsx
index adc987679e9..c733a560c2f 100644
--- a/apps/web/src/pages/TokenDetails/index.tsx
+++ b/apps/web/src/pages/TokenDetails/index.tsx
@@ -2,16 +2,13 @@ import PrefetchBalancesWrapper from 'components/PrefetchBalancesWrapper/Prefetch
 import TokenDetails from 'components/Tokens/TokenDetails'
 import { TokenDetailsPageSkeleton } from 'components/Tokens/TokenDetails/Skeleton'
 import { NATIVE_CHAIN_ID } from 'constants/tokens'
-import { useInfoTDPEnabled } from 'featureFlags/flags/infoTDP'
 import { useTokenPriceQuery, useTokenQuery } from 'graphql/data/__generated__/types-and-hooks'
 import { TimePeriod, toHistoryDuration, validateUrlChainParam } from 'graphql/data/util'
-import { useSrcColor } from 'hooks/useColor'
 import useParsedQueryString from 'hooks/useParsedQueryString'
 import { useEffect, useMemo, useState } from 'react'
 import { Helmet } from 'react-helmet'
-import { useLocation, useParams } from 'react-router-dom'
-import styled, { useTheme } from 'styled-components'
-import { ThemeProvider } from 'theme'
+import { useParams } from 'react-router-dom'
+import styled from 'styled-components'
 import { getNativeTokenDBAddress } from 'utils/nativeTokens'
 
 import { getTokenPageTitle } from './utils'
@@ -21,7 +18,6 @@ const StyledPrefetchBalancesWrapper = styled(PrefetchBalancesWrapper)`
 `
 
 export default function TokenDetailsPage() {
-  const isInfoTDPEnabled = useInfoTDPEnabled()
   const { tokenAddress, chainName } = useParams<{
     tokenAddress: string
     chainName?: string
@@ -36,8 +32,6 @@ export default function TokenDetailsPage() {
     [chain, isNative, timePeriod, tokenAddress]
   )
 
-  const { preloadedLogoSrc } = (useLocation().state as { preloadedLogoSrc?: string }) ?? {}
-
   const parsedQs = useParsedQueryString()
 
   const parsedInputTokenAddress: string | undefined = useMemo(() => {
@@ -67,29 +61,22 @@ export default function TokenDetailsPage() {
     if (tokenPriceQuery) setCurrentPriceQuery(tokenPriceQuery)
   }, [setCurrentPriceQuery, tokenPriceQuery])
 
-  const theme = useTheme()
-
-  const extractedColorSrc = isInfoTDPEnabled ? tokenQuery?.token?.project?.logoUrl ?? preloadedLogoSrc : undefined
-  const extractedAccent1 = useSrcColor(extractedColorSrc, { backgroundColor: theme.surface2, darkMode: theme.darkMode })
-
   if (!tokenQuery) return <TokenDetailsPageSkeleton />
 
   return (
-    <ThemeProvider accent1={extractedAccent1}>
-      <StyledPrefetchBalancesWrapper shouldFetchOnAccountUpdate={true} shouldFetchOnHover={false}>
-        <Helmet>
-          <title>{getTokenPageTitle(tokenQuery)}</title>
-        </Helmet>
-        <TokenDetails
-          urlAddress={tokenAddress}
-          chain={chain}
-          tokenQuery={tokenQuery}
-          tokenPriceQuery={currentPriceQuery}
-          inputTokenAddress={parsedInputTokenAddress}
-          timePeriod={timePeriod}
-          onChangeTimePeriod={setTimePeriod}
-        />
-      </StyledPrefetchBalancesWrapper>
-    </ThemeProvider>
+    <StyledPrefetchBalancesWrapper shouldFetchOnAccountUpdate={true} shouldFetchOnHover={false}>
+      <Helmet>
+        <title>{getTokenPageTitle(tokenQuery)}</title>
+      </Helmet>
+      <TokenDetails
+        urlAddress={tokenAddress}
+        chain={chain}
+        tokenQuery={tokenQuery}
+        tokenPriceQuery={currentPriceQuery}
+        inputTokenAddress={parsedInputTokenAddress}
+        timePeriod={timePeriod}
+        onChangeTimePeriod={setTimePeriod}
+      />
+    </StyledPrefetchBalancesWrapper>
   )
 }
diff --git a/apps/web/src/pages/TokenDetails/util.test.ts b/apps/web/src/pages/TokenDetails/util.test.ts
index ba6afb644ba..3f254aa3d85 100644
--- a/apps/web/src/pages/TokenDetails/util.test.ts
+++ b/apps/web/src/pages/TokenDetails/util.test.ts
@@ -19,22 +19,22 @@ describe('pages/TokenDetails/util', () => {
   describe('getTokenPageTitle', () => {
     it('should return the correct title when tokenName and tokenSymbol are undefined', () => {
       const result = getTokenPageTitle(getMockTokenQuery(undefined, undefined))
-      expect(result).toBe('Buy, Sell, and Trade on Uniswap')
+      expect(result).toBe('Buy & Trade: Live Price & Chart on Uniswap')
     })
 
     it('should return the correct title when only tokenName is defined', () => {
       const result = getTokenPageTitle(getMockTokenQuery('Baby Doge Token', undefined))
-      expect(result).toBe('Baby Doge Token: Buy, Sell, and Trade on Uniswap')
+      expect(result).toBe('Buy & Trade Baby Doge Token: Live Price & Chart on Uniswap')
     })
 
     it('should return the correct title when only tokenSymbol is defined', () => {
       const result = getTokenPageTitle(getMockTokenQuery(undefined, 'BDT'))
-      expect(result).toBe('BDT: Buy, Sell, and Trade on Uniswap')
+      expect(result).toBe('Buy & Trade BDT: Live Price & Chart on Uniswap')
     })
 
     it('should return the correct title when tokenName and tokenSymbol are defined', () => {
       const result = getTokenPageTitle(getMockTokenQuery('Baby Doge Token', 'BDT'))
-      expect(result).toBe('Baby Doge Token (BDT): Buy, Sell, and Trade on Uniswap')
+      expect(result).toBe('Buy & Trade Baby Doge Token (BDT): Live Price & Chart on Uniswap')
     })
   })
 })
diff --git a/apps/web/src/pages/TokenDetails/utils.ts b/apps/web/src/pages/TokenDetails/utils.ts
index 4bc0ce12cac..57daefc5efe 100644
--- a/apps/web/src/pages/TokenDetails/utils.ts
+++ b/apps/web/src/pages/TokenDetails/utils.ts
@@ -1,18 +1,19 @@
 import { t } from '@lingui/macro'
 import { TokenQuery } from 'graphql/data/__generated__/types-and-hooks'
 
-export const getTokenPageTitle = (tokenQuery: TokenQuery) => {
+export const getTokenPageTitle = (tokenQuery: TokenQuery, omitSearchDetail?: boolean) => {
   const tokenName = tokenQuery?.token?.name
   const tokenSymbol = tokenQuery?.token?.symbol
-  const baseTitle = t`Buy, Sell, and Trade on Uniswap`
+  const baseTitle = 'Buy & Trade'
+  const searchDetail = omitSearchDetail ? '' : ': Live Price & Chart on Uniswap'
   if (!tokenName && !tokenSymbol) {
-    return baseTitle
+    return t`${baseTitle}${searchDetail}`
   }
   if (!tokenName && tokenSymbol) {
-    return t`${tokenSymbol}: ${baseTitle}`
+    return t`${baseTitle} ${tokenSymbol}${searchDetail}`
   }
   if (tokenName && !tokenSymbol) {
-    return t`${tokenName}: ${baseTitle}`
+    return t`${baseTitle} ${tokenName}${searchDetail}`
   }
-  return t`${tokenName} (${tokenSymbol}): ${baseTitle}`
+  return t`${baseTitle} ${tokenName} (${tokenSymbol})${searchDetail}`
 }
diff --git a/apps/web/src/pages/Vote/Landing.tsx b/apps/web/src/pages/Vote/Landing.tsx
index 8040e2437fa..4b595a05f22 100644
--- a/apps/web/src/pages/Vote/Landing.tsx
+++ b/apps/web/src/pages/Vote/Landing.tsx
@@ -21,7 +21,8 @@ import { Button } from 'rebass/styled-components'
 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 { ProposalData, ProposalState } from 'state/governance/hooks'
+import { useAllProposalData, useUserDelegatee, useUserVotes } from 'state/governance/hooks'
 import styled, { useTheme } from 'styled-components'
 import { ExternalLink, ThemedText } from 'theme/components'
 import { shortenAddress } from 'utils'
diff --git a/apps/web/src/pages/getDefaultTokensTitle.ts b/apps/web/src/pages/getDefaultTokensTitle.ts
deleted file mode 100644
index 34cb9050965..00000000000
--- a/apps/web/src/pages/getDefaultTokensTitle.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { t } from '@lingui/macro'
-import { getValidUrlChainName } from 'graphql/data/util'
-import { capitalize } from 'tsafe/capitalize'
-
-export const getDefaultTokensTitle = (path?: string) => {
-  const parts = path?.split('/').filter((part) => part !== '')
-  const network = parts?.find((part) => getValidUrlChainName(part)) ?? 'ethereum'
-
-  return t`Explore Top Tokens on ${capitalize(network)} on Uniswap`
-}
diff --git a/apps/web/src/pages/getExploreTitle.ts b/apps/web/src/pages/getExploreTitle.ts
deleted file mode 100644
index cb3f2e855c5..00000000000
--- a/apps/web/src/pages/getExploreTitle.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { t } from '@lingui/macro'
-import { getValidUrlChainName } from 'graphql/data/util'
-import { capitalize } from 'tsafe/capitalize'
-
-import { ExploreTab } from './Explore'
-
-export const getExploreTitle = (path?: string) => {
-  const parts = path?.split('/').filter((part) => part !== '')
-  const tabsToFind: string[] = [ExploreTab.Pools, ExploreTab.Tokens, ExploreTab.Transactions]
-  const tab = parts?.find((part) => tabsToFind.includes(part)) ?? ExploreTab.Tokens
-
-  const network = parts?.find((part) => getValidUrlChainName(part)) ?? 'ethereum'
-
-  return t`Explore Top ${capitalize(tab)} on ${capitalize(network)} on Uniswap`
-}
diff --git a/apps/web/src/pages/paths.test.ts b/apps/web/src/pages/paths.test.ts
index bb9c31db30a..edde0b260c8 100644
--- a/apps/web/src/pages/paths.test.ts
+++ b/apps/web/src/pages/paths.test.ts
@@ -1,8 +1,6 @@
 import { ChainId, WETH9 } from '@uniswap/sdk-core'
 
-import { getDefaultTokensTitle } from './getDefaultTokensTitle'
-import { getExploreTitle } from './getExploreTitle'
-import { paths } from './paths'
+import { getDefaultTokensTitle, getExploreTitle, paths } from './paths'
 import { routes } from './RouteDefinitions'
 
 describe('Paths', () => {
diff --git a/apps/web/src/pages/paths.ts b/apps/web/src/pages/paths.ts
index 18f5fb024d4..dd098424562 100644
--- a/apps/web/src/pages/paths.ts
+++ b/apps/web/src/pages/paths.ts
@@ -2,6 +2,12 @@
 // Do not add any imports to this file.
 // The array is kept up to date via the tests in src/pages/paths.test.ts
 
+import { t } from '@lingui/macro'
+import { getValidUrlChainName } from 'graphql/data/util'
+import { capitalize } from 'tsafe/capitalize'
+
+import { ExploreTab } from './Explore'
+
 export const paths = [
   '/',
   '/explore',
@@ -36,3 +42,20 @@ export const paths = [
   '/nfts/collection/:contractAddress',
   '/nfts/collection/:contractAddress/activity',
 ]
+
+export const getExploreTitle = (path?: string) => {
+  const parts = path?.split('/').filter((part) => part !== '')
+  const tabsToFind: string[] = [ExploreTab.Pools, ExploreTab.Tokens, ExploreTab.Transactions]
+  const tab = parts?.find((part) => tabsToFind.includes(part)) ?? ExploreTab.Tokens
+
+  const network = parts?.find((part) => getValidUrlChainName(part)) ?? 'ethereum'
+
+  return t`Explore Top ${capitalize(tab)} on ${capitalize(network)} on Uniswap`
+}
+
+export const getDefaultTokensTitle = (path?: string) => {
+  const parts = path?.split('/').filter((part) => part !== '')
+  const network = parts?.find((part) => getValidUrlChainName(part)) ?? 'ethereum'
+
+  return t`Explore Top Tokens on ${capitalize(network)} on Uniswap`
+}
diff --git a/apps/web/src/rpc/AppJsonRpcProvider.test.ts b/apps/web/src/rpc/AppJsonRpcProvider.test.ts
deleted file mode 100644
index fb46fa5d9a5..00000000000
--- a/apps/web/src/rpc/AppJsonRpcProvider.test.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-import { TransactionResponse } from '@ethersproject/abstract-provider'
-import { JsonRpcProvider, Network, Provider } from '@ethersproject/providers'
-import { ChainId } from '@uniswap/sdk-core'
-
-import AppJsonRpcProvider from './AppJsonRpcProvider'
-
-jest.mock('@ethersproject/providers')
-
-describe('AppJsonRpcProvider', () => {
-  beforeEach(() => {
-    jest.useFakeTimers()
-  })
-  afterEach(() => {
-    jest.useRealTimers()
-  })
-
-  let mockProviders: JsonRpcProvider[]
-  let mockProvider1: jest.Mocked<JsonRpcProvider>
-  let mockProvider2: jest.Mocked<JsonRpcProvider>
-  let mockIsProvider: jest.SpyInstance
-
-  beforeEach(() => {
-    mockProvider1 = new JsonRpcProvider() as jest.Mocked<JsonRpcProvider>
-    mockProvider2 = new JsonRpcProvider() as jest.Mocked<JsonRpcProvider>
-
-    mockIsProvider = jest.spyOn(Provider, 'isProvider').mockReturnValue(true)
-    mockProviders = [mockProvider1, mockProvider2]
-    mockProviders.forEach((provider) => {
-      // override readonly property
-      // @ts-expect-error
-      provider.network = {
-        name: 'homestead',
-        chainId: 1,
-      } as Network
-      provider.getNetwork = jest.fn().mockReturnValue({
-        name: 'homestead',
-        chainId: 1,
-      } as Network)
-      // override readonly property
-      // @ts-expect-error
-      provider.connection = { url: '' }
-    })
-  })
-
-  it('constructor initializes with valid providers', () => {
-    expect(() => new AppJsonRpcProvider(ChainId.MAINNET, mockProviders)).not.toThrow()
-  })
-
-  it('constructor throws with empty providers array', () => {
-    expect(() => new AppJsonRpcProvider(ChainId.MAINNET, [])).toThrow('providers array empty')
-  })
-
-  it('constructor throws with network mismatch', () => {
-    mockProviders[0].network.chainId = 2
-    expect(() => new AppJsonRpcProvider(ChainId.MAINNET, mockProviders)).toThrow('networks mismatch')
-  })
-
-  it('constructor throws with invalid providers', () => {
-    mockIsProvider.mockReturnValueOnce(false)
-    expect(() => new AppJsonRpcProvider(ChainId.MAINNET, [{} as JsonRpcProvider])).toThrow('invalid provider')
-  })
-
-  it('handles and instruments call', async () => {
-    const hash = '0x123'
-    mockProvider1.perform.mockImplementation(async () => {
-      jest.advanceTimersByTime(100)
-      return { hash } as TransactionResponse
-    })
-    const provider = new AppJsonRpcProvider(ChainId.MAINNET, [mockProvider1])
-
-    const { hash: result } = await provider.perform('call', [{ hash }])
-    expect(result).toBe(hash)
-
-    // Validate that the latency and callCount were incremented
-    expect(provider.providerEvaluations[0].performance.latency).toBeGreaterThanOrEqual(100)
-    expect(provider.providerEvaluations[0].performance.callCount).toBe(1)
-  })
-
-  it('should increment failureCount on provider failure', async () => {
-    const hash = '0x123'
-    mockProvider1.perform.mockRejectedValue(new Error('Failed'))
-    const provider = new AppJsonRpcProvider(ChainId.MAINNET, mockProviders)
-    const warn = jest.spyOn(console, 'warn').mockImplementation()
-
-    await expect(provider.perform('call', [{ hash }])).rejects.toThrow()
-    expect(warn).toHaveBeenCalled()
-
-    // Validate that the failureCount and callCount were incremented
-    expect(provider.providerEvaluations[0].performance.failureCount).toBe(1)
-    expect(provider.providerEvaluations[0].performance.callCount).toBe(1)
-  })
-
-  it('should sort faster providers before slower providers', async () => {
-    // Validate that the providers are sorted correctly by latency
-    const [fastProvider, slowProvider] = AppJsonRpcProvider.sortProviders([
-      { provider: {} as JsonRpcProvider, performance: { latency: 500, callCount: 1, failureCount: 0 } },
-      { provider: {} as JsonRpcProvider, performance: { latency: 1, callCount: 1, failureCount: 0 } },
-    ])
-
-    expect(fastProvider.performance.latency).toBeLessThan(slowProvider.performance.latency)
-  })
-
-  it('should sort failing providers after successful providers', async () => {
-    // Validate that the providers are sorted correctly by failure rate
-    const [provider, failingProvider] = AppJsonRpcProvider.sortProviders([
-      { provider: {} as JsonRpcProvider, performance: { latency: 1, callCount: 1, failureCount: 1 } },
-      { provider: {} as JsonRpcProvider, performance: { latency: 1, callCount: 1, failureCount: 0 } },
-    ])
-
-    expect(provider.performance.failureCount).toBeLessThan(failingProvider.performance.failureCount)
-  })
-})
diff --git a/apps/web/src/rpc/AppJsonRpcProvider.ts b/apps/web/src/rpc/AppJsonRpcProvider.ts
deleted file mode 100644
index 28174eef09e..00000000000
--- a/apps/web/src/rpc/AppJsonRpcProvider.ts
+++ /dev/null
@@ -1,119 +0,0 @@
-import { Network } from '@ethersproject/networks'
-import { JsonRpcProvider, Provider } from '@ethersproject/providers'
-import { SupportedInterfaceChain } from 'constants/chains'
-import CachingJsonRpcProvider from 'rpc/CachingJsonRpcProvider'
-
-function checkNetworks(networks: Array<Network>): Network | null {
-  let result: Network | null = null
-
-  for (let i = 0; i < networks.length; i++) {
-    const network = networks[i]
-
-    // Null! We do not know our network; bail.
-    if (network == null) {
-      throw new Error('unknown network')
-    }
-
-    if (result) {
-      // Make sure the network matches the previous networks
-      if (
-        !(
-          result.name === network.name &&
-          result.chainId === network.chainId &&
-          (result.ensAddress === network.ensAddress || (result.ensAddress == null && network.ensAddress == null))
-        )
-      ) {
-        throw new Error('networks mismatch')
-      }
-    } else {
-      result = network
-    }
-  }
-
-  return result
-}
-
-interface ProviderPerformance {
-  callCount: number
-  latency: number
-  failureCount: number
-}
-
-interface ProviderPerformanceMetrics {
-  latencyAvg: number
-  failureRate: number
-}
-
-interface FallbackProviderEvaluation {
-  provider: JsonRpcProvider
-  performance: ProviderPerformance
-}
-
-function computeProviderPerformanceMetrics(performance: ProviderPerformance): ProviderPerformanceMetrics {
-  if (performance.callCount === 0) {
-    // guard against division by zero
-    return { latencyAvg: 1, failureRate: 0.01 }
-  } else {
-    return {
-      latencyAvg: performance.latency / performance.callCount,
-      failureRate: performance.failureCount / performance.callCount,
-    }
-  }
-}
-
-/**
- * This provider includes fallbacks among multiple JSON-RPC endpoints should requests start to fail.
- */
-export default class AppJsonRpcProvider extends CachingJsonRpcProvider {
-  providerEvaluations: ReadonlyArray<FallbackProviderEvaluation>
-
-  constructor(chainId: SupportedInterfaceChain, providers: JsonRpcProvider[]) {
-    if (providers.length === 0) throw new Error('providers array empty')
-    providers.forEach((provider, i) => {
-      if (!Provider.isProvider(provider)) throw new Error(`invalid provider ${i}`)
-    })
-    checkNetworks(providers.map((p) => p.network))
-
-    super(chainId, providers[0].connection.url)
-    this.providerEvaluations = providers.map((provider) => ({
-      provider,
-      performance: {
-        callCount: 0,
-        latency: 1,
-        failureCount: 0,
-      },
-    }))
-  }
-
-  /**
-   * Perform a JSON-RPC request.
-   * Throws an error if all providers fail to perform the operation.
-   */
-  async perform(method: string, params: { [name: string]: any }): Promise<any> {
-    this.providerEvaluations = AppJsonRpcProvider.sortProviders(this.providerEvaluations.slice())
-
-    for (const { provider, performance } of this.providerEvaluations) {
-      performance.callCount++
-      try {
-        const start = Date.now()
-        const result = await provider.perform(method, params)
-        performance.latency += Date.now() - start
-        return result
-      } catch (error) {
-        performance.failureCount++
-        console.warn('rpc action failed', error)
-      }
-    }
-    throw new Error('All providers failed to perform the operation.')
-  }
-
-  static sortProviders(providerEvaluations: FallbackProviderEvaluation[]) {
-    return providerEvaluations.sort((a, b) => {
-      const { latencyAvg: aLatencyAvg, failureRate: aFailureRate } = computeProviderPerformanceMetrics(a.performance)
-      const { latencyAvg: bLatencyAvg, failureRate: bFailureRate } = computeProviderPerformanceMetrics(b.performance)
-      if (aFailureRate < bFailureRate) return -1
-      if (aLatencyAvg < bLatencyAvg) return -1
-      return 1
-    })
-  }
-}
diff --git a/apps/web/src/rpc/AppRpcProvider.test.ts b/apps/web/src/rpc/AppRpcProvider.test.ts
new file mode 100644
index 00000000000..84ec1d87e7b
--- /dev/null
+++ b/apps/web/src/rpc/AppRpcProvider.test.ts
@@ -0,0 +1,121 @@
+import { TransactionResponse } from '@ethersproject/abstract-provider'
+import { JsonRpcProvider, Network, Provider } from '@ethersproject/providers'
+import { ChainId } from '@uniswap/sdk-core'
+
+import AppRpcProvider from './AppRpcProvider'
+
+jest.mock('@ethersproject/providers')
+
+describe('AppRpcProvider', () => {
+  let mockProviders: JsonRpcProvider[]
+  let mockProvider1: jest.Mocked<JsonRpcProvider>
+  let mockProvider2: jest.Mocked<JsonRpcProvider>
+  let mockIsProvider: jest.SpyInstance
+
+  beforeEach(() => {
+    mockProvider1 = new JsonRpcProvider() as jest.Mocked<JsonRpcProvider>
+    mockProvider2 = new JsonRpcProvider() as jest.Mocked<JsonRpcProvider>
+
+    mockIsProvider = jest.spyOn(Provider, 'isProvider').mockReturnValue(true)
+    mockProviders = [mockProvider1, mockProvider2]
+    mockProviders.forEach((provider) => {
+      // override readonly property
+      // @ts-expect-error
+      provider.network = {
+        name: 'homestead',
+        chainId: 1,
+      } as Network
+      provider.getNetwork = jest.fn().mockReturnValue({
+        name: 'homestead',
+        chainId: 1,
+      } as Network)
+      // override readonly property
+      // @ts-expect-error
+      provider.connection = { url: '' }
+    })
+  })
+
+  test('constructor initializes with valid providers', () => {
+    expect(() => new AppRpcProvider(ChainId.MAINNET, mockProviders)).not.toThrow()
+  })
+
+  test('constructor throws with empty providers array', () => {
+    expect(() => new AppRpcProvider(ChainId.MAINNET, [])).toThrow('providers array empty')
+  })
+
+  test('constructor throws with network mismatch', () => {
+    mockProviders[0].network.chainId = 2
+    expect(() => new AppRpcProvider(ChainId.MAINNET, mockProviders)).toThrow('networks mismatch')
+  })
+
+  test('constructor throws with invalid providers', () => {
+    mockIsProvider.mockReturnValueOnce(false)
+    expect(() => new AppRpcProvider(ChainId.MAINNET, [{} as JsonRpcProvider])).toThrow('invalid provider')
+  })
+
+  test('handles sendTransaction', async () => {
+    const hash = '0x123'
+    mockProvider1.sendTransaction.mockResolvedValue({ hash } as TransactionResponse)
+    const provider = new AppRpcProvider(ChainId.MAINNET, [mockProvider1])
+
+    const result = await provider.perform('sendTransaction', { signedTransaction: '0xabc' })
+    expect(result).toBe(hash)
+  })
+
+  test('handles call', async () => {
+    const hash = '0x123'
+    mockProvider1.perform.mockResolvedValue({ hash } as TransactionResponse)
+    const provider = new AppRpcProvider(ChainId.MAINNET, [mockProvider1])
+
+    const { hash: result } = await provider.perform('call', [{ hash }])
+    expect(result).toBe(hash)
+  })
+
+  test('should sort faster providers before slower providers', async () => {
+    const SLOW = 500
+    mockProvider1.getBlockNumber = jest.fn(() => new Promise((resolve) => setTimeout(() => resolve(1), SLOW)))
+
+    const FAST = 1
+    mockProvider2.getBlockNumber = jest.fn(() => new Promise((resolve) => setTimeout(() => resolve(1), FAST)))
+
+    const appRpcProvider = new AppRpcProvider(ChainId.MAINNET, mockProviders)
+
+    // Evaluate all providers
+    const evaluationPromises = appRpcProvider.providerEvaluations.map(appRpcProvider.evaluateProvider)
+    await Promise.all(evaluationPromises)
+
+    // Validate that the providers are sorted correctly by latency
+    const [fastProvider, slowProvider] = AppRpcProvider.sortProviders(appRpcProvider.providerEvaluations.slice())
+
+    expect(fastProvider.performance.latency).toBeLessThan(slowProvider.performance.latency)
+  })
+
+  test('should sort failing providers after successful providers', async () => {
+    mockProvider1.getBlockNumber = jest.fn(
+      () => new Promise((_resolve, reject) => setTimeout(() => reject('fail'), 50))
+    )
+    mockProvider2.getBlockNumber = jest.fn(() => new Promise((resolve) => setTimeout(() => resolve(1), 50)))
+
+    const appRpcProvider = new AppRpcProvider(ChainId.MAINNET, mockProviders)
+
+    // Evaluate all providers
+    const evaluationPromises = appRpcProvider.providerEvaluations.map(appRpcProvider.evaluateProvider)
+    await Promise.all(evaluationPromises)
+
+    // Validate that the providers are sorted correctly by latency
+    const [provider, failingProvider] = AppRpcProvider.sortProviders(appRpcProvider.providerEvaluations.slice())
+    expect(provider.performance.failureCount).toBeLessThan(failingProvider.performance.failureCount)
+  })
+
+  test('should increment failureCount on provider failure', async () => {
+    mockProvider1.getBlockNumber.mockRejectedValue(new Error('Failed'))
+
+    const appRpcProvider = new AppRpcProvider(ChainId.MAINNET, mockProviders)
+
+    // Evaluate the failing provider
+    await appRpcProvider.evaluateProvider(appRpcProvider.providerEvaluations[0])
+
+    // Validate that the failureCount was incremented
+    expect(appRpcProvider.providerEvaluations[0].performance.failureCount).toBe(1)
+  })
+})
diff --git a/apps/web/src/rpc/AppRpcProvider.ts b/apps/web/src/rpc/AppRpcProvider.ts
new file mode 100644
index 00000000000..dd865486225
--- /dev/null
+++ b/apps/web/src/rpc/AppRpcProvider.ts
@@ -0,0 +1,158 @@
+import { Network } from '@ethersproject/networks'
+import { JsonRpcProvider, Provider } from '@ethersproject/providers'
+import { SupportedInterfaceChain } from 'constants/chains'
+
+import AppStaticJsonRpcProvider from './StaticJsonRpcProvider'
+
+function checkNetworks(networks: Array<Network>): Network | null {
+  let result: Network | null = null
+
+  for (let i = 0; i < networks.length; i++) {
+    const network = networks[i]
+
+    // Null! We do not know our network; bail.
+    if (network == null) {
+      throw new Error('unknown network')
+    }
+
+    if (result) {
+      // Make sure the network matches the previous networks
+      if (
+        !(
+          result.name === network.name &&
+          result.chainId === network.chainId &&
+          (result.ensAddress === network.ensAddress || (result.ensAddress == null && network.ensAddress == null))
+        )
+      ) {
+        throw new Error('networks mismatch')
+      }
+    } else {
+      result = network
+    }
+  }
+
+  return result
+}
+
+interface ProviderPerformance {
+  callCount: number
+  latency: number
+  failureCount: number
+  lastEvaluated: number
+}
+
+interface FallbackProviderEvaluation {
+  provider: JsonRpcProvider
+  performance: ProviderPerformance
+}
+
+/**
+ * This provider balances requests among multiple JSON-RPC endpoints.
+ */
+export default class AppRpcProvider extends AppStaticJsonRpcProvider {
+  providerEvaluations: ReadonlyArray<FallbackProviderEvaluation>
+  readonly evaluationIntervalMs: number
+
+  constructor(chainId: SupportedInterfaceChain, providers: JsonRpcProvider[], evaluationIntervalMs = 30000) {
+    if (providers.length === 0) throw new Error('providers array empty')
+    providers.forEach((provider, i) => {
+      if (!Provider.isProvider(provider)) throw new Error(`invalid provider ${i}`)
+    })
+    checkNetworks(providers.map((p) => p.network))
+
+    super(chainId, providers[0].connection.url)
+    this.providerEvaluations = providers.map((provider) => ({
+      provider,
+      performance: {
+        callCount: 0,
+        latency: 1,
+        failureCount: 0,
+        lastEvaluated: 0,
+      },
+    }))
+
+    this.evaluationIntervalMs = evaluationIntervalMs
+  }
+
+  /**
+   * Perform a JSON-RPC request.
+   * Throws an error if all providers fail to perform the operation.
+   */
+  async perform(method: string, params: { [name: string]: any }): Promise<any> {
+    // Periodically evaluate all providers
+    const currentTime = Date.now()
+    // Note that this async action will not affect the current perform call
+    this.providerEvaluations.forEach((providerEval) => {
+      if (currentTime - providerEval.performance.lastEvaluated >= this.evaluationIntervalMs) {
+        this.evaluateProvider(providerEval)
+      }
+    })
+
+    this.providerEvaluations = AppRpcProvider.sortProviders(this.providerEvaluations.slice())
+
+    // Always broadcast "sendTransaction" to all backends
+    if (method === 'sendTransaction') {
+      const results: Array<string | Error> = await Promise.all(
+        this.providerEvaluations.map(({ performance, provider }) => {
+          performance.callCount++
+          return provider.sendTransaction(params.signedTransaction).then(
+            (result) => result.hash,
+            (error) => error
+          )
+        })
+      )
+
+      // Any success is good enough
+      for (let i = 0; i < results.length; i++) {
+        if (typeof results[i] === 'string') return results[i]
+      }
+
+      // They were all an error; pick the first error
+      throw results[0]
+    } else {
+      for (const { provider, performance } of this.providerEvaluations) {
+        performance.callCount++
+        try {
+          return await provider.perform(method, params)
+        } catch (error) {
+          performance.failureCount++
+          console.warn('rpc action failed', error)
+        }
+      }
+      throw new Error('All providers failed to perform the operation.')
+    }
+  }
+
+  /**
+   * Evaluates the performance of a provider. Updates latency and failure count metrics.
+   */
+  async evaluateProvider(config: FallbackProviderEvaluation): Promise<void> {
+    const startTime = Date.now()
+    config.performance.callCount++
+    try {
+      await config.provider.getBlockNumber()
+    } catch (error) {
+      config.performance.failureCount++
+    }
+    const latency = Date.now() - startTime
+    config.performance.latency += latency
+
+    config.performance.lastEvaluated = Date.now()
+  }
+
+  static sortProviders(providerEvaluations: FallbackProviderEvaluation[]) {
+    return providerEvaluations.sort((a, b) => {
+      // Provider a calculations
+      const aAverageLatency = a.performance.latency / (a.performance.callCount || 1)
+      const aFailRate = (a.performance.failureCount || 0.01) / (a.performance.callCount || 1)
+
+      // Provider b calculations
+      const bAverageLatency = b.performance.latency / (b.performance.callCount || 1)
+      const bFailRate = (b.performance.failureCount || 0.01) / (b.performance.callCount || 1)
+
+      if (aFailRate < bFailRate) return -1
+      if (aAverageLatency < bAverageLatency) return -1
+      return 1
+    })
+  }
+}
diff --git a/apps/web/src/rpc/CachingJsonRpcProvider.ts b/apps/web/src/rpc/StaticJsonRpcProvider.ts
similarity index 84%
rename from apps/web/src/rpc/CachingJsonRpcProvider.ts
rename to apps/web/src/rpc/StaticJsonRpcProvider.ts
index bf3b1a2eda9..76a606cddb5 100644
--- a/apps/web/src/rpc/CachingJsonRpcProvider.ts
+++ b/apps/web/src/rpc/StaticJsonRpcProvider.ts
@@ -1,11 +1,13 @@
 import { deepCopy } from '@ethersproject/properties'
+// This is the only file which should instantiate new Providers.
+// eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { StaticJsonRpcProvider } from '@ethersproject/providers'
 import { isPlain } from '@reduxjs/toolkit'
 
 import { AVERAGE_L1_BLOCK_TIME } from '../constants/chainInfo'
 import { CHAIN_IDS_TO_NAMES, SupportedInterfaceChain } from '../constants/chains'
 
-export default abstract class CachingJsonRpcProvider extends StaticJsonRpcProvider {
+export default class AppStaticJsonRpcProvider extends StaticJsonRpcProvider {
   private _blockCache = new Map<string, Promise<any>>()
   get blockCache() {
     // If the blockCache has not yet been initialized this block, do so by
@@ -22,7 +24,7 @@ export default abstract class CachingJsonRpcProvider extends StaticJsonRpcProvid
 
     // NB: Third-party providers (eg MetaMask) will have their own polling intervals,
     // which should be left as-is to allow operations (eg transaction confirmation) to resolve faster.
-    // Network providers (eg CachingJsonRpcProvider) need to update less frequently to be considered responsive.
+    // Network providers (eg AppStaticJsonRpcProvider) need to update less frequently to be considered responsive.
     this.pollingInterval = AVERAGE_L1_BLOCK_TIME
   }
 
diff --git a/apps/web/src/serviceWorker/index.ts b/apps/web/src/serviceWorker/index.ts
index a47b18ac448..142a178e973 100644
--- a/apps/web/src/serviceWorker/index.ts
+++ b/apps/web/src/serviceWorker/index.ts
@@ -3,7 +3,7 @@ import 'workbox-precaching' // defines __WB_MANIFEST
 import { cacheNames, clientsClaim } from 'workbox-core'
 import { ExpirationPlugin } from 'workbox-expiration'
 import { precacheAndRoute } from 'workbox-precaching'
-import { Route, registerRoute } from 'workbox-routing'
+import { registerRoute, Route } from 'workbox-routing'
 import { CacheFirst } from 'workbox-strategies'
 
 import { DocumentRoute } from './document'
diff --git a/apps/web/src/setupTests.ts b/apps/web/src/setupTests.ts
index b816ca2288e..5fbe457d0c7 100644
--- a/apps/web/src/setupTests.ts
+++ b/apps/web/src/setupTests.ts
@@ -1,7 +1,8 @@
 import '@testing-library/jest-dom' // jest custom assertions
 import '@vanilla-extract/css/disableRuntimeStyles' // https://vanilla-extract.style/documentation/test-environments/#disabling-runtime-styles
+import 'polyfills'
 import 'jest-styled-components' // adds style diffs to snapshot tests
-import 'polyfills' // add polyfills
+import 'polyfills'
 
 import type { createPopper } from '@popperjs/core'
 import { useWeb3React } from '@web3-react/core'
diff --git a/apps/web/src/state/application/reducer.ts b/apps/web/src/state/application/reducer.ts
index 6848fb69e94..2ee87ded42e 100644
--- a/apps/web/src/state/application/reducer.ts
+++ b/apps/web/src/state/application/reducer.ts
@@ -46,7 +46,6 @@ export enum ApplicationModal {
   VOTE,
   UK_DISCLAIMER,
   UNISWAP_NFT_AIRDROP_CLAIM,
-  GET_THE_APP,
 }
 
 export type PopupList = Array<{ key: string; show: boolean; content: PopupContent; removeAfterMs: number | null }>
diff --git a/apps/web/src/state/governance/hooks.ts b/apps/web/src/state/governance/hooks.ts
index f2d695fffad..8d2df2a4bb0 100644
--- a/apps/web/src/state/governance/hooks.ts
+++ b/apps/web/src/state/governance/hooks.ts
@@ -17,6 +17,7 @@ import {
   Token,
 } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
+import GOVERNOR_BRAVO_ABI from 'abis/governor-bravo.json'
 import { LATEST_GOVERNOR_INDEX } from 'constants/governance'
 import { POLYGON_PROPOSAL_TITLE } from 'constants/proposals/polygon_proposal_title'
 import { UNISWAP_GRANTS_PROPOSAL_DESCRIPTION } from 'constants/proposals/uniswap_grants_proposal_description'
@@ -24,7 +25,6 @@ import { useContract } from 'hooks/useContract'
 import { useSingleCallResult, useSingleContractMultipleData } from 'lib/hooks/multicall'
 import { useCallback, useMemo } from 'react'
 import { calculateGasMargin } from 'utils/calculateGasMargin'
-import GOVERNOR_BRAVO_ABI from 'wallet/src/abis/governor-bravo.json'
 
 import {
   BRAVO_START_BLOCK,
diff --git a/apps/web/src/state/index.ts b/apps/web/src/state/index.ts
index ce4d59da46f..75707b52561 100644
--- a/apps/web/src/state/index.ts
+++ b/apps/web/src/state/index.ts
@@ -15,12 +15,9 @@ export function createDefaultStore() {
     middleware: (getDefaultMiddleware) =>
       getDefaultMiddleware({
         thunk: true,
-        immutableCheck:
-          process.env.NODE_ENV === 'test'
-            ? false
-            : {
-                ignoredPaths: [routingApi.reducerPath, 'logs', 'lists'],
-              },
+        immutableCheck: {
+          ignoredPaths: [routingApi.reducerPath, 'logs', 'lists'],
+        },
         serializableCheck:
           process.env.NODE_ENV === 'test'
             ? false
diff --git a/apps/web/src/state/limit/LimitContext.tsx b/apps/web/src/state/limit/LimitContext.tsx
index fc7f02f6ef6..fa64f018cae 100644
--- a/apps/web/src/state/limit/LimitContext.tsx
+++ b/apps/web/src/state/limit/LimitContext.tsx
@@ -2,7 +2,7 @@ import { createContext, Dispatch, PropsWithChildren, SetStateAction, useContext,
 
 import { LimitInfo, useDerivedLimitInfo } from './hooks'
 
-export enum Expiry {
+enum Expiry {
   Day = 1,
   Week,
   Month,
@@ -11,17 +11,9 @@ export enum Expiry {
 
 export interface LimitState {
   readonly inputAmount: string
+  readonly price: string
   readonly outputAmount: string
   readonly expiry: Expiry
-  readonly limitPrice: string
-
-  // The form should autofill in the market price between two currencies unless the user has
-  // already manually edited the price for that currency pair
-  readonly limitPriceEdited: boolean
-
-  // The limit form has 3 fields, but only two of them can be independent at a time.
-  // Always prefer `marketPrice` be independent, so either derive the input amount or the output amount
-  readonly isInputAmountFixed: boolean
 }
 
 type LimitContextType = {
@@ -32,15 +24,12 @@ type LimitContextType = {
 
 const DEFAULT_LIMIT_STATE = {
   inputAmount: '',
-  limitPrice: '',
-  limitPriceEdited: false,
+  price: '',
   outputAmount: '',
-  expiry: Expiry.Week,
-  isInputAmountFixed: true,
+  expiry: Expiry.Day, // TODO: update default expiry?
 }
 
-// exported for testing
-export const LimitContext = createContext<LimitContextType>({
+const LimitContext = createContext<LimitContextType>({
   limitState: DEFAULT_LIMIT_STATE,
   setLimitState: () => undefined,
   derivedLimitInfo: {
@@ -55,18 +44,9 @@ export function useLimitContext() {
 
 export function LimitContextProvider({ children }: PropsWithChildren) {
   const [limitState, setLimitState] = useState<LimitState>(DEFAULT_LIMIT_STATE)
-
   const derivedLimitInfo = useDerivedLimitInfo(limitState)
 
   return (
     <LimitContext.Provider value={{ limitState, setLimitState, derivedLimitInfo }}>{children}</LimitContext.Provider>
   )
 }
-
-export function useLimitPrice() {
-  const { limitState, setLimitState } = useLimitContext()
-  const setLimitPrice = (limitPrice: string) => {
-    setLimitState((prevState) => ({ ...prevState, limitPrice, limitPriceEdited: true }))
-  }
-  return { limitPrice: limitState.limitPrice, setLimitPrice }
-}
diff --git a/apps/web/src/state/limit/hooks.ts b/apps/web/src/state/limit/hooks.ts
index d48535512e0..c800f4d2fe4 100644
--- a/apps/web/src/state/limit/hooks.ts
+++ b/apps/web/src/state/limit/hooks.ts
@@ -1,43 +1,16 @@
-import { Currency, CurrencyAmount, Price, TradeType } from '@uniswap/sdk-core'
+import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import { useWeb3React } from '@web3-react/core'
 import { Field } from 'components/swap/constants'
-import { nativeOnChain } from 'constants/tokens'
-import JSBI from 'jsbi'
 import { useCurrencyBalances } from 'lib/hooks/useCurrencyBalance'
 import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
-import ms from 'ms'
-import { useEffect, useMemo, useState } from 'react'
-import { getWrapInfo } from 'state/routing/gas'
-import { LimitOrderTrade, RouterPreference, SubmittableTrade, SwapFeeInfo, WrapInfo } from 'state/routing/types'
-import { useRoutingAPITrade } from 'state/routing/useRoutingAPITrade'
-import { getUSDCostPerGas, isClassicTrade } from 'state/routing/utils'
+import { useMemo } from 'react'
 import { useSwapAndLimitContext } from 'state/swap/SwapContext'
 
-import { useLimitsFeesEnabled } from 'featureFlags/flags/limitsFees'
-import { Expiry, LimitState } from './LimitContext'
+import { LimitState } from './LimitContext'
 
 export type LimitInfo = {
   currencyBalances: { [field in Field]?: CurrencyAmount<Currency> }
   parsedAmounts: { [field in Field]?: CurrencyAmount<Currency> }
-  parsedLimitPrice?: Price<Currency, Currency>
-  limitOrderTrade?: LimitOrderTrade
-  marketPrice?: Price<Currency, Currency>
-  fee?: SwapFeeInfo
-}
-
-const DAY_SECS = ms('1d') / 1000
-
-export function expiryToDeadlineSeconds(expiry: Expiry): number {
-  switch (expiry) {
-    case Expiry.Day:
-      return DAY_SECS
-    case Expiry.Week:
-      return DAY_SECS * 7
-    case Expiry.Month:
-      return DAY_SECS * 30
-    case Expiry.Year:
-      return DAY_SECS * 365
-  }
 }
 
 export function useDerivedLimitInfo(state: LimitState): LimitInfo {
@@ -60,215 +33,12 @@ export function useDerivedLimitInfo(state: LimitState): LimitInfo {
     [relevantTokenBalances]
   )
 
-  const parsedLimitPrice = useMemo(() => {
-    if (!inputCurrency || !outputCurrency || !state.limitPrice) {
-      return undefined
-    }
-
-    const parsedLimitPriceOutputAmount = tryParseCurrencyAmount(state.limitPrice, outputCurrency)
-    if (!parsedLimitPriceOutputAmount) {
-      return undefined
-    }
-
-    return new Price(
-      inputCurrency,
-      outputCurrency,
-      JSBI.BigInt(10 ** inputCurrency.decimals),
-      parsedLimitPriceOutputAmount.quotient
-    )
-  }, [inputCurrency, outputCurrency, state.limitPrice])
-
   const parsedAmounts = useMemo(() => {
-    let parsedInputAmount
-    let parsedOutputAmount
-    if (state.isInputAmountFixed) {
-      parsedInputAmount = tryParseCurrencyAmount(inputAmount, inputCurrency)
-      parsedOutputAmount = !parsedLimitPrice
-        ? tryParseCurrencyAmount(outputAmount, outputCurrency)
-        : parsedInputAmount && parsedLimitPrice.quote(parsedInputAmount)
-    } else {
-      parsedOutputAmount = tryParseCurrencyAmount(outputAmount, outputCurrency)
-      parsedInputAmount = !parsedLimitPrice
-        ? tryParseCurrencyAmount(inputAmount, inputCurrency)
-        : parsedOutputAmount && parsedLimitPrice.invert().quote(parsedOutputAmount)
-    }
-
     return {
-      [Field.INPUT]: parsedInputAmount,
-      [Field.OUTPUT]: parsedOutputAmount,
-    }
-  }, [inputAmount, inputCurrency, outputAmount, outputCurrency, parsedLimitPrice, state.isInputAmountFixed])
-
-  const { marketPrice, fee: swapFee } = useMarketPriceAndFee(inputCurrency, outputCurrency)
-
-  const skip = !(inputCurrency && outputCurrency)
-
-  const { trade } = useRoutingAPITrade(
-    skip,
-    TradeType.EXACT_INPUT,
-    parsedAmounts?.[Field.INPUT],
-    outputCurrency,
-    RouterPreference.API
-  )
-
-  const limitOrderTrade = useLimitOrderTrade({
-    inputCurrency,
-    parsedAmounts,
-    outputAmount: parsedAmounts[Field.OUTPUT],
-    trade,
-    state,
-    swapFee,
-  })
-
-  return { currencyBalances, parsedAmounts, parsedLimitPrice, limitOrderTrade, marketPrice }
-}
-
-function useLimitOrderTrade({
-  state,
-  trade,
-  inputCurrency,
-  parsedAmounts,
-  outputAmount,
-  swapFee,
-}: {
-  state: LimitState
-  trade?: SubmittableTrade
-  inputCurrency?: Currency
-  parsedAmounts: { [field in Field]?: CurrencyAmount<Currency> }
-  outputAmount?: CurrencyAmount<Currency>
-  swapFee?: SwapFeeInfo
-}) {
-  const { account } = useWeb3React()
-  const [wrapInfo, setWrapInfo] = useState<WrapInfo>()
-
-  useEffect(() => {
-    async function calculateWrapInfo() {
-      if (!inputCurrency) {
-        setWrapInfo(undefined)
-        return
-      }
-
-      const [currencyIn, needsWrap] = inputCurrency.isNative ? [inputCurrency.wrapped, true] : [inputCurrency, false]
-      const [gasUseEstimate, gasUseEstimateUSD] = isClassicTrade(trade)
-        ? [trade.gasUseEstimate, trade.gasUseEstimateUSD]
-        : [undefined, undefined]
-      const usdCostPerGas = getUSDCostPerGas(gasUseEstimateUSD, gasUseEstimate)
-
-      if (needsWrap) {
-        const wrapInfo = await getWrapInfo(needsWrap, account, currencyIn.chainId, '1', usdCostPerGas)
-        setWrapInfo(wrapInfo)
-      } else {
-        setWrapInfo({ needsWrap: false })
-      }
+      [Field.INPUT]: tryParseCurrencyAmount(inputAmount, inputCurrency),
+      [Field.OUTPUT]: tryParseCurrencyAmount(outputAmount, outputCurrency),
     }
-    calculateWrapInfo()
-  }, [account, inputCurrency, trade])
-
-  const limitOrderTrade = useMemo(() => {
-    if (!inputCurrency || !parsedAmounts?.[Field.INPUT] || !account || !outputAmount || !wrapInfo) {
-      return undefined
-    }
-    const amountIn = CurrencyAmount.fromRawAmount(inputCurrency.wrapped, parsedAmounts?.[Field.INPUT].quotient)
-    return new LimitOrderTrade({
-      amountIn,
-      amountOut: outputAmount,
-      tradeType: TradeType.EXACT_INPUT,
-      wrapInfo,
-      approveInfo: { needsApprove: false },
-      swapper: account,
-      deadlineBufferSecs: expiryToDeadlineSeconds(state.expiry),
-      swapFee,
-    })
-  }, [account, outputAmount, inputCurrency, parsedAmounts, state.expiry, wrapInfo, swapFee])
-
-  return limitOrderTrade
-}
-
-function isNativeOrWrappedNative(currency: Currency) {
-  return currency.isNative || nativeOnChain(currency.chainId).wrapped.equals(currency)
-}
-
-function useMarketPriceAndFee(
-  inputCurrency: Currency | undefined,
-  outputCurrency: Currency | undefined
-): { marketPrice?: Price<Currency, Currency>; fee?: SwapFeeInfo } {
-  const skip = !(inputCurrency && outputCurrency)
-  // TODO(limits): update amount for MATIC and CELO once Limits are supported on those chains
-  const baseCurrencyAmount =
-    inputCurrency && CurrencyAmount.fromRawAmount(nativeOnChain(inputCurrency.chainId), 10 ** 18)
-  const { trade: tradeA } = useRoutingAPITrade(
-    skip,
-    TradeType.EXACT_OUTPUT,
-    baseCurrencyAmount,
-    inputCurrency,
-    RouterPreference.API
-  )
-
-  const { trade: tradeB } = useRoutingAPITrade(
-    skip,
-    TradeType.EXACT_INPUT,
-    baseCurrencyAmount,
-    outputCurrency,
-    RouterPreference.API
-  )
-
-  const marketPrice: Price<Currency, Currency> | undefined = useMemo(() => {
-    if (skip) return undefined
-
-    // if one of the currencies is ETH or WETH, just use the spot price from one of the Trade objects
-    if (isNativeOrWrappedNative(inputCurrency)) {
-      if (!tradeB?.outputAmount.currency.equals(outputCurrency) || !isClassicTrade(tradeB)) return undefined
-
-      const referencePrice = tradeB.routes[0]?.midPrice
-      // reconstruct Price object using correct currency between ETH or WETH
-      return new Price(inputCurrency, outputCurrency, referencePrice.denominator, referencePrice.numerator)
-    }
-
-    // same thing but for output currency being ETH or WETH
-    if (isNativeOrWrappedNative(outputCurrency)) {
-      if (!tradeA?.inputAmount.currency.equals(inputCurrency) || !isClassicTrade(tradeA)) return undefined
-
-      const referencePrice = tradeA.routes[0]?.midPrice
-      return new Price(inputCurrency, outputCurrency, referencePrice.denominator, referencePrice.numerator)
-    }
-
-    // trade objects are still loading
-    if (!tradeA?.inputAmount.currency.equals(inputCurrency) || !tradeB?.outputAmount.currency.equals(outputCurrency)) {
-      return undefined
-    }
-
-    if (!tradeA || !tradeB || !isClassicTrade(tradeA) || !isClassicTrade(tradeB)) return undefined
-
-    const priceA = tradeA.routes[0]?.midPrice
-    const priceB = tradeB.routes[0]?.midPrice
-    if (!priceA || !priceB) return undefined
-
-    // Combine spot prices of A -> ETH and ETH -> B to get a price for A -> B
-    return priceA.multiply(priceB)
-  }, [inputCurrency, outputCurrency, skip, tradeA, tradeB])
-
-  const feesEnabled = useLimitsFeesEnabled()
-  const fee = useMemo(() => {
-    if (!marketPrice || !inputCurrency || !outputCurrency || !feesEnabled) return undefined
-
-    if (isNativeOrWrappedNative(inputCurrency)) {
-      if (!tradeB?.outputAmount.currency.equals(outputCurrency) || !isClassicTrade(tradeB)) return undefined
-
-      return tradeB.swapFee
-    }
-
-    if (isNativeOrWrappedNative(outputCurrency)) {
-      if (!tradeA?.inputAmount.currency.equals(inputCurrency) || !isClassicTrade(tradeA)) return undefined
-
-      return tradeA.swapFee
-    }
-
-    if (!tradeA || !tradeB) return undefined
-
-    // This currency pair is only eligible for fees iff both tradeA and tradeB are eligible for fees
-    const canTakeFees = tradeA.swapFee?.percent.greaterThan(0) && tradeB.swapFee?.percent.greaterThan(0)
-    return canTakeFees ? tradeB.swapFee : undefined
-  }, [inputCurrency, outputCurrency, marketPrice, tradeA, tradeB, feesEnabled])
+  }, [inputAmount, inputCurrency, outputAmount, outputCurrency])
 
-  return useMemo(() => ({ marketPrice, fee }), [marketPrice, fee])
+  return { currencyBalances, parsedAmounts }
 }
diff --git a/apps/web/src/state/logs/hooks.ts b/apps/web/src/state/logs/hooks.ts
index 002637361a5..0df6de90b48 100644
--- a/apps/web/src/state/logs/hooks.ts
+++ b/apps/web/src/state/logs/hooks.ts
@@ -5,7 +5,7 @@ import { useEffect, useMemo } from 'react'
 
 import { useAppDispatch, useAppSelector } from '../hooks'
 import { addListener, removeListener } from './slice'
-import { Log, filterToKey, isHistoricalLog } from './utils'
+import { filterToKey, isHistoricalLog, Log } from './utils'
 
 enum LogsState {
   // The filter is invalid
diff --git a/apps/web/src/state/migrations/3.ts b/apps/web/src/state/migrations/3.ts
index c7f5837ef2b..51397d91c26 100644
--- a/apps/web/src/state/migrations/3.ts
+++ b/apps/web/src/state/migrations/3.ts
@@ -1,4 +1,5 @@
-import { ChainId, Token } from '@uniswap/sdk-core'
+import { Token } from '@uniswap/sdk-core'
+import { ChainId } from '@uniswap/sdk-core'
 import { PersistState } from 'redux-persist'
 import { serializeToken } from 'state/user/hooks'
 import { UserState } from 'state/user/reducer'
diff --git a/apps/web/src/state/migrations/legacy.ts b/apps/web/src/state/migrations/legacy.ts
index b242209df33..85cad11658e 100644
--- a/apps/web/src/state/migrations/legacy.ts
+++ b/apps/web/src/state/migrations/legacy.ts
@@ -3,8 +3,10 @@ import { persistor } from 'state'
 
 import { initialState as initialListsState } from '../lists/reducer'
 import { RouterPreference } from '../routing/types'
-import { initialState as initialTransactionsState, TransactionState } from '../transactions/reducer'
-import { initialState as initialUserState, UserState } from '../user/reducer'
+import { TransactionState } from '../transactions/reducer'
+import { initialState as initialTransactionsState } from '../transactions/reducer'
+import { UserState } from '../user/reducer'
+import { initialState as initialUserState } from '../user/reducer'
 import { SlippageTolerance } from '../user/types'
 
 const currentTimestamp = () => new Date().getTime()
diff --git a/apps/web/src/state/mint/v3/hooks.tsx b/apps/web/src/state/mint/v3/hooks.tsx
index 6adbc142c48..eb9640a48f1 100644
--- a/apps/web/src/state/mint/v3/hooks.tsx
+++ b/apps/web/src/state/mint/v3/hooks.tsx
@@ -1,14 +1,14 @@
 import { Trans } from '@lingui/macro'
 import { Currency, CurrencyAmount, Price, Rounding, Token } from '@uniswap/sdk-core'
 import {
+  encodeSqrtRatioX96,
   FeeAmount,
+  nearestUsableTick,
   Pool,
   Position,
+  priceToClosestTick,
   TICK_SPACINGS,
   TickMath,
-  encodeSqrtRatioX96,
-  nearestUsableTick,
-  priceToClosestTick,
   tickToPrice,
 } from '@uniswap/v3-sdk'
 import { useWeb3React } from '@web3-react/core'
diff --git a/apps/web/src/state/mint/v3/utils.ts b/apps/web/src/state/mint/v3/utils.ts
index 9a56ffe340b..ffe2f8e72b6 100644
--- a/apps/web/src/state/mint/v3/utils.ts
+++ b/apps/web/src/state/mint/v3/utils.ts
@@ -1,11 +1,11 @@
 import { Price, Token } from '@uniswap/sdk-core'
 import {
-  FeeAmount,
-  TICK_SPACINGS,
-  TickMath,
   encodeSqrtRatioX96,
+  FeeAmount,
   nearestUsableTick,
   priceToClosestTick,
+  TICK_SPACINGS,
+  TickMath,
 } from '@uniswap/v3-sdk'
 import JSBI from 'jsbi'
 
diff --git a/apps/web/src/state/routing/gas.ts b/apps/web/src/state/routing/gas.ts
index 046fb6a5400..59fb443e535 100644
--- a/apps/web/src/state/routing/gas.ts
+++ b/apps/web/src/state/routing/gas.ts
@@ -1,12 +1,12 @@
 import { MaxUint256, PERMIT2_ADDRESS } from '@uniswap/permit2-sdk'
 import { ChainId, Currency } from '@uniswap/sdk-core'
+import ERC20_ABI from 'abis/erc20.json'
+import { Erc20, Weth } from 'abis/types'
+import WETH_ABI from 'abis/weth.json'
 import { SupportedInterfaceChain } from 'constants/chains'
 import { DEPRECATED_RPC_PROVIDERS } from 'constants/providers'
 import { WRAPPED_NATIVE_CURRENCY } from 'constants/tokens'
 import { getContract } from 'utils'
-import ERC20_ABI from 'wallet/src/abis/erc20.json'
-import { Erc20, Weth } from 'wallet/src/abis/types'
-import WETH_ABI from 'wallet/src/abis/weth.json'
 
 import { ApproveInfo, WrapInfo } from './types'
 
diff --git a/apps/web/src/state/routing/types.test.ts b/apps/web/src/state/routing/types.test.ts
deleted file mode 100644
index 548dc1f41d7..00000000000
--- a/apps/web/src/state/routing/types.test.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { CurrencyAmount, TradeType } from '@uniswap/sdk-core'
-import { DAI, USDC_MAINNET } from 'constants/tokens'
-import { LIMIT_ORDER_TRADE } from 'test-utils/constants'
-
-describe('LimitOrderTrade', () => {
-  it('should have the correct values', () => {
-    const trade = LIMIT_ORDER_TRADE
-    expect(trade.executionPrice.toSignificant(6)).toEqual('1000000000000')
-    expect(trade.inputAmount).toEqual(CurrencyAmount.fromRawAmount(DAI, 100))
-    expect(trade.outputAmount).toEqual(CurrencyAmount.fromRawAmount(USDC_MAINNET, 100))
-    expect(trade.tradeType).toEqual(TradeType.EXACT_INPUT)
-    expect(trade.wrapInfo).toEqual({ needsWrap: false })
-    expect(trade.approveInfo).toEqual({ needsApprove: false })
-    expect(trade.deadlineBufferSecs).toEqual(604800)
-    expect(trade.postTaxOutputAmount).toEqual(CurrencyAmount.fromRawAmount(USDC_MAINNET, 100))
-    expect(trade.totalGasUseEstimateUSD).toEqual(0)
-    expect(trade.classicGasUseEstimateUSD).toEqual(0)
-    expect(trade.startTimeBufferSecs).toEqual(0)
-    expect(trade.auctionPeriodSecs).toEqual(604800)
-  })
-})
diff --git a/apps/web/src/state/routing/types.ts b/apps/web/src/state/routing/types.ts
index dbda412308f..cbc4105ff56 100644
--- a/apps/web/src/state/routing/types.ts
+++ b/apps/web/src/state/routing/types.ts
@@ -1,11 +1,9 @@
-import { AddressZero } from '@ethersproject/constants'
 import { MixedRouteSDK, ONE, Protocol, Trade } from '@uniswap/router-sdk'
 import { ChainId, Currency, CurrencyAmount, Fraction, Percent, Price, Token, TradeType } from '@uniswap/sdk-core'
 import { DutchOrderInfo, DutchOrderInfoJSON, DutchOrderTrade as IDutchOrderTrade } from '@uniswap/uniswapx-sdk'
 import { Route as V2Route } from '@uniswap/v2-sdk'
 import { Route as V3Route } from '@uniswap/v3-sdk'
 import { ZERO_PERCENT } from 'constants/misc'
-import { BigNumber } from 'ethers/lib/ethers'
 
 export enum TradeState {
   LOADING = 'loading',
@@ -30,7 +28,7 @@ export enum RouterPreference {
   API = 'api',
 }
 
-// TODO(limits): add Limit market price intent
+// TODO: add Limit market price intent
 export enum QuoteIntent {
   Pricing = 'pricing',
   Quote = 'quote',
@@ -200,15 +198,13 @@ export type SwapFeeInfo = { recipient: string; percent: Percent; amount: string
 export class ClassicTrade extends Trade<Currency, Currency, TradeType> {
   public readonly fillType = TradeFillType.Classic
   approveInfo: ApproveInfo
-  gasUseEstimate?: number // gas estimate for swaps
-  gasUseEstimateUSD?: number // gas estimate for swaps in USD
+  gasUseEstimateUSD?: number // gas estimate for swaps
   blockNumber: string | null | undefined
   requestId: string | undefined
   quoteMethod: QuoteMethod
   swapFee: SwapFeeInfo | undefined
 
   constructor({
-    gasUseEstimate,
     gasUseEstimateUSD,
     blockNumber,
     requestId,
@@ -217,7 +213,6 @@ export class ClassicTrade extends Trade<Currency, Currency, TradeType> {
     swapFee,
     ...routes
   }: {
-    gasUseEstimate?: number
     gasUseEstimateUSD?: number
     totalGasUseEstimateUSD?: number
     blockNumber?: string | null
@@ -249,7 +244,6 @@ export class ClassicTrade extends Trade<Currency, Currency, TradeType> {
     this.quoteMethod = quoteMethod
     this.approveInfo = approveInfo
     this.swapFee = swapFee
-    this.gasUseEstimate = gasUseEstimate
   }
 
   public get executionPrice(): Price<Currency, Currency> {
@@ -277,15 +271,8 @@ export class ClassicTrade extends Trade<Currency, Currency, TradeType> {
   }
 }
 
-export enum OffchainOrderType {
-  DUTCH_AUCTION = 'dutch_auction',
-  LIMIT_ORDER = 'limit_order',
-}
-
 export class DutchOrderTrade extends IDutchOrderTrade<Currency, Currency, TradeType> {
   public readonly fillType = TradeFillType.UniswapX
-  public readonly offchainOrderType = OffchainOrderType.DUTCH_AUCTION
-
   quoteId?: string
   requestId?: string
   wrapInfo: WrapInfo
@@ -355,10 +342,6 @@ export class DutchOrderTrade extends IDutchOrderTrade<Currency, Currency, TradeT
 
     return 0
   }
-
-  public asDutchOrderTrade() {
-    return this
-  }
 }
 
 export class PreviewTrade {
@@ -451,156 +434,7 @@ export class PreviewTrade {
   }
 }
 
-// TODO(limits): get this from uniswapx-sdk
-const UNISWAPX_REACTOR = '0x6000da47483062a0d734ba3dc7576ce6a0b645c4'
-
-export class LimitOrderTrade {
-  public readonly fillType = TradeFillType.UniswapX
-  public readonly offchainOrderType = OffchainOrderType.LIMIT_ORDER
-  deadlineBufferSecs: number
-  wrapInfo: WrapInfo
-  approveInfo: ApproveInfo
-  swapFee: SwapFeeInfo | undefined
-  amountIn: CurrencyAmount<Token>
-  amountOut: CurrencyAmount<Currency>
-  tradeType: TradeType
-  swapper: string
-  deadline: number
-
-  // Placeholder values that aren't used in a limit trade
-  inputTax = ZERO_PERCENT
-  outputTax = ZERO_PERCENT
-  slippageTolerance = ZERO_PERCENT
-  quoteId = undefined
-  requestId = undefined
-
-  constructor({
-    tradeType,
-    amountIn,
-    amountOut,
-    deadlineBufferSecs,
-    swapFee,
-    wrapInfo,
-    approveInfo,
-    swapper,
-  }: {
-    tradeType: TradeType
-    amountIn: CurrencyAmount<Token>
-    amountOut: CurrencyAmount<Currency>
-    deadlineBufferSecs: number
-    swapFee?: SwapFeeInfo
-    wrapInfo: WrapInfo
-    approveInfo: ApproveInfo
-    swapper: string
-  }) {
-    this.deadlineBufferSecs = deadlineBufferSecs
-    this.swapFee = swapFee
-    this.wrapInfo = wrapInfo
-    this.approveInfo = approveInfo
-    this.amountIn = amountIn
-    this.amountOut = amountOut
-    this.tradeType = tradeType
-    this.swapper = swapper
-    // deadline is shown in the review modal, but updated on submission
-    const nowSecs = Math.floor(Date.now() / 1000)
-    this.deadline = (nowSecs + deadlineBufferSecs) * 1000
-  }
-
-  public asDutchOrderTrade(options?: {
-    nonce: BigNumber
-    swapper: string
-  }): IDutchOrderTrade<Currency, Currency, TradeType> {
-    const swapperOutput = {
-      token: this.amountOut.currency.isNative ? AddressZero : this.amountOut.currency.address,
-      recipient: options?.swapper ?? this.swapper,
-      startAmount: BigNumber.from(this.amountOut.quotient.toString()),
-      endAmount: BigNumber.from(this.amountOut.quotient.toString()),
-    }
-
-    const swapFee = this.swapFee && {
-      token: this.amountOut.currency.isNative ? AddressZero : this.amountOut.currency.address,
-      recipient: this.swapFee.recipient,
-      startAmount: BigNumber.from(this.amountOut.multiply(this.swapFee.percent).quotient.toString()),
-      endAmount: BigNumber.from(this.amountOut.multiply(this.swapFee.percent).quotient.toString()),
-    }
-
-    const outputs = swapFee ? [swapperOutput, swapFee] : [swapperOutput]
-
-    const nowSecs = Math.floor(Date.now() / 1000)
-    return new IDutchOrderTrade({
-      currencyIn: this.amountIn.currency,
-      currenciesOut: [this.amountOut.currency],
-      orderInfo: {
-        reactor: UNISWAPX_REACTOR,
-        swapper: options?.swapper ?? this.swapper,
-        deadline: (nowSecs + this.deadlineBufferSecs) * 1000,
-        additionalValidationContract: AddressZero,
-        additionalValidationData: '0x',
-        nonce: options?.nonce ?? BigNumber.from(0),
-        // decay timings dont matter at all
-        decayStartTime: nowSecs,
-        decayEndTime: nowSecs,
-        exclusiveFiller: AddressZero,
-        exclusivityOverrideBps: BigNumber.from(0),
-        input: {
-          token: this.amountIn.currency.isNative ? AddressZero : this.amountIn.currency.address,
-          startAmount: BigNumber.from(this.amountIn.quotient.toString()),
-          endAmount: BigNumber.from(this.amountIn.quotient.toString()),
-        },
-        outputs,
-      },
-      tradeType: this.tradeType,
-    })
-  }
-
-  public get inputAmount(): CurrencyAmount<Token> {
-    return this.amountIn
-  }
-
-  public get outputAmount(): CurrencyAmount<Currency> {
-    return this.amountOut
-  }
-
-  /** For UniswapX, handling token taxes in the output amount is outsourced to quoters */
-  public get postTaxOutputAmount() {
-    return this.outputAmount
-  }
-
-  public get totalGasUseEstimateUSD(): number {
-    return this.wrapInfo.needsWrap ? this.wrapInfo.wrapGasEstimateUSD : 0
-  }
-
-  public get classicGasUseEstimateUSD(): number {
-    return 0
-  }
-
-  // no decay for limit orders
-  public get startTimeBufferSecs(): number {
-    return 0
-  }
-
-  public get auctionPeriodSecs(): number {
-    return this.deadlineBufferSecs
-  }
-
-  public get executionPrice(): Price<Currency, Currency> {
-    return new Price(this.amountIn.currency, this.amountOut.currency, this.amountIn.quotient, this.amountOut.quotient)
-  }
-
-  public worstExecutionPrice(): Price<Currency, Currency> {
-    return this.executionPrice
-  }
-
-  public maximumAmountIn(): CurrencyAmount<Currency> {
-    return this.inputAmount
-  }
-
-  public minimumAmountOut(): CurrencyAmount<Currency> {
-    return this.outputAmount
-  }
-}
-
-export type SubmittableTrade = ClassicTrade | DutchOrderTrade | LimitOrderTrade
+export type SubmittableTrade = ClassicTrade | DutchOrderTrade
 export type InterfaceTrade = SubmittableTrade | PreviewTrade
 
 export enum QuoteState {
diff --git a/apps/web/src/state/routing/utils.ts b/apps/web/src/state/routing/utils.ts
index 608ee108fe4..b5c0af4c593 100644
--- a/apps/web/src/state/routing/utils.ts
+++ b/apps/web/src/state/routing/utils.ts
@@ -16,8 +16,7 @@ import {
   GetQuickQuoteArgs,
   GetQuoteArgs,
   InterfaceTrade,
-  LimitOrderTrade,
-  OffchainOrderType,
+  isClassicQuoteResponse,
   PoolType,
   PreviewTrade,
   QuickRouteResponse,
@@ -35,7 +34,6 @@ import {
   URAQuoteType,
   V2PoolInRoute,
   V3PoolInRoute,
-  isClassicQuoteResponse,
 } from './types'
 
 interface RouteResult {
@@ -216,12 +214,6 @@ export function transformQuickRouteToTrade(args: GetQuickQuoteArgs, data: QuickR
   return new PreviewTrade({ inputAmount, outputAmount, tradeType })
 }
 
-export function getUSDCostPerGas(gasUseEstimateUSD?: number, gasUseEstimate?: number): number | undefined {
-  // Some sus javascript float math but it's ok because its just an estimate for display purposes
-  if (!gasUseEstimateUSD || !gasUseEstimate) return undefined
-  return gasUseEstimateUSD / gasUseEstimate
-}
-
 export async function transformQuoteToTrade(
   args: GetQuoteArgs,
   data: URAQuoteResponse,
@@ -235,7 +227,8 @@ export async function transformQuoteToTrade(
 
   const { gasUseEstimateUSD, blockNumber, routes, gasUseEstimate, swapFee } = getClassicTradeDetails(args, data)
 
-  const usdCostPerGas = getUSDCostPerGas(gasUseEstimateUSD, gasUseEstimate)
+  // Some sus javascript float math but it's ok because its just an estimate for display purposes
+  const usdCostPerGas = gasUseEstimateUSD && gasUseEstimate ? gasUseEstimateUSD / gasUseEstimate : undefined
 
   const approveInfo = await getApproveInfo(account, currencyIn, amount, usdCostPerGas)
 
@@ -268,7 +261,6 @@ export async function transformQuoteToTrade(
         })) ?? [],
     tradeType,
     gasUseEstimateUSD,
-    gasUseEstimate,
     approveInfo,
     blockNumber,
     requestId: data.quote.requestId,
@@ -360,10 +352,6 @@ export function isSubmittableTrade(trade?: InterfaceTrade): trade is Submittable
   return trade?.fillType === TradeFillType.Classic || trade?.fillType === TradeFillType.UniswapX
 }
 
-export function isUniswapXTrade(trade?: InterfaceTrade): trade is DutchOrderTrade | LimitOrderTrade {
+export function isUniswapXTrade(trade?: InterfaceTrade): trade is DutchOrderTrade {
   return trade?.fillType === TradeFillType.UniswapX
 }
-
-export function isLimitTrade(trade?: InterfaceTrade): trade is LimitOrderTrade {
-  return trade?.fillType === TradeFillType.UniswapX && trade?.offchainOrderType === OffchainOrderType.LIMIT_ORDER
-}
diff --git a/apps/web/src/state/send/SendContext.tsx b/apps/web/src/state/send/SendContext.tsx
deleted file mode 100644
index bb5655dbe6a..00000000000
--- a/apps/web/src/state/send/SendContext.tsx
+++ /dev/null
@@ -1,96 +0,0 @@
-import { Currency } from '@uniswap/sdk-core'
-import {
-  createContext,
-  Dispatch,
-  PropsWithChildren,
-  SetStateAction,
-  useContext,
-  useEffect,
-  useMemo,
-  useState,
-} from 'react'
-import { RecipientData, SendInfo, useDerivedSendInfo } from 'state/send/hooks'
-import { useSwapAndLimitContext } from 'state/swap/SwapContext'
-
-export type SendState =
-  | {
-      readonly exactAmountToken?: string
-      readonly exactAmountFiat?: string
-      readonly recipient: string
-      readonly inputCurrency?: Currency
-      readonly inputInFiat: boolean
-      readonly validatedRecipientData?: RecipientData
-    } & (
-      | {
-          readonly exactAmountToken: string
-          readonly exactAmountFiat: undefined
-          readonly inputInFiat: false
-        }
-      | {
-          readonly exactAmountFiat: string
-          readonly exactAmountToken: undefined
-          readonly inputInFiat: true
-        }
-    )
-
-export type SendContextType = {
-  sendState: SendState
-  derivedSendInfo: SendInfo
-  setSendState: Dispatch<SetStateAction<SendState>>
-}
-
-const DEFAULT_SEND_STATE: SendState = {
-  exactAmountToken: undefined,
-  exactAmountFiat: '',
-  recipient: '',
-  inputCurrency: undefined,
-  inputInFiat: true,
-  validatedRecipientData: undefined,
-}
-
-// exported for testing
-export const SendContext = createContext<SendContextType>({
-  sendState: DEFAULT_SEND_STATE,
-  setSendState: () => undefined,
-  derivedSendInfo: {
-    currencyBalance: undefined,
-    parsedTokenAmount: undefined,
-    exactAmountOut: undefined,
-    recipientData: undefined,
-    transaction: undefined,
-    gasFeeCurrencyAmount: undefined,
-    inputError: undefined,
-  },
-})
-
-export function useSendContext() {
-  return useContext(SendContext)
-}
-
-export function SendContextProvider({ children }: PropsWithChildren) {
-  const {
-    currencyState: { inputCurrency, outputCurrency },
-  } = useSwapAndLimitContext()
-
-  const initialCurrency = useMemo(() => {
-    return inputCurrency ?? outputCurrency
-  }, [inputCurrency, outputCurrency])
-
-  const [sendState, setSendState] = useState<SendState>({ ...DEFAULT_SEND_STATE, inputCurrency: initialCurrency })
-  const derivedSendInfo = useDerivedSendInfo(sendState)
-
-  useEffect(() => {
-    setSendState((prev) => ({ ...prev, inputCurrency: initialCurrency }))
-  }, [initialCurrency])
-
-  const value = useMemo(
-    () => ({
-      sendState,
-      setSendState,
-      derivedSendInfo,
-    }),
-    [derivedSendInfo, setSendState, sendState]
-  )
-
-  return <SendContext.Provider value={value}>{children}</SendContext.Provider>
-}
diff --git a/apps/web/src/state/send/hooks.tsx b/apps/web/src/state/send/hooks.tsx
deleted file mode 100644
index 18276f7d2a6..00000000000
--- a/apps/web/src/state/send/hooks.tsx
+++ /dev/null
@@ -1,132 +0,0 @@
-import { TransactionRequest } from '@ethersproject/abstract-provider'
-import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
-import { useWeb3React } from '@web3-react/core'
-import { nativeOnChain } from 'constants/tokens'
-import { useCurrency } from 'hooks/Tokens'
-import useENSAddress from 'hooks/useENSAddress'
-import useENSName from 'hooks/useENSName'
-import { GasSpeed, useTransactionGasFee } from 'hooks/useTransactionGasFee'
-import { useUSDTokenUpdater } from 'hooks/useUSDTokenUpdater'
-import { useCurrencyBalances } from 'lib/hooks/useCurrencyBalance'
-import tryParseCurrencyAmount from 'lib/utils/tryParseCurrencyAmount'
-import { useMemo } from 'react'
-import { SendState } from 'state/send/SendContext'
-import { isAddress } from 'utils'
-import { useCreateTransferTransaction } from 'utils/transfer'
-
-export interface RecipientData {
-  address: string
-  ensName?: string
-}
-
-export enum SendInputError {
-  INSUFFICIENT_FUNDS = 'INSUFFICIENT_FUNDS',
-  INSUFFICIENT_FUNDS_FOR_GAS = 'INSUFFICIENT_FUNDS_FOR_GAS',
-}
-
-export type SendInfo = {
-  currencyBalance?: CurrencyAmount<Currency>
-  parsedTokenAmount?: CurrencyAmount<Currency>
-  exactAmountOut?: string
-  recipientData?: RecipientData
-  transaction?: TransactionRequest
-  gasFeeCurrencyAmount?: CurrencyAmount<Currency>
-  inputError?: SendInputError
-}
-
-export function useDerivedSendInfo(state: SendState): SendInfo {
-  const { account, chainId, provider } = useWeb3React()
-  const { exactAmountToken, exactAmountFiat, inputInFiat, inputCurrency, recipient, validatedRecipientData } = state
-
-  const { address: recipientInputEnsAddress } = useENSAddress(validatedRecipientData ? undefined : recipient)
-  const validatedRecipientAddress = useMemo(() => {
-    if (validatedRecipientData) {
-      return validatedRecipientData.address
-    }
-    return isAddress(recipient) || isAddress(recipientInputEnsAddress) || undefined
-  }, [recipient, recipientInputEnsAddress, validatedRecipientData])
-  const { ENSName } = useENSName(validatedRecipientData?.ensName ? undefined : validatedRecipientAddress)
-  const recipientData = useMemo(() => {
-    if (validatedRecipientAddress) {
-      return {
-        address: validatedRecipientAddress,
-        ensName: recipientInputEnsAddress ? recipient : validatedRecipientData?.ensName ?? ENSName ?? undefined,
-      }
-    }
-
-    return undefined
-  }, [ENSName, recipient, recipientInputEnsAddress, validatedRecipientData?.ensName, validatedRecipientAddress])
-
-  const nativeCurrency = useCurrency('ETH')
-  const [inputCurrencyBalance, nativeCurencyBalance] = useCurrencyBalances(
-    account,
-    useMemo(() => [inputCurrency, nativeCurrency], [inputCurrency, nativeCurrency])
-  )
-
-  const exactAmountOut = useUSDTokenUpdater(inputInFiat, exactAmountToken ?? exactAmountFiat, inputCurrency)
-  const parsedTokenAmount = useMemo(() => {
-    return tryParseCurrencyAmount(inputInFiat ? exactAmountOut : exactAmountToken, inputCurrency)
-  }, [exactAmountOut, exactAmountToken, inputCurrency, inputInFiat])
-
-  const transferInfo = useMemo(() => {
-    return {
-      provider,
-      account,
-      chainId,
-      currencyAmount: parsedTokenAmount,
-      toAddress: recipientData?.address,
-    }
-  }, [account, chainId, parsedTokenAmount, provider, recipientData?.address])
-  const transferTransaction = useCreateTransferTransaction(transferInfo)
-  const gasFee = useTransactionGasFee(transferTransaction, GasSpeed.Normal, !transferTransaction)
-  const gasFeeCurrencyAmount = useMemo(() => {
-    if (!chainId || !gasFee?.value) {
-      return undefined
-    }
-
-    return CurrencyAmount.fromRawAmount(nativeOnChain(chainId), gasFee.value)
-  }, [chainId, gasFee?.value])
-
-  const inputError = useMemo(() => {
-    const insufficientBalance = parsedTokenAmount && inputCurrencyBalance?.lessThan(parsedTokenAmount)
-    if (insufficientBalance) {
-      return SendInputError.INSUFFICIENT_FUNDS
-    }
-
-    if (!gasFee.value || !nativeCurrency || !nativeCurencyBalance) {
-      return undefined
-    }
-
-    let totalAmount = CurrencyAmount.fromRawAmount(nativeCurrency, gasFee?.value)
-    if (parsedTokenAmount && inputCurrency && nativeCurrency?.equals(inputCurrency)) {
-      totalAmount = totalAmount?.add(parsedTokenAmount)
-    }
-
-    if (!totalAmount || nativeCurencyBalance?.lessThan(totalAmount)) {
-      return SendInputError.INSUFFICIENT_FUNDS_FOR_GAS
-    }
-
-    return undefined
-  }, [gasFee.value, inputCurrency, inputCurrencyBalance, nativeCurencyBalance, nativeCurrency, parsedTokenAmount])
-
-  return useMemo(
-    () => ({
-      currencyBalance: inputCurrencyBalance,
-      exactAmountOut,
-      parsedTokenAmount,
-      recipientData,
-      transaction: transferTransaction,
-      gasFeeCurrencyAmount,
-      inputError,
-    }),
-    [
-      exactAmountOut,
-      gasFeeCurrencyAmount,
-      inputCurrencyBalance,
-      inputError,
-      parsedTokenAmount,
-      recipientData,
-      transferTransaction,
-    ]
-  )
-}
diff --git a/apps/web/src/state/signatures/hooks.ts b/apps/web/src/state/signatures/hooks.ts
index b4481be64fa..14696c1a04f 100644
--- a/apps/web/src/state/signatures/hooks.ts
+++ b/apps/web/src/state/signatures/hooks.ts
@@ -4,7 +4,6 @@ import { UniswapXOrderStatus } from 'lib/hooks/orders/types'
 import { useCallback, useMemo } from 'react'
 import { useDispatch } from 'react-redux'
 import { useAppSelector } from 'state/hooks'
-import { OffchainOrderType } from 'state/routing/types'
 
 import { addSignature } from './reducer'
 import { SignatureDetails, SignatureType, UniswapXOrderDetails } from './types'
@@ -27,7 +26,7 @@ export function useOrder(orderHash: string): UniswapXOrderDetails | undefined {
   const signatures = useAllSignatures()
   return useMemo(() => {
     const order = signatures[orderHash]
-    if (!order || ![SignatureType.SIGN_UNISWAPX_ORDER, SignatureType.SIGN_LIMIT].includes(order.type)) return undefined
+    if (!order || order.type !== SignatureType.SIGN_UNISWAPX_ORDER) return undefined
     return order
   }, [signatures, orderHash])
 }
@@ -41,16 +40,11 @@ export function useAddOrder() {
       orderHash: string,
       chainId: ChainId,
       expiry: number,
-      swapInfo: UniswapXOrderDetails['swapInfo'],
-      encodedOrder: string,
-      offchainOrderType?: OffchainOrderType
+      swapInfo: UniswapXOrderDetails['swapInfo']
     ) => {
       dispatch(
         addSignature({
-          type:
-            offchainOrderType === OffchainOrderType.DUTCH_AUCTION
-              ? SignatureType.SIGN_UNISWAPX_ORDER
-              : SignatureType.SIGN_LIMIT,
+          type: SignatureType.SIGN_UNISWAPX_ORDER,
           offerer,
           id: orderHash,
           chainId,
@@ -59,7 +53,6 @@ export function useAddOrder() {
           swapInfo,
           status: UniswapXOrderStatus.OPEN,
           addedTime: Date.now(),
-          encodedOrder,
         })
       )
     },
@@ -72,7 +65,7 @@ export function isFinalizedOrder(orderStatus: UniswapXOrderStatus) {
 }
 
 export function isOnChainOrder(orderStatus: UniswapXOrderStatus) {
-  return orderStatus === UniswapXOrderStatus.FILLED
+  return orderStatus === UniswapXOrderStatus.FILLED || orderStatus === UniswapXOrderStatus.CANCELLED
 }
 
 function isPendingOrder(signature: SignatureDetails): signature is UniswapXOrderDetails {
diff --git a/apps/web/src/state/signatures/types.ts b/apps/web/src/state/signatures/types.ts
index 2edfe90cb96..dfa7d788844 100644
--- a/apps/web/src/state/signatures/types.ts
+++ b/apps/web/src/state/signatures/types.ts
@@ -4,7 +4,6 @@ import { ExactInputSwapTransactionInfo, ExactOutputSwapTransactionInfo } from '.
 
 export enum SignatureType {
   SIGN_UNISWAPX_ORDER = 'signUniswapXOrder',
-  SIGN_LIMIT = 'signLimit',
 }
 
 interface BaseSignatureFields {
@@ -17,12 +16,11 @@ interface BaseSignatureFields {
 }
 
 export interface UniswapXOrderDetails extends BaseSignatureFields {
-  type: SignatureType
+  type: SignatureType.SIGN_UNISWAPX_ORDER
   orderHash: string
   status: UniswapXOrderStatus
   swapInfo: (ExactInputSwapTransactionInfo | ExactOutputSwapTransactionInfo) & { isUniswapXOrder: true }
   txHash?: string
-  encodedOrder?: string
 }
 
 export type SignatureDetails = UniswapXOrderDetails
diff --git a/apps/web/src/state/signatures/updater.tsx b/apps/web/src/state/signatures/updater.tsx
index bd9b73a3415..09c72f4bc8a 100644
--- a/apps/web/src/state/signatures/updater.tsx
+++ b/apps/web/src/state/signatures/updater.tsx
@@ -24,8 +24,7 @@ export default function Updater() {
     () =>
       Object.values(signatures).filter(
         (signature) =>
-          [SignatureType.SIGN_UNISWAPX_ORDER, SignatureType.SIGN_LIMIT].includes(signature.type) &&
-          signature.status === UniswapXOrderStatus.OPEN
+          signature.type === SignatureType.SIGN_UNISWAPX_ORDER && signature.status === UniswapXOrderStatus.OPEN
       ) as UniswapXOrderDetails[],
     [signatures]
   )
diff --git a/apps/web/src/state/swap/SwapContext.tsx b/apps/web/src/state/swap/SwapContext.tsx
index 258340a65f3..c5a38f20eb1 100644
--- a/apps/web/src/state/swap/SwapContext.tsx
+++ b/apps/web/src/state/swap/SwapContext.tsx
@@ -108,7 +108,6 @@ export function SwapAndLimitContextProvider({
 }>) {
   const { chainId: connectedChainId } = useWeb3React()
   const [currentTab, setCurrentTab] = useState<SwapTab>(SwapTab.Swap)
-
   const [currencyState, setCurrencyState] = useState<CurrencyState>({
     inputCurrency: initialInputCurrency,
     outputCurrency: initialOutputCurrency,
@@ -128,16 +127,12 @@ export function SwapAndLimitContextProvider({
   useEffect(() => {
     const combinedCurrencyState = { ...currencyState, ...prefilledState }
     const chainChanged = previousConnectedChainId && previousConnectedChainId !== connectedChainId
-    const prefilledInputChanged = Boolean(
-      previousPrefilledState?.inputCurrency
-        ? !prefilledState.inputCurrency?.equals(previousPrefilledState.inputCurrency)
-        : prefilledState.inputCurrency
-    )
-    const prefilledOutputChanged = Boolean(
-      previousPrefilledState?.outputCurrency
-        ? !prefilledState?.outputCurrency?.equals(previousPrefilledState.outputCurrency)
-        : prefilledState.outputCurrency
-    )
+    const prefilledInputChanged =
+      previousPrefilledState?.inputCurrency &&
+      !prefilledState.inputCurrency?.equals(previousPrefilledState.inputCurrency)
+    const prefilledOutputChanged =
+      previousPrefilledState?.outputCurrency &&
+      !prefilledState?.outputCurrency?.equals(previousPrefilledState.outputCurrency)
 
     if (chainChanged || prefilledInputChanged || prefilledOutputChanged) {
       setCurrencyState({
@@ -147,24 +142,17 @@ export function SwapAndLimitContextProvider({
     }
   }, [connectedChainId, currencyState, prefilledState, previousConnectedChainId, previousPrefilledState])
 
-  const value = useMemo(() => {
-    return {
-      currencyState,
-      setCurrencyState,
-      currentTab,
-      setCurrentTab,
-      prefilledState,
-      chainId,
-    }
-  }, [currencyState, setCurrencyState, currentTab, setCurrentTab, prefilledState, chainId])
-
-  return <SwapAndLimitContext.Provider value={value}>{children}</SwapAndLimitContext.Provider>
+  return (
+    <SwapAndLimitContext.Provider
+      value={{ currencyState, setCurrencyState, currentTab, setCurrentTab, prefilledState, chainId }}
+    >
+      {children}
+    </SwapAndLimitContext.Provider>
+  )
 }
 
 export function SwapContextProvider({ children }: { children: React.ReactNode }) {
-  const [swapState, setSwapState] = useState<SwapState>({
-    ...initialSwapState,
-  })
+  const [swapState, setSwapState] = useState<SwapState>({ ...initialSwapState })
   const derivedSwapInfo = useDerivedSwapInfo(swapState)
   return <SwapContext.Provider value={{ swapState, setSwapState, derivedSwapInfo }}>{children}</SwapContext.Provider>
 }
diff --git a/apps/web/src/state/swap/hooks.test.ts b/apps/web/src/state/swap/hooks.test.ts
index 84a018cc411..1fe0e81a2f1 100644
--- a/apps/web/src/state/swap/hooks.test.ts
+++ b/apps/web/src/state/swap/hooks.test.ts
@@ -40,17 +40,6 @@ describe('hooks', () => {
         inputCurrencyId: null,
       })
     })
-
-    test('output ETH only, lowercase', () => {
-      expect(
-        queryParametersToCurrencyState(
-          parse('?outputcurrency=eth&exactAmount=20.5', { parseArrays: false, ignoreQueryPrefix: true })
-        )
-      ).toEqual({
-        outputCurrencyId: 'ETH',
-        inputCurrencyId: null,
-      })
-    })
   })
 
   describe('#queryParametersToSwapState', () => {
diff --git a/apps/web/src/state/swap/hooks.tsx b/apps/web/src/state/swap/hooks.tsx
index 07e8b7a8ea1..664d7857cee 100644
--- a/apps/web/src/state/swap/hooks.tsx
+++ b/apps/web/src/state/swap/hooks.tsx
@@ -27,7 +27,7 @@ import {
 
 export function useSwapActionHandlers(): {
   onCurrencySelection: (field: Field, currency: Currency) => void
-  onSwitchTokens: (options: { newOutputHasTax: boolean; previouslyEstimatedOutput: string }) => void
+  onSwitchTokens: (newOutputHasTax: boolean, previouslyEstimatedOutput: string) => void
   onUserInput: (field: Field, typedValue: string) => void
 } {
   const { swapState, setSwapState } = useSwapContext()
@@ -58,13 +58,7 @@ export function useSwapActionHandlers(): {
   )
 
   const onSwitchTokens = useCallback(
-    ({
-      newOutputHasTax,
-      previouslyEstimatedOutput,
-    }: {
-      newOutputHasTax: boolean
-      previouslyEstimatedOutput: string
-    }) => {
+    (newOutputHasTax: boolean, previouslyEstimatedOutput: string) => {
       // To prevent swaps with FOT tokens as exact-outputs, we leave it as an exact-in swap and use the previously estimated output amount as the new exact-in amount.
       if (newOutputHasTax && swapState.independentField === Field.INPUT) {
         setSwapState((swapState) => ({
@@ -268,8 +262,8 @@ function parseIndependentFieldURLParameter(urlParam: any): Field {
 }
 
 export function queryParametersToCurrencyState(parsedQs: ParsedQs): SerializedCurrencyState {
-  let inputCurrency = parseCurrencyFromURLParameter(parsedQs.inputCurrency ?? parsedQs.inputcurrency)
-  let outputCurrency = parseCurrencyFromURLParameter(parsedQs.outputCurrency ?? parsedQs.outputcurrency)
+  let inputCurrency = parseCurrencyFromURLParameter(parsedQs.inputCurrency)
+  let outputCurrency = parseCurrencyFromURLParameter(parsedQs.outputCurrency)
   const independentField = parseIndependentFieldURLParameter(parsedQs.exactField)
 
   if (inputCurrency === '' && outputCurrency === '' && independentField === Field.INPUT) {
diff --git a/apps/web/src/state/transactions/types.ts b/apps/web/src/state/transactions/types.ts
index 9463250a758..3bcf07f4587 100644
--- a/apps/web/src/state/transactions/types.ts
+++ b/apps/web/src/state/transactions/types.ts
@@ -44,7 +44,6 @@ export enum TransactionType {
   REPAY,
   DEPLOY,
   CANCEL,
-  LIMIT,
 }
 
 interface BaseTransactionInfo {
@@ -181,13 +180,6 @@ interface SubmitProposalTransactionInfo {
   type: TransactionType.SUBMIT_PROPOSAL
 }
 
-export interface SendTransactionInfo {
-  type: TransactionType.SEND
-  currencyId: string
-  amount: string
-  recipient: string
-}
-
 export type TransactionInfo =
   | ApproveTransactionInfo
   | ExactOutputSwapTransactionInfo
@@ -207,7 +199,6 @@ export type TransactionInfo =
   | CollectFeesTransactionInfo
   | RemoveLiquidityV3TransactionInfo
   | SubmitProposalTransactionInfo
-  | SendTransactionInfo
 
 export interface TransactionDetails {
   hash: string
diff --git a/apps/web/src/state/user/hooks.tsx b/apps/web/src/state/user/hooks.tsx
index 15cce86a1b6..d9b3c61a4cb 100644
--- a/apps/web/src/state/user/hooks.tsx
+++ b/apps/web/src/state/user/hooks.tsx
@@ -1,5 +1,5 @@
 import { Percent, Token, V2_FACTORY_ADDRESSES } from '@uniswap/sdk-core'
-import { Pair, computePairAddress } from '@uniswap/v2-sdk'
+import { computePairAddress, Pair } from '@uniswap/v2-sdk'
 import { useWeb3React } from '@web3-react/core'
 import { L2_CHAIN_IDS } from 'constants/chains'
 import { SupportedLocale } from 'constants/locales'
diff --git a/apps/web/src/test-utils/constants.ts b/apps/web/src/test-utils/constants.ts
index 51147ade729..8ceecf2cd12 100644
--- a/apps/web/src/test-utils/constants.ts
+++ b/apps/web/src/test-utils/constants.ts
@@ -3,12 +3,10 @@ import { ChainId, CurrencyAmount, Percent, Token, TradeType } from '@uniswap/sdk
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { V3Route } from '@uniswap/smart-order-router'
 import { FeeAmount, Pool } from '@uniswap/v3-sdk'
-import { DAI, nativeOnChain, USDC_MAINNET } from 'constants/tokens'
+import { nativeOnChain } from 'constants/tokens'
 import { BigNumber } from 'ethers/lib/ethers'
 import JSBI from 'jsbi'
-import { expiryToDeadlineSeconds } from 'state/limit/hooks'
-import { Expiry } from 'state/limit/LimitContext'
-import { ClassicTrade, DutchOrderTrade, LimitOrderTrade, PreviewTrade, QuoteMethod } from 'state/routing/types'
+import { ClassicTrade, DutchOrderTrade, PreviewTrade, QuoteMethod } from 'state/routing/types'
 
 export const TEST_TOKEN_1 = new Token(1, '0x0000000000000000000000000000000000000001', 18, 'ABC', 'Abc')
 export const TEST_TOKEN_2 = new Token(1, '0x0000000000000000000000000000000000000002', 18, 'DEF', 'Def')
@@ -192,13 +190,3 @@ export const PREVIEW_EXACT_IN_TRADE = new PreviewTrade({
   outputAmount: toCurrencyAmount(TEST_TOKEN_2, 1000),
   tradeType: TradeType.EXACT_INPUT,
 })
-
-export const LIMIT_ORDER_TRADE = new LimitOrderTrade({
-  amountIn: CurrencyAmount.fromRawAmount(DAI, 100),
-  amountOut: CurrencyAmount.fromRawAmount(USDC_MAINNET, 100),
-  tradeType: TradeType.EXACT_INPUT,
-  wrapInfo: { needsWrap: false },
-  approveInfo: { needsApprove: false },
-  swapper: '0xSwapperAddress',
-  deadlineBufferSecs: expiryToDeadlineSeconds(Expiry.Week),
-})
diff --git a/apps/web/src/test-utils/pools/fixtures.ts b/apps/web/src/test-utils/pools/fixtures.ts
index ba91e7a6e46..ccbfabb3afa 100644
--- a/apps/web/src/test-utils/pools/fixtures.ts
+++ b/apps/web/src/test-utils/pools/fixtures.ts
@@ -3,7 +3,7 @@ import { BigNumber } from '@ethersproject/bignumber'
 import { ChainId, Currency, WETH9 } from '@uniswap/sdk-core'
 import { FeeAmount, Pool, Position } from '@uniswap/v3-sdk'
 import { USDC_MAINNET } from 'constants/tokens'
-import { Token as BEToken, Chain, Exact, TokenProjectQuery } from 'graphql/data/__generated__/types-and-hooks'
+import { Chain, Exact, TokenProjectQuery } from 'graphql/data/__generated__/types-and-hooks'
 import { Token } from 'graphql/thegraph/__generated__/types-and-hooks'
 import { PoolData } from 'graphql/thegraph/PoolData'
 
@@ -17,7 +17,6 @@ export const validPoolToken0 = {
   derivedETH: '0.0006240873011635544626425964678706127',
   __typename: 'Token',
 } as Token
-export const validBEPoolToken0 = { ...validPoolToken0, chain: 'ETHEREUM' } as BEToken
 
 export const validUSDCCurrency = {
   isNative: false,
@@ -42,7 +41,6 @@ export const validPoolToken1 = {
   derivedETH: '1',
   __typename: 'Token',
 } as Token
-export const validBEPoolToken1 = { ...validPoolToken1, chain: 'ETHEREUM' } as BEToken
 
 export const owner = '0xf5b6bb25f5beaea03dd014c6ef9fa9f3926bf36c'
 
diff --git a/apps/web/src/test-utils/render.tsx b/apps/web/src/test-utils/render.tsx
index 7e51a95832c..c33259c442d 100644
--- a/apps/web/src/test-utils/render.tsx
+++ b/apps/web/src/test-utils/render.tsx
@@ -12,7 +12,7 @@ import { QueryClient, QueryClientProvider } from 'react-query'
 import { Provider } from 'react-redux'
 import { BrowserRouter } from 'react-router-dom'
 import store from 'state'
-import { ThemeProvider } from 'theme'
+import ThemeProvider from 'theme'
 
 i18n.load({
   [DEFAULT_LOCALE]: catalog.messages,
@@ -63,4 +63,5 @@ const customRenderHook = <Result, Props>(
 // Testing utils may export *.
 // eslint-disable-next-line no-restricted-syntax
 export * from '@testing-library/react'
-export { customRender as render, customRenderHook as renderHook }
+export { customRender as render }
+export { customRenderHook as renderHook }
diff --git a/apps/web/src/theme/colors.ts b/apps/web/src/theme/colors.ts
index 4cd99b37da3..81491b30716 100644
--- a/apps/web/src/theme/colors.ts
+++ b/apps/web/src/theme/colors.ts
@@ -164,7 +164,6 @@ export const darkTheme = {
   neutral1: colors.neutral1_dark,
   neutral2: colors.neutral2_dark,
   neutral3: colors.neutral3_dark,
-  neutralContrast: colors.white,
 
   surface1: colors.surface1_dark,
   surface2: colors.surface2_dark,
@@ -175,15 +174,9 @@ export const darkTheme = {
   accent1: colors.accent1_dark,
   accent2: colors.accent2_dark,
   accent3: colors.accent3_dark,
-
-  token0: colors.accent1_dark,
-  token1: colors.accent3_dark,
-
   success: colors.success,
   critical: colors.critical,
   scrim: colors.scrim,
-
-  warning2: colors.gold200,
 }
 
 export const lightTheme: ThemeColors = {
@@ -194,7 +187,6 @@ export const lightTheme: ThemeColors = {
   neutral1: colors.neutral1_light,
   neutral2: colors.neutral2_light,
   neutral3: colors.neutral3_light,
-  neutralContrast: colors.white,
 
   surface1: colors.surface1_light,
   surface2: colors.surface2_light,
@@ -206,12 +198,7 @@ export const lightTheme: ThemeColors = {
   accent2: colors.accent2_light,
   accent3: colors.accent3_light,
 
-  token0: colors.accent1_light,
-  token1: colors.accent3_light,
-
   success: colors.success,
   critical: colors.critical,
   scrim: colors.scrim,
-
-  warning2: colors.gold200,
 }
diff --git a/apps/web/src/theme/components/text.tsx b/apps/web/src/theme/components/text.tsx
index f25523a4600..65f6b36f8ed 100644
--- a/apps/web/src/theme/components/text.tsx
+++ b/apps/web/src/theme/components/text.tsx
@@ -9,7 +9,6 @@ const TextWrapper = styled(Text).withConfig({
   shouldForwardProp: (prop) => prop !== 'color',
 })<{ color: keyof string }>`
   color: ${({ color, theme }) => (theme as any)[color]};
-  letter-spacing: -0.01em;
 `
 
 const HeadingWrapper = styled.h1.withConfig({
@@ -20,7 +19,6 @@ const HeadingWrapper = styled.h1.withConfig({
   font-weight: 485;
   font-size: ${({ fontSize }) => fontSize};
   margin: ${({ margin }) => margin ?? 0};
-  letter-spacing: -0.02em;
 `
 
 type TextProps = Omit<TextPropsOriginal, 'css'>
diff --git a/apps/web/src/theme/index.tsx b/apps/web/src/theme/index.tsx
index 4441bba5ef5..200b53f4227 100644
--- a/apps/web/src/theme/index.tsx
+++ b/apps/web/src/theme/index.tsx
@@ -1,11 +1,10 @@
 import { rootCssString } from 'nft/css/cssStringFromTheme'
-import { PropsWithChildren, useMemo } from 'react'
+import React, { useMemo } from 'react'
 import { createGlobalStyle, css, ThemeProvider as StyledComponentsThemeProvider } from 'styled-components'
 import { useIsDarkMode } from 'theme/components/ThemeToggle'
-import { getAccent2, getNeutralContrast } from 'theme/utils'
 
 import { navDimensions } from '../nft/css/sprinkles.css'
-import { darkTheme, lightTheme, ThemeColors } from './colors'
+import { darkTheme, lightTheme } from './colors'
 import { darkDeprecatedTheme, lightDeprecatedTheme } from './deprecatedColors'
 
 export const MEDIA_WIDTHS = {
@@ -75,7 +74,6 @@ export type Gap = keyof typeof gapValues
 
 function getSettings(darkMode: boolean) {
   return {
-    darkMode,
     grids: gapValues,
     fonts,
 
@@ -105,42 +103,18 @@ function getSettings(darkMode: boolean) {
 }
 
 // eslint-disable-next-line import/no-unused-modules -- used in styled.d.ts
-export function getTheme(darkMode: boolean, overriddenColors?: Partial<ThemeColors>) {
-  const [colors, deprecatedColors] = darkMode ? [darkTheme, darkDeprecatedTheme] : [lightTheme, lightDeprecatedTheme]
-  const colorsWithOverrides = applyOverriddenColors(colors, overriddenColors)
-
-  return { ...colorsWithOverrides, ...deprecatedColors, ...getSettings(darkMode) }
-}
-
-function applyOverriddenColors(defaultColors: ThemeColors, overriddenColors?: Partial<ThemeColors>) {
-  if (!overriddenColors) return defaultColors
-
-  // Remove any undefined values from the object such that no theme values are overridden by undefined
-  const definedOverriddenColors = Object.keys(overriddenColors).reduce((acc, curr) => {
-    const key = curr as keyof ThemeColors
-    if (overriddenColors[key] !== undefined) acc[key] = overriddenColors[key]
-    return acc
-  }, {} as Partial<ThemeColors>)
-
-  const mergedColors = { ...defaultColors, ...definedOverriddenColors }
-
-  // Since accent2 is derived from accent1 and surface1, it needs to be recalculated if either are overridden
-  if ((overriddenColors.accent1 || overriddenColors.surface1) && !overriddenColors.accent2) {
-    mergedColors.accent2 = getAccent2(mergedColors.accent1, mergedColors.surface1)
-  }
-  // neutralContrast should be updated to contrast against accent1 if accent1 is overridden
-  if (overriddenColors.accent1 && !overriddenColors.neutralContrast) {
-    mergedColors.neutralContrast = getNeutralContrast(mergedColors.accent1)
+export function getTheme(darkMode: boolean) {
+  return {
+    darkMode,
+    ...(darkMode ? darkTheme : lightTheme),
+    ...(darkMode ? darkDeprecatedTheme : lightDeprecatedTheme),
+    ...getSettings(darkMode),
   }
-
-  return mergedColors
 }
 
-export function ThemeProvider({ children, ...overriddenColors }: PropsWithChildren<Partial<ThemeColors>>) {
+export default function ThemeProvider({ children }: { children: React.ReactNode }) {
   const darkMode = useIsDarkMode()
-  // eslint-disable-next-line react-hooks/exhaustive-deps -- only update when darkMode or overriddenColors' entries change
-  const themeObject = useMemo(() => getTheme(darkMode, overriddenColors), [darkMode, JSON.stringify(overriddenColors)])
-
+  const themeObject = useMemo(() => getTheme(darkMode), [darkMode])
   return <StyledComponentsThemeProvider theme={themeObject}>{children}</StyledComponentsThemeProvider>
 }
 
diff --git a/apps/web/src/theme/utils.test.ts b/apps/web/src/theme/utils.test.ts
deleted file mode 100644
index 3882c0d6fe3..00000000000
--- a/apps/web/src/theme/utils.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { getAccent2, getNeutralContrast, opacify, passesContrast } from 'theme/utils'
-
-describe('opacify', () => {
-  it('should return the same color for invalid hex strings', () => {
-    expect(opacify(50, 'blue')).toBe('blue')
-  })
-
-  it('should throw an error for invalid hex format', () => {
-    expect(() => opacify(50, '#12345')).toThrow('provided color #12345 was not in hexadecimal format')
-  })
-
-  it('should handle shorthand hex color correctly', () => {
-    expect(opacify(50, '#123')).toBe('#11223380')
-  })
-
-  it('should handle full hex color correctly', () => {
-    expect(opacify(50, '#112233')).toBe('#11223380')
-  })
-
-  it('should throw an error for out-of-range opacity values', () => {
-    expect(() => opacify(-1, '#123')).toThrow('provided amount should be between 0 and 100')
-    expect(() => opacify(101, '#123')).toThrow('provided amount should be between 0 and 100')
-  })
-})
-
-describe('passesContrast', () => {
-  it('should return true for contrasting colors', () => {
-    expect(passesContrast('#ffffff', '#000000')).toBe(true)
-  })
-
-  it('should return false for non-contrasting colors', () => {
-    expect(passesContrast('#ffffff', '#fff')).toBe(false)
-  })
-})
-
-describe('getNeutralContrast', () => {
-  it('should return white for a color that contrasts well with white', () => {
-    const darkPurple = '#330033'
-    expect(getNeutralContrast(darkPurple)).toBe('#FFFFFF') // Black contrasts well with white
-  })
-
-  it('should return black for a color that contrasts well with black', () => {
-    const lightYellow = '#ffffaa'
-    expect(getNeutralContrast(lightYellow)).toBe('#000000') // White contrasts well with black
-  })
-})
-
-describe('getAccent2', () => {
-  it('should return a mix of two colors', () => {
-    const result = getAccent2('#FFFFFF', '#000000')
-    expect(result).toMatch(/^#/) // Result should be a hex color
-    expect(result).toBe('#1e1e1e') // Result should 12% white & 88% black
-  })
-
-  it('should handle same color inputs', () => {
-    expect(getAccent2('#f00', '#f00')).toBe('#f00') // Same color inputs should return the same color
-  })
-})
diff --git a/apps/web/src/theme/utils.ts b/apps/web/src/theme/utils.ts
index a7dee15d932..e829b2293d6 100644
--- a/apps/web/src/theme/utils.ts
+++ b/apps/web/src/theme/utils.ts
@@ -1,7 +1,3 @@
-import { darken, lighten, mix } from 'polished'
-import { colors } from 'theme/colors'
-import { hex } from 'wcag-contrast'
-
 /**
  * Add opacity information to a hex color
  * @param amount opacity value from 0 to 100
@@ -12,68 +8,16 @@ export function opacify(amount: number, hexColor: string): string {
     return hexColor
   }
 
-  let normalizedHexColor = hexColor
-
-  // Expand short hex code to full form
-  if (hexColor.length === 4) {
-    normalizedHexColor = '#' + hexColor[1] + hexColor[1] + hexColor[2] + hexColor[2] + hexColor[3] + hexColor[3]
-  }
-
-  if (normalizedHexColor.length !== 7) {
-    throw new Error(`opacify: provided color ${hexColor} was not in hexadecimal format (e.g. #000000 or #000)`)
+  if (hexColor.length !== 7) {
+    throw new Error(`opacify: provided color ${hexColor} was not in hexadecimal format (e.g. #000000)`)
   }
 
   if (amount < 0 || amount > 100) {
     throw new Error('opacify: provided amount should be between 0 and 100')
   }
 
-  const opacityHex = Math.round((amount / 100) * 255)
-    .toString(16)
-    .padStart(2, '0')
-  return `${normalizedHexColor}${opacityHex}`
-}
-
-// The WCAG AA standard color contrast threshold
-const MIN_COLOR_CONTRAST_THRESHOLD = 1.95
-
-/**
- * Compares a given color against the background color to determine if it passes the minimum contrast threshold.
- * @param color The hex value of the extracted color
- * @param backgroundColor The hex value of the background color to check contrast against
- * @returns boolean value indicating if the color passes the contrast threshold
- */
-export function passesContrast(color: string, backgroundColor: string): boolean {
-  const contrast = hex(color, backgroundColor)
-  return contrast >= MIN_COLOR_CONTRAST_THRESHOLD
-}
-
-/** Returns a color that passes the minimum contrast threshold against the background color. */
-export function getAccessibleColor(color: string, backgroundColor: string, darkMode: boolean): string {
-  if (passesContrast(color, backgroundColor)) return color
+  const opacityHex = Math.round((amount / 100) * 255).toString(16)
+  const opacifySuffix = opacityHex.length < 2 ? `0${opacityHex}` : opacityHex
 
-  let accessibleColor = color
-  for (let amount = 0.1; amount <= 1; amount += 0.1) {
-    if (passesContrast(accessibleColor, backgroundColor)) return accessibleColor
-    accessibleColor = darkMode ? lighten(amount, color) : darken(amount, color)
-  }
-
-  console.warn(`Unable to find accessible color for ${color} on ${backgroundColor}`)
-  return color
-}
-
-/**
- * Compares a given color against white to determine if it passes the minimum contrast threshold.
- * @param color The hex value of the extracted color
- * @param accent1 The hex value of the background color to check contrast against
- * @returns white if the color passes the contrast threshold, otherwise black
- */
-export function getNeutralContrast(accent1: string) {
-  return passesContrast(accent1, colors.white) ? colors.white : colors.black
-}
-
-/**
- * Returns an accent2 value by mixing the given accent1 and surface1.
- */
-export function getAccent2(accent1: string, surface1: string) {
-  return mix(0.12, accent1, surface1)
+  return `${hexColor.slice(0, 7)}${opacifySuffix}`
 }
diff --git a/apps/web/src/tracing/index.ts b/apps/web/src/tracing/index.ts
index beacb698e96..d37c0d20f2b 100644
--- a/apps/web/src/tracing/index.ts
+++ b/apps/web/src/tracing/index.ts
@@ -4,7 +4,8 @@ import { SharedEventName } from '@uniswap/analytics-events'
 import { initializeAnalytics, OriginApplication } from 'analytics'
 import store from 'state'
 import { setOriginCountry } from 'state/user/reducer'
-import { getEnvName, isDevelopmentEnv, isProductionEnv, isSentryEnabled } from 'utils/env'
+import { isDevelopmentEnv, isProductionEnv, isSentryEnabled } from 'utils/env'
+import { getEnvName } from 'utils/env'
 import { v4 as uuidv4 } from 'uuid'
 
 import { beforeSend } from './errors'
diff --git a/apps/web/src/tracing/swapFlowLoggers.ts b/apps/web/src/tracing/swapFlowLoggers.ts
index 574588518c1..96a4861ac2a 100644
--- a/apps/web/src/tracing/swapFlowLoggers.ts
+++ b/apps/web/src/tracing/swapFlowLoggers.ts
@@ -1,5 +1,6 @@
 import { SwapEventName } from '@uniswap/analytics-events'
-import { ITraceContext, sendAnalyticsEvent } from 'analytics'
+import { ITraceContext } from 'analytics'
+import { sendAnalyticsEvent } from 'analytics'
 import { INTERNAL_ROUTER_PREFERENCE_PRICE, RouterPreference } from 'state/routing/types'
 
 import { SwapEventType, timestampTracker } from './SwapEventTimestampTracker'
diff --git a/apps/web/src/utils/approveAmountCalldata.ts b/apps/web/src/utils/approveAmountCalldata.ts
index b7b15f4de4a..cdb77db9203 100644
--- a/apps/web/src/utils/approveAmountCalldata.ts
+++ b/apps/web/src/utils/approveAmountCalldata.ts
@@ -1,7 +1,8 @@
 import { Interface } from '@ethersproject/abi'
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import { toHex } from '@uniswap/v3-sdk'
-import { Erc20Interface } from 'wallet/src/abis/types/Erc20'
+
+import { Erc20Interface } from '../abis/types/Erc20'
 
 const ERC20_INTERFACE = new Interface([
   {
diff --git a/apps/web/src/utils/formatNumbers.test.ts b/apps/web/src/utils/formatNumbers.test.ts
index 10bdfec08d4..c8164d4e254 100644
--- a/apps/web/src/utils/formatNumbers.test.ts
+++ b/apps/web/src/utils/formatNumbers.test.ts
@@ -1,10 +1,9 @@
 import { renderHook } from '@testing-library/react'
 import { CurrencyAmount, Percent } from '@uniswap/sdk-core'
-import { DEFAULT_LOCAL_CURRENCY } from 'constants/localCurrencies'
 import { USDC_MAINNET } from 'constants/tokens'
 import { useCurrencyConversionFlagEnabled } from 'featureFlags/flags/currencyConversion'
-import { useLocalCurrencyConversionRate } from 'graphql/data/ConversionRate'
 import { Currency } from 'graphql/data/__generated__/types-and-hooks'
+import { useLocalCurrencyConversionRate } from 'graphql/data/ConversionRate'
 import { useActiveLocalCurrency } from 'hooks/useActiveLocalCurrency'
 import { useActiveLocale } from 'hooks/useActiveLocale'
 import { mocked } from 'test-utils/mocked'
@@ -461,32 +460,3 @@ describe('formatDelta', () => {
     expect(formatDelta(100)).toBe('100,00%')
   })
 })
-
-describe('formatToFiatAmount', () => {
-  beforeEach(() => {
-    mocked(useCurrencyConversionFlagEnabled).mockReturnValue(true)
-  })
-
-  it('should return default values when undefined', () => {
-    mocked(useLocalCurrencyConversionRate).mockReturnValue({ data: 1, isLoading: false })
-    const { convertToFiatAmount } = renderHook(() => useFormatter()).result.current
-
-    expect(convertToFiatAmount()).toStrictEqual({ amount: 1.0, currency: DEFAULT_LOCAL_CURRENCY })
-  })
-
-  it('should return input amount for same currency', () => {
-    mocked(useActiveLocalCurrency).mockReturnValue(Currency.Usd)
-    mocked(useLocalCurrencyConversionRate).mockReturnValue({ data: 1, isLoading: false })
-    const { convertToFiatAmount } = renderHook(() => useFormatter()).result.current
-
-    expect(convertToFiatAmount(12)).toStrictEqual({ amount: 12.0, currency: Currency.Usd })
-  })
-
-  it('should correctly convert different currency', () => {
-    mocked(useActiveLocalCurrency).mockReturnValue(Currency.Cad)
-    mocked(useLocalCurrencyConversionRate).mockReturnValue({ data: 0.5, isLoading: false })
-    const { convertToFiatAmount } = renderHook(() => useFormatter()).result.current
-
-    expect(convertToFiatAmount(12)).toStrictEqual({ amount: 6.0, currency: Currency.Cad })
-  })
-})
diff --git a/apps/web/src/utils/formatNumbers.ts b/apps/web/src/utils/formatNumbers.ts
index df56b45cd7e..c5e73f66a96 100644
--- a/apps/web/src/utils/formatNumbers.ts
+++ b/apps/web/src/utils/formatNumbers.ts
@@ -7,8 +7,8 @@ import {
 } from 'constants/localCurrencies'
 import { DEFAULT_LOCALE, SupportedLocale } from 'constants/locales'
 import { useCurrencyConversionFlagEnabled } from 'featureFlags/flags/currencyConversion'
-import { useLocalCurrencyConversionRate } from 'graphql/data/ConversionRate'
 import { Currency as GqlCurrency } from 'graphql/data/__generated__/types-and-hooks'
+import { useLocalCurrencyConversionRate } from 'graphql/data/ConversionRate'
 import { useActiveLocalCurrency } from 'hooks/useActiveLocalCurrency'
 import { useActiveLocale } from 'hooks/useActiveLocale'
 import usePrevious from 'hooks/usePrevious'
@@ -223,14 +223,6 @@ const tokenNonTxFormatter: FormatterRule[] = [
   },
 ]
 
-const tokenQuantityStatsFormatter: FormatterRule[] = [
-  // if token stat value is 0, we probably don't have the data for it, so show '-' as a placeholder
-  { exact: 0, hardCodedInput: { hardcodedOutput: '-' }, formatterOptions: NO_DECIMALS },
-  { upperBound: 0.01, hardCodedInput: { input: 0.01, prefix: '<' }, formatterOptions: TWO_DECIMALS },
-  { upperBound: 1000, formatterOptions: TWO_DECIMALS },
-  { upperBound: Infinity, formatterOptions: SHORTHAND_ONE_DECIMAL },
-]
-
 const tokenTxFormatter: FormatterRule[] = [
   { exact: 0, formatterOptions: NO_DECIMALS },
   {
@@ -409,9 +401,6 @@ export enum NumberType {
   // used for token quantities in non-transaction contexts (e.g. portfolio balances)
   TokenNonTx = 'token-non-tx',
 
-  // used for token quantity stats where shorthand is okay (e.g. pool stats balances)
-  TokenQuantityStats = 'token-quantity-stats',
-
   // used for token quantities in transaction contexts (e.g. swap, send)
   TokenTx = 'token-tx',
 
@@ -471,7 +460,6 @@ export enum NumberType {
 type FormatterType = NumberType | FormatterRule[]
 const TYPE_TO_FORMATTER_RULES = {
   [NumberType.TokenNonTx]: tokenNonTxFormatter,
-  [NumberType.TokenQuantityStats]: tokenQuantityStatsFormatter,
   [NumberType.TokenTx]: tokenTxFormatter,
   [NumberType.SwapPrice]: swapPriceFormatter,
   [NumberType.SwapTradeAmount]: swapTradeAmountFormatter,
@@ -602,7 +590,7 @@ function formatDelta(delta: Nullish<number>, locale: SupportedLocale = DEFAULT_L
 
 interface FormatPriceOptions {
   price: Nullish<Price<Currency, Currency>>
-  type?: FormatterType
+  type: FormatterType
   locale?: SupportedLocale
   localCurrency?: SupportedLocalCurrency
   conversionRate?: number
@@ -718,82 +706,6 @@ function formatReviewSwapCurrencyAmount(
   return formattedAmount
 }
 
-function convertToFiatAmount(
-  amount = 1,
-  toCurrency = DEFAULT_LOCAL_CURRENCY,
-  conversionRate = 1
-): { amount: number; currency: SupportedLocalCurrency } {
-  const defaultResult = { amount, currency: DEFAULT_LOCAL_CURRENCY }
-
-  if (defaultResult.currency === toCurrency) {
-    return defaultResult
-  }
-
-  return {
-    amount: amount * conversionRate,
-    currency: toCurrency,
-  }
-}
-
-// TODO: https://linear.app/uniswap/issue/WEB-3495/import-useasyncdata-from-mobile
-type FiatCurrencyComponents = {
-  groupingSeparator: string
-  decimalSeparator: string
-  symbol: string
-  fullSymbol: string // Some currencies have whitespace in between number and currency
-  symbolAtFront: boolean // All currencies are at front or back except CVE, which we won't ever support
-}
-
-/**
- * Helper function to return components of a currency value for a specific locale
- * E.g. comma, period, or space for separating thousands
- */
-export function getFiatCurrencyComponents(
-  locale = DEFAULT_LOCALE,
-  localCurrency = DEFAULT_LOCAL_CURRENCY
-): FiatCurrencyComponents {
-  const format = new Intl.NumberFormat(locale, {
-    ...TWO_DECIMALS_CURRENCY,
-    currency: localCurrency,
-    currencyDisplay: LOCAL_CURRENCY_SYMBOL_DISPLAY_TYPE[localCurrency],
-  })
-
-  // See MDN for official docs https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/NumberFormat/formatToParts
-  // Returns something like [{"type":"currency","value":"$"},{"type":"integer","value":"1"}]
-  const parts = format.formatToParts(1000000.0) // This number should provide both types of separators
-  let groupingSeparator = ','
-  let decimalSeparator = '.'
-  let symbol = ''
-  let fullSymbol = ''
-  let symbolAtFront = true
-
-  parts.forEach((part, index) => {
-    if (part.type === 'group') {
-      groupingSeparator = part.value
-    } else if (part.type === 'decimal') {
-      decimalSeparator = part.value
-    } else if (part.type === 'currency') {
-      symbol = part.value
-      fullSymbol = symbol
-
-      symbolAtFront = index === 0
-      const nextPart = symbolAtFront ? parts[index + 1] : parts[index - 1]
-      // Check for additional characters between symbol and number, like whitespace
-      if (nextPart?.type === 'literal') {
-        fullSymbol = symbolAtFront ? symbol + nextPart.value : nextPart.value + symbol
-      }
-    }
-  })
-
-  return {
-    groupingSeparator,
-    decimalSeparator,
-    symbol,
-    fullSymbol,
-    symbolAtFront,
-  }
-}
-
 export function useFormatterLocales(): {
   formatterLocale: SupportedLocale
   formatterLocalCurrency: SupportedLocalCurrency
@@ -943,26 +855,8 @@ export function useFormatter() {
     [currencyToFormatWith, formatterLocale]
   )
 
-  const convertToFiatAmountWithLocales = useCallback(
-    (amount?: number) => convertToFiatAmount(amount, currencyToFormatWith, localCurrencyConversionRateToFormatWith),
-    [currencyToFormatWith, localCurrencyConversionRateToFormatWith]
-  )
-
-  const formatConvertedFiatNumberOrString = useCallback(
-    (options: Omit<FormatNumberOrStringOptions, LocalesType>) =>
-      formatNumberOrString({
-        ...options,
-        locale: formatterLocale,
-        localCurrency: currencyToFormatWith,
-        conversionRate: undefined,
-      }),
-    [currencyToFormatWith, formatterLocale]
-  )
-
   return useMemo(
     () => ({
-      convertToFiatAmount: convertToFiatAmountWithLocales,
-      formatConvertedFiatNumberOrString,
       formatCurrencyAmount: formatCurrencyAmountWithLocales,
       formatEther: formatEtherwithLocales,
       formatFiatPrice: formatFiatPriceWithLocales,
@@ -975,14 +869,12 @@ export function useFormatter() {
       formatTickPrice: formatTickPriceWithLocales,
     }),
     [
-      convertToFiatAmountWithLocales,
-      formatConvertedFiatNumberOrString,
       formatCurrencyAmountWithLocales,
-      formatDeltaWithLocales,
       formatEtherwithLocales,
       formatFiatPriceWithLocales,
       formatNumberOrStringWithLocales,
       formatNumberWithLocales,
+      formatDeltaWithLocales,
       formatPercentWithLocales,
       formatPriceWithLocales,
       formatReviewSwapCurrencyAmountWithLocales,
diff --git a/apps/web/src/utils/index.ts b/apps/web/src/utils/index.ts
index c828d6f2cbd..85481d1e404 100644
--- a/apps/web/src/utils/index.ts
+++ b/apps/web/src/utils/index.ts
@@ -1,3 +1,4 @@
 export { isAddress, shortenAddress } from './addresses'
 export { escapeRegExp } from './escapeRegExp'
 export { getContract } from './getContract'
+export { countSignificantFigures } from './sigFigs'
diff --git a/apps/web/src/utils/isEmpty.test.ts b/apps/web/src/utils/isEmpty.test.ts
deleted file mode 100644
index e73bcd48eee..00000000000
--- a/apps/web/src/utils/isEmpty.test.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { isEmptyObject } from './isEmpty'
-
-describe('isEmptyObject', () => {
-  it.each([
-    [{}, true],
-    [{ a: 1 }, false],
-  ])('should return true for empty objects', (obj, expectedResult) => {
-    expect(isEmptyObject(obj)).toBe(expectedResult)
-  })
-})
diff --git a/apps/web/src/utils/isEmpty.ts b/apps/web/src/utils/isEmpty.ts
deleted file mode 100644
index 764fbd4d7b5..00000000000
--- a/apps/web/src/utils/isEmpty.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export function isEmptyObject(obj: object) {
-  return Object.keys(obj).length === 0
-}
diff --git a/apps/web/src/utils/sigFigs.ts b/apps/web/src/utils/sigFigs.ts
new file mode 100644
index 00000000000..b42aa3dd8b5
--- /dev/null
+++ b/apps/web/src/utils/sigFigs.ts
@@ -0,0 +1,14 @@
+export function countSignificantFigures(num: number): number {
+  const str = num.toString()
+
+  // Remove decimal point if it exists
+  const noPoint = str.replace('.', '')
+
+  // Remove leading zeros
+  const noLeadingZeros = noPoint.replace(/^0+/, '')
+
+  // Remove trailing zeros if number is an integer
+  const noTrailingZeros = str.includes('.') ? noLeadingZeros : noLeadingZeros.replace(/0+$/, '')
+
+  return noTrailingZeros.length
+}
diff --git a/apps/web/src/utils/signing.ts b/apps/web/src/utils/signing.ts
index f9f6bbee561..1d56af1f1ad 100644
--- a/apps/web/src/utils/signing.ts
+++ b/apps/web/src/utils/signing.ts
@@ -1,7 +1,7 @@
 import type { TypedDataDomain, TypedDataField } from '@ethersproject/abstract-signer'
 import { _TypedDataEncoder } from '@ethersproject/hash'
 import type { JsonRpcProvider, JsonRpcSigner } from '@ethersproject/providers'
-import { WalletType, getWalletMeta } from 'utils/walletMeta'
+import { getWalletMeta, WalletType } from 'utils/walletMeta'
 
 // These are WalletConnect peers which do not implement eth_signTypedData_v4, but *do* implement eth_signTypedData.
 // They are special-cased so that signing will still use EIP-712 (which is safer for the user).
diff --git a/apps/web/src/utils/transfer.test.ts b/apps/web/src/utils/transfer.test.ts
deleted file mode 100644
index 6663de8cc09..00000000000
--- a/apps/web/src/utils/transfer.test.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-import { ExternalProvider, JsonRpcProvider, JsonRpcSigner, Web3Provider } from '@ethersproject/providers'
-import { ChainId, CurrencyAmount } from '@uniswap/sdk-core'
-import { DAI, nativeOnChain } from 'constants/tokens'
-import { act, renderHook } from 'test-utils/render'
-
-import { useCreateTransferTransaction } from './transfer'
-
-type Mutable<T> = { -readonly [P in keyof T]: T[P] }
-
-describe('useCreateTransfer', () => {
-  const wallet = '0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826'
-
-  let signer: JsonRpcSigner
-  beforeEach(() => {
-    signer = new JsonRpcProvider().getSigner()
-    jest.spyOn(signer, 'getAddress').mockResolvedValue(wallet)
-    const web3Provider = signer.provider as Mutable<Web3Provider>
-    web3Provider.provider = {
-      isWalletConnect: true,
-      session: { peer: { metadata: { name } } },
-    } as ExternalProvider
-  })
-
-  it('sending eth', async () => {
-    const transferInfo = {
-      provider: signer.provider as Web3Provider,
-      account: wallet,
-      chainId: 1,
-      toAddress: '0xaDd287e6d0213e662D400d815C481b4b2ddE5d65',
-      currencyAmount: CurrencyAmount.fromRawAmount(nativeOnChain(ChainId.MAINNET), 1e18),
-    }
-    const transaction = renderHook(() => useCreateTransferTransaction(transferInfo)).result
-
-    await act(async () => {
-      transaction.current
-    })
-
-    expect(transaction.current).toStrictEqual({
-      from: wallet,
-      to: '0xaDd287e6d0213e662D400d815C481b4b2ddE5d65',
-      value: (1e18).toString(),
-      chainId: 1,
-    })
-  })
-
-  it('sending token', async () => {
-    const transferInfo = {
-      provider: signer.provider as Web3Provider,
-      account: wallet,
-      chainId: 1,
-      toAddress: '0xaDd287e6d0213e662D400d815C481b4b2ddE5d65',
-      currencyAmount: CurrencyAmount.fromRawAmount(DAI, 1e18),
-    }
-    const transaction = renderHook(() => useCreateTransferTransaction(transferInfo)).result
-
-    await act(async () => {
-      transaction.current
-    })
-
-    expect(transaction.current).toStrictEqual({
-      data: '0xa9059cbb000000000000000000000000add287e6d0213e662d400d815c481b4b2dde5d650000000000000000000000000000000000000000000000000de0b6b3a7640000',
-      to: DAI.address,
-      from: wallet,
-      chainId: 1,
-    })
-  })
-
-  it('fails when transfer info is not defined', async () => {
-    const transferInfo = {}
-    const transaction = renderHook(() => useCreateTransferTransaction(transferInfo)).result
-
-    await act(async () => {
-      transaction.current
-    })
-
-    expect(transaction.current).toBeUndefined()
-  })
-})
diff --git a/apps/web/src/utils/transfer.ts b/apps/web/src/utils/transfer.ts
deleted file mode 100644
index ef38e6a3d10..00000000000
--- a/apps/web/src/utils/transfer.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { TransactionRequest } from '@ethersproject/abstract-provider'
-import type { Web3Provider } from '@ethersproject/providers'
-import { ChainId, Currency, CurrencyAmount } from '@uniswap/sdk-core'
-import { useWeb3React } from '@web3-react/core'
-import { useAsyncData } from 'hooks/useAsyncData'
-import { useCallback } from 'react'
-import ERC20_ABI from 'wallet/src/abis/erc20.json'
-import { Erc20 } from 'wallet/src/abis/types'
-
-import { getContract } from './getContract'
-
-interface TransferInfo {
-  provider?: Web3Provider
-  account?: string
-  chainId?: ChainId
-  currencyAmount?: CurrencyAmount<Currency>
-  toAddress?: string
-}
-
-interface TransferCurrencyParams {
-  provider: Web3Provider
-  account: string
-  chainId: ChainId
-  toAddress: string
-  tokenAddress: string
-  amountInWei: string
-}
-
-export function useCreateTransferTransaction(transferInfo: TransferInfo) {
-  const transactionFetcher = useCallback(() => {
-    return getTransferTransaction(transferInfo)
-  }, [transferInfo])
-
-  return useAsyncData(transactionFetcher).data
-}
-
-async function getTransferTransaction(transferInfo: TransferInfo): Promise<TransactionRequest | undefined> {
-  const { provider, account, chainId, currencyAmount, toAddress } = transferInfo
-
-  if (!provider || !account || !chainId || !currencyAmount || !toAddress) {
-    return
-  }
-
-  const currency = currencyAmount.currency
-  const params = {
-    provider,
-    account,
-    chainId,
-    toAddress,
-    tokenAddress: currency.isNative ? '' : currency.address,
-    amountInWei: currencyAmount.quotient.toString(),
-  }
-
-  return currency.isNative ? getNativeTransferRequest(params) : getTokenTransferRequest(params)
-}
-
-function getNativeTransferRequest(params: TransferCurrencyParams): TransactionRequest {
-  const { account, toAddress, amountInWei, chainId } = params
-
-  return {
-    from: account,
-    to: toAddress,
-    value: amountInWei,
-    chainId,
-  }
-}
-
-async function getTokenTransferRequest(
-  transferParams: TransferCurrencyParams
-): Promise<TransactionRequest | undefined> {
-  const { provider, account, chainId, toAddress, tokenAddress, amountInWei } = transferParams
-  const tokenContract = getContract(tokenAddress, ERC20_ABI, provider, account) as Erc20
-
-  try {
-    const populatedTransaction = await tokenContract.populateTransaction.transfer(toAddress, amountInWei, {
-      from: account,
-    })
-
-    return { ...populatedTransaction, chainId }
-  } catch (_) {
-    console.error('could not populate transaction')
-  }
-
-  return undefined
-}
-
-// TODO: https://linear.app/uniswap/issue/WEB-3495/import-useasyncdata-from-mobile
-export function useIsSmartContractAddress(address?: string): {
-  loading: boolean
-  isSmartContractAddress: boolean
-} {
-  const { provider } = useWeb3React()
-
-  const fetchIsSmartContractAddress = useCallback(async () => {
-    if (!address) {
-      return false
-    }
-    const code = await provider?.getCode(address)
-    // provider.getCode(address) will return a hex string if a smart contract is deployed at that address
-    // returning just 0x means there's no code and it's not a smart contract
-    return code !== '0x'
-  }, [provider, address])
-
-  const { data, isLoading } = useAsyncData(fetchIsSmartContractAddress)
-  return { isSmartContractAddress: !!data, loading: isLoading }
-}
diff --git a/apps/web/src/utils/transformSwapRouteToGetQuoteResult.ts b/apps/web/src/utils/transformSwapRouteToGetQuoteResult.ts
index d47c22122ce..8b20f183d33 100644
--- a/apps/web/src/utils/transformSwapRouteToGetQuoteResult.ts
+++ b/apps/web/src/utils/transformSwapRouteToGetQuoteResult.ts
@@ -4,14 +4,8 @@ import { Currency, CurrencyAmount, TradeType } from '@uniswap/sdk-core'
 // eslint-disable-next-line @typescript-eslint/no-restricted-imports
 import { routeAmountsToString, SwapRoute } from '@uniswap/smart-order-router'
 import { Pool } from '@uniswap/v3-sdk'
-import {
-  ClassicQuoteData,
-  QuoteResult,
-  QuoteState,
-  URAQuoteType,
-  V2PoolInRoute,
-  V3PoolInRoute,
-} from 'state/routing/types'
+import { QuoteResult, QuoteState, URAQuoteType } from 'state/routing/types'
+import { ClassicQuoteData, V2PoolInRoute, V3PoolInRoute } from 'state/routing/types'
 
 // from routing-api (https://github.com/Uniswap/routing-api/blob/main/lib/handlers/quote/quote.ts#L243-L311)
 export function transformSwapRouteToGetQuoteResult(
diff --git a/packages/wallet/codegen.ts b/codegen.ts
similarity index 77%
rename from packages/wallet/codegen.ts
rename to codegen.ts
index 8879432c489..060eea1b872 100644
--- a/packages/wallet/codegen.ts
+++ b/codegen.ts
@@ -7,12 +7,12 @@ import type { CodegenConfig } from '@graphql-codegen/cli'
 // future if unwieldy.
 const config: CodegenConfig = {
   overwrite: true,
-  schema: 'src/data/schema.graphql',
+  schema: 'packages/wallet/src/data/__generated__/schema.graphql',
   // pulls every graphql files in a single config
-  documents: ['../../apps/{mobile,stretch}/src/**/*.graphql', '../../packages/**/src/**/*.graphql'],
+  documents: ['apps/{mobile,stretch}/src/**/*.graphql', 'packages/**/src/**/*.graphql'],
   generates: {
     // generates a single output for every app and package
-    'src/data/__generated__/types-and-hooks.ts': {
+    'packages/wallet/src/data/__generated__/types-and-hooks.ts': {
       plugins: ['typescript', 'typescript-operations', 'typescript-react-apollo', 'typescript-resolvers'],
       config: {
         withHooks: true,
diff --git a/config/README.md b/config/README.md
index b4c3c482ba4..dadd085867a 100644
--- a/config/README.md
+++ b/config/README.md
@@ -1 +1,2 @@
-  - `tsconfig` for specific TypeScript configuration for each package
+  - `eslint-config-custom` as a global ESLint config, used in packages as `{ extends: ["custom", ...] }`
+  - `tsconfig` for specific TypeScript configuration for each package
\ No newline at end of file
diff --git a/packages/eslint-config/native.js b/config/eslint-config-custom/index.js
similarity index 77%
rename from packages/eslint-config/native.js
rename to config/eslint-config-custom/index.js
index 2199fcf29b8..113826340c4 100644
--- a/packages/eslint-config/native.js
+++ b/config/eslint-config-custom/index.js
@@ -20,11 +20,11 @@ module.exports = {
   root: true,
   parser: '@typescript-eslint/parser',
   parserOptions: {
-    ecmaFeatures: {
-      jsx: true,
-      modules: true,
-      experimentalObjectRestSpread: true,
-    },
+    "ecmaFeatures": {
+      "jsx": true,
+      "modules": true,
+      "experimentalObjectRestSpread": true
+    }
   },
 
   extends: [
@@ -53,13 +53,13 @@ module.exports = {
     'no-extra-boolean-cast': 'error',
     'no-ex-assign': 'error',
     'no-console': 'warn',
-    curly: 'error',
+    'curly': 'error',
     'no-restricted-globals': ['error'].concat(restrictedGlobals),
-    'no-relative-import-paths/no-relative-import-paths': [
+    "no-relative-import-paths/no-relative-import-paths": [
       2,
       {
-        allowSameFolder: true,
-      },
+        "allowSameFolder": true
+      }
     ],
     'object-shorthand': 'error',
     // https://stackoverflow.com/questions/63961803/eslint-says-all-enums-in-typescript-app-are-already-declared-in-the-upper-scope
@@ -123,65 +123,45 @@ module.exports = {
             importNames: ['logException'],
             message: 'Please use `logger.error` instead.',
           },
-          {
+         {
             name: '@tamagui/core',
             message: "Please import from 'tamagui' directly to prevent mismatches.",
           },
           {
             name: 'utilities/src/format/localeBased',
-            message: 'Use via `useLocalizationContext` instead.',
+            message: "Use via `useLocalizationContext` instead.",
           },
           {
             name: 'wallet/src/features/fiatCurrency/conversion',
-            message: 'Use via `useLocalizationContext` instead.',
+            message: "Use via `useLocalizationContext` instead.",
           },
           {
             name: 'wallet/src/features/language/formatter',
-            message: 'Use via `useLocalizationContext` instead.',
+            message: "Use via `useLocalizationContext` instead.",
           },
           {
             name: 'react-native-safe-area-context',
-            importNames: ['useSafeAreaInsets'],
-            message: 'Use our internal `useDeviceInsets` hook instead.',
+            importNames: ["useSafeAreaInsets"],
+            message: "Use our internal `useDeviceInsets` hook instead.",
           },
           {
             name: 'wallet/src/data/__generated__/types-and-hooks',
-            importNames: ['usePortfolioBalancesQuery'],
-            message: 'Use `usePortfolioBalances` instead.',
+            importNames: ["usePortfolioBalancesQuery"],
+            message: "Use `usePortfolioBalances` instead.",
           },
           {
             name: 'wallet/src/data/__generated__/types-and-hooks',
-            importNames: ['useAccountListQuery'],
-            message: 'Use `useAccountList` instead.',
+            importNames: ["useAccountListQuery"],
+            message: "Use `useAccountList` instead.",
           },
           {
             name: 'wallet/src/features/dataApi/balances',
-            importNames: ['usePortfolioValueModifiers'],
-            message:
-              'Use the wrapper hooks `usePortfolioTotalValue`, `useAccountList` or `usePortfolioBalances` instead of `usePortfolioValueModifiers` directly.',
-          },
-          {
-            name: '@gorhom/bottom-sheet',
-            importNames: ['BottomSheetTextInput'],
-            message:
-              'Use our internal `BottomSheetTextInput` wrapper from `/wallet/src/components/modals/BottomSheetModal`.',
-          },
-          {
-            name: 'expo-localization',
-            message:
-              'Avoid using due to issue with unsupported locales. Use utilties/src/device/locales.ts getDeviceLocales instead',
+            importNames: ["usePortfolioValueModifiers"],
+            message: "Use the wrapper hooks `usePortfolioTotalValue`, `useAccountList` or `usePortfolioBalances` instead of `usePortfolioValueModifiers` directly.",
           },
         ],
       },
     ],
-    'no-restricted-syntax': [
-      'error',
-      {
-        selector: "NewExpression[callee.name='InMemoryCache']",
-        message:
-          'Use `createNewInMemoryCache()` instead of `new InMemoryCache()` to correctly support our custom `ttlMs` cache invalidation policy (see `useRestQuery`). See PR #5683 for details.',
-      },
-    ],
     // React Plugin
     // Overrides rules from @react-native-community:
     // https://github.com/facebook/react-native/blob/3cf0291008dfeed4d967ebb95bdccbe2d52c5b81/packages/eslint-config-react-native-community/index.js#L287
@@ -196,7 +176,10 @@ module.exports = {
       },
     ],
     // Disallow unnecessary curly braces in JSX props and children
-    'react/jsx-curly-brace-presence': [2, { props: 'never', children: 'never', propElementValues: 'always' }],
+    'react/jsx-curly-brace-presence': [
+      2,
+      { props: 'never', children: 'never', propElementValues: 'always' },
+    ],
     'react/no-unstable-nested-components': 'error',
     // React-Native Plugin
     // Overrides rules from @react-native-community:
@@ -245,18 +228,18 @@ module.exports = {
       // enable the rule specifically for TypeScript files
       files: ['*.ts', '*.mts', '*.cts', '*.tsx'],
       rules: {
-        '@typescript-eslint/explicit-function-return-type': ['error', { allowedNames: ['useEffect'] }],
+        '@typescript-eslint/explicit-function-return-type': [
+          'error',
+          { allowedNames: ['useEffect'] },
+        ],
       },
     },
     {
-      // TypeScript rules for non-test files (can be a bit more strict)
+      // enable the rule specifically for TypeScript files
       files: ['*.ts', '*.mts', '*.cts', '*.tsx'],
-      excludedFiles: ['migrations.ts', './**/*.test.ts', './**/*.test.tsx', './test/**'],
+      "excludedFiles": ["migrations.ts", "./**/*.test.ts", "./**/*.test.tsx", "./test/**"],
       rules: {
-        '@typescript-eslint/no-unsafe-return': 'error',
-        '@typescript-eslint/no-non-null-assertion': 'error',
-        '@typescript-eslint/explicit-function-return-type': 'warn',
-        '@typescript-eslint/no-empty-interface': 'warn',
+        "@typescript-eslint/no-unsafe-return": 'error',
       },
     },
     // ignore return type in saga files given return types are unwieldy and tied
@@ -269,19 +252,19 @@ module.exports = {
     },
     // enforce saga imports from typed-redux-saga
     {
-      files: ['./**/*.ts'],
-      excludedFiles: ['./**/*.test.ts', './**/*.test.tsx'],
-      rules: {
-        '@jambit/typed-redux-saga/use-typed-effects': 'error',
-        '@jambit/typed-redux-saga/delegate-effects': 'error',
-      },
+      "files": ["./**/*.ts"],
+      "excludedFiles": ["./**/*.test.ts", "./**/*.test.tsx"],
+      "rules": {
+          "@jambit/typed-redux-saga/use-typed-effects": "error",
+          "@jambit/typed-redux-saga/delegate-effects": "error"
+      }
     },
     // Allow more depth for testing files
     {
-      files: ['./**/*.test.ts', './**/*.test.tsx'],
-      rules: {
+      "files": ["./**/*.test.ts", "./**/*.test.tsx"],
+      "rules": {
         'max-nested-callbacks': ['error', 4],
-      },
+      }
     },
     {
       files: ['*.json'],
@@ -354,6 +337,7 @@ module.exports = {
               'Passcode',
             ],
           },
+
         ],
         'max-lines': ['off'], // cap file length
       },
diff --git a/config/eslint-config-custom/package.json b/config/eslint-config-custom/package.json
new file mode 100644
index 00000000000..c80692cdd80
--- /dev/null
+++ b/config/eslint-config-custom/package.json
@@ -0,0 +1,30 @@
+{
+  "name": "eslint-config-custom",
+  "version": "0.0.0",
+  "dependencies": {
+    "@jambit/eslint-plugin-typed-redux-saga": "0.4.0",
+    "@react-native-community/eslint-config": "3.0.3",
+    "@typescript-eslint/eslint-plugin": "5.62.0",
+    "@typescript-eslint/parser": "5.62.0",
+    "eslint": "8.44.0",
+    "eslint-config-next": "^13.1.3",
+    "eslint-config-prettier": "8.7.0",
+    "eslint-config-turbo": "latest",
+    "eslint-plugin-detox": "1.0.0",
+    "eslint-plugin-jest": "27.2.1",
+    "eslint-plugin-no-relative-import-paths": "1.5.2",
+    "eslint-plugin-no-unsanitized": "4.0.1",
+    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-react": "7.33.2",
+    "eslint-plugin-react-native": "3.11.0",
+    "eslint-plugin-security": "1.5.0",
+    "eslint-plugin-spellcheck": "0.0.20",
+    "eslint-plugin-storybook": "^0.6.10",
+    "prettier": "latest",
+    "prettier-plugin-organize-imports": "3.1.1",
+    "typescript": "4.9.4"
+  },
+  "license": "MIT",
+  "main": "index.js",
+  "private": true
+}
diff --git a/config/jest-presets/jest/globals.js b/config/jest-presets/jest/globals.js
index b4bd13ad892..ad2e331d620 100644
--- a/config/jest-presets/jest/globals.js
+++ b/config/jest-presets/jest/globals.js
@@ -6,7 +6,9 @@ module.exports = {
     AMPLITUDE_EXPERIMENTS_DEPLOYMENT_KEY: 'key',
     APPSFLYER_API_KEY: 'key',
     APPSFLYER_APP_ID: 123,
-    FIAT_ON_RAMP_API_URL: 'https://api.uniswap.org',
+    MELD_API_KEY: 'key',
+    MELD_API_VERSION: 'version',
+    MELD_API_URL: 'https://api-sb.meld.io',
     MOONPAY_API_KEY: 'key',
     MOONPAY_API_URL: 'https://api.moonpay.com',
     MOONPAY_WIDGET_API_URL: 'https://api.moonpay.com',
@@ -19,8 +21,6 @@ module.exports = {
     SIMPLEHASH_API_KEY: 'key',
     SIMPLEHASH_API_URL: 'https://api.simplehash.com',
     STATSIG_PROXY_URL: 'https://api.statsig.com',
-    TEMP_SCANTASTIC_URL: 'https://api.uniswap.org',
-    TRADING_API_KEY: 'key',
     UNISWAP_API_KEY: 'key',
     UNISWAP_API_BASE_URL: 'https://api.uniswap.org',
     UNISWAP_APP_URL: 'https://app.uniswap.org',
diff --git a/dangerfile.ts b/dangerfile.ts
index 11866eea48e..d753719e9ec 100644
--- a/dangerfile.ts
+++ b/dangerfile.ts
@@ -21,30 +21,28 @@ async function processAddChanges() {
   .concat(danger.git.created_files)
   .filter((file) => (file.endsWith('.ts') || file.endsWith('.tsx')) && !file.includes('dangerfile.ts'))
 
-  const linesAddedByFile = (await Promise.all(updatedTsFiles.flatMap(async (file) => {
+  const changes = (await Promise.all(updatedTsFiles.flatMap(async (file) => {
     const structuredDiff = await danger.git.structuredDiffForFile(file);
 
     return (structuredDiff?.chunks || []).flatMap((chunk) => {
       return chunk.changes.filter((change) => change.type === 'add')
     })
-  })))
-
-  const allLinesAdded = linesAddedByFile.flatMap((x) => x)
+  }))).flatMap((x) => x)
 
   // Checks for any logging and reminds the developer not to log sensitive data
-  if (allLinesAdded.some((change) => change.content.includes('logMessage') || change.content.includes('logger.'))) {
+  if (changes.some((change) => change.content.includes('logMessage') || change.content.includes('logger.'))) {
     warn('You are logging data. Please confirm that nothing sensitive is being logged!')
   }
 
   // Check for direct logging calls
-  if (allLinesAdded.some((change) => change.content.includes('analytics.sendEvent'))) {
+  if (changes.some((change) => change.content.includes('analytics.sendEvent'))) {
     warn(`You are using the direct analytics call. Please use the typed wrapper for your given surface if possible!`)
   }
 
   // Check for UI package imports that are longer than needed
-  const validLongerImports = [`'ui/src'`, `'ui/src/theme'`, `'ui/src/loading'`, `'ui/src/assets'`]
+  const validLongerImports = [`'ui/src'`, `'ui/src/theme'`, `'ui/src/loading'`]
   const longestImportLength = Math.max(...validLongerImports.map((i) => i.length))
-  allLinesAdded.forEach((change) => {
+  changes.forEach((change) => {
     const indices = getIndicesOf(`from 'ui/src/`, change.content)
 
     indices.forEach((idx) => {
@@ -56,27 +54,21 @@ async function processAddChanges() {
     })
   })
 
-  linesAddedByFile.forEach((linesAdded) => {
-    const concatenatedAddedLines = linesAdded.reduce((acc, curr) => acc + curr.content, '')
-
-    // In this section we concatenate all the added lines by file in order to account for multiline changes.
-
-    // Check for non-recommended sentry usage
-    if (/logger\.error\(\s*new Error\(/.test(concatenatedAddedLines)) {
-      warn(`It appears you may be manually logging a Sentry error. Please log the error directly if possible. If you need to use a custom error message, ensure the error object is added to the 'cause' property.`)
-    }
-    if (/logger\.error\(\s*['`"]/.test(concatenatedAddedLines)) {
-      warn(`Please log an error, not a string!`)
-    }
+  // Check for non-recommended sentry usage
+  if (changes.some((change) => /logger\.error\(\s*new Error\(/.test(change.content))) {
+    warn(`It appears you may be manually logging a Sentry error. Please log the error directly if possible. If you need to use a custom error message, ensure the error object is added to the 'cause' property.`)
+  }
+  if (changes.some((change) => /logger\.error\(\s*['`"]/.test(change.content))) {
+    warn(`Please log an error, not a string!`)
+  }
 
-    // Check for incorrect usage of `createSelector`
-    if (concatenatedAddedLines.includes(`createSelector(`)) {
-      warn("You've added a new call to `createSelector()`. This is Ok, but please make sure you're using it correctly and you're not creating a new selector on every render. See PR #5172 for details.")
-    }
-    if (/(useAppSelector|appSelect|select)\(\s*makeSelect/.test(concatenatedAddedLines)) {
-      fail(`It appears you may be creating a new selector on every render. See PR #5172 for details on how to fix this.`)
-    }
-  })
+  // Check for incorrect usage of `createSelector`
+  if (changes.some((change) => change.content.includes(`createSelector(`))) {
+    warn("You've added a new call to `createSelector()`. This is Ok, but please make sure you're using it correctly and you're not creating a new selector on every render. See PR #5172 for details.")
+  }
+  if (changes.some((change) => /(useAppSelector|appSelect|select)\(\s*makeSelect/.test(change.content))) {
+    fail(`It appears you may be creating a new selector on every render. See PR #5172 for details on how to fix this.`)
+  }
 }
 
 async function checkCocoaPodsVersion() {
@@ -100,9 +92,9 @@ async function checkApostrophes() {
     const changedLines = (structuredDiff?.chunks || []).flatMap((chunk) => {
       return chunk.changes.filter((change) => change.type === 'add')
     })
-    changedLines.forEach((line, index) => {
+    changedLines.forEach((line) => {
       if (line.content.includes("'")) {
-        fail("You added a string using the ' character. Please use the ’ character instead!. Issue in line: " + index)
+        fail("You added a string using the ' character. Please use the ’ character instead!")
       }
     })
   }
diff --git a/package.json b/package.json
index 2ba182ee5a7..0fec35f99ad 100644
--- a/package.json
+++ b/package.json
@@ -6,17 +6,23 @@
     "@commitlint/config-conventional": "^17.4.2",
     "@crowdin/cli": "3.14.0",
     "@ethersproject/keccak256": "5.7.0",
+    "@graphql-codegen/cli": "^3.3.1",
+    "@graphql-codegen/client-preset": "^3.0.1",
+    "@graphql-codegen/typescript": "^3.0.4",
+    "@graphql-codegen/typescript-operations": "^3.0.2",
+    "@graphql-codegen/typescript-react-apollo": "^3.3.7",
+    "@graphql-codegen/typescript-resolvers": "^3.2.1",
     "@manypkg/cli": "^0.19.2",
     "danger": "11.2.6",
     "depcheck": "1.4.7",
     "dotenv-cli": "^7.0.0",
+    "get-graphql-schema": "^2.1.2",
     "husky": "^8.0.3",
     "i18next": "21.9.1",
     "i18next-parser": "8.6.0",
     "patch-package": "^7.0.0",
     "syncpack": "^8.5.14",
-    "turbo": "1.10.16",
-    "turbo-ignore": "^1.11.3"
+    "turbo": "1.10.16"
   },
   "engines": {
     "node": "=18.12.1",
@@ -37,7 +43,7 @@
     "cypress": "12.12.0",
     "@babel/preset-env": "7.23.3",
     "immer": "9.0.21",
-    "@uniswap/v2-sdk": "4.1.0",
+    "@uniswap/v2-sdk": "3.2.3",
     "@apollo/client": "3.7.11",
     "@uniswap/sdk-core": "4.0.7",
     "@react-navigation/routers": "6.1.9",
@@ -46,7 +52,7 @@
     "@walletconnect/ethereum-provider": "2.10.1",
     "@xmldom/xmldom": "0.7.7",
     "esbuild": "0.19.3",
-    "eslint-plugin-import": "2.27.5",
+    "eslint-plugin-import": "2.27",
     "multicodec": "3.0.1",
     "multihashes": "4.0.2",
     "@ethersproject/hash": "5.7.0",
@@ -65,6 +71,7 @@
     "@sentry/node": "7.45.0",
     "@sentry/types": "7.45.0",
     "@sentry/tracing": "7.45.0",
+    "typescript": "4.9.4",
     "xml2js": "0.5.0",
     "yaml": "2.2.2",
     "@shopify/flash-list@1.4.3": "patch:@shopify/flash-list@npm%3A1.4.3#./.yarn/patches/@shopify-flash-list-npm-1.4.3-dc03c28fdd.patch",
@@ -72,8 +79,7 @@
     "expo-local-authentication@13.0.2": "patch:expo-local-authentication@npm%3A13.0.2#./.yarn/patches/expo-local-authentication-npm-13.0.2-e7639a51e4.patch",
     "react-native-context-menu-view@1.6.0": "patch:react-native-context-menu-view@npm%3A1.6.0#./.yarn/patches/react-native-context-menu-view-npm-1.6.0-f5f5410f50.patch",
     "multiformats@^9.4.2": "patch:multiformats@npm%3A9.4.2#./.yarn/patches/multiformats-npm-9.4.2-44b8a13c1d.patch",
-    "react-native-wagmi-charts@2.3.0": "patch:react-native-wagmi-charts@npm%3A2.3.0#./.yarn/patches/react-native-wagmi-charts-npm-2.3.0-8e836a8f3c.patch",
-    "@gorhom/bottom-sheet@4.5.1": "patch:@gorhom/bottom-sheet@npm%3A4.5.1#./.yarn/patches/@gorhom-bottom-sheet-npm-4.5.1-d8ef5d483d.patch"
+    "react-native-wagmi-charts@2.3.0": "patch:react-native-wagmi-charts@npm%3A2.3.0#./.yarn/patches/react-native-wagmi-charts-npm-2.3.0-8e836a8f3c.patch"
   },
   "scripts": {
     "g:build": "turbo run build --concurrency=100%",
@@ -90,12 +96,13 @@
     "g:run-fast-checks": "turbo run typecheck lint build --parallel --filter=\"[HEAD]\"",
     "g:run-all-checks": "turbo run typecheck lint test build check:circular --parallel",
     "g:test": "turbo run test --parallel",
+    "g:test:changed": "./scripts/turbo-changed.sh test",
     "g:test:coverage": "turbo run test --parallel -- --collectCoverage=true",
     "g:snapshots": "turbo run snapshots --parallel",
     "g:typecheck": "turbo run typecheck --parallel",
     "g:typecheck:changed": "./scripts/turbo-changed.sh typecheck",
-    "graphql:schema": "turbo run graphql:schema --parallel",
-    "graphql:generate": "turbo run graphql:generate --parallel",
+    "graphql:generate": "graphql-codegen --config codegen.ts",
+    "graphql:schema": "get-graphql-schema https://api.uniswap.org/v1/graphql -h Origin=https://app.uniswap.org > ./packages/wallet/src/data/__generated__/schema.graphql",
     "i18n:extract": "i18next",
     "i18n:_upload": "crowdin upload --token=$CROWDIN_ACCESS_TOKEN",
     "i18n:upload": "dotenv -e .env.defaults -c -- yarn run i18n:_upload",
@@ -107,8 +114,9 @@
     "postinstall": "husky install && yarn patch-package && yarn g:prepare",
     "stretch": "yarn workspace @uniswap/stretch",
     "ui:build:icons": "yarn workspace ui build:icons",
-    "upgrade:tamagui": "yarn up '*tamagui*' '@tamagui/*'",
-    "upgrade:tamagui:canary": "yarn up '*tamagui*'@canary '@tamagui/*'@canary",
+    "upgrade:next": "manypkg upgrade next && manypkg upgrade eslint-config-next",
+    "upgrade:rnw": "manypkg upgrade react-native-web",
+    "upgrade:tamagui": "manypkg upgrade tamagui && manypkg upgrade @tamagui && manypkg upgrade tamagui-loader",
     "web": "yarn workspace @uniswap/interface"
   },
   "workspaces": [
diff --git a/packages/eslint-config/.depcheckrc b/packages/eslint-config/.depcheckrc
deleted file mode 100644
index 453e712f92c..00000000000
--- a/packages/eslint-config/.depcheckrc
+++ /dev/null
@@ -1 +0,0 @@
-ignores: ["prettier-plugin-organize-imports"]
diff --git a/packages/eslint-config/.eslintrc b/packages/eslint-config/.eslintrc
deleted file mode 100644
index f2d1386bbf4..00000000000
--- a/packages/eslint-config/.eslintrc
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "root": true,
-  "extends": [
-    "./node.js"
-  ]
-}
diff --git a/packages/eslint-config/.gitignore b/packages/eslint-config/.gitignore
deleted file mode 100644
index 34f87ba1ec2..00000000000
--- a/packages/eslint-config/.gitignore
+++ /dev/null
@@ -1,18 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.js
-
-# misc
-/src/__generated__
-.DS_Store
-.env.local
-.env.development.local
-.env.test.local
-.env.production.local
-
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
diff --git a/packages/eslint-config/LICENSE b/packages/eslint-config/LICENSE
deleted file mode 100644
index 43b8875914c..00000000000
--- a/packages/eslint-config/LICENSE
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright 2022 Uniswap Labs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
diff --git a/packages/eslint-config/README.md b/packages/eslint-config/README.md
deleted file mode 100644
index 09eafc55ce0..00000000000
--- a/packages/eslint-config/README.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# @uniswap/eslint-config
-
-Uniswap ESLint config to enforce coding standards and best practices.
-
-- TypeScript and Jest support
-- Seamless Prettier integration
-- Separate environments for Node.js and React
-
-## Installation
-
-It's already in the monorepo, just add to package.json devDependencies:
-
-```
-  "@uniswap/eslint-config": "workspace:^"
-```
-
-## Usage
-
-For react-native based apps and packages:
-
-```js
-module.exports = {
-  extends: ['@uniswap/eslint-config/native'],
-}
-```
-
-For web-only apps:
-
-Make sure to include `require('@uniswap/eslint-config/load')` at the top of your ESLint config. This loads a `@rushstack/eslint-patch/modern-module-resolution` patch so that ESLint loads any plugins installed by this package. 
-
-```js
-require('@uniswap/eslint-config/load')
-
-module.exports = {
-  extends: '@uniswap/eslint-config/node'
-}
-```
-
-or:
-
-```js
-require('@uniswap/eslint-config/load')
-
-module.exports = {
-  extends: '@uniswap/eslint-config/react'
-}
-```
-
-#### VSCode
-
-If you're a VSCode user, consider installing the official [ESLint plugin](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) and copying [`./.vscode/settings.json`](.vscode/settings.json#L1-L6) to your own `.vscode/settings.json` configuration file. This will automatically run `eslint --fix` on save.
diff --git a/packages/eslint-config/__snapshots__/preset.test.ts.snap b/packages/eslint-config/__snapshots__/preset.test.ts.snap
deleted file mode 100644
index a15275d9a34..00000000000
--- a/packages/eslint-config/__snapshots__/preset.test.ts.snap
+++ /dev/null
@@ -1,3725 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`should have a correct configuration for a Cypress e2e file 1`] = `
-{
-  "env": {
-    "cypress/globals": true,
-    "es6": true,
-    "node": true,
-  },
-  "globals": {},
-  "ignorePatterns": [],
-  "noInlineConfig": undefined,
-  "parser": Any<String>,
-  "parserOptions": {
-    "ecmaVersion": 2020,
-    "sourceType": "module",
-  },
-  "plugins": [
-    "unused-imports",
-    "import",
-    "@typescript-eslint",
-    "cypress",
-    "prettier",
-  ],
-  "reportUnusedDisableDirectives": undefined,
-  "rules": {
-    "@babel/object-curly-spacing": [
-      "off",
-    ],
-    "@babel/semi": [
-      "off",
-    ],
-    "@typescript-eslint/ban-ts-comment": [
-      "off",
-    ],
-    "@typescript-eslint/ban-ts-ignore": [
-      "off",
-    ],
-    "@typescript-eslint/ban-types": [
-      "error",
-    ],
-    "@typescript-eslint/block-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/brace-style": [
-      "off",
-    ],
-    "@typescript-eslint/comma-dangle": [
-      "off",
-    ],
-    "@typescript-eslint/comma-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/explicit-function-return-type": [
-      "off",
-    ],
-    "@typescript-eslint/explicit-module-boundary-types": [
-      "off",
-    ],
-    "@typescript-eslint/func-call-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/indent": [
-      "off",
-    ],
-    "@typescript-eslint/key-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/keyword-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/lines-around-comment": [
-      0,
-    ],
-    "@typescript-eslint/member-delimiter-style": [
-      "off",
-    ],
-    "@typescript-eslint/no-array-constructor": [
-      "error",
-    ],
-    "@typescript-eslint/no-duplicate-enum-values": [
-      "error",
-    ],
-    "@typescript-eslint/no-explicit-any": [
-      "off",
-    ],
-    "@typescript-eslint/no-extra-non-null-assertion": [
-      "error",
-    ],
-    "@typescript-eslint/no-extra-parens": [
-      "off",
-    ],
-    "@typescript-eslint/no-extra-semi": [
-      "off",
-    ],
-    "@typescript-eslint/no-loss-of-precision": [
-      "error",
-    ],
-    "@typescript-eslint/no-misused-new": [
-      "error",
-    ],
-    "@typescript-eslint/no-namespace": [
-      "error",
-    ],
-    "@typescript-eslint/no-non-null-asserted-optional-chain": [
-      "error",
-    ],
-    "@typescript-eslint/no-restricted-imports": [
-      "error",
-      {
-        "paths": [
-          {
-            "message": "Please import from '@ethersproject/module' directly to support tree-shaking.",
-            "name": "ethers",
-          },
-        ],
-        "patterns": [
-          {
-            "group": [
-              "**/dist",
-            ],
-            "message": "Do not import from dist/ - this is an implementation detail, and breaks tree-shaking.",
-          },
-        ],
-      },
-    ],
-    "@typescript-eslint/no-this-alias": [
-      "error",
-    ],
-    "@typescript-eslint/no-unnecessary-type-constraint": [
-      "error",
-    ],
-    "@typescript-eslint/no-unsafe-declaration-merging": [
-      "error",
-    ],
-    "@typescript-eslint/no-unused-vars": [
-      "error",
-    ],
-    "@typescript-eslint/no-var-requires": [
-      "error",
-    ],
-    "@typescript-eslint/object-curly-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/prefer-as-const": [
-      "error",
-    ],
-    "@typescript-eslint/quotes": [
-      0,
-    ],
-    "@typescript-eslint/semi": [
-      "off",
-    ],
-    "@typescript-eslint/space-before-blocks": [
-      "off",
-    ],
-    "@typescript-eslint/space-before-function-paren": [
-      "off",
-    ],
-    "@typescript-eslint/space-infix-ops": [
-      "off",
-    ],
-    "@typescript-eslint/triple-slash-reference": [
-      "error",
-    ],
-    "@typescript-eslint/type-annotation-spacing": [
-      "off",
-    ],
-    "array-bracket-newline": [
-      "off",
-    ],
-    "array-bracket-spacing": [
-      "off",
-    ],
-    "array-element-newline": [
-      "off",
-    ],
-    "arrow-body-style": [
-      "off",
-    ],
-    "arrow-parens": [
-      "off",
-    ],
-    "arrow-spacing": [
-      "off",
-    ],
-    "babel/object-curly-spacing": [
-      "off",
-    ],
-    "babel/quotes": [
-      0,
-    ],
-    "babel/semi": [
-      "off",
-    ],
-    "block-spacing": [
-      "off",
-    ],
-    "brace-style": [
-      "off",
-    ],
-    "comma-dangle": [
-      "off",
-    ],
-    "comma-spacing": [
-      "off",
-    ],
-    "comma-style": [
-      "off",
-    ],
-    "computed-property-spacing": [
-      "off",
-    ],
-    "constructor-super": [
-      "off",
-    ],
-    "curly": [
-      0,
-    ],
-    "cypress/no-assigning-return-values": [
-      "error",
-    ],
-    "cypress/no-async-tests": [
-      "error",
-    ],
-    "cypress/no-unnecessary-waiting": [
-      "error",
-    ],
-    "cypress/unsafe-to-chain-command": [
-      "error",
-    ],
-    "dot-location": [
-      "off",
-    ],
-    "eol-last": [
-      "off",
-    ],
-    "flowtype/boolean-style": [
-      "off",
-    ],
-    "flowtype/delimiter-dangle": [
-      "off",
-    ],
-    "flowtype/generic-spacing": [
-      "off",
-    ],
-    "flowtype/object-type-curly-spacing": [
-      "off",
-    ],
-    "flowtype/object-type-delimiter": [
-      "off",
-    ],
-    "flowtype/quotes": [
-      "off",
-    ],
-    "flowtype/semi": [
-      "off",
-    ],
-    "flowtype/space-after-type-colon": [
-      "off",
-    ],
-    "flowtype/space-before-generic-bracket": [
-      "off",
-    ],
-    "flowtype/space-before-type-colon": [
-      "off",
-    ],
-    "flowtype/union-intersection-spacing": [
-      "off",
-    ],
-    "for-direction": [
-      "error",
-    ],
-    "func-call-spacing": [
-      "off",
-    ],
-    "function-call-argument-newline": [
-      "off",
-    ],
-    "function-paren-newline": [
-      "off",
-    ],
-    "generator-star": [
-      "off",
-    ],
-    "generator-star-spacing": [
-      "off",
-    ],
-    "getter-return": [
-      "off",
-    ],
-    "implicit-arrow-linebreak": [
-      "off",
-    ],
-    "import/named": [
-      "off",
-    ],
-    "import/no-unused-modules": [
-      "error",
-      {
-        "unusedExports": true,
-      },
-    ],
-    "indent": [
-      "off",
-    ],
-    "indent-legacy": [
-      "off",
-    ],
-    "jsx-quotes": [
-      "off",
-    ],
-    "key-spacing": [
-      "off",
-    ],
-    "keyword-spacing": [
-      "off",
-    ],
-    "linebreak-style": [
-      "off",
-    ],
-    "lines-around-comment": [
-      0,
-    ],
-    "max-len": [
-      0,
-    ],
-    "max-statements-per-line": [
-      "off",
-    ],
-    "multiline-ternary": [
-      "off",
-    ],
-    "new-parens": [
-      "off",
-    ],
-    "newline-per-chained-call": [
-      "off",
-    ],
-    "no-array-constructor": [
-      "off",
-    ],
-    "no-arrow-condition": [
-      "off",
-    ],
-    "no-async-promise-executor": [
-      "error",
-    ],
-    "no-case-declarations": [
-      "error",
-    ],
-    "no-class-assign": [
-      "error",
-    ],
-    "no-comma-dangle": [
-      "off",
-    ],
-    "no-compare-neg-zero": [
-      "error",
-    ],
-    "no-cond-assign": [
-      "error",
-    ],
-    "no-confusing-arrow": [
-      0,
-    ],
-    "no-const-assign": [
-      "off",
-    ],
-    "no-constant-condition": [
-      "error",
-    ],
-    "no-control-regex": [
-      "error",
-    ],
-    "no-debugger": [
-      "error",
-    ],
-    "no-delete-var": [
-      "error",
-    ],
-    "no-dupe-args": [
-      "off",
-    ],
-    "no-dupe-class-members": [
-      "off",
-    ],
-    "no-dupe-else-if": [
-      "error",
-    ],
-    "no-dupe-keys": [
-      "off",
-    ],
-    "no-duplicate-case": [
-      "error",
-    ],
-    "no-empty": [
-      "error",
-    ],
-    "no-empty-character-class": [
-      "error",
-    ],
-    "no-empty-pattern": [
-      "error",
-    ],
-    "no-ex-assign": [
-      "error",
-    ],
-    "no-extra-boolean-cast": [
-      "error",
-    ],
-    "no-extra-parens": [
-      "off",
-    ],
-    "no-extra-semi": [
-      "off",
-    ],
-    "no-fallthrough": [
-      "error",
-    ],
-    "no-floating-decimal": [
-      "off",
-    ],
-    "no-func-assign": [
-      "off",
-    ],
-    "no-global-assign": [
-      "error",
-    ],
-    "no-import-assign": [
-      "off",
-    ],
-    "no-inner-declarations": [
-      "error",
-    ],
-    "no-invalid-regexp": [
-      "error",
-    ],
-    "no-irregular-whitespace": [
-      "error",
-    ],
-    "no-loss-of-precision": [
-      "off",
-    ],
-    "no-misleading-character-class": [
-      "error",
-    ],
-    "no-mixed-operators": [
-      0,
-    ],
-    "no-mixed-spaces-and-tabs": [
-      "off",
-    ],
-    "no-multi-spaces": [
-      "off",
-    ],
-    "no-multiple-empty-lines": [
-      "off",
-    ],
-    "no-new-symbol": [
-      "off",
-    ],
-    "no-nonoctal-decimal-escape": [
-      "error",
-    ],
-    "no-obj-calls": [
-      "off",
-    ],
-    "no-octal": [
-      "error",
-    ],
-    "no-prototype-builtins": [
-      "error",
-    ],
-    "no-redeclare": [
-      "off",
-    ],
-    "no-regex-spaces": [
-      "error",
-    ],
-    "no-reserved-keys": [
-      "off",
-    ],
-    "no-self-assign": [
-      "error",
-    ],
-    "no-setter-return": [
-      "off",
-    ],
-    "no-shadow-restricted-names": [
-      "error",
-    ],
-    "no-space-before-semi": [
-      "off",
-    ],
-    "no-spaced-func": [
-      "off",
-    ],
-    "no-sparse-arrays": [
-      "error",
-    ],
-    "no-tabs": [
-      0,
-    ],
-    "no-this-before-super": [
-      "off",
-    ],
-    "no-trailing-spaces": [
-      "off",
-    ],
-    "no-undef": [
-      "off",
-    ],
-    "no-unexpected-multiline": [
-      0,
-    ],
-    "no-unreachable": [
-      "off",
-    ],
-    "no-unsafe-finally": [
-      "error",
-    ],
-    "no-unsafe-negation": [
-      "off",
-    ],
-    "no-unsafe-optional-chaining": [
-      "error",
-    ],
-    "no-unused-labels": [
-      "error",
-    ],
-    "no-unused-vars": [
-      "off",
-    ],
-    "no-useless-backreference": [
-      "error",
-    ],
-    "no-useless-catch": [
-      "error",
-    ],
-    "no-useless-escape": [
-      "error",
-    ],
-    "no-var": [
-      "error",
-    ],
-    "no-whitespace-before-property": [
-      "off",
-    ],
-    "no-with": [
-      "error",
-    ],
-    "no-wrap-func": [
-      "off",
-    ],
-    "nonblock-statement-body-position": [
-      "off",
-    ],
-    "object-curly-newline": [
-      "off",
-    ],
-    "object-curly-spacing": [
-      "off",
-    ],
-    "object-property-newline": [
-      "off",
-    ],
-    "object-shorthand": [
-      "error",
-      "always",
-    ],
-    "one-var-declaration-per-line": [
-      "off",
-    ],
-    "operator-linebreak": [
-      "off",
-    ],
-    "padded-blocks": [
-      "off",
-    ],
-    "prefer-arrow-callback": [
-      "off",
-    ],
-    "prefer-const": [
-      "error",
-    ],
-    "prefer-rest-params": [
-      "error",
-    ],
-    "prefer-spread": [
-      "error",
-    ],
-    "prettier/prettier": [
-      "error",
-      {
-        "printWidth": 120,
-        "semi": false,
-        "singleQuote": true,
-      },
-    ],
-    "quote-props": [
-      "off",
-    ],
-    "quotes": [
-      0,
-    ],
-    "react/jsx-child-element-spacing": [
-      "off",
-    ],
-    "react/jsx-closing-bracket-location": [
-      "off",
-    ],
-    "react/jsx-closing-tag-location": [
-      "off",
-    ],
-    "react/jsx-curly-newline": [
-      "off",
-    ],
-    "react/jsx-curly-spacing": [
-      "off",
-    ],
-    "react/jsx-equals-spacing": [
-      "off",
-    ],
-    "react/jsx-first-prop-new-line": [
-      "off",
-    ],
-    "react/jsx-indent": [
-      "off",
-    ],
-    "react/jsx-indent-props": [
-      "off",
-    ],
-    "react/jsx-max-props-per-line": [
-      "off",
-    ],
-    "react/jsx-newline": [
-      "off",
-    ],
-    "react/jsx-one-expression-per-line": [
-      "off",
-    ],
-    "react/jsx-props-no-multi-spaces": [
-      "off",
-    ],
-    "react/jsx-space-before-closing": [
-      "off",
-    ],
-    "react/jsx-tag-spacing": [
-      "off",
-    ],
-    "react/jsx-wrap-multilines": [
-      "off",
-    ],
-    "require-yield": [
-      "error",
-    ],
-    "rest-spread-spacing": [
-      "off",
-    ],
-    "semi": [
-      "off",
-    ],
-    "semi-spacing": [
-      "off",
-    ],
-    "semi-style": [
-      "off",
-    ],
-    "space-after-function-name": [
-      "off",
-    ],
-    "space-after-keywords": [
-      "off",
-    ],
-    "space-before-blocks": [
-      "off",
-    ],
-    "space-before-function-paren": [
-      "off",
-    ],
-    "space-before-function-parentheses": [
-      "off",
-    ],
-    "space-before-keywords": [
-      "off",
-    ],
-    "space-in-brackets": [
-      "off",
-    ],
-    "space-in-parens": [
-      "off",
-    ],
-    "space-infix-ops": [
-      "off",
-    ],
-    "space-return-throw-case": [
-      "off",
-    ],
-    "space-unary-ops": [
-      "off",
-    ],
-    "space-unary-word-ops": [
-      "off",
-    ],
-    "standard/array-bracket-even-spacing": [
-      "off",
-    ],
-    "standard/computed-property-even-spacing": [
-      "off",
-    ],
-    "standard/object-curly-even-spacing": [
-      "off",
-    ],
-    "switch-colon-spacing": [
-      "off",
-    ],
-    "template-curly-spacing": [
-      "off",
-    ],
-    "template-tag-spacing": [
-      "off",
-    ],
-    "unicode-bom": [
-      "off",
-    ],
-    "unicorn/empty-brace-spaces": [
-      "off",
-    ],
-    "unicorn/no-nested-ternary": [
-      "off",
-    ],
-    "unicorn/number-literal-case": [
-      "off",
-    ],
-    "unused-imports/no-unused-imports": [
-      "error",
-    ],
-    "use-isnan": [
-      "error",
-    ],
-    "valid-typeof": [
-      "error",
-    ],
-    "vue/array-bracket-newline": [
-      "off",
-    ],
-    "vue/array-bracket-spacing": [
-      "off",
-    ],
-    "vue/array-element-newline": [
-      "off",
-    ],
-    "vue/arrow-spacing": [
-      "off",
-    ],
-    "vue/block-spacing": [
-      "off",
-    ],
-    "vue/block-tag-newline": [
-      "off",
-    ],
-    "vue/brace-style": [
-      "off",
-    ],
-    "vue/comma-dangle": [
-      "off",
-    ],
-    "vue/comma-spacing": [
-      "off",
-    ],
-    "vue/comma-style": [
-      "off",
-    ],
-    "vue/dot-location": [
-      "off",
-    ],
-    "vue/func-call-spacing": [
-      "off",
-    ],
-    "vue/html-closing-bracket-newline": [
-      "off",
-    ],
-    "vue/html-closing-bracket-spacing": [
-      "off",
-    ],
-    "vue/html-end-tags": [
-      "off",
-    ],
-    "vue/html-indent": [
-      "off",
-    ],
-    "vue/html-quotes": [
-      "off",
-    ],
-    "vue/html-self-closing": [
-      0,
-    ],
-    "vue/key-spacing": [
-      "off",
-    ],
-    "vue/keyword-spacing": [
-      "off",
-    ],
-    "vue/max-attributes-per-line": [
-      "off",
-    ],
-    "vue/max-len": [
-      0,
-    ],
-    "vue/multiline-html-element-content-newline": [
-      "off",
-    ],
-    "vue/multiline-ternary": [
-      "off",
-    ],
-    "vue/mustache-interpolation-spacing": [
-      "off",
-    ],
-    "vue/no-extra-parens": [
-      "off",
-    ],
-    "vue/no-multi-spaces": [
-      "off",
-    ],
-    "vue/no-spaces-around-equal-signs-in-attribute": [
-      "off",
-    ],
-    "vue/object-curly-newline": [
-      "off",
-    ],
-    "vue/object-curly-spacing": [
-      "off",
-    ],
-    "vue/object-property-newline": [
-      "off",
-    ],
-    "vue/operator-linebreak": [
-      "off",
-    ],
-    "vue/quote-props": [
-      "off",
-    ],
-    "vue/script-indent": [
-      "off",
-    ],
-    "vue/singleline-html-element-content-newline": [
-      "off",
-    ],
-    "vue/space-in-parens": [
-      "off",
-    ],
-    "vue/space-infix-ops": [
-      "off",
-    ],
-    "vue/space-unary-ops": [
-      "off",
-    ],
-    "vue/template-curly-spacing": [
-      "off",
-    ],
-    "wrap-iife": [
-      "off",
-    ],
-    "wrap-regex": [
-      "off",
-    ],
-    "yield-star-spacing": [
-      "off",
-    ],
-  },
-  "settings": {
-    "import/extensions": [
-      ".ts",
-      ".tsx",
-      ".js",
-      ".jsx",
-    ],
-    "import/external-module-folders": [
-      "node_modules",
-      "node_modules/@types",
-    ],
-    "import/parsers": {
-      "@typescript-eslint/parser": [
-        ".ts",
-        ".tsx",
-      ],
-    },
-    "import/resolver": {
-      "node": {
-        "extensions": [
-          ".ts",
-          ".tsx",
-          ".js",
-          ".jsx",
-        ],
-      },
-      "typescript": {
-        "alwaysTryTypes": true,
-      },
-    },
-  },
-}
-`;
-
-exports[`should have a correct configuration for a Jest file 1`] = `
-{
-  "env": {
-    "es6": true,
-    "jest": true,
-    "jest/globals": true,
-    "node": true,
-  },
-  "globals": {},
-  "ignorePatterns": [],
-  "noInlineConfig": undefined,
-  "parser": Any<String>,
-  "parserOptions": {
-    "ecmaVersion": 2020,
-    "sourceType": "module",
-  },
-  "plugins": [
-    "unused-imports",
-    "import",
-    "@typescript-eslint",
-    "jest",
-    "prettier",
-  ],
-  "reportUnusedDisableDirectives": undefined,
-  "rules": {
-    "@babel/object-curly-spacing": [
-      "off",
-    ],
-    "@babel/semi": [
-      "off",
-    ],
-    "@typescript-eslint/ban-ts-comment": [
-      "off",
-    ],
-    "@typescript-eslint/ban-ts-ignore": [
-      "off",
-    ],
-    "@typescript-eslint/ban-types": [
-      "error",
-    ],
-    "@typescript-eslint/block-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/brace-style": [
-      "off",
-    ],
-    "@typescript-eslint/comma-dangle": [
-      "off",
-    ],
-    "@typescript-eslint/comma-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/explicit-function-return-type": [
-      "off",
-    ],
-    "@typescript-eslint/explicit-module-boundary-types": [
-      "off",
-    ],
-    "@typescript-eslint/func-call-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/indent": [
-      "off",
-    ],
-    "@typescript-eslint/key-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/keyword-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/lines-around-comment": [
-      0,
-    ],
-    "@typescript-eslint/member-delimiter-style": [
-      "off",
-    ],
-    "@typescript-eslint/no-array-constructor": [
-      "error",
-    ],
-    "@typescript-eslint/no-duplicate-enum-values": [
-      "error",
-    ],
-    "@typescript-eslint/no-explicit-any": [
-      "off",
-    ],
-    "@typescript-eslint/no-extra-non-null-assertion": [
-      "error",
-    ],
-    "@typescript-eslint/no-extra-parens": [
-      "off",
-    ],
-    "@typescript-eslint/no-extra-semi": [
-      "off",
-    ],
-    "@typescript-eslint/no-loss-of-precision": [
-      "error",
-    ],
-    "@typescript-eslint/no-misused-new": [
-      "error",
-    ],
-    "@typescript-eslint/no-namespace": [
-      "error",
-    ],
-    "@typescript-eslint/no-non-null-asserted-optional-chain": [
-      "error",
-    ],
-    "@typescript-eslint/no-restricted-imports": [
-      "error",
-      {
-        "paths": [
-          {
-            "message": "Please import from '@ethersproject/module' directly to support tree-shaking.",
-            "name": "ethers",
-          },
-        ],
-        "patterns": [
-          {
-            "group": [
-              "**/dist",
-            ],
-            "message": "Do not import from dist/ - this is an implementation detail, and breaks tree-shaking.",
-          },
-        ],
-      },
-    ],
-    "@typescript-eslint/no-this-alias": [
-      "error",
-    ],
-    "@typescript-eslint/no-unnecessary-type-constraint": [
-      "error",
-    ],
-    "@typescript-eslint/no-unsafe-declaration-merging": [
-      "error",
-    ],
-    "@typescript-eslint/no-unused-vars": [
-      "error",
-    ],
-    "@typescript-eslint/no-var-requires": [
-      "error",
-    ],
-    "@typescript-eslint/object-curly-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/prefer-as-const": [
-      "error",
-    ],
-    "@typescript-eslint/quotes": [
-      0,
-    ],
-    "@typescript-eslint/semi": [
-      "off",
-    ],
-    "@typescript-eslint/space-before-blocks": [
-      "off",
-    ],
-    "@typescript-eslint/space-before-function-paren": [
-      "off",
-    ],
-    "@typescript-eslint/space-infix-ops": [
-      "off",
-    ],
-    "@typescript-eslint/triple-slash-reference": [
-      "error",
-    ],
-    "@typescript-eslint/type-annotation-spacing": [
-      "off",
-    ],
-    "array-bracket-newline": [
-      "off",
-    ],
-    "array-bracket-spacing": [
-      "off",
-    ],
-    "array-element-newline": [
-      "off",
-    ],
-    "arrow-body-style": [
-      "off",
-    ],
-    "arrow-parens": [
-      "off",
-    ],
-    "arrow-spacing": [
-      "off",
-    ],
-    "babel/object-curly-spacing": [
-      "off",
-    ],
-    "babel/quotes": [
-      0,
-    ],
-    "babel/semi": [
-      "off",
-    ],
-    "block-spacing": [
-      "off",
-    ],
-    "brace-style": [
-      "off",
-    ],
-    "comma-dangle": [
-      "off",
-    ],
-    "comma-spacing": [
-      "off",
-    ],
-    "comma-style": [
-      "off",
-    ],
-    "computed-property-spacing": [
-      "off",
-    ],
-    "constructor-super": [
-      "off",
-    ],
-    "curly": [
-      0,
-    ],
-    "dot-location": [
-      "off",
-    ],
-    "eol-last": [
-      "off",
-    ],
-    "flowtype/boolean-style": [
-      "off",
-    ],
-    "flowtype/delimiter-dangle": [
-      "off",
-    ],
-    "flowtype/generic-spacing": [
-      "off",
-    ],
-    "flowtype/object-type-curly-spacing": [
-      "off",
-    ],
-    "flowtype/object-type-delimiter": [
-      "off",
-    ],
-    "flowtype/quotes": [
-      "off",
-    ],
-    "flowtype/semi": [
-      "off",
-    ],
-    "flowtype/space-after-type-colon": [
-      "off",
-    ],
-    "flowtype/space-before-generic-bracket": [
-      "off",
-    ],
-    "flowtype/space-before-type-colon": [
-      "off",
-    ],
-    "flowtype/union-intersection-spacing": [
-      "off",
-    ],
-    "for-direction": [
-      "error",
-    ],
-    "func-call-spacing": [
-      "off",
-    ],
-    "function-call-argument-newline": [
-      "off",
-    ],
-    "function-paren-newline": [
-      "off",
-    ],
-    "generator-star": [
-      "off",
-    ],
-    "generator-star-spacing": [
-      "off",
-    ],
-    "getter-return": [
-      "off",
-    ],
-    "implicit-arrow-linebreak": [
-      "off",
-    ],
-    "import/named": [
-      "off",
-    ],
-    "import/no-unused-modules": [
-      "error",
-      {
-        "unusedExports": true,
-      },
-    ],
-    "indent": [
-      "off",
-    ],
-    "indent-legacy": [
-      "off",
-    ],
-    "jest/expect-expect": [
-      "warn",
-    ],
-    "jest/no-alias-methods": [
-      "error",
-    ],
-    "jest/no-commented-out-tests": [
-      "warn",
-    ],
-    "jest/no-conditional-expect": [
-      "error",
-    ],
-    "jest/no-deprecated-functions": [
-      "error",
-    ],
-    "jest/no-disabled-tests": [
-      "warn",
-    ],
-    "jest/no-done-callback": [
-      "error",
-    ],
-    "jest/no-export": [
-      "error",
-    ],
-    "jest/no-focused-tests": [
-      "error",
-    ],
-    "jest/no-identical-title": [
-      "error",
-    ],
-    "jest/no-interpolation-in-snapshots": [
-      "error",
-    ],
-    "jest/no-jasmine-globals": [
-      "error",
-    ],
-    "jest/no-mocks-import": [
-      "error",
-    ],
-    "jest/no-standalone-expect": [
-      "error",
-    ],
-    "jest/no-test-prefixes": [
-      "error",
-    ],
-    "jest/valid-describe-callback": [
-      "error",
-    ],
-    "jest/valid-expect": [
-      "error",
-    ],
-    "jest/valid-expect-in-promise": [
-      "error",
-    ],
-    "jest/valid-title": [
-      "error",
-    ],
-    "jsx-quotes": [
-      "off",
-    ],
-    "key-spacing": [
-      "off",
-    ],
-    "keyword-spacing": [
-      "off",
-    ],
-    "linebreak-style": [
-      "off",
-    ],
-    "lines-around-comment": [
-      0,
-    ],
-    "max-len": [
-      0,
-    ],
-    "max-statements-per-line": [
-      "off",
-    ],
-    "multiline-ternary": [
-      "off",
-    ],
-    "new-parens": [
-      "off",
-    ],
-    "newline-per-chained-call": [
-      "off",
-    ],
-    "no-array-constructor": [
-      "off",
-    ],
-    "no-arrow-condition": [
-      "off",
-    ],
-    "no-async-promise-executor": [
-      "error",
-    ],
-    "no-case-declarations": [
-      "error",
-    ],
-    "no-class-assign": [
-      "error",
-    ],
-    "no-comma-dangle": [
-      "off",
-    ],
-    "no-compare-neg-zero": [
-      "error",
-    ],
-    "no-cond-assign": [
-      "error",
-    ],
-    "no-confusing-arrow": [
-      0,
-    ],
-    "no-const-assign": [
-      "off",
-    ],
-    "no-constant-condition": [
-      "error",
-    ],
-    "no-control-regex": [
-      "error",
-    ],
-    "no-debugger": [
-      "error",
-    ],
-    "no-delete-var": [
-      "error",
-    ],
-    "no-dupe-args": [
-      "off",
-    ],
-    "no-dupe-class-members": [
-      "off",
-    ],
-    "no-dupe-else-if": [
-      "error",
-    ],
-    "no-dupe-keys": [
-      "off",
-    ],
-    "no-duplicate-case": [
-      "error",
-    ],
-    "no-empty": [
-      "error",
-    ],
-    "no-empty-character-class": [
-      "error",
-    ],
-    "no-empty-pattern": [
-      "error",
-    ],
-    "no-ex-assign": [
-      "error",
-    ],
-    "no-extra-boolean-cast": [
-      "error",
-    ],
-    "no-extra-parens": [
-      "off",
-    ],
-    "no-extra-semi": [
-      "off",
-    ],
-    "no-fallthrough": [
-      "error",
-    ],
-    "no-floating-decimal": [
-      "off",
-    ],
-    "no-func-assign": [
-      "off",
-    ],
-    "no-global-assign": [
-      "error",
-    ],
-    "no-import-assign": [
-      "off",
-    ],
-    "no-inner-declarations": [
-      "error",
-    ],
-    "no-invalid-regexp": [
-      "error",
-    ],
-    "no-irregular-whitespace": [
-      "error",
-    ],
-    "no-loss-of-precision": [
-      "off",
-    ],
-    "no-misleading-character-class": [
-      "error",
-    ],
-    "no-mixed-operators": [
-      0,
-    ],
-    "no-mixed-spaces-and-tabs": [
-      "off",
-    ],
-    "no-multi-spaces": [
-      "off",
-    ],
-    "no-multiple-empty-lines": [
-      "off",
-    ],
-    "no-new-symbol": [
-      "off",
-    ],
-    "no-nonoctal-decimal-escape": [
-      "error",
-    ],
-    "no-obj-calls": [
-      "off",
-    ],
-    "no-octal": [
-      "error",
-    ],
-    "no-prototype-builtins": [
-      "error",
-    ],
-    "no-redeclare": [
-      "off",
-    ],
-    "no-regex-spaces": [
-      "error",
-    ],
-    "no-reserved-keys": [
-      "off",
-    ],
-    "no-self-assign": [
-      "error",
-    ],
-    "no-setter-return": [
-      "off",
-    ],
-    "no-shadow-restricted-names": [
-      "error",
-    ],
-    "no-space-before-semi": [
-      "off",
-    ],
-    "no-spaced-func": [
-      "off",
-    ],
-    "no-sparse-arrays": [
-      "error",
-    ],
-    "no-tabs": [
-      0,
-    ],
-    "no-this-before-super": [
-      "off",
-    ],
-    "no-trailing-spaces": [
-      "off",
-    ],
-    "no-undef": [
-      "off",
-    ],
-    "no-unexpected-multiline": [
-      0,
-    ],
-    "no-unreachable": [
-      "off",
-    ],
-    "no-unsafe-finally": [
-      "error",
-    ],
-    "no-unsafe-negation": [
-      "off",
-    ],
-    "no-unsafe-optional-chaining": [
-      "error",
-    ],
-    "no-unused-labels": [
-      "error",
-    ],
-    "no-unused-vars": [
-      "off",
-    ],
-    "no-useless-backreference": [
-      "error",
-    ],
-    "no-useless-catch": [
-      "error",
-    ],
-    "no-useless-escape": [
-      "error",
-    ],
-    "no-var": [
-      "error",
-    ],
-    "no-whitespace-before-property": [
-      "off",
-    ],
-    "no-with": [
-      "error",
-    ],
-    "no-wrap-func": [
-      "off",
-    ],
-    "nonblock-statement-body-position": [
-      "off",
-    ],
-    "object-curly-newline": [
-      "off",
-    ],
-    "object-curly-spacing": [
-      "off",
-    ],
-    "object-property-newline": [
-      "off",
-    ],
-    "object-shorthand": [
-      "error",
-      "always",
-    ],
-    "one-var-declaration-per-line": [
-      "off",
-    ],
-    "operator-linebreak": [
-      "off",
-    ],
-    "padded-blocks": [
-      "off",
-    ],
-    "prefer-arrow-callback": [
-      "off",
-    ],
-    "prefer-const": [
-      "error",
-    ],
-    "prefer-rest-params": [
-      "error",
-    ],
-    "prefer-spread": [
-      "error",
-    ],
-    "prettier/prettier": [
-      "error",
-      {
-        "printWidth": 120,
-        "semi": false,
-        "singleQuote": true,
-      },
-    ],
-    "quote-props": [
-      "off",
-    ],
-    "quotes": [
-      0,
-    ],
-    "react/jsx-child-element-spacing": [
-      "off",
-    ],
-    "react/jsx-closing-bracket-location": [
-      "off",
-    ],
-    "react/jsx-closing-tag-location": [
-      "off",
-    ],
-    "react/jsx-curly-newline": [
-      "off",
-    ],
-    "react/jsx-curly-spacing": [
-      "off",
-    ],
-    "react/jsx-equals-spacing": [
-      "off",
-    ],
-    "react/jsx-first-prop-new-line": [
-      "off",
-    ],
-    "react/jsx-indent": [
-      "off",
-    ],
-    "react/jsx-indent-props": [
-      "off",
-    ],
-    "react/jsx-max-props-per-line": [
-      "off",
-    ],
-    "react/jsx-newline": [
-      "off",
-    ],
-    "react/jsx-one-expression-per-line": [
-      "off",
-    ],
-    "react/jsx-props-no-multi-spaces": [
-      "off",
-    ],
-    "react/jsx-space-before-closing": [
-      "off",
-    ],
-    "react/jsx-tag-spacing": [
-      "off",
-    ],
-    "react/jsx-wrap-multilines": [
-      "off",
-    ],
-    "require-yield": [
-      "error",
-    ],
-    "rest-spread-spacing": [
-      "off",
-    ],
-    "semi": [
-      "off",
-    ],
-    "semi-spacing": [
-      "off",
-    ],
-    "semi-style": [
-      "off",
-    ],
-    "space-after-function-name": [
-      "off",
-    ],
-    "space-after-keywords": [
-      "off",
-    ],
-    "space-before-blocks": [
-      "off",
-    ],
-    "space-before-function-paren": [
-      "off",
-    ],
-    "space-before-function-parentheses": [
-      "off",
-    ],
-    "space-before-keywords": [
-      "off",
-    ],
-    "space-in-brackets": [
-      "off",
-    ],
-    "space-in-parens": [
-      "off",
-    ],
-    "space-infix-ops": [
-      "off",
-    ],
-    "space-return-throw-case": [
-      "off",
-    ],
-    "space-unary-ops": [
-      "off",
-    ],
-    "space-unary-word-ops": [
-      "off",
-    ],
-    "standard/array-bracket-even-spacing": [
-      "off",
-    ],
-    "standard/computed-property-even-spacing": [
-      "off",
-    ],
-    "standard/object-curly-even-spacing": [
-      "off",
-    ],
-    "switch-colon-spacing": [
-      "off",
-    ],
-    "template-curly-spacing": [
-      "off",
-    ],
-    "template-tag-spacing": [
-      "off",
-    ],
-    "unicode-bom": [
-      "off",
-    ],
-    "unicorn/empty-brace-spaces": [
-      "off",
-    ],
-    "unicorn/no-nested-ternary": [
-      "off",
-    ],
-    "unicorn/number-literal-case": [
-      "off",
-    ],
-    "unused-imports/no-unused-imports": [
-      "error",
-    ],
-    "use-isnan": [
-      "error",
-    ],
-    "valid-typeof": [
-      "error",
-    ],
-    "vue/array-bracket-newline": [
-      "off",
-    ],
-    "vue/array-bracket-spacing": [
-      "off",
-    ],
-    "vue/array-element-newline": [
-      "off",
-    ],
-    "vue/arrow-spacing": [
-      "off",
-    ],
-    "vue/block-spacing": [
-      "off",
-    ],
-    "vue/block-tag-newline": [
-      "off",
-    ],
-    "vue/brace-style": [
-      "off",
-    ],
-    "vue/comma-dangle": [
-      "off",
-    ],
-    "vue/comma-spacing": [
-      "off",
-    ],
-    "vue/comma-style": [
-      "off",
-    ],
-    "vue/dot-location": [
-      "off",
-    ],
-    "vue/func-call-spacing": [
-      "off",
-    ],
-    "vue/html-closing-bracket-newline": [
-      "off",
-    ],
-    "vue/html-closing-bracket-spacing": [
-      "off",
-    ],
-    "vue/html-end-tags": [
-      "off",
-    ],
-    "vue/html-indent": [
-      "off",
-    ],
-    "vue/html-quotes": [
-      "off",
-    ],
-    "vue/html-self-closing": [
-      0,
-    ],
-    "vue/key-spacing": [
-      "off",
-    ],
-    "vue/keyword-spacing": [
-      "off",
-    ],
-    "vue/max-attributes-per-line": [
-      "off",
-    ],
-    "vue/max-len": [
-      0,
-    ],
-    "vue/multiline-html-element-content-newline": [
-      "off",
-    ],
-    "vue/multiline-ternary": [
-      "off",
-    ],
-    "vue/mustache-interpolation-spacing": [
-      "off",
-    ],
-    "vue/no-extra-parens": [
-      "off",
-    ],
-    "vue/no-multi-spaces": [
-      "off",
-    ],
-    "vue/no-spaces-around-equal-signs-in-attribute": [
-      "off",
-    ],
-    "vue/object-curly-newline": [
-      "off",
-    ],
-    "vue/object-curly-spacing": [
-      "off",
-    ],
-    "vue/object-property-newline": [
-      "off",
-    ],
-    "vue/operator-linebreak": [
-      "off",
-    ],
-    "vue/quote-props": [
-      "off",
-    ],
-    "vue/script-indent": [
-      "off",
-    ],
-    "vue/singleline-html-element-content-newline": [
-      "off",
-    ],
-    "vue/space-in-parens": [
-      "off",
-    ],
-    "vue/space-infix-ops": [
-      "off",
-    ],
-    "vue/space-unary-ops": [
-      "off",
-    ],
-    "vue/template-curly-spacing": [
-      "off",
-    ],
-    "wrap-iife": [
-      "off",
-    ],
-    "wrap-regex": [
-      "off",
-    ],
-    "yield-star-spacing": [
-      "off",
-    ],
-  },
-  "settings": {
-    "import/extensions": [
-      ".ts",
-      ".tsx",
-      ".js",
-      ".jsx",
-    ],
-    "import/external-module-folders": [
-      "node_modules",
-      "node_modules/@types",
-    ],
-    "import/parsers": {
-      "@typescript-eslint/parser": [
-        ".ts",
-        ".tsx",
-      ],
-    },
-    "import/resolver": {
-      "node": {
-        "extensions": [
-          ".ts",
-          ".tsx",
-          ".js",
-          ".jsx",
-        ],
-      },
-      "typescript": {
-        "alwaysTryTypes": true,
-      },
-    },
-  },
-}
-`;
-
-exports[`should have a correct configuration for a React file 1`] = `
-{
-  "env": {
-    "browser": true,
-    "es6": true,
-    "node": false,
-  },
-  "globals": {},
-  "ignorePatterns": [
-    "**/__generated__/",
-  ],
-  "noInlineConfig": undefined,
-  "parser": Any<String>,
-  "parserOptions": {
-    "ecmaFeatures": {
-      "jsx": true,
-    },
-    "ecmaVersion": 2020,
-    "sourceType": "module",
-  },
-  "plugins": [
-    "unused-imports",
-    "import",
-    "@typescript-eslint",
-    "prettier",
-    "react-hooks",
-    "react",
-  ],
-  "reportUnusedDisableDirectives": undefined,
-  "rules": {
-    "@babel/object-curly-spacing": [
-      "off",
-    ],
-    "@babel/semi": [
-      "off",
-    ],
-    "@typescript-eslint/ban-ts-comment": [
-      "off",
-    ],
-    "@typescript-eslint/ban-ts-ignore": [
-      "off",
-    ],
-    "@typescript-eslint/ban-types": [
-      "error",
-    ],
-    "@typescript-eslint/block-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/brace-style": [
-      "off",
-    ],
-    "@typescript-eslint/comma-dangle": [
-      "off",
-    ],
-    "@typescript-eslint/comma-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/explicit-function-return-type": [
-      "off",
-    ],
-    "@typescript-eslint/explicit-module-boundary-types": [
-      "off",
-    ],
-    "@typescript-eslint/func-call-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/indent": [
-      "off",
-    ],
-    "@typescript-eslint/key-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/keyword-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/lines-around-comment": [
-      0,
-    ],
-    "@typescript-eslint/member-delimiter-style": [
-      "off",
-    ],
-    "@typescript-eslint/no-array-constructor": [
-      "error",
-    ],
-    "@typescript-eslint/no-duplicate-enum-values": [
-      "error",
-    ],
-    "@typescript-eslint/no-explicit-any": [
-      "off",
-    ],
-    "@typescript-eslint/no-extra-non-null-assertion": [
-      "error",
-    ],
-    "@typescript-eslint/no-extra-parens": [
-      "off",
-    ],
-    "@typescript-eslint/no-extra-semi": [
-      "off",
-    ],
-    "@typescript-eslint/no-loss-of-precision": [
-      "error",
-    ],
-    "@typescript-eslint/no-misused-new": [
-      "error",
-    ],
-    "@typescript-eslint/no-namespace": [
-      "error",
-    ],
-    "@typescript-eslint/no-non-null-asserted-optional-chain": [
-      "error",
-    ],
-    "@typescript-eslint/no-restricted-imports": [
-      "error",
-      {
-        "paths": [
-          {
-            "message": "Please import from '@ethersproject/module' directly to support tree-shaking.",
-            "name": "ethers",
-          },
-          {
-            "message": "Please import from styled-components/macro.",
-            "name": "styled-components",
-          },
-        ],
-        "patterns": [
-          {
-            "group": [
-              "**/dist",
-            ],
-            "message": "Do not import from dist/ - this is an implementation detail, and breaks tree-shaking.",
-          },
-        ],
-      },
-    ],
-    "@typescript-eslint/no-this-alias": [
-      "error",
-    ],
-    "@typescript-eslint/no-unnecessary-type-constraint": [
-      "error",
-    ],
-    "@typescript-eslint/no-unsafe-declaration-merging": [
-      "error",
-    ],
-    "@typescript-eslint/no-unused-vars": [
-      "error",
-    ],
-    "@typescript-eslint/no-var-requires": [
-      "error",
-    ],
-    "@typescript-eslint/object-curly-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/prefer-as-const": [
-      "error",
-    ],
-    "@typescript-eslint/quotes": [
-      0,
-    ],
-    "@typescript-eslint/semi": [
-      "off",
-    ],
-    "@typescript-eslint/space-before-blocks": [
-      "off",
-    ],
-    "@typescript-eslint/space-before-function-paren": [
-      "off",
-    ],
-    "@typescript-eslint/space-infix-ops": [
-      "off",
-    ],
-    "@typescript-eslint/triple-slash-reference": [
-      "error",
-    ],
-    "@typescript-eslint/type-annotation-spacing": [
-      "off",
-    ],
-    "array-bracket-newline": [
-      "off",
-    ],
-    "array-bracket-spacing": [
-      "off",
-    ],
-    "array-element-newline": [
-      "off",
-    ],
-    "arrow-body-style": [
-      "off",
-    ],
-    "arrow-parens": [
-      "off",
-    ],
-    "arrow-spacing": [
-      "off",
-    ],
-    "babel/object-curly-spacing": [
-      "off",
-    ],
-    "babel/quotes": [
-      0,
-    ],
-    "babel/semi": [
-      "off",
-    ],
-    "block-spacing": [
-      "off",
-    ],
-    "brace-style": [
-      "off",
-    ],
-    "comma-dangle": [
-      "off",
-    ],
-    "comma-spacing": [
-      "off",
-    ],
-    "comma-style": [
-      "off",
-    ],
-    "computed-property-spacing": [
-      "off",
-    ],
-    "constructor-super": [
-      "off",
-    ],
-    "curly": [
-      0,
-    ],
-    "dot-location": [
-      "off",
-    ],
-    "eol-last": [
-      "off",
-    ],
-    "flowtype/boolean-style": [
-      "off",
-    ],
-    "flowtype/delimiter-dangle": [
-      "off",
-    ],
-    "flowtype/generic-spacing": [
-      "off",
-    ],
-    "flowtype/object-type-curly-spacing": [
-      "off",
-    ],
-    "flowtype/object-type-delimiter": [
-      "off",
-    ],
-    "flowtype/quotes": [
-      "off",
-    ],
-    "flowtype/semi": [
-      "off",
-    ],
-    "flowtype/space-after-type-colon": [
-      "off",
-    ],
-    "flowtype/space-before-generic-bracket": [
-      "off",
-    ],
-    "flowtype/space-before-type-colon": [
-      "off",
-    ],
-    "flowtype/union-intersection-spacing": [
-      "off",
-    ],
-    "for-direction": [
-      "error",
-    ],
-    "func-call-spacing": [
-      "off",
-    ],
-    "function-call-argument-newline": [
-      "off",
-    ],
-    "function-paren-newline": [
-      "off",
-    ],
-    "generator-star": [
-      "off",
-    ],
-    "generator-star-spacing": [
-      "off",
-    ],
-    "getter-return": [
-      "off",
-    ],
-    "implicit-arrow-linebreak": [
-      "off",
-    ],
-    "import/named": [
-      "off",
-    ],
-    "import/no-unused-modules": [
-      "error",
-      {
-        "unusedExports": true,
-      },
-    ],
-    "indent": [
-      "off",
-    ],
-    "indent-legacy": [
-      "off",
-    ],
-    "jsx-quotes": [
-      "off",
-    ],
-    "key-spacing": [
-      "off",
-    ],
-    "keyword-spacing": [
-      "off",
-    ],
-    "linebreak-style": [
-      "off",
-    ],
-    "lines-around-comment": [
-      0,
-    ],
-    "max-len": [
-      0,
-    ],
-    "max-statements-per-line": [
-      "off",
-    ],
-    "multiline-ternary": [
-      "off",
-    ],
-    "new-parens": [
-      "off",
-    ],
-    "newline-per-chained-call": [
-      "off",
-    ],
-    "no-array-constructor": [
-      "off",
-    ],
-    "no-arrow-condition": [
-      "off",
-    ],
-    "no-async-promise-executor": [
-      "error",
-    ],
-    "no-case-declarations": [
-      "error",
-    ],
-    "no-class-assign": [
-      "error",
-    ],
-    "no-comma-dangle": [
-      "off",
-    ],
-    "no-compare-neg-zero": [
-      "error",
-    ],
-    "no-cond-assign": [
-      "error",
-    ],
-    "no-confusing-arrow": [
-      0,
-    ],
-    "no-const-assign": [
-      "off",
-    ],
-    "no-constant-condition": [
-      "error",
-    ],
-    "no-control-regex": [
-      "error",
-    ],
-    "no-debugger": [
-      "error",
-    ],
-    "no-delete-var": [
-      "error",
-    ],
-    "no-dupe-args": [
-      "off",
-    ],
-    "no-dupe-class-members": [
-      "off",
-    ],
-    "no-dupe-else-if": [
-      "error",
-    ],
-    "no-dupe-keys": [
-      "off",
-    ],
-    "no-duplicate-case": [
-      "error",
-    ],
-    "no-empty": [
-      "error",
-    ],
-    "no-empty-character-class": [
-      "error",
-    ],
-    "no-empty-pattern": [
-      "error",
-    ],
-    "no-ex-assign": [
-      "error",
-    ],
-    "no-extra-boolean-cast": [
-      "error",
-    ],
-    "no-extra-parens": [
-      "off",
-    ],
-    "no-extra-semi": [
-      "off",
-    ],
-    "no-fallthrough": [
-      "error",
-    ],
-    "no-floating-decimal": [
-      "off",
-    ],
-    "no-func-assign": [
-      "off",
-    ],
-    "no-global-assign": [
-      "error",
-    ],
-    "no-import-assign": [
-      "off",
-    ],
-    "no-inner-declarations": [
-      "error",
-    ],
-    "no-invalid-regexp": [
-      "error",
-    ],
-    "no-irregular-whitespace": [
-      "error",
-    ],
-    "no-loss-of-precision": [
-      "off",
-    ],
-    "no-misleading-character-class": [
-      "error",
-    ],
-    "no-mixed-operators": [
-      0,
-    ],
-    "no-mixed-spaces-and-tabs": [
-      "off",
-    ],
-    "no-multi-spaces": [
-      "off",
-    ],
-    "no-multiple-empty-lines": [
-      "off",
-    ],
-    "no-new-symbol": [
-      "off",
-    ],
-    "no-nonoctal-decimal-escape": [
-      "error",
-    ],
-    "no-obj-calls": [
-      "off",
-    ],
-    "no-octal": [
-      "error",
-    ],
-    "no-prototype-builtins": [
-      "error",
-    ],
-    "no-redeclare": [
-      "off",
-    ],
-    "no-regex-spaces": [
-      "error",
-    ],
-    "no-reserved-keys": [
-      "off",
-    ],
-    "no-self-assign": [
-      "error",
-    ],
-    "no-setter-return": [
-      "off",
-    ],
-    "no-shadow-restricted-names": [
-      "error",
-    ],
-    "no-space-before-semi": [
-      "off",
-    ],
-    "no-spaced-func": [
-      "off",
-    ],
-    "no-sparse-arrays": [
-      "error",
-    ],
-    "no-tabs": [
-      0,
-    ],
-    "no-this-before-super": [
-      "off",
-    ],
-    "no-trailing-spaces": [
-      "off",
-    ],
-    "no-undef": [
-      "off",
-    ],
-    "no-unexpected-multiline": [
-      0,
-    ],
-    "no-unreachable": [
-      "off",
-    ],
-    "no-unsafe-finally": [
-      "error",
-    ],
-    "no-unsafe-negation": [
-      "off",
-    ],
-    "no-unsafe-optional-chaining": [
-      "error",
-    ],
-    "no-unused-labels": [
-      "error",
-    ],
-    "no-unused-vars": [
-      "off",
-    ],
-    "no-useless-backreference": [
-      "error",
-    ],
-    "no-useless-catch": [
-      "error",
-    ],
-    "no-useless-escape": [
-      "error",
-    ],
-    "no-var": [
-      "error",
-    ],
-    "no-whitespace-before-property": [
-      "off",
-    ],
-    "no-with": [
-      "error",
-    ],
-    "no-wrap-func": [
-      "off",
-    ],
-    "nonblock-statement-body-position": [
-      "off",
-    ],
-    "object-curly-newline": [
-      "off",
-    ],
-    "object-curly-spacing": [
-      "off",
-    ],
-    "object-property-newline": [
-      "off",
-    ],
-    "object-shorthand": [
-      "error",
-      "always",
-    ],
-    "one-var-declaration-per-line": [
-      "off",
-    ],
-    "operator-linebreak": [
-      "off",
-    ],
-    "padded-blocks": [
-      "off",
-    ],
-    "prefer-arrow-callback": [
-      "off",
-    ],
-    "prefer-const": [
-      "error",
-    ],
-    "prefer-rest-params": [
-      "error",
-    ],
-    "prefer-spread": [
-      "error",
-    ],
-    "prettier/prettier": [
-      "error",
-      {
-        "printWidth": 120,
-        "semi": false,
-        "singleQuote": true,
-      },
-    ],
-    "quote-props": [
-      "off",
-    ],
-    "quotes": [
-      0,
-    ],
-    "react-hooks/exhaustive-deps": [
-      "warn",
-    ],
-    "react-hooks/rules-of-hooks": [
-      "error",
-    ],
-    "react/display-name": [
-      2,
-    ],
-    "react/jsx-child-element-spacing": [
-      "off",
-    ],
-    "react/jsx-closing-bracket-location": [
-      "off",
-    ],
-    "react/jsx-closing-tag-location": [
-      "off",
-    ],
-    "react/jsx-curly-brace-presence": [
-      "error",
-      {
-        "children": "never",
-        "props": "never",
-      },
-    ],
-    "react/jsx-curly-newline": [
-      "off",
-    ],
-    "react/jsx-curly-spacing": [
-      "off",
-    ],
-    "react/jsx-equals-spacing": [
-      "off",
-    ],
-    "react/jsx-first-prop-new-line": [
-      "off",
-    ],
-    "react/jsx-indent": [
-      "off",
-    ],
-    "react/jsx-indent-props": [
-      "off",
-    ],
-    "react/jsx-key": [
-      2,
-    ],
-    "react/jsx-max-props-per-line": [
-      "off",
-    ],
-    "react/jsx-newline": [
-      "off",
-    ],
-    "react/jsx-no-comment-textnodes": [
-      2,
-    ],
-    "react/jsx-no-duplicate-props": [
-      2,
-    ],
-    "react/jsx-no-target-blank": [
-      2,
-    ],
-    "react/jsx-no-undef": [
-      2,
-    ],
-    "react/jsx-one-expression-per-line": [
-      "off",
-    ],
-    "react/jsx-props-no-multi-spaces": [
-      "off",
-    ],
-    "react/jsx-space-before-closing": [
-      "off",
-    ],
-    "react/jsx-tag-spacing": [
-      "off",
-    ],
-    "react/jsx-uses-react": [
-      2,
-    ],
-    "react/jsx-uses-vars": [
-      2,
-    ],
-    "react/jsx-wrap-multilines": [
-      "off",
-    ],
-    "react/no-children-prop": [
-      2,
-    ],
-    "react/no-danger-with-children": [
-      2,
-    ],
-    "react/no-deprecated": [
-      2,
-    ],
-    "react/no-direct-mutation-state": [
-      2,
-    ],
-    "react/no-find-dom-node": [
-      2,
-    ],
-    "react/no-is-mounted": [
-      2,
-    ],
-    "react/no-render-return-value": [
-      2,
-    ],
-    "react/no-string-refs": [
-      2,
-    ],
-    "react/no-unescaped-entities": [
-      2,
-    ],
-    "react/no-unknown-property": [
-      2,
-    ],
-    "react/no-unsafe": [
-      0,
-    ],
-    "react/prop-types": [
-      2,
-    ],
-    "react/react-in-jsx-scope": [
-      "off",
-    ],
-    "react/require-render-return": [
-      2,
-    ],
-    "require-yield": [
-      "error",
-    ],
-    "rest-spread-spacing": [
-      "off",
-    ],
-    "semi": [
-      "off",
-    ],
-    "semi-spacing": [
-      "off",
-    ],
-    "semi-style": [
-      "off",
-    ],
-    "space-after-function-name": [
-      "off",
-    ],
-    "space-after-keywords": [
-      "off",
-    ],
-    "space-before-blocks": [
-      "off",
-    ],
-    "space-before-function-paren": [
-      "off",
-    ],
-    "space-before-function-parentheses": [
-      "off",
-    ],
-    "space-before-keywords": [
-      "off",
-    ],
-    "space-in-brackets": [
-      "off",
-    ],
-    "space-in-parens": [
-      "off",
-    ],
-    "space-infix-ops": [
-      "off",
-    ],
-    "space-return-throw-case": [
-      "off",
-    ],
-    "space-unary-ops": [
-      "off",
-    ],
-    "space-unary-word-ops": [
-      "off",
-    ],
-    "standard/array-bracket-even-spacing": [
-      "off",
-    ],
-    "standard/computed-property-even-spacing": [
-      "off",
-    ],
-    "standard/object-curly-even-spacing": [
-      "off",
-    ],
-    "switch-colon-spacing": [
-      "off",
-    ],
-    "template-curly-spacing": [
-      "off",
-    ],
-    "template-tag-spacing": [
-      "off",
-    ],
-    "unicode-bom": [
-      "off",
-    ],
-    "unicorn/empty-brace-spaces": [
-      "off",
-    ],
-    "unicorn/no-nested-ternary": [
-      "off",
-    ],
-    "unicorn/number-literal-case": [
-      "off",
-    ],
-    "unused-imports/no-unused-imports": [
-      "error",
-    ],
-    "use-isnan": [
-      "error",
-    ],
-    "valid-typeof": [
-      "error",
-    ],
-    "vue/array-bracket-newline": [
-      "off",
-    ],
-    "vue/array-bracket-spacing": [
-      "off",
-    ],
-    "vue/array-element-newline": [
-      "off",
-    ],
-    "vue/arrow-spacing": [
-      "off",
-    ],
-    "vue/block-spacing": [
-      "off",
-    ],
-    "vue/block-tag-newline": [
-      "off",
-    ],
-    "vue/brace-style": [
-      "off",
-    ],
-    "vue/comma-dangle": [
-      "off",
-    ],
-    "vue/comma-spacing": [
-      "off",
-    ],
-    "vue/comma-style": [
-      "off",
-    ],
-    "vue/dot-location": [
-      "off",
-    ],
-    "vue/func-call-spacing": [
-      "off",
-    ],
-    "vue/html-closing-bracket-newline": [
-      "off",
-    ],
-    "vue/html-closing-bracket-spacing": [
-      "off",
-    ],
-    "vue/html-end-tags": [
-      "off",
-    ],
-    "vue/html-indent": [
-      "off",
-    ],
-    "vue/html-quotes": [
-      "off",
-    ],
-    "vue/html-self-closing": [
-      0,
-    ],
-    "vue/key-spacing": [
-      "off",
-    ],
-    "vue/keyword-spacing": [
-      "off",
-    ],
-    "vue/max-attributes-per-line": [
-      "off",
-    ],
-    "vue/max-len": [
-      0,
-    ],
-    "vue/multiline-html-element-content-newline": [
-      "off",
-    ],
-    "vue/multiline-ternary": [
-      "off",
-    ],
-    "vue/mustache-interpolation-spacing": [
-      "off",
-    ],
-    "vue/no-extra-parens": [
-      "off",
-    ],
-    "vue/no-multi-spaces": [
-      "off",
-    ],
-    "vue/no-spaces-around-equal-signs-in-attribute": [
-      "off",
-    ],
-    "vue/object-curly-newline": [
-      "off",
-    ],
-    "vue/object-curly-spacing": [
-      "off",
-    ],
-    "vue/object-property-newline": [
-      "off",
-    ],
-    "vue/operator-linebreak": [
-      "off",
-    ],
-    "vue/quote-props": [
-      "off",
-    ],
-    "vue/script-indent": [
-      "off",
-    ],
-    "vue/singleline-html-element-content-newline": [
-      "off",
-    ],
-    "vue/space-in-parens": [
-      "off",
-    ],
-    "vue/space-infix-ops": [
-      "off",
-    ],
-    "vue/space-unary-ops": [
-      "off",
-    ],
-    "vue/template-curly-spacing": [
-      "off",
-    ],
-    "wrap-iife": [
-      "off",
-    ],
-    "wrap-regex": [
-      "off",
-    ],
-    "yield-star-spacing": [
-      "off",
-    ],
-  },
-  "settings": {
-    "import/extensions": [
-      ".ts",
-      ".tsx",
-      ".js",
-      ".jsx",
-    ],
-    "import/external-module-folders": [
-      "node_modules",
-      "node_modules/@types",
-    ],
-    "import/parsers": {
-      "@typescript-eslint/parser": [
-        ".ts",
-        ".tsx",
-      ],
-    },
-    "import/resolver": {
-      "node": {
-        "extensions": [
-          ".ts",
-          ".tsx",
-          ".js",
-          ".jsx",
-        ],
-      },
-      "typescript": {
-        "alwaysTryTypes": true,
-      },
-    },
-    "react": {
-      "version": "detect",
-    },
-  },
-}
-`;
-
-exports[`should have a correct configuration for a TypeScript file 1`] = `
-{
-  "env": {
-    "es6": true,
-    "node": true,
-  },
-  "globals": {},
-  "ignorePatterns": [],
-  "noInlineConfig": undefined,
-  "parser": Any<String>,
-  "parserOptions": {
-    "ecmaVersion": 2020,
-    "sourceType": "module",
-  },
-  "plugins": [
-    "unused-imports",
-    "import",
-    "@typescript-eslint",
-    "prettier",
-  ],
-  "reportUnusedDisableDirectives": undefined,
-  "rules": {
-    "@babel/object-curly-spacing": [
-      "off",
-    ],
-    "@babel/semi": [
-      "off",
-    ],
-    "@typescript-eslint/ban-ts-comment": [
-      "off",
-    ],
-    "@typescript-eslint/ban-ts-ignore": [
-      "off",
-    ],
-    "@typescript-eslint/ban-types": [
-      "error",
-    ],
-    "@typescript-eslint/block-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/brace-style": [
-      "off",
-    ],
-    "@typescript-eslint/comma-dangle": [
-      "off",
-    ],
-    "@typescript-eslint/comma-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/explicit-function-return-type": [
-      "off",
-    ],
-    "@typescript-eslint/explicit-module-boundary-types": [
-      "off",
-    ],
-    "@typescript-eslint/func-call-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/indent": [
-      "off",
-    ],
-    "@typescript-eslint/key-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/keyword-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/lines-around-comment": [
-      0,
-    ],
-    "@typescript-eslint/member-delimiter-style": [
-      "off",
-    ],
-    "@typescript-eslint/no-array-constructor": [
-      "error",
-    ],
-    "@typescript-eslint/no-duplicate-enum-values": [
-      "error",
-    ],
-    "@typescript-eslint/no-explicit-any": [
-      "off",
-    ],
-    "@typescript-eslint/no-extra-non-null-assertion": [
-      "error",
-    ],
-    "@typescript-eslint/no-extra-parens": [
-      "off",
-    ],
-    "@typescript-eslint/no-extra-semi": [
-      "off",
-    ],
-    "@typescript-eslint/no-loss-of-precision": [
-      "error",
-    ],
-    "@typescript-eslint/no-misused-new": [
-      "error",
-    ],
-    "@typescript-eslint/no-namespace": [
-      "error",
-    ],
-    "@typescript-eslint/no-non-null-asserted-optional-chain": [
-      "error",
-    ],
-    "@typescript-eslint/no-restricted-imports": [
-      "error",
-      {
-        "paths": [
-          {
-            "message": "Please import from '@ethersproject/module' directly to support tree-shaking.",
-            "name": "ethers",
-          },
-        ],
-        "patterns": [
-          {
-            "group": [
-              "**/dist",
-            ],
-            "message": "Do not import from dist/ - this is an implementation detail, and breaks tree-shaking.",
-          },
-        ],
-      },
-    ],
-    "@typescript-eslint/no-this-alias": [
-      "error",
-    ],
-    "@typescript-eslint/no-unnecessary-type-constraint": [
-      "error",
-    ],
-    "@typescript-eslint/no-unsafe-declaration-merging": [
-      "error",
-    ],
-    "@typescript-eslint/no-unused-vars": [
-      "error",
-    ],
-    "@typescript-eslint/no-var-requires": [
-      "error",
-    ],
-    "@typescript-eslint/object-curly-spacing": [
-      "off",
-    ],
-    "@typescript-eslint/prefer-as-const": [
-      "error",
-    ],
-    "@typescript-eslint/quotes": [
-      0,
-    ],
-    "@typescript-eslint/semi": [
-      "off",
-    ],
-    "@typescript-eslint/space-before-blocks": [
-      "off",
-    ],
-    "@typescript-eslint/space-before-function-paren": [
-      "off",
-    ],
-    "@typescript-eslint/space-infix-ops": [
-      "off",
-    ],
-    "@typescript-eslint/triple-slash-reference": [
-      "error",
-    ],
-    "@typescript-eslint/type-annotation-spacing": [
-      "off",
-    ],
-    "array-bracket-newline": [
-      "off",
-    ],
-    "array-bracket-spacing": [
-      "off",
-    ],
-    "array-element-newline": [
-      "off",
-    ],
-    "arrow-body-style": [
-      "off",
-    ],
-    "arrow-parens": [
-      "off",
-    ],
-    "arrow-spacing": [
-      "off",
-    ],
-    "babel/object-curly-spacing": [
-      "off",
-    ],
-    "babel/quotes": [
-      0,
-    ],
-    "babel/semi": [
-      "off",
-    ],
-    "block-spacing": [
-      "off",
-    ],
-    "brace-style": [
-      "off",
-    ],
-    "comma-dangle": [
-      "off",
-    ],
-    "comma-spacing": [
-      "off",
-    ],
-    "comma-style": [
-      "off",
-    ],
-    "computed-property-spacing": [
-      "off",
-    ],
-    "constructor-super": [
-      "off",
-    ],
-    "curly": [
-      0,
-    ],
-    "dot-location": [
-      "off",
-    ],
-    "eol-last": [
-      "off",
-    ],
-    "flowtype/boolean-style": [
-      "off",
-    ],
-    "flowtype/delimiter-dangle": [
-      "off",
-    ],
-    "flowtype/generic-spacing": [
-      "off",
-    ],
-    "flowtype/object-type-curly-spacing": [
-      "off",
-    ],
-    "flowtype/object-type-delimiter": [
-      "off",
-    ],
-    "flowtype/quotes": [
-      "off",
-    ],
-    "flowtype/semi": [
-      "off",
-    ],
-    "flowtype/space-after-type-colon": [
-      "off",
-    ],
-    "flowtype/space-before-generic-bracket": [
-      "off",
-    ],
-    "flowtype/space-before-type-colon": [
-      "off",
-    ],
-    "flowtype/union-intersection-spacing": [
-      "off",
-    ],
-    "for-direction": [
-      "error",
-    ],
-    "func-call-spacing": [
-      "off",
-    ],
-    "function-call-argument-newline": [
-      "off",
-    ],
-    "function-paren-newline": [
-      "off",
-    ],
-    "generator-star": [
-      "off",
-    ],
-    "generator-star-spacing": [
-      "off",
-    ],
-    "getter-return": [
-      "off",
-    ],
-    "implicit-arrow-linebreak": [
-      "off",
-    ],
-    "import/named": [
-      "off",
-    ],
-    "import/no-unused-modules": [
-      "error",
-      {
-        "unusedExports": true,
-      },
-    ],
-    "indent": [
-      "off",
-    ],
-    "indent-legacy": [
-      "off",
-    ],
-    "jsx-quotes": [
-      "off",
-    ],
-    "key-spacing": [
-      "off",
-    ],
-    "keyword-spacing": [
-      "off",
-    ],
-    "linebreak-style": [
-      "off",
-    ],
-    "lines-around-comment": [
-      0,
-    ],
-    "max-len": [
-      0,
-    ],
-    "max-statements-per-line": [
-      "off",
-    ],
-    "multiline-ternary": [
-      "off",
-    ],
-    "new-parens": [
-      "off",
-    ],
-    "newline-per-chained-call": [
-      "off",
-    ],
-    "no-array-constructor": [
-      "off",
-    ],
-    "no-arrow-condition": [
-      "off",
-    ],
-    "no-async-promise-executor": [
-      "error",
-    ],
-    "no-case-declarations": [
-      "error",
-    ],
-    "no-class-assign": [
-      "error",
-    ],
-    "no-comma-dangle": [
-      "off",
-    ],
-    "no-compare-neg-zero": [
-      "error",
-    ],
-    "no-cond-assign": [
-      "error",
-    ],
-    "no-confusing-arrow": [
-      0,
-    ],
-    "no-const-assign": [
-      "off",
-    ],
-    "no-constant-condition": [
-      "error",
-    ],
-    "no-control-regex": [
-      "error",
-    ],
-    "no-debugger": [
-      "error",
-    ],
-    "no-delete-var": [
-      "error",
-    ],
-    "no-dupe-args": [
-      "off",
-    ],
-    "no-dupe-class-members": [
-      "off",
-    ],
-    "no-dupe-else-if": [
-      "error",
-    ],
-    "no-dupe-keys": [
-      "off",
-    ],
-    "no-duplicate-case": [
-      "error",
-    ],
-    "no-empty": [
-      "error",
-    ],
-    "no-empty-character-class": [
-      "error",
-    ],
-    "no-empty-pattern": [
-      "error",
-    ],
-    "no-ex-assign": [
-      "error",
-    ],
-    "no-extra-boolean-cast": [
-      "error",
-    ],
-    "no-extra-parens": [
-      "off",
-    ],
-    "no-extra-semi": [
-      "off",
-    ],
-    "no-fallthrough": [
-      "error",
-    ],
-    "no-floating-decimal": [
-      "off",
-    ],
-    "no-func-assign": [
-      "off",
-    ],
-    "no-global-assign": [
-      "error",
-    ],
-    "no-import-assign": [
-      "off",
-    ],
-    "no-inner-declarations": [
-      "error",
-    ],
-    "no-invalid-regexp": [
-      "error",
-    ],
-    "no-irregular-whitespace": [
-      "error",
-    ],
-    "no-loss-of-precision": [
-      "off",
-    ],
-    "no-misleading-character-class": [
-      "error",
-    ],
-    "no-mixed-operators": [
-      0,
-    ],
-    "no-mixed-spaces-and-tabs": [
-      "off",
-    ],
-    "no-multi-spaces": [
-      "off",
-    ],
-    "no-multiple-empty-lines": [
-      "off",
-    ],
-    "no-new-symbol": [
-      "off",
-    ],
-    "no-nonoctal-decimal-escape": [
-      "error",
-    ],
-    "no-obj-calls": [
-      "off",
-    ],
-    "no-octal": [
-      "error",
-    ],
-    "no-prototype-builtins": [
-      "error",
-    ],
-    "no-redeclare": [
-      "off",
-    ],
-    "no-regex-spaces": [
-      "error",
-    ],
-    "no-reserved-keys": [
-      "off",
-    ],
-    "no-self-assign": [
-      "error",
-    ],
-    "no-setter-return": [
-      "off",
-    ],
-    "no-shadow-restricted-names": [
-      "error",
-    ],
-    "no-space-before-semi": [
-      "off",
-    ],
-    "no-spaced-func": [
-      "off",
-    ],
-    "no-sparse-arrays": [
-      "error",
-    ],
-    "no-tabs": [
-      0,
-    ],
-    "no-this-before-super": [
-      "off",
-    ],
-    "no-trailing-spaces": [
-      "off",
-    ],
-    "no-undef": [
-      "off",
-    ],
-    "no-unexpected-multiline": [
-      0,
-    ],
-    "no-unreachable": [
-      "off",
-    ],
-    "no-unsafe-finally": [
-      "error",
-    ],
-    "no-unsafe-negation": [
-      "off",
-    ],
-    "no-unsafe-optional-chaining": [
-      "error",
-    ],
-    "no-unused-labels": [
-      "error",
-    ],
-    "no-unused-vars": [
-      "off",
-    ],
-    "no-useless-backreference": [
-      "error",
-    ],
-    "no-useless-catch": [
-      "error",
-    ],
-    "no-useless-escape": [
-      "error",
-    ],
-    "no-var": [
-      "error",
-    ],
-    "no-whitespace-before-property": [
-      "off",
-    ],
-    "no-with": [
-      "error",
-    ],
-    "no-wrap-func": [
-      "off",
-    ],
-    "nonblock-statement-body-position": [
-      "off",
-    ],
-    "object-curly-newline": [
-      "off",
-    ],
-    "object-curly-spacing": [
-      "off",
-    ],
-    "object-property-newline": [
-      "off",
-    ],
-    "object-shorthand": [
-      "error",
-      "always",
-    ],
-    "one-var-declaration-per-line": [
-      "off",
-    ],
-    "operator-linebreak": [
-      "off",
-    ],
-    "padded-blocks": [
-      "off",
-    ],
-    "prefer-arrow-callback": [
-      "off",
-    ],
-    "prefer-const": [
-      "error",
-    ],
-    "prefer-rest-params": [
-      "error",
-    ],
-    "prefer-spread": [
-      "error",
-    ],
-    "prettier/prettier": [
-      "error",
-      {
-        "printWidth": 120,
-        "semi": false,
-        "singleQuote": true,
-      },
-    ],
-    "quote-props": [
-      "off",
-    ],
-    "quotes": [
-      0,
-    ],
-    "react/jsx-child-element-spacing": [
-      "off",
-    ],
-    "react/jsx-closing-bracket-location": [
-      "off",
-    ],
-    "react/jsx-closing-tag-location": [
-      "off",
-    ],
-    "react/jsx-curly-newline": [
-      "off",
-    ],
-    "react/jsx-curly-spacing": [
-      "off",
-    ],
-    "react/jsx-equals-spacing": [
-      "off",
-    ],
-    "react/jsx-first-prop-new-line": [
-      "off",
-    ],
-    "react/jsx-indent": [
-      "off",
-    ],
-    "react/jsx-indent-props": [
-      "off",
-    ],
-    "react/jsx-max-props-per-line": [
-      "off",
-    ],
-    "react/jsx-newline": [
-      "off",
-    ],
-    "react/jsx-one-expression-per-line": [
-      "off",
-    ],
-    "react/jsx-props-no-multi-spaces": [
-      "off",
-    ],
-    "react/jsx-space-before-closing": [
-      "off",
-    ],
-    "react/jsx-tag-spacing": [
-      "off",
-    ],
-    "react/jsx-wrap-multilines": [
-      "off",
-    ],
-    "require-yield": [
-      "error",
-    ],
-    "rest-spread-spacing": [
-      "off",
-    ],
-    "semi": [
-      "off",
-    ],
-    "semi-spacing": [
-      "off",
-    ],
-    "semi-style": [
-      "off",
-    ],
-    "space-after-function-name": [
-      "off",
-    ],
-    "space-after-keywords": [
-      "off",
-    ],
-    "space-before-blocks": [
-      "off",
-    ],
-    "space-before-function-paren": [
-      "off",
-    ],
-    "space-before-function-parentheses": [
-      "off",
-    ],
-    "space-before-keywords": [
-      "off",
-    ],
-    "space-in-brackets": [
-      "off",
-    ],
-    "space-in-parens": [
-      "off",
-    ],
-    "space-infix-ops": [
-      "off",
-    ],
-    "space-return-throw-case": [
-      "off",
-    ],
-    "space-unary-ops": [
-      "off",
-    ],
-    "space-unary-word-ops": [
-      "off",
-    ],
-    "standard/array-bracket-even-spacing": [
-      "off",
-    ],
-    "standard/computed-property-even-spacing": [
-      "off",
-    ],
-    "standard/object-curly-even-spacing": [
-      "off",
-    ],
-    "switch-colon-spacing": [
-      "off",
-    ],
-    "template-curly-spacing": [
-      "off",
-    ],
-    "template-tag-spacing": [
-      "off",
-    ],
-    "unicode-bom": [
-      "off",
-    ],
-    "unicorn/empty-brace-spaces": [
-      "off",
-    ],
-    "unicorn/no-nested-ternary": [
-      "off",
-    ],
-    "unicorn/number-literal-case": [
-      "off",
-    ],
-    "unused-imports/no-unused-imports": [
-      "error",
-    ],
-    "use-isnan": [
-      "error",
-    ],
-    "valid-typeof": [
-      "error",
-    ],
-    "vue/array-bracket-newline": [
-      "off",
-    ],
-    "vue/array-bracket-spacing": [
-      "off",
-    ],
-    "vue/array-element-newline": [
-      "off",
-    ],
-    "vue/arrow-spacing": [
-      "off",
-    ],
-    "vue/block-spacing": [
-      "off",
-    ],
-    "vue/block-tag-newline": [
-      "off",
-    ],
-    "vue/brace-style": [
-      "off",
-    ],
-    "vue/comma-dangle": [
-      "off",
-    ],
-    "vue/comma-spacing": [
-      "off",
-    ],
-    "vue/comma-style": [
-      "off",
-    ],
-    "vue/dot-location": [
-      "off",
-    ],
-    "vue/func-call-spacing": [
-      "off",
-    ],
-    "vue/html-closing-bracket-newline": [
-      "off",
-    ],
-    "vue/html-closing-bracket-spacing": [
-      "off",
-    ],
-    "vue/html-end-tags": [
-      "off",
-    ],
-    "vue/html-indent": [
-      "off",
-    ],
-    "vue/html-quotes": [
-      "off",
-    ],
-    "vue/html-self-closing": [
-      0,
-    ],
-    "vue/key-spacing": [
-      "off",
-    ],
-    "vue/keyword-spacing": [
-      "off",
-    ],
-    "vue/max-attributes-per-line": [
-      "off",
-    ],
-    "vue/max-len": [
-      0,
-    ],
-    "vue/multiline-html-element-content-newline": [
-      "off",
-    ],
-    "vue/multiline-ternary": [
-      "off",
-    ],
-    "vue/mustache-interpolation-spacing": [
-      "off",
-    ],
-    "vue/no-extra-parens": [
-      "off",
-    ],
-    "vue/no-multi-spaces": [
-      "off",
-    ],
-    "vue/no-spaces-around-equal-signs-in-attribute": [
-      "off",
-    ],
-    "vue/object-curly-newline": [
-      "off",
-    ],
-    "vue/object-curly-spacing": [
-      "off",
-    ],
-    "vue/object-property-newline": [
-      "off",
-    ],
-    "vue/operator-linebreak": [
-      "off",
-    ],
-    "vue/quote-props": [
-      "off",
-    ],
-    "vue/script-indent": [
-      "off",
-    ],
-    "vue/singleline-html-element-content-newline": [
-      "off",
-    ],
-    "vue/space-in-parens": [
-      "off",
-    ],
-    "vue/space-infix-ops": [
-      "off",
-    ],
-    "vue/space-unary-ops": [
-      "off",
-    ],
-    "vue/template-curly-spacing": [
-      "off",
-    ],
-    "wrap-iife": [
-      "off",
-    ],
-    "wrap-regex": [
-      "off",
-    ],
-    "yield-star-spacing": [
-      "off",
-    ],
-  },
-  "settings": {
-    "import/extensions": [
-      ".ts",
-      ".tsx",
-      ".js",
-      ".jsx",
-    ],
-    "import/external-module-folders": [
-      "node_modules",
-      "node_modules/@types",
-    ],
-    "import/parsers": {
-      "@typescript-eslint/parser": [
-        ".ts",
-        ".tsx",
-      ],
-    },
-    "import/resolver": {
-      "node": {
-        "extensions": [
-          ".ts",
-          ".tsx",
-          ".js",
-          ".jsx",
-        ],
-      },
-      "typescript": {
-        "alwaysTryTypes": true,
-      },
-    },
-  },
-}
-`;
diff --git a/packages/eslint-config/babel.config.js b/packages/eslint-config/babel.config.js
deleted file mode 100644
index 7916f5be50e..00000000000
--- a/packages/eslint-config/babel.config.js
+++ /dev/null
@@ -1,3 +0,0 @@
-module.exports = {
-  presets: [['@babel/preset-env', { targets: { node: 'current' } }, '@babel/preset-typescript']],
-}
diff --git a/packages/eslint-config/load.js b/packages/eslint-config/load.js
deleted file mode 100644
index 249141c2ac5..00000000000
--- a/packages/eslint-config/load.js
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * This is a workaround to allow ESLint to resolve plugins that were installed
- * by an external config; see https://github.com/eslint/eslint/issues/3458.
- */
-require('@rushstack/eslint-patch/modern-module-resolution')
diff --git a/packages/eslint-config/node.js b/packages/eslint-config/node.js
deleted file mode 100644
index 40ee49f05d2..00000000000
--- a/packages/eslint-config/node.js
+++ /dev/null
@@ -1,76 +0,0 @@
-const { node: nodeRestrictedImports } = require('./restrictedImports')
-
-module.exports = {
-  env: {
-    es6: true,
-    node: true,
-  },
-  plugins: ['import', 'unused-imports'],
-  extends: ['eslint:recommended'],
-  parserOptions: {
-    ecmaVersion: 2020,
-    sourceType: 'module',
-  },
-  rules: {
-    'prettier/prettier': [
-      'error',
-      {
-        semi: false,
-        singleQuote: true,
-        printWidth: 120,
-      },
-    ],
-    'import/no-unused-modules': ['error', { unusedExports: true }],
-    'object-shorthand': ['error', 'always'],
-    'unused-imports/no-unused-imports': 'error',
-  },
-  overrides: [
-    {
-      files: ['*.ts', '*.tsx'],
-      parser: '@typescript-eslint/parser',
-      plugins: ['@typescript-eslint/eslint-plugin'],
-      extends: ['plugin:@typescript-eslint/recommended', 'plugin:import/typescript'],
-      settings: {
-        'import/parsers': {
-          '@typescript-eslint/parser': ['.ts', '.tsx'],
-        },
-        'import/resolver': {
-          typescript: {
-            alwaysTryTypes: true,
-          },
-        },
-      },
-      rules: {
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/ban-ts-comment': 'off',
-        '@typescript-eslint/ban-ts-ignore': 'off',
-        '@typescript-eslint/explicit-module-boundary-types': 'off',
-        '@typescript-eslint/explicit-function-return-type': 'off',
-        '@typescript-eslint/no-restricted-imports': ['error', nodeRestrictedImports],
-      },
-    },
-    {
-      files: ['**/__tests__/**/*.[jt]s?(x)', '**/?(*.)+(spec|test).[tj]s?(x)'],
-      excludedFiles: '**/cypress/**',
-      env: {
-        jest: true,
-        'jest/globals': true,
-      },
-      extends: ['plugin:jest/recommended'],
-      plugins: ['jest'],
-    },
-    {
-      files: ['**/cypress/**/*.[jt]s?(x)'],
-      env: {
-        'cypress/globals': true,
-      },
-      extends: ['plugin:cypress/recommended'],
-      plugins: ['cypress'],
-    },
-    {
-      files: ['*'],
-      plugins: ['prettier'],
-      extends: ['plugin:prettier/recommended'],
-    },
-  ],
-}
diff --git a/packages/eslint-config/package.json b/packages/eslint-config/package.json
deleted file mode 100644
index 5d06ea23413..00000000000
--- a/packages/eslint-config/package.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "name": "@uniswap/eslint-config",
-  "version": "0.0.1",
-  "description": "Uniswap ESLint config",
-  "repository": "https://github.com/Uniswap/eslint-config",
-  "homepage": "https://github.com/Uniswap/eslint-config#readme",
-  "bugs": "https://github.com/Uniswap/eslint-config/issues",
-  "license": "MIT",
-  "scripts": {
-    "lint": "eslint .",
-    "test": "jest",
-    "release": "semantic-release"
-  },
-  "keywords": [
-    "config",
-    "eslint",
-    "eslintconfig",
-    "uniswap"
-  ],
-  "main": "node.js",
-  "files": [
-    "restrictedImports.js",
-    "node.js",
-    "react.js",
-    "load.js"
-  ],
-  "dependencies": {
-    "@jambit/eslint-plugin-typed-redux-saga": "0.4.0",
-    "@react-native-community/eslint-config": "3.0.3",
-    "@rushstack/eslint-patch": "^1.2.0",
-    "@typescript-eslint/eslint-plugin": "6.20.0",
-    "@typescript-eslint/parser": "6.20.0",
-    "eslint-config-prettier": "^8.5.0",
-    "eslint-config-turbo": "latest",
-    "eslint-import-resolver-typescript": "^3.5.2",
-    "eslint-plugin-cypress": "^2.12.1",
-    "eslint-plugin-detox": "1.0.0",
-    "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-jest": "^27.1.6",
-    "eslint-plugin-no-relative-import-paths": "1.5.2",
-    "eslint-plugin-no-unsanitized": "4.0.1",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.31.11",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-native": "3.11.0",
-    "eslint-plugin-security": "1.5.0",
-    "eslint-plugin-spellcheck": "0.0.20",
-    "eslint-plugin-storybook": "^0.6.10",
-    "eslint-plugin-unused-imports": "^2.0.0",
-    "prettier": "^2.8.0",
-    "prettier-plugin-organize-imports": "3.2.4"
-  },
-  "peerDependencies": {
-    "eslint": "^8.0.0"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.20.5",
-    "@babel/preset-env": "7.23.3",
-    "@babel/preset-typescript": "^7.18.6",
-    "@semantic-release/changelog": "^6.0.2",
-    "@semantic-release/git": "^10.0.1",
-    "@types/jest": "29.5.0",
-    "babel-jest": "29.6.1",
-    "eslint": "8.44.0",
-    "jest": "29.6.4",
-    "semantic-release": "^19.0.5",
-    "typescript": "5.3.3"
-  }
-}
diff --git a/packages/eslint-config/preset.test.ts b/packages/eslint-config/preset.test.ts
deleted file mode 100644
index eb86c4213b1..00000000000
--- a/packages/eslint-config/preset.test.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-import { ESLint } from 'eslint'
-
-it('should have a correct configuration for a TypeScript file', async () => {
-  const linter = new ESLint({
-    overrideConfig: {
-      extends: ['./node.js'],
-    },
-  })
-  expect(await linter.calculateConfigForFile('file.ts')).toMatchSnapshot({ parser: expect.any(String) })
-})
-
-it('should have a correct configuration for a React file', async () => {
-  const linter = new ESLint({
-    overrideConfig: {
-      extends: ['./react.js'],
-    },
-  })
-  expect(await linter.calculateConfigForFile('file.tsx')).toMatchSnapshot({ parser: expect.any(String) })
-})
-
-it('should have a correct configuration for a Jest file', async () => {
-  const linter = new ESLint({
-    overrideConfig: {
-      extends: ['./node.js'],
-    },
-  })
-  expect(await linter.calculateConfigForFile('src/feature/file.test.ts')).toMatchSnapshot({
-    parser: expect.any(String),
-  })
-})
-
-it('should have a correct configuration for a Cypress e2e file', async () => {
-  const linter = new ESLint({
-    overrideConfig: {
-      extends: ['./node.js'],
-    },
-  })
-  expect(await linter.calculateConfigForFile('cypress/e2e/file.ts')).toMatchSnapshot({
-    parser: expect.any(String),
-  })
-})
diff --git a/packages/eslint-config/react.js b/packages/eslint-config/react.js
deleted file mode 100644
index 6dbbfd20952..00000000000
--- a/packages/eslint-config/react.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const { react: reactRestrictedImports } = require('./restrictedImports')
-
-module.exports = {
-  extends: [require.resolve('./node.js'), 'plugin:react/recommended', 'plugin:react-hooks/recommended'],
-  env: {
-    browser: true,
-    node: false,
-  },
-  plugins: ['react', 'react-hooks'],
-  ignorePatterns: ['**/__generated__/'],
-  parserOptions: {
-    ecmaFeatures: {
-      jsx: true,
-    },
-  },
-  rules: {
-    'react/react-in-jsx-scope': 'off',
-    'react/jsx-curly-brace-presence': ['error', { props: 'never', children: 'never' }],
-  },
-  settings: {
-    react: {
-      version: 'detect',
-    },
-  },
-  overrides: [
-    {
-      files: ['*.ts', '*.tsx'],
-      rules: {
-        '@typescript-eslint/no-restricted-imports': ['error', reactRestrictedImports],
-      },
-    },
-  ],
-}
diff --git a/packages/eslint-config/restrictedImports.js b/packages/eslint-config/restrictedImports.js
deleted file mode 100644
index 10957eac4f1..00000000000
--- a/packages/eslint-config/restrictedImports.js
+++ /dev/null
@@ -1,25 +0,0 @@
-exports.node = {
-  paths: [
-    {
-      name: 'ethers',
-      message: "Please import from '@ethersproject/module' directly to support tree-shaking.",
-    },
-  ],
-  patterns: [
-    {
-      group: ['**/dist'],
-      message: 'Do not import from dist/ - this is an implementation detail, and breaks tree-shaking.',
-    },
-  ],
-}
-
-exports.react = {
-  paths: [
-    ...exports.node.paths,
-    {
-      name: 'styled-components',
-      message: 'Please import from styled-components/macro.',
-    },
-  ],
-  patterns: exports.node.patterns,
-}
diff --git a/packages/ui/.depcheckrc b/packages/ui/.depcheckrc
index 502cdb97577..d3dd9181381 100644
--- a/packages/ui/.depcheckrc
+++ b/packages/ui/.depcheckrc
@@ -6,6 +6,6 @@ ignores: [
     "@tamagui/theme-base",
     ## Internal packages / workspaces
     "ui",
+    "eslint-config-custom",
     "tsconfig",
-    "utilities",
   ]
diff --git a/packages/ui/.eslintrc.js b/packages/ui/.eslintrc.js
index 9e0f4db8acc..72f3637dec6 100644
--- a/packages/ui/.eslintrc.js
+++ b/packages/ui/.eslintrc.js
@@ -1,10 +1,10 @@
-const eslintConfig = require('@uniswap/eslint-config/native')
+const eslintConfig = require('eslint-config-custom')
 
 const noRestrictedImportsPaths = eslintConfig.rules['no-restricted-imports']?.[1]?.paths ?? []
 
 module.exports = {
   root: true,
-  extends: ['@uniswap/eslint-config/native'],
+  extends: ['custom'],
   ignorePatterns: [
     'node_modules',
     '.turbo',
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 6bd7ebe1738..62dd26e4eef 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -5,37 +5,35 @@
     "@gorhom/bottom-sheet": "4.5.1",
     "@react-native-masked-view/masked-view": "0.2.9",
     "@shopify/flash-list": "1.4.3",
-    "@shopify/react-native-skia": "0.1.187",
-    "@tamagui/animations-css": "1.88.18",
-    "@tamagui/animations-react-native": "1.88.18",
-    "@tamagui/font-inter": "1.88.18",
-    "@tamagui/helpers-icon": "1.88.18",
-    "@tamagui/react-native-media-driver": "1.88.18",
-    "@tamagui/shorthands": "1.88.18",
-    "@tamagui/theme-base": "1.88.18",
-    "@tamagui/toast": "1.88.18",
+    "@tamagui/animations-css": "1.74.16",
+    "@tamagui/animations-react-native": "1.74.16",
+    "@tamagui/font-inter": "1.74.16",
+    "@tamagui/helpers-icon": "1.74.16",
+    "@tamagui/react-native-media-driver": "1.74.16",
+    "@tamagui/shorthands": "1.74.16",
+    "@tamagui/theme-base": "1.74.16",
+    "@tamagui/toast": "1.74.16",
     "burnt": "0.11.4",
     "ethers": "5.7.2",
     "expo-haptics": "12.0.1",
     "expo-linear-gradient": "12.3.0",
+    "expo-localization": "14.1.1",
     "react": "18.2.0",
     "react-i18next": "11.18.6",
     "react-native": "0.71.13",
-    "react-native-reanimated": "3.6.2",
+    "react-native-reanimated": "3.3.0",
     "react-native-safe-area-context": "4.5.0",
     "react-native-svg": "13.9.0",
-    "tamagui": "1.88.18",
-    "utilities": "workspace:^"
+    "tamagui": "1.74.16"
   },
   "devDependencies": {
-    "@tamagui/animations-moti": "1.88.18",
-    "@tamagui/build": "1.88.18",
-    "@uniswap/eslint-config": "workspace:^",
+    "@tamagui/animations-moti": "1.74.16",
+    "@tamagui/build": "1.74.16",
     "camelcase": "^6.0.0",
     "cheerio": "^1.0.0-rc.5",
     "eslint": "8.44.0",
     "fs-extra": "^11.1.1",
-    "typescript": "5.3.3",
+    "typescript": "4.9.4",
     "uppercamelcase": "^3.0.0"
   },
   "files": [
diff --git a/packages/ui/src/assets/graphics/froggy.png b/packages/ui/src/assets/graphics/froggy.png
deleted file mode 100644
index c33be971ab7..00000000000
Binary files a/packages/ui/src/assets/graphics/froggy.png and /dev/null differ
diff --git a/packages/ui/src/assets/graphics/unitag-sparkle.svg b/packages/ui/src/assets/graphics/unitag-sparkle.svg
deleted file mode 100644
index 064d9a3dd6f..00000000000
--- a/packages/ui/src/assets/graphics/unitag-sparkle.svg
+++ /dev/null
@@ -1,27 +0,0 @@
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g clip-path="url(#clip0_870_14)">
-<g filter="url(#filter0_d_870_14)">
-<rect x="4.11621" y="11.0002" width="16" height="16" rx="2.14154" transform="rotate(4 4.11621 11.0002)" fill="#FC74FE" shape-rendering="crispEdges"/>
-<rect x="3.91645" y="10.7704" width="16.4306" height="16.4306" rx="2.35685" transform="rotate(4 3.91645 10.7704)" stroke="#FDAFF0" stroke-width="0.430609" shape-rendering="crispEdges"/>
-<rect x="6.89941" y="14.2021" width="2" height="8" transform="rotate(4 6.89941 14.2021)" fill="#FEF4FF"/>
-<rect x="14.8804" y="14.7603" width="2" height="8" transform="rotate(4 14.8804 14.7603)" fill="#FEF4FF"/>
-<rect x="8.33643" y="22.3223" width="8" height="2" transform="rotate(4 8.33643 22.3223)" fill="#FEF4FF"/>
-</g>
-<path d="M24.0703 3L24.4926 4.07073C25.3058 6.13251 26.9378 7.76456 28.9996 8.57771L30.0703 9L28.9996 9.42229C26.9378 10.2354 25.3058 11.8675 24.4926 13.9293L24.0703 15L23.648 13.9293C22.8349 11.8675 21.2028 10.2354 19.141 9.42229L18.0703 9L19.141 8.57771C21.2028 7.76456 22.8349 6.13251 23.648 4.07073L24.0703 3Z" fill="#FC74FE"/>
-</g>
-<defs>
-<filter id="filter0_d_870_14" x="-1.03336" y="7.71623" width="25.1439" height="25.1439" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="0.749348"/>
-<feGaussianBlur stdDeviation="1.87337"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.988917 0 0 0 0 0.445833 0 0 0 0 1 0 0 0 0.3 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_870_14"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_870_14" result="shape"/>
-</filter>
-<clipPath id="clip0_870_14">
-<rect width="32" height="32" fill="white"/>
-</clipPath>
-</defs>
-</svg>
diff --git a/packages/ui/src/assets/graphics/unitag.svg b/packages/ui/src/assets/graphics/unitag.svg
deleted file mode 100644
index bdda3eea1a5..00000000000
--- a/packages/ui/src/assets/graphics/unitag.svg
+++ /dev/null
@@ -1,21 +0,0 @@
-<svg width="27" height="26" viewBox="0 0 27 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<g filter="url(#filter0_d_1776_22093)">
-<rect x="6.04565" y="4" width="16" height="16" rx="2.14154" transform="rotate(4 6.04565 4)" fill="#FC74FE" shape-rendering="crispEdges"/>
-<rect x="5.84589" y="3.7702" width="16.4306" height="16.4306" rx="2.35685" transform="rotate(4 5.84589 3.7702)" stroke="#FDAFF0" stroke-width="0.430609" shape-rendering="crispEdges"/>
-<rect x="8.8291" y="7.20215" width="2" height="8" transform="rotate(4 8.8291 7.20215)" fill="#FEF4FF"/>
-<rect x="16.8101" y="7.75977" width="2" height="8" transform="rotate(4 16.8101 7.75977)" fill="#FEF4FF"/>
-<rect x="10.2659" y="15.3223" width="8" height="2" transform="rotate(4 10.2659 15.3223)" fill="#FEF4FF"/>
-</g>
-<defs>
-<filter id="filter0_d_1776_22093" x="0.896327" y="0.716475" width="25.1436" height="25.1429" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
-<feFlood flood-opacity="0" result="BackgroundImageFix"/>
-<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
-<feOffset dy="0.749348"/>
-<feGaussianBlur stdDeviation="1.87337"/>
-<feComposite in2="hardAlpha" operator="out"/>
-<feColorMatrix type="matrix" values="0 0 0 0 0.988917 0 0 0 0 0.445833 0 0 0 0 1 0 0 0 0.3 0"/>
-<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1776_22093"/>
-<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1776_22093" result="shape"/>
-</filter>
-</defs>
-</svg>
diff --git a/packages/ui/src/assets/graphics/unitags-banner-v-dark.png b/packages/ui/src/assets/graphics/unitags-banner-v-dark.png
deleted file mode 100644
index 4c6bd447857..00000000000
Binary files a/packages/ui/src/assets/graphics/unitags-banner-v-dark.png and /dev/null differ
diff --git a/packages/ui/src/assets/graphics/unitags-banner-v-light.png b/packages/ui/src/assets/graphics/unitags-banner-v-light.png
deleted file mode 100644
index 6fef65ec670..00000000000
Binary files a/packages/ui/src/assets/graphics/unitags-banner-v-light.png and /dev/null differ
diff --git a/packages/ui/src/assets/graphics/unitags-intro-banner-dark.png b/packages/ui/src/assets/graphics/unitags-intro-banner-dark.png
deleted file mode 100644
index 59e90161307..00000000000
Binary files a/packages/ui/src/assets/graphics/unitags-intro-banner-dark.png and /dev/null differ
diff --git a/packages/ui/src/assets/graphics/unitags-intro-banner-light.png b/packages/ui/src/assets/graphics/unitags-intro-banner-light.png
deleted file mode 100644
index 8343727acac..00000000000
Binary files a/packages/ui/src/assets/graphics/unitags-intro-banner-light.png and /dev/null differ
diff --git a/packages/ui/src/assets/icons/arrow-down-circle.svg b/packages/ui/src/assets/icons/arrow-down-circle.svg
index d6bf9e3574f..96006deb0ac 100644
--- a/packages/ui/src/assets/icons/arrow-down-circle.svg
+++ b/packages/ui/src/assets/icons/arrow-down-circle.svg
@@ -1,3 +1,5 @@
-<svg width="25" height="26" viewBox="0 0 25 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M0 13C0 6.09625 5.59625 0.499999 12.5 0.499999C19.4037 0.499999 25 6.09625 25 13C25 19.9037 19.4037 25.5 12.5 25.5C5.59625 25.5 0 19.9037 0 13ZM13.25 7.75C13.25 7.33579 12.9142 7 12.5 7C12.0858 7 11.75 7.33579 11.75 7.75V15.4737C11.75 15.8846 11.75 16.0901 11.6265 16.1413C11.5031 16.1924 11.3578 16.0471 11.0672 15.7565L7.78033 12.4697C7.48744 12.1768 7.01256 12.1768 6.71967 12.4697C6.42678 12.7626 6.42678 13.2374 6.71967 13.5303L11.9697 18.7803C12.2626 19.0732 12.7374 19.0732 13.0303 18.7803L18.2803 13.5303C18.5732 13.2374 18.5732 12.7626 18.2803 12.4697C17.9874 12.1768 17.5126 12.1768 17.2197 12.4697L13.9328 15.7565C13.6422 16.0471 13.4969 16.1924 13.3735 16.1413C13.25 16.0901 13.25 15.8846 13.25 15.4737V7.75Z" fill="currentColor"/>
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.00004 14.6667C11.6819 14.6667 14.6667 11.6819 14.6667 8.00003C14.6667 4.31813 11.6819 1.33337 8.00004 1.33337C4.31814 1.33337 1.33337 4.31813 1.33337 8.00003C1.33337 11.6819 4.31814 14.6667 8.00004 14.6667Z" fill="#FFFFFF" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M5.33337 8L8.00004 10.6667L10.6667 8" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M8 5.33337V10.6667" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/packages/ui/src/assets/icons/diamond-exclamation.svg b/packages/ui/src/assets/icons/diamond-exclamation.svg
deleted file mode 100644
index 33946a2a9fd..00000000000
--- a/packages/ui/src/assets/icons/diamond-exclamation.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="M17.5243 8.04627L11.9534 2.47539C10.8743 1.39622 9.12509 1.39622 8.04676 2.47539L2.47588 8.04627C1.39671 9.12544 1.39671 10.8746 2.47588 11.9529L8.04676 17.5238C9.12593 18.603 10.8751 18.603 11.9534 17.5238L17.5243 11.9529C18.6035 10.8746 18.6035 9.12461 17.5243 8.04627ZM9.37509 7.08293C9.37509 6.73793 9.65509 6.45793 10.0001 6.45793C10.3451 6.45793 10.6251 6.73793 10.6251 7.08293V10.4163C10.6251 10.7613 10.3451 11.0413 10.0001 11.0413C9.65509 11.0413 9.37509 10.7613 9.37509 10.4163V7.08293ZM10.0168 13.7496C9.55677 13.7496 9.17917 13.3763 9.17917 12.9163C9.17917 12.4563 9.54843 12.0829 10.0084 12.0829H10.0168C10.4776 12.0829 10.8501 12.4563 10.8501 12.9163C10.8501 13.3763 10.4768 13.7496 10.0168 13.7496Z" fill="#7D7D7D"/>
-</svg>
diff --git a/packages/ui/src/assets/icons/laptop.svg b/packages/ui/src/assets/icons/laptop.svg
deleted file mode 100644
index db99c3e9b2a..00000000000
--- a/packages/ui/src/assets/icons/laptop.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M20 7V14.2C20 14.366 19.866 14.5 19.7 14.5H4.30005C4.13405 14.5 4 14.366 4 14.2V7C4 5 5 4 7 4H17C19 4 20 5 20 7ZM20.7 16H3.30005C3.13405 16 3 16.134 3 16.3V17C3 18.333 3.667 19 5 19H19C20.333 19 21 18.333 21 17V16.3C21 16.134 20.866 16 20.7 16Z" fill="#FF5F52"/>
-</svg>
diff --git a/packages/ui/src/assets/icons/no-transactions.svg b/packages/ui/src/assets/icons/no-transactions.svg
deleted file mode 100644
index 5298451beea..00000000000
--- a/packages/ui/src/assets/icons/no-transactions.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="114" height="96" viewBox="0 0 114 96" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M26.5247 10.001L11.2535 14.3799C7.53727 15.4455 5.38851 19.322 6.45413 23.0382L19.6601 69.093C20.7257 72.8092 24.6022 74.958 28.3184 73.8924L62.817 64H37.5247C31.4495 64 26.5247 59.0752 26.5247 53V10.001Z" fill="#CECECE"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M37.5244 1C33.6584 1 30.5244 4.13401 30.5244 8V53C30.5244 56.866 33.6584 60 37.5244 60H62.7608C66.618 52.6192 73.9151 47.3207 82.5244 46.2321V8C82.5244 4.13401 79.3904 1 75.5244 1H37.5244ZM43.0244 20C44.4051 20 45.5244 18.8807 45.5244 17.5C45.5244 16.1193 44.4051 15 43.0244 15C41.6437 15 40.5244 16.1193 40.5244 17.5C40.5244 18.8807 41.6437 20 43.0244 20ZM45.5244 30.5C45.5244 31.8807 44.4051 33 43.0244 33C41.6437 33 40.5244 31.8807 40.5244 30.5C40.5244 29.1193 41.6437 28 43.0244 28C44.4051 28 45.5244 29.1193 45.5244 30.5ZM43.0244 46C44.4051 46 45.5244 44.8807 45.5244 43.5C45.5244 42.1193 44.4051 41 43.0244 41C41.6437 41 40.5244 42.1193 40.5244 43.5C40.5244 44.8807 41.6437 46 43.0244 46ZM50.5244 17.5C50.5244 16.1193 51.6437 15 53.0244 15H70.0244C71.4051 15 72.5244 16.1193 72.5244 17.5C72.5244 18.8807 71.4051 20 70.0244 20H53.0244C51.6437 20 50.5244 18.8807 50.5244 17.5ZM53.0244 28C51.6437 28 50.5244 29.1193 50.5244 30.5C50.5244 31.8807 51.6437 33 53.0244 33H70.0244C71.4051 33 72.5244 31.8807 72.5244 30.5C72.5244 29.1193 71.4051 28 70.0244 28H53.0244ZM50.5244 43.5C50.5244 42.1193 51.6437 41 53.0244 41H70.0244C71.4051 41 72.5244 42.1193 72.5244 43.5C72.5244 44.8807 71.4051 46 70.0244 46H53.0244C51.6437 46 50.5244 44.8807 50.5244 43.5Z" fill="#CECECE"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M85.8188 94.0254C97.9691 94.0254 107.819 84.1757 107.819 72.0254C107.819 59.8751 97.9691 50.0254 85.8188 50.0254C73.6686 50.0254 63.8188 59.8751 63.8188 72.0254C63.8188 84.1757 73.6686 94.0254 85.8188 94.0254ZM94.0682 72.0251L85.8185 63.7754L77.5689 72.0251L85.8185 80.2748L94.0682 72.0251Z" fill="#CECECE"/>
-</svg>
diff --git a/packages/ui/src/assets/icons/pen-line.svg b/packages/ui/src/assets/icons/pen-line.svg
deleted file mode 100644
index 2a24ff76d34..00000000000
--- a/packages/ui/src/assets/icons/pen-line.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="19" height="19" viewBox="0 0 19 19" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M14.0371 9.00194L5 18H0V13L8.99805 3.963C9.11505 3.845 9.3051 3.845 9.4231 3.963L14.0381 8.57799C14.1551 8.69499 14.1551 8.88494 14.0371 9.00194ZM15.1079 7.52794C15.2249 7.64494 15.415 7.64494 15.532 7.52794L17.4099 5.65001C18.1939 4.86601 18.1939 3.59405 17.4099 2.81005L15.1899 0.589953C14.4059 -0.194047 13.1341 -0.194047 12.3501 0.589953L10.4719 2.468C10.3549 2.58501 10.3549 2.77496 10.4719 2.89196L15.1079 7.52794ZM18 17.25H11C10.586 17.25 10.25 17.586 10.25 18C10.25 18.414 10.586 18.75 11 18.75H18C18.414 18.75 18.75 18.414 18.75 18C18.75 17.586 18.414 17.25 18 17.25Z" fill="#CECECE"/>
-</svg>
diff --git a/packages/ui/src/assets/icons/sticky-note-square.svg b/packages/ui/src/assets/icons/sticky-note-square.svg
deleted file mode 100644
index d9be8de2f4f..00000000000
--- a/packages/ui/src/assets/icons/sticky-note-square.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
-<path d="M14 4.24666V8.56665C14 8.71332 13.9866 8.86 13.9533 9H11.2533C10.0066 9 9 10.0067 9 11.2533V13.9534C8.86 13.9867 8.7134 14 8.56673 14H4.25326C2.74659 14 2 13.2467 2 11.7467V4.24666C2 2.74666 2.74659 2 4.25326 2H11.7467C13.2534 2 14 2.74666 14 4.24666ZM10 11.2533V13.48C10.06 13.44 10.1067 13.3933 10.16 13.34L13.34 10.16C13.3933 10.1067 13.44 10.06 13.48 10H11.2533C10.5599 10 10 10.56 10 11.2533Z" fill="#FC74FE"/>
-</svg>
diff --git a/packages/ui/src/assets/icons/trash-filled.svg b/packages/ui/src/assets/icons/trash-filled.svg
deleted file mode 100644
index d9645dd2e48..00000000000
--- a/packages/ui/src/assets/icons/trash-filled.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M8.214 5.75H8.52001L8.65924 5.47751C8.77151 5.25781 8.85397 5.01821 8.93013 4.79074L8.93041 4.78989L9.13235 4.18311C9.26824 3.77544 9.65004 3.5 10.081 3.5H13.919C14.35 3.5 14.7318 3.77544 14.8677 4.18311L15.0696 4.78989L15.0699 4.79074C15.146 5.01821 15.2285 5.25781 15.3408 5.47751L15.48 5.75H15.786H20C20.1379 5.75 20.25 5.86214 20.25 6C20.25 6.13786 20.1379 6.25 20 6.25H4C3.86214 6.25 3.75 6.13786 3.75 6C3.75 5.86214 3.86214 5.75 4 5.75H8.214ZM5.65398 8.25H18.346L17.6912 18.1653C17.6912 18.1655 17.6912 18.1658 17.6912 18.166C17.641 18.8842 17.4313 19.4571 17.0592 19.8476C16.696 20.2289 16.1172 20.5 15.19 20.5H8.81C7.88279 20.5 7.30399 20.2289 6.94075 19.8476C6.56874 19.4571 6.35899 18.8843 6.30885 18.1662C6.30883 18.1659 6.30881 18.1656 6.30879 18.1653L5.65398 8.25ZM11.25 11C11.25 10.3139 10.6861 9.75 10 9.75C9.31386 9.75 8.75 10.3139 8.75 11V16C8.75 16.6861 9.31386 17.25 10 17.25C10.6861 17.25 11.25 16.6861 11.25 16V11ZM15.25 11C15.25 10.3139 14.6861 9.75 14 9.75C13.3139 9.75 12.75 10.3139 12.75 11V16C12.75 16.6861 13.3139 17.25 14 17.25C14.6861 17.25 15.25 16.6861 15.25 16V11Z" fill="#FF5F52" stroke="#FF5F52"/>
-</svg>
diff --git a/packages/ui/src/assets/icons/twitter.svg b/packages/ui/src/assets/icons/twitter.svg
new file mode 100644
index 00000000000..d0c7a2c90c7
--- /dev/null
+++ b/packages/ui/src/assets/icons/twitter.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="13" viewBox="0 0 16 13" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13.955 2.99252C13.9625 3.12002 13.9625 3.25501 13.9625 3.39001C13.9625 7.39501 10.8725 12.0075 5.21749 12.0075C3.47749 12.0075 1.8575 11.5125 0.5 10.65C0.7475 10.68 0.987504 10.6875 1.2425 10.6875C2.6825 10.6875 4.0025 10.2075 5.06 9.39751C3.71 9.36751 2.5775 8.49751 2.1875 7.29751C2.375 7.32751 2.57 7.34251 2.765 7.34251C3.0425 7.34251 3.32 7.30501 3.575 7.23751C2.165 6.95251 1.1075 5.73751 1.1075 4.26751V4.23001C1.52 4.45501 1.9925 4.59751 2.495 4.61251C1.67 4.06501 1.1225 3.14251 1.1225 2.09251C1.1225 1.53001 1.2725 1.01251 1.5425 0.562511C3.0575 2.40001 5.33 3.60001 7.88 3.73501C7.835 3.51001 7.805 3.27751 7.805 3.04501C7.805 1.37251 9.1775 0.0150146 10.88 0.0150146C11.765 0.0150146 12.5675 0.382506 13.1225 0.967506C13.82 0.840006 14.48 0.585017 15.0725 0.240017C14.8475 0.945017 14.36 1.53751 13.7225 1.90501C14.3375 1.83751 14.9375 1.67251 15.4925 1.44001C15.0725 2.04001 14.5475 2.57251 13.9475 3.00751L13.955 2.99252Z" fill="currentColor"/>
+</svg>
diff --git a/packages/ui/src/assets/icons/unitag.svg b/packages/ui/src/assets/icons/unitag.svg
new file mode 100644
index 00000000000..3a63d596aef
--- /dev/null
+++ b/packages/ui/src/assets/icons/unitag.svg
@@ -0,0 +1,5 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect x="0.634923" y="0.634923" width="22.7302" height="22.7303" rx="10.2495" fill="#FFEFFF"/>
+<path d="M11.9067 17.2489C9.54223 17.2489 7.97778 15.9867 7.97778 13.3022V8.21775H10.1111V13.2844C10.1111 14.6711 10.6445 15.4356 11.9067 15.4356C13.1689 15.4356 13.7022 14.6711 13.7022 13.2844V8.21775H15.8356V13.3022C15.8356 15.9867 14.2711 17.2489 11.9067 17.2489Z" fill="#FC72FF"/>
+<rect x="0.634923" y="0.634923" width="22.7302" height="22.7303" rx="10.2495" stroke="#FFF4FF" stroke-width="1.26985"/>
+</svg>
diff --git a/packages/ui/src/assets/icons/user-square.svg b/packages/ui/src/assets/icons/user-square.svg
deleted file mode 100644
index 76d84f4a4b1..00000000000
--- a/packages/ui/src/assets/icons/user-square.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.6875 2.5H5.3125C3.4375 2.5 2.5 3.4375 2.5 5.3125V14.6875C2.5 16.5625 3.4375 17.5 5.3125 17.5H14.6875C16.5625 17.5 17.5 16.5625 17.5 14.6875V5.3125C17.5 3.4375 16.5625 2.5 14.6875 2.5ZM10.0067 5.83333C11.3875 5.83333 12.5067 6.9525 12.5067 8.33333C12.5067 9.71417 11.3875 10.8333 10.0067 10.8333C8.62588 10.8333 7.50671 9.71417 7.50671 8.33333C7.50671 6.9525 8.62588 5.83333 10.0067 5.83333ZM14.6833 16.25H5.31667C5.20834 16.25 5.10834 16.25 5.00834 16.2417C5.11667 14.825 5.9167 12.975 8.57503 12.975H11.425C14.075 12.975 14.8833 14.8417 14.9917 16.2417C14.8917 16.25 14.7917 16.25 14.6833 16.25Z" fill="#FC72FF"/>
-</svg>
diff --git a/packages/ui/src/assets/icons/x-twitter.svg b/packages/ui/src/assets/icons/x-twitter.svg
deleted file mode 100644
index 38b185a1762..00000000000
--- a/packages/ui/src/assets/icons/x-twitter.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 512 512" fill="currentColor"><path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"/></svg>
diff --git a/packages/ui/src/assets/index.ts b/packages/ui/src/assets/index.ts
index a7a8aba569e..12fc7a72df9 100644
--- a/packages/ui/src/assets/index.ts
+++ b/packages/ui/src/assets/index.ts
@@ -12,18 +12,8 @@ export const ONBOARDING_QR_ETCHING_VIDEO_LIGHT = require('./videos/light-etching
 export const ONBOARDING_QR_ETCHING_VIDEO_DARK = require('./videos/dark-etching.mp4')
 export const AVATARS_LIGHT = require('./misc/avatars-light.png')
 export const AVATARS_DARK = require('./misc/avatars-dark.png')
-export const APP_SCREENSHOT_ICON = require('./misc/app-screenshot-icon.png')
-export const UNITAGS_BANNER_VERTICAL_LIGHT = require('./graphics/unitags-banner-v-light.png')
-export const UNITAGS_BANNER_VERTICAL_DARK = require('./graphics/unitags-banner-v-dark.png')
-export const UNITAGS_INTRO_BANNER_LIGHT = require('./graphics/unitags-intro-banner-light.png')
-export const UNITAGS_INTRO_BANNER_DARK = require('./graphics/unitags-intro-banner-dark.png')
-
-export const DAI_LOGO = require('./logos/png/dai-logo.png')
-export const USDC_LOGO = require('./logos/png/usdc-logo.png')
-export const ETH_LOGO = require('./logos/png/eth-logo.png')
-export const OPENSEA_LOGO = require('./logos/png/opensea-logo.png')
-export const ENS_LOGO = require('./logos/png/ens-logo.png')
-export const FROGGY = require('./graphics/froggy.png')
+export const UNITAGS_BANNER_HORIZONTAL = require('./misc/unitags-banner-h.png')
+export const UNITAGS_BANNER_VERTICAL = require('./misc/unitags-banner-v.png')
 
 export const ONBOARDING_LANDING_LIGHT = {
   ios: require(`./backgrounds/onboarding-landing-static-light.png`),
diff --git a/packages/ui/src/assets/logos/png/dai-logo.png b/packages/ui/src/assets/logos/png/dai-logo.png
deleted file mode 100644
index 443213d931c..00000000000
Binary files a/packages/ui/src/assets/logos/png/dai-logo.png and /dev/null differ
diff --git a/packages/ui/src/assets/logos/png/ens-logo.png b/packages/ui/src/assets/logos/png/ens-logo.png
deleted file mode 100644
index a0944bc6bd6..00000000000
Binary files a/packages/ui/src/assets/logos/png/ens-logo.png and /dev/null differ
diff --git a/packages/ui/src/assets/logos/png/eth-logo.png b/packages/ui/src/assets/logos/png/eth-logo.png
deleted file mode 100644
index e6c503670b2..00000000000
Binary files a/packages/ui/src/assets/logos/png/eth-logo.png and /dev/null differ
diff --git a/packages/ui/src/assets/logos/png/opensea-logo.png b/packages/ui/src/assets/logos/png/opensea-logo.png
deleted file mode 100644
index 39caf83fa1e..00000000000
Binary files a/packages/ui/src/assets/logos/png/opensea-logo.png and /dev/null differ
diff --git a/packages/ui/src/assets/logos/png/usdc-logo.png b/packages/ui/src/assets/logos/png/usdc-logo.png
deleted file mode 100644
index 462c2d59498..00000000000
Binary files a/packages/ui/src/assets/logos/png/usdc-logo.png and /dev/null differ
diff --git a/packages/ui/src/assets/misc/app-screenshot-icon.png b/packages/ui/src/assets/misc/app-screenshot-icon.png
deleted file mode 100644
index 2375587e725..00000000000
Binary files a/packages/ui/src/assets/misc/app-screenshot-icon.png and /dev/null differ
diff --git a/packages/ui/src/assets/misc/unitags-banner-h.png b/packages/ui/src/assets/misc/unitags-banner-h.png
new file mode 100644
index 00000000000..965ded95dfd
Binary files /dev/null and b/packages/ui/src/assets/misc/unitags-banner-h.png differ
diff --git a/packages/ui/src/assets/misc/unitags-banner-v.png b/packages/ui/src/assets/misc/unitags-banner-v.png
new file mode 100644
index 00000000000..cb4c4941207
Binary files /dev/null and b/packages/ui/src/assets/misc/unitags-banner-v.png differ
diff --git a/packages/ui/src/components/Unicon/Container.ts b/packages/ui/src/components/Unicon/Container.ts
index 1f7c2cf3dd0..b87579f3986 100644
--- a/packages/ui/src/components/Unicon/Container.ts
+++ b/packages/ui/src/components/Unicon/Container.ts
@@ -1,5 +1,4 @@
-// dummy data to prevent errors importing
-export const containerSvgPaths: React.SVGProps<SVGPathElement>[][] = [
+export const svgPaths: React.SVGProps<SVGPathElement>[][] = [
   [
     {
       d: 'M35.9146 19.765L29.9428 19.1838C29.9805 18.796 30 18.4012 30 18C30 17.5988 29.9805 17.204 29.9428 16.8162L35.9146 16.235C35.9711 16.8157 36 17.4045 36 18C36 18.5955 35.9711 19.1843 35.9146 19.765ZM35.2294 12.7731L29.4871 14.5128C29.2582 13.7572 28.9562 13.0324 28.5887 12.3463L33.8778 9.51335C34.4298 10.544 34.8845 11.6347 35.2294 12.7731ZM31.9147 6.58074L27.2788 10.3897C26.7784 9.78072 26.2193 9.22156 25.6103 8.7212L29.4193 4.08528C30.3302 4.8337 31.1663 5.66983 31.9147 6.58074ZM26.4867 2.12222L23.6537 7.41131C22.9676 7.04381 22.2428 6.74181 21.4872 6.51288L23.2269 0.770639C24.3653 1.11554 25.456 1.57016 26.4867 2.12222ZM19.765 0.0854343L19.1838 6.05722C18.796 6.01948 18.4012 6 18 6C17.5988 6 17.204 6.01948 16.8162 6.05722L16.235 0.0854339C16.8157 0.0289206 17.4045 0 18 0C18.5955 0 19.1843 0.0289207 19.765 0.0854343ZM12.7731 0.770638L14.5128 6.51288C13.7572 6.74181 13.0324 7.04381 12.3463 7.41131L9.51335 2.12222C10.544 1.57016 11.6347 1.11553 12.7731 0.770638ZM6.58074 4.08528L10.3897 8.7212C9.78072 9.22156 9.22156 9.78072 8.7212 10.3897L4.08528 6.58074C4.8337 5.66983 5.66983 4.8337 6.58074 4.08528ZM2.12222 9.51335L7.41131 12.3463C7.04381 13.0324 6.74181 13.7572 6.51288 14.5128L0.770639 12.7731C1.11554 11.6347 1.57016 10.544 2.12222 9.51335ZM0.0854342 16.235C0.0289207 16.8157 0 17.4045 0 18C0 18.5955 0.0289206 19.1843 0.0854339 19.765L6.05722 19.1838C6.01948 18.796 6 18.4012 6 18C6 17.5988 6.01948 17.204 6.05722 16.8162L0.0854342 16.235ZM0.770638 23.2269L6.51288 21.4872C6.74181 22.2428 7.04381 22.9676 7.41131 23.6537L2.12222 26.4867C1.57016 25.456 1.11554 24.3653 0.770638 23.2269ZM4.08528 29.4193L8.7212 25.6103C9.22156 26.2193 9.78072 26.7784 10.3897 27.2788L6.58074 31.9147C5.66983 31.1663 4.8337 30.3302 4.08528 29.4193ZM9.51335 33.8778L12.3463 28.5887C13.0324 28.9562 13.7572 29.2582 14.5128 29.4871L12.7731 35.2294C11.6347 34.8845 10.544 34.4298 9.51335 33.8778ZM16.235 35.9146L16.8162 29.9428C17.204 29.9805 17.5988 30 18 30C18.4012 30 18.796 29.9805 19.1838 29.9428L19.765 35.9146C19.1843 35.9711 18.5955 36 18 36C17.4045 36 16.8157 35.9711 16.235 35.9146ZM23.2269 35.2294C24.3653 34.8845 25.456 34.4298 26.4867 33.8778L23.6537 28.5887C22.9676 28.9562 22.2428 29.2582 21.4872 29.4871L23.2269 35.2294ZM29.4193 31.9147L25.6103 27.2788C26.2193 26.7784 26.7784 26.2193 27.2788 25.6103L31.9147 29.4193C31.1663 30.3302 30.3302 31.1663 29.4193 31.9147ZM33.8778 26.4867L28.5887 23.6537C28.9562 22.9676 29.2582 22.2428 29.4871 21.4872L35.2294 23.2269C34.8845 24.3653 34.4298 25.456 33.8778 26.4867Z',
diff --git a/packages/ui/src/components/Unicon/Container.web.ts b/packages/ui/src/components/Unicon/Container.web.ts
deleted file mode 100644
index c35fb6cf6a5..00000000000
--- a/packages/ui/src/components/Unicon/Container.web.ts
+++ /dev/null
@@ -1,223 +0,0 @@
-export const containerSvgPaths: React.SVGProps<SVGPathElement>[][] = [
-  [
-    {
-      d: 'M35.9146 19.765L29.9428 19.1838C29.9805 18.796 30 18.4012 30 18C30 17.5988 29.9805 17.204 29.9428 16.8162L35.9146 16.235C35.9711 16.8157 36 17.4045 36 18C36 18.5955 35.9711 19.1843 35.9146 19.765ZM35.2294 12.7731L29.4871 14.5128C29.2582 13.7572 28.9562 13.0324 28.5887 12.3463L33.8778 9.51335C34.4298 10.544 34.8845 11.6347 35.2294 12.7731ZM31.9147 6.58074L27.2788 10.3897C26.7784 9.78072 26.2193 9.22156 25.6103 8.7212L29.4193 4.08528C30.3302 4.8337 31.1663 5.66983 31.9147 6.58074ZM26.4867 2.12222L23.6537 7.41131C22.9676 7.04381 22.2428 6.74181 21.4872 6.51288L23.2269 0.770639C24.3653 1.11554 25.456 1.57016 26.4867 2.12222ZM19.765 0.0854343L19.1838 6.05722C18.796 6.01948 18.4012 6 18 6C17.5988 6 17.204 6.01948 16.8162 6.05722L16.235 0.0854339C16.8157 0.0289206 17.4045 0 18 0C18.5955 0 19.1843 0.0289207 19.765 0.0854343ZM12.7731 0.770638L14.5128 6.51288C13.7572 6.74181 13.0324 7.04381 12.3463 7.41131L9.51335 2.12222C10.544 1.57016 11.6347 1.11553 12.7731 0.770638ZM6.58074 4.08528L10.3897 8.7212C9.78072 9.22156 9.22156 9.78072 8.7212 10.3897L4.08528 6.58074C4.8337 5.66983 5.66983 4.8337 6.58074 4.08528ZM2.12222 9.51335L7.41131 12.3463C7.04381 13.0324 6.74181 13.7572 6.51288 14.5128L0.770639 12.7731C1.11554 11.6347 1.57016 10.544 2.12222 9.51335ZM0.0854342 16.235C0.0289207 16.8157 0 17.4045 0 18C0 18.5955 0.0289206 19.1843 0.0854339 19.765L6.05722 19.1838C6.01948 18.796 6 18.4012 6 18C6 17.5988 6.01948 17.204 6.05722 16.8162L0.0854342 16.235ZM0.770638 23.2269L6.51288 21.4872C6.74181 22.2428 7.04381 22.9676 7.41131 23.6537L2.12222 26.4867C1.57016 25.456 1.11554 24.3653 0.770638 23.2269ZM4.08528 29.4193L8.7212 25.6103C9.22156 26.2193 9.78072 26.7784 10.3897 27.2788L6.58074 31.9147C5.66983 31.1663 4.8337 30.3302 4.08528 29.4193ZM9.51335 33.8778L12.3463 28.5887C13.0324 28.9562 13.7572 29.2582 14.5128 29.4871L12.7731 35.2294C11.6347 34.8845 10.544 34.4298 9.51335 33.8778ZM16.235 35.9146L16.8162 29.9428C17.204 29.9805 17.5988 30 18 30C18.4012 30 18.796 29.9805 19.1838 29.9428L19.765 35.9146C19.1843 35.9711 18.5955 36 18 36C17.4045 36 16.8157 35.9711 16.235 35.9146ZM23.2269 35.2294C24.3653 34.8845 25.456 34.4298 26.4867 33.8778L23.6537 28.5887C22.9676 28.9562 22.2428 29.2582 21.4872 29.4871L23.2269 35.2294ZM29.4193 31.9147L25.6103 27.2788C26.2193 26.7784 26.7784 26.2193 27.2788 25.6103L31.9147 29.4193C31.1663 30.3302 30.3302 31.1663 29.4193 31.9147ZM33.8778 26.4867L28.5887 23.6537C28.9562 22.9676 29.2582 22.2428 29.4871 21.4872L35.2294 23.2269C34.8845 24.3653 34.4298 25.456 33.8778 26.4867Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M35.993 18.5062L30.9949 18.3682C30.9983 18.246 31 18.1233 31 18C31 17.8767 30.9983 17.754 30.9949 17.6318L35.993 17.4938C35.9977 17.662 36 17.8307 36 18C36 18.1693 35.9977 18.338 35.993 18.5062ZM35.9372 16.4858L30.9545 16.9008C30.9341 16.6567 30.9071 16.4149 30.8736 16.1755L35.8253 15.4825C35.8717 15.8141 35.9091 16.1486 35.9372 16.4858ZM35.6574 14.4871L30.7524 15.4574C30.7052 15.2185 30.6514 14.9821 30.5913 14.7483L35.4336 13.5028C35.5171 13.8274 35.5918 14.1556 35.6574 14.4871ZM35.1545 12.532L30.3902 14.0493C30.3165 13.8176 30.2363 13.5888 30.15 13.3629L34.8209 11.5788C34.9407 11.8924 35.052 12.2103 35.1545 12.532ZM34.4341 10.646L29.8714 12.6909C29.7719 12.469 29.6664 12.2504 29.555 12.0352L33.9953 9.73658C34.1498 10.0349 34.2961 10.3382 34.4341 10.646ZM33.5061 8.85332L29.202 11.3977C29.0781 11.1882 28.9485 10.9824 28.8133 10.7805L32.9682 7.99892C33.1552 8.27829 33.3346 8.56319 33.5061 8.85332ZM32.3832 7.17587L28.3904 10.1854C28.2437 9.99086 28.0917 9.80047 27.9345 9.6145L31.7531 6.38676C31.9703 6.64373 32.1804 6.90687 32.3832 7.17587ZM31.0799 5.63405L27.4472 9.06966C27.2798 8.8926 27.1074 8.72022 26.9303 8.55276L30.3659 4.92005C30.6105 5.15137 30.8486 5.38947 31.0799 5.63405ZM29.6132 4.24694L26.3855 8.06554C26.1995 7.90834 26.0091 7.7563 25.8146 7.60964L28.8241 3.61683C29.0931 3.8196 29.3563 4.02973 29.6132 4.24694ZM28.0011 3.03182L25.2195 7.18666C25.0176 7.05149 24.8118 6.92188 24.6023 6.79804L27.1467 2.49385C27.4368 2.66536 27.7217 2.84478 28.0011 3.03182ZM26.2634 2.00466L23.9648 6.44498C23.7496 6.33357 23.531 6.22806 23.3091 6.12863L25.354 1.5659C25.6618 1.70386 25.965 1.85021 26.2634 2.00466ZM24.4212 1.17909L22.6371 5.84995C22.4112 5.76367 22.1823 5.68354 21.9507 5.60976L23.4679 0.845535C23.7897 0.948011 24.1076 1.05929 24.4212 1.17909ZM22.4972 0.566362L21.2517 5.40875C21.0179 5.34861 20.7815 5.29482 20.5426 5.24755L21.5129 0.342612C21.8444 0.408185 22.1726 0.482859 22.4972 0.566362ZM20.5175 0.174659L19.8245 5.1264C19.5851 5.09289 19.3433 5.06587 19.0992 5.04554L19.5142 0.0627905C19.8514 0.090873 20.1859 0.128248 20.5175 0.174659ZM18.5062 0.00698034L18.3682 5.00508C18.246 5.0017 18.1233 5 18 5C17.8767 5 17.754 5.0017 17.6318 5.00508L17.4938 0.0069805C17.662 0.002337 17.8307 0 18 0C18.1693 0 18.338 0.00233695 18.5062 0.00698034ZM16.4858 0.0627908L16.9008 5.04554C16.6567 5.06587 16.4149 5.09289 16.1755 5.1264L15.4825 0.17466C15.8141 0.128249 16.1486 0.0908734 16.4858 0.0627908ZM14.4871 0.342613L15.4574 5.24755C15.2185 5.29482 14.9821 5.34862 14.7483 5.40875L13.5028 0.566363C13.8274 0.48286 14.1556 0.408186 14.4871 0.342613ZM12.532 0.845537L14.0493 5.60977C13.8176 5.68355 13.5888 5.76367 13.3629 5.84995L11.5788 1.17909C11.8924 1.05929 12.2103 0.948013 12.532 0.845537ZM10.646 1.56591L12.6909 6.12863C12.469 6.22806 12.2504 6.33357 12.0352 6.44499L9.73658 2.00466C10.0349 1.85021 10.3382 1.70386 10.646 1.56591ZM8.85332 2.49385L11.3977 6.79804C11.1882 6.92188 10.9824 7.05149 10.7805 7.18667L7.99892 3.03182C8.27829 2.84479 8.56319 2.66537 8.85332 2.49385ZM7.17587 3.61684L10.1854 7.60964C9.99086 7.75631 9.80047 7.90834 9.6145 8.06554L6.38676 4.24694C6.64373 4.02974 6.90686 3.8196 7.17587 3.61684ZM5.63406 4.92005L9.06966 8.55276C8.8926 8.72022 8.72022 8.8926 8.55276 9.06967L4.92005 5.63406C5.15137 5.38947 5.38947 5.15137 5.63406 4.92005ZM4.24694 6.38676L8.06554 9.6145C7.90834 9.80048 7.7563 9.99086 7.60964 10.1854L3.61683 7.17588C3.8196 6.90687 4.02973 6.64373 4.24694 6.38676ZM3.03182 7.99892L7.18666 10.7805C7.05149 10.9824 6.92188 11.1882 6.79804 11.3977L2.49385 8.85333C2.66536 8.5632 2.84478 8.27829 3.03182 7.99892ZM2.00466 9.73659L6.44498 12.0352C6.33357 12.2504 6.22806 12.469 6.12863 12.6909L1.5659 10.646C1.70386 10.3382 1.85021 10.035 2.00466 9.73659ZM1.17909 11.5788L5.84995 13.3629C5.76367 13.5888 5.68354 13.8177 5.60976 14.0493L0.845535 12.5321C0.948011 12.2103 1.05929 11.8924 1.17909 11.5788ZM0.566362 13.5028L5.40875 14.7483C5.34861 14.9821 5.29482 15.2185 5.24755 15.4574L0.342612 14.4871C0.408185 14.1556 0.482859 13.8274 0.566362 13.5028ZM0.174659 15.4825L5.1264 16.1755C5.09289 16.4149 5.06587 16.6567 5.04554 16.9008L0.0627905 16.4858C0.090873 16.1486 0.128248 15.8141 0.174659 15.4825ZM0.00698034 17.4938C0.00233695 17.662 0 17.8307 0 18C0 18.1693 0.002337 18.338 0.0069805 18.5062L5.00508 18.3682C5.0017 18.246 5 18.1233 5 18C5 17.8767 5.0017 17.754 5.00508 17.6318L0.00698034 17.4938ZM0.0627908 19.5142L5.04554 19.0992C5.06587 19.3433 5.09289 19.5851 5.1264 19.8245L0.17466 20.5175C0.128249 20.1859 0.0908734 19.8514 0.0627908 19.5142ZM0.342613 21.5129L5.24755 20.5426C5.29482 20.7815 5.34862 21.0179 5.40875 21.2517L0.566363 22.4972C0.48286 22.1726 0.408186 21.8444 0.342613 21.5129ZM0.845537 23.468L5.60977 21.9507C5.68355 22.1824 5.76367 22.4112 5.84995 22.6371L1.17909 24.4212C1.05929 24.1076 0.948013 23.7897 0.845537 23.468ZM1.56591 25.354L6.12863 23.3091C6.22806 23.531 6.33357 23.7496 6.44499 23.9648L2.00466 26.2634C1.85021 25.9651 1.70386 25.6618 1.56591 25.354ZM2.49385 27.1467L6.79804 24.6023C6.92188 24.8118 7.05149 25.0176 7.18667 25.2195L3.03182 28.0011C2.84479 27.7217 2.66537 27.4368 2.49385 27.1467ZM3.61684 28.8241L7.60964 25.8146C7.75631 26.0091 7.90834 26.1995 8.06554 26.3855L4.24694 29.6132C4.02974 29.3563 3.8196 29.0931 3.61684 28.8241ZM4.92005 30.3659L8.55276 26.9303C8.72022 27.1074 8.8926 27.2798 9.06967 27.4472L5.63406 31.08C5.38947 30.8486 5.15137 30.6105 4.92005 30.3659ZM6.38676 31.7531L9.6145 27.9345C9.80048 28.0917 9.99086 28.2437 10.1854 28.3904L7.17588 32.3832C6.90687 32.1804 6.64373 31.9703 6.38676 31.7531ZM7.99892 32.9682L10.7805 28.8133C10.9824 28.9485 11.1882 29.0781 11.3977 29.202L8.85333 33.5061C8.5632 33.3346 8.27829 33.1552 7.99892 32.9682ZM9.73659 33.9953L12.0352 29.555C12.2504 29.6664 12.469 29.7719 12.6909 29.8714L10.646 34.4341C10.3382 34.2961 10.035 34.1498 9.73659 33.9953ZM11.5788 34.8209L13.3629 30.15C13.5888 30.2363 13.8177 30.3165 14.0493 30.3902L12.5321 35.1545C12.2103 35.052 11.8924 34.9407 11.5788 34.8209ZM13.5028 35.4336L14.7483 30.5913C14.9821 30.6514 15.2185 30.7052 15.4574 30.7524L14.4871 35.6574C14.1556 35.5918 13.8274 35.5171 13.5028 35.4336ZM15.4825 35.8253L16.1755 30.8736C16.4149 30.9071 16.6567 30.9341 16.9008 30.9545L16.4858 35.9372C16.1486 35.9091 15.8141 35.8717 15.4825 35.8253ZM17.4938 35.993L17.6318 30.9949C17.754 30.9983 17.8767 31 18 31C18.1233 31 18.246 30.9983 18.3682 30.9949L18.5062 35.993C18.338 35.9977 18.1693 36 18 36C17.8307 36 17.662 35.9977 17.4938 35.993ZM19.5142 35.9372L19.0992 30.9545C19.3433 30.9341 19.5851 30.9071 19.8245 30.8736L20.5175 35.8253C20.1859 35.8717 19.8514 35.9091 19.5142 35.9372ZM21.5129 35.6574L20.5426 30.7524C20.7815 30.7052 21.0179 30.6514 21.2517 30.5913L22.4972 35.4336C22.1726 35.5171 21.8444 35.5918 21.5129 35.6574ZM23.468 35.1545L21.9507 30.3902C22.1824 30.3165 22.4112 30.2363 22.6371 30.15L24.4212 34.8209C24.1076 34.9407 23.7897 35.052 23.468 35.1545ZM25.354 34.4341L23.3091 29.8714C23.531 29.7719 23.7496 29.6664 23.9648 29.555L26.2634 33.9953C25.9651 34.1498 25.6618 34.2961 25.354 34.4341ZM27.1467 33.5061L24.6023 29.202C24.8118 29.0781 25.0176 28.9485 25.2195 28.8133L28.0011 32.9682C27.7217 33.1552 27.4368 33.3346 27.1467 33.5061ZM28.8241 32.3832L25.8146 28.3904C26.0091 28.2437 26.1995 28.0917 26.3855 27.9345L29.6132 31.7531C29.3563 31.9703 29.0931 32.1804 28.8241 32.3832ZM30.3659 31.0799L26.9303 27.4472C27.1074 27.2798 27.2798 27.1074 27.4472 26.9303L31.08 30.3659C30.8486 30.6105 30.6105 30.8486 30.3659 31.0799ZM31.7531 29.6132L27.9345 26.3855C28.0917 26.1995 28.2437 26.0091 28.3904 25.8146L32.3832 28.8241C32.1804 29.0931 31.9703 29.3563 31.7531 29.6132ZM32.9682 28.0011L28.8133 25.2195C28.9485 25.0176 29.0781 24.8118 29.202 24.6023L33.5061 27.1467C33.3346 27.4368 33.1552 27.7217 32.9682 28.0011ZM33.9953 26.2634L29.555 23.9648C29.6664 23.7496 29.7719 23.531 29.8714 23.3091L34.4341 25.354C34.2961 25.6618 34.1498 25.965 33.9953 26.2634ZM34.8209 24.4212L30.15 22.6371C30.2363 22.4112 30.3165 22.1823 30.3902 21.9507L35.1545 23.4679C35.052 23.7897 34.9407 24.1076 34.8209 24.4212ZM35.4336 22.4972L30.5913 21.2517C30.6514 21.0179 30.7052 20.7815 30.7524 20.5426L35.6574 21.5129C35.5918 21.8444 35.5171 22.1726 35.4336 22.4972ZM35.8253 20.5175L30.8736 19.8245C30.9071 19.5851 30.9341 19.3433 30.9545 19.0992L35.9372 19.5142C35.9091 19.8514 35.8717 20.1859 35.8253 20.5175Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M16.6962 0.411464C17.4776 -0.137155 18.5224 -0.137155 19.3038 0.411465L25.4698 4.74043C25.5828 4.81972 25.7028 4.88854 25.8284 4.94603L32.6866 8.08442C33.5558 8.48216 34.0782 9.38069 33.9904 10.327L33.2983 17.7944C33.2856 17.9312 33.2856 18.0688 33.2983 18.2056L33.9904 25.673C34.0782 26.6193 33.5558 27.5178 32.6866 27.9156L25.8284 31.054C25.7028 31.1115 25.5828 31.1803 25.4698 31.2596L19.3038 35.5885C18.5224 36.1372 17.4776 36.1372 16.6962 35.5885L10.5302 31.2596C10.4172 31.1803 10.2972 31.1115 10.1716 31.054L3.31338 27.9156C2.44423 27.5178 1.92184 26.6193 2.00956 25.673L2.70174 18.2056C2.71442 18.0688 2.71442 17.9312 2.70174 17.7944L2.00956 10.327C1.92184 9.38068 2.44423 8.48216 3.31338 8.08442L10.1716 4.94603C10.2972 4.88854 10.4172 4.81972 10.5302 4.74043L16.6962 0.411464Z',
-    },
-  ],
-  [
-    {
-      d: 'M16.79 0.854044C17.1949 -0.2846 18.8052 -0.2846 19.2101 0.854043L21.9319 8.50777L29.2685 5.02035C30.3599 4.50153 31.4986 5.64018 30.9798 6.73164L27.4923 14.0682L35.1461 16.79C36.2847 17.1949 36.2847 18.8052 35.1461 19.2101L27.4923 21.9319L30.9798 29.2685C31.4986 30.3599 30.3599 31.4986 29.2685 30.9798L21.9319 27.4923L19.2101 35.1461C18.8052 36.2847 17.1949 36.2847 16.79 35.1461L14.0682 27.4923L6.73164 30.9798C5.64018 31.4986 4.50153 30.3599 5.02035 29.2685L8.50777 21.9319L0.854043 19.2101C-0.2846 18.8052 -0.2846 17.1949 0.854044 16.79L8.50777 14.0682L5.02035 6.73164C4.50153 5.64018 5.64018 4.50153 6.73164 5.02035L14.0682 8.50777L16.79 0.854044Z',
-    },
-  ],
-  [
-    {
-      d: 'M5.27208 5.27208C5.32789 6.2816 5.28704 7.28498 5.15454 8.2701C4.78652 11.0064 3.71144 13.6019 2.03681 15.797C1.43391 16.5872 0.753302 17.3256 0 18C0.753302 18.6744 1.43391 19.4128 2.03681 20.203C3.71144 22.3981 4.78652 24.9936 5.15454 27.7299C5.28704 28.715 5.32789 29.7184 5.27208 30.7279C6.2816 30.6721 7.28498 30.713 8.2701 30.8455C11.0064 31.2135 13.6019 32.2886 15.797 33.9632C16.5872 34.5661 17.3256 35.2467 18 36C18.6744 35.2467 19.4128 34.5661 20.203 33.9632C22.3981 32.2886 24.9936 31.2135 27.7299 30.8455C28.715 30.713 29.7184 30.6721 30.7279 30.7279C30.6721 29.7184 30.713 28.715 30.8455 27.7299C31.2135 24.9936 32.2886 22.3981 33.9632 20.203C34.5661 19.4128 35.2467 18.6744 36 18C35.2467 17.3256 34.5661 16.5872 33.9632 15.797C32.2886 13.6019 31.2135 11.0064 30.8455 8.2701C30.713 7.28498 30.6721 6.2816 30.7279 5.27208C29.7184 5.32789 28.715 5.28704 27.7299 5.15454C24.9936 4.78652 22.3981 3.71144 20.203 2.03681C19.4128 1.43391 18.6744 0.753302 18 0C17.3256 0.753302 16.5872 1.43391 15.797 2.03681C13.6019 3.71144 11.0064 4.78652 8.2701 5.15454C7.28498 5.28704 6.2816 5.32789 5.27208 5.27208ZM8.18649 8.18649C7.79745 11.7778 6.38596 15.1854 4.1216 18C6.38596 20.8146 7.79745 24.2222 8.18649 27.8135C11.7778 28.2026 15.1854 29.614 18 31.8784C20.8146 29.614 24.2222 28.2026 27.8135 27.8135C28.2026 24.2222 29.614 20.8146 31.8784 18C29.614 15.1854 28.2026 11.7778 27.8135 8.18649C24.2222 7.79745 20.8146 6.38596 18 4.1216C15.1854 6.38596 11.7778 7.79745 8.18649 8.18649Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M16.951 2.48991C17.349 1.65123 18.651 1.65123 19.049 2.48991C22.058 8.83114 27.1689 13.942 33.5101 16.951C34.3488 17.349 34.3488 18.651 33.5101 19.049C27.1689 22.058 22.058 27.1689 19.049 33.5101C18.651 34.3488 17.349 34.3488 16.951 33.5101C13.942 27.1689 8.83114 22.058 2.48991 19.049C1.65123 18.651 1.65123 17.349 2.48991 16.951C8.83114 13.942 13.942 8.83114 16.951 2.48991Z',
-    },
-  ],
-  [
-    {
-      d: 'M18 0C21.2219 3.599 25.9048 5.53872 30.7279 5.27208C30.4613 10.0952 32.401 14.7781 36 18C32.401 21.2219 30.4613 25.9048 30.7279 30.7279C25.9048 30.4613 21.2219 32.401 18 36C14.7781 32.401 10.0952 30.4613 5.27208 30.7279C5.53872 25.9048 3.599 21.2219 0 18C3.599 14.7781 5.53872 10.0952 5.27208 5.27208C10.0952 5.53872 14.7781 3.599 18 0Z',
-    },
-  ],
-  [
-    {
-      d: 'M28 3H8C5.23858 3 3 5.23858 3 8V28C3 30.7614 5.23858 33 8 33H28C30.7614 33 33 30.7614 33 28V8C33 5.23858 30.7614 3 28 3ZM8 0C3.58172 0 0 3.58172 0 8V28C0 32.4183 3.58172 36 8 36H28C32.4183 36 36 32.4183 36 28V8C36 3.58172 32.4183 0 28 0H8Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M14.8848 1.29034C16.6053 -0.430117 19.3947 -0.430113 21.1152 1.29035L34.7097 14.8848C36.4301 16.6053 36.4301 19.3947 34.7097 21.1152L21.1152 34.7097C19.3947 36.4301 16.6053 36.4301 14.8848 34.7097L1.29034 21.1152C-0.430117 19.3947 -0.430113 16.6053 1.29035 14.8848L14.8848 1.29034Z',
-    },
-  ],
-  [
-    {
-      d: 'M18 3.16162L12.254 7.19574C11.991 7.38034 11.7118 7.54039 11.4199 7.67396L5.04683 10.5904L5.68893 17.5175C5.71869 17.8385 5.71869 18.1615 5.68893 18.4825L5.04683 25.4096L11.4199 28.326C11.7118 28.4596 11.991 28.6197 12.254 28.8043L18 32.8384L23.746 28.8043C24.009 28.6197 24.2882 28.4596 24.5801 28.326L30.9532 25.4096L30.3111 18.4825C30.2813 18.1615 30.2813 17.8385 30.3111 17.5175L30.9532 10.5904L24.5801 7.67396C24.2882 7.54038 24.009 7.38033 23.746 7.19574L18 3.16162ZM19.3038 0.411465C18.5224 -0.137155 17.4776 -0.137155 16.6962 0.411464L10.5302 4.74043C10.4172 4.81972 10.2972 4.88854 10.1716 4.94603L3.31338 8.08442C2.44423 8.48216 1.92184 9.38068 2.00956 10.327L2.70174 17.7944C2.71442 17.9312 2.71442 18.0688 2.70174 18.2056L2.00956 25.673C1.92184 26.6193 2.44423 27.5178 3.31338 27.9156L10.1716 31.054C10.2972 31.1115 10.4172 31.1803 10.5302 31.2596L16.6962 35.5885C17.4776 36.1372 18.5224 36.1372 19.3038 35.5885L25.4698 31.2596C25.5828 31.1803 25.7028 31.1115 25.8284 31.054L32.6866 27.9156C33.5558 27.5178 34.0782 26.6193 33.9904 25.673L33.2983 18.2056C33.2856 18.0688 33.2856 17.9312 33.2983 17.7944L33.9904 10.327C34.0782 9.38069 33.5558 8.48216 32.6866 8.08442L25.8284 4.94603C25.7028 4.88854 25.5828 4.81972 25.4698 4.74043L19.3038 0.411465Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M15.4282 2.57149C15.4281 1.15133 16.5794 3.65802e-05 17.9995 0H18.0005C19.4206 3.67846e-05 20.5719 1.15133 20.5718 2.5715C20.5718 3.99166 19.4205 5.14289 18.0003 5.14286C16.5802 5.14289 15.4282 3.99166 15.4282 2.57149ZM23.4894 3.34828C24.2006 2.11903 25.7736 1.69906 27.0029 2.41025L27.0037 2.41072C28.2329 3.12198 28.6528 4.69504 27.9416 5.92426C27.2303 7.15347 25.6572 7.57336 24.428 6.8621C23.1988 6.15091 22.7782 4.57753 23.4894 3.34828ZM12.5106 3.34828C13.2218 4.57753 12.8018 6.15057 11.5726 6.86177C10.3433 7.57302 8.7697 7.15347 8.05844 5.92426C7.34719 4.69504 7.76707 3.12198 8.99629 2.41072L8.9971 2.41025C10.2264 1.69906 11.7994 2.11903 12.5106 3.34828ZM30.0757 8.05844C31.305 7.34719 32.878 7.76707 33.5893 8.99629L33.5898 8.9971C34.3009 10.2264 33.881 11.7994 32.6517 12.5106C31.4225 13.2218 29.8494 12.8018 29.1382 11.5726C28.427 10.3433 28.8465 8.7697 30.0757 8.05844ZM5.92426 8.05844C7.15347 8.7697 7.57336 10.3428 6.8621 11.572C6.15091 12.8012 4.57753 13.2218 3.34828 12.5106C2.11903 11.7994 1.69906 10.2264 2.41025 8.9971L2.41072 8.99629C3.12198 7.76707 4.69504 7.34719 5.92426 8.05844ZM2.5715 15.4282C3.99166 15.4282 5.14289 16.5795 5.14286 17.9997C5.14289 19.4198 3.99166 20.5718 2.57149 20.5718C1.15133 20.5719 3.65802e-05 19.4206 0 18.0005V17.9995C3.67846e-05 16.5794 1.15133 15.4281 2.5715 15.4282ZM33.4285 15.4282C34.8487 15.4281 36 16.5794 36 17.9995V18.0005C36 19.4206 34.8487 20.5719 33.4285 20.5718C32.0083 20.5718 30.8571 19.4205 30.8571 18.0003C30.8571 16.5802 32.0083 15.4282 33.4285 15.4282ZM3.34828 23.4894C4.57753 22.7782 6.15057 23.1982 6.86177 24.4274C7.57302 25.6567 7.15347 27.2303 5.92426 27.9416C4.69504 28.6528 3.12198 28.2329 2.41072 27.0037L2.41025 27.0029C1.69906 25.7736 2.11903 24.2006 3.34828 23.4894ZM32.6517 23.4894C33.881 24.2006 34.3009 25.7736 33.5898 27.0029L33.5893 27.0037C32.878 28.2329 31.305 28.6528 30.0757 27.9416C28.8465 27.2303 28.4266 25.6572 29.1379 24.428C29.8491 23.1988 31.4225 22.7782 32.6517 23.4894ZM27.9416 30.0757C28.6528 31.305 28.2329 32.878 27.0037 33.5893L27.0029 33.5898C25.7736 34.3009 24.2006 33.881 23.4894 32.6517C22.7782 31.4225 23.1982 29.8494 24.4274 29.1382C25.6567 28.427 27.2303 28.8465 27.9416 30.0757ZM8.05844 30.0757C8.7697 28.8465 10.3428 28.4266 11.572 29.1379C12.8012 29.8491 13.2218 31.4225 12.5106 32.6517C11.7994 33.881 10.2264 34.3009 8.9971 33.5898L8.99629 33.5893C7.76707 32.878 7.34719 31.305 8.05844 30.0757ZM15.4282 33.4285C15.4282 32.0083 16.5795 30.8571 17.9997 30.8571C19.4198 30.8571 20.5718 32.0083 20.5718 33.4285C20.5719 34.8487 19.4206 36 18.0005 36H17.9995C16.5794 36 15.4281 34.8487 15.4282 33.4285Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M31.3333 31.3333H18C10.6362 31.3333 4.66667 25.3638 4.66667 18C4.66667 10.6362 10.6362 4.66667 18 4.66667C25.3638 4.66667 31.3333 10.6362 31.3333 18V31.3333ZM18 2C26.8366 2 34 9.16344 34 18V34H18C9.16345 34 2 26.8366 2 18C2 9.16344 9.16345 2 18 2Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M3 18C3 26.2843 9.71573 33 18 33C26.2843 33 33 26.2843 33 18C33 9.71573 26.2843 3 18 3H3V18Z',
-    },
-  ],
-  [
-    {
-      d: 'M18.1309 3.25957C9.91898 3.40293 3.14567 10.1762 3.00231 18.3882C2.85896 26.6001 9.39985 33.141 17.6118 32.9977C25.8238 32.8543 32.5971 26.081 32.7404 17.8691L33 3L18.1309 3.25957Z',
-    },
-  ],
-  [
-    {
-      d: 'M31.3333 4.66667H18C10.6362 4.66667 4.66667 10.6362 4.66667 18C4.66667 25.3638 10.6362 31.3333 18 31.3333C25.3638 31.3333 31.3333 25.3638 31.3333 18V4.66667ZM18 34C26.8366 34 34 26.8366 34 18V2H18C9.16345 2 2 9.16345 2 18C2 26.8366 9.16345 34 18 34Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M5.5 30.5H18C24.9036 30.5 30.5 24.9036 30.5 18C30.5 11.0964 24.9036 5.5 18 5.5C11.0964 5.5 5.5 11.0964 5.5 18V30.5ZM18 3C9.71573 3 3 9.71573 3 18V33H18C26.2843 33 33 26.2843 33 18C33 9.71573 26.2843 3 18 3Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M18.1309 32.7404C9.91898 32.5971 3.14567 25.8238 3.00231 17.6118C2.85896 9.39985 9.39985 2.85896 17.6118 3.00231C25.8238 3.14567 32.5971 9.91898 32.7404 18.1309L33 33L18.1309 32.7404Z',
-    },
-  ],
-  [
-    {
-      d: 'M3 18C3 9.71573 9.71573 3 18 3C26.2843 3 33 9.71573 33 18C33 26.2843 26.2843 33 18 33H3V18Z',
-    },
-  ],
-  [
-    {
-      d: 'M31.3333 4.66667H18C10.6362 4.66667 4.66667 10.6362 4.66667 18C4.66667 25.3638 10.6362 31.3333 18 31.3333C25.3638 31.3333 31.3333 25.3638 31.3333 18V4.66667ZM18 34C26.8366 34 34 26.8366 34 18V2H18C9.16345 2 2 9.16345 2 18C2 26.8366 9.16345 34 18 34Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M22.3256 8.9814C22.8579 7.58563 23.219 6.3422 23.219 5.53768C23.219 2.47931 20.8825 0 18.0003 0C15.1181 0 12.7816 2.4793 12.7816 5.53768C12.7816 6.34216 13.1426 7.5855 13.6748 8.98118C13.3006 9.16098 12.9393 9.36339 12.5926 9.58663C11.6988 8.42573 10.8474 7.49306 10.1797 7.09422C7.61962 5.56503 4.37602 6.41884 2.93491 9.00126C1.4938 11.5837 2.4009 14.9168 4.96097 16.446C5.59209 16.823 6.70445 17.1085 8.02244 17.3248C8.00756 17.5479 8 17.7731 8 18C8 18.2269 8.00756 18.4521 8.02244 18.6752C6.70444 18.8915 5.59208 19.177 4.96097 19.554C2.4009 21.0832 1.4938 24.4163 2.93491 26.9987C4.37602 29.5812 7.61962 30.435 10.1797 28.9058C10.8474 28.5069 11.6988 27.5743 12.5926 26.4134C12.9393 26.6366 13.3006 26.839 13.6748 27.0188C13.1426 28.4145 12.7816 29.6578 12.7816 30.4623C12.7816 33.5207 15.1181 36 18.0003 36C20.8825 36 23.219 33.5207 23.219 30.4623C23.219 29.6578 22.8579 28.4144 22.3256 27.0186C22.6997 26.8388 23.0609 26.6365 23.4074 26.4133C24.3012 27.5742 25.1526 28.5069 25.8203 28.9057C28.3804 30.4349 31.624 29.5811 33.0651 26.9987C34.5062 24.4163 33.5991 21.0831 31.0391 19.554C30.4079 19.177 29.2956 18.8914 27.9776 18.6751C27.9924 18.452 28 18.2269 28 18C28 17.7731 27.9924 17.548 27.9776 17.3249C29.2956 17.1086 30.4079 16.823 31.0391 16.446C33.5991 14.9169 34.5062 11.5837 33.0651 9.00132C31.624 6.4189 28.3804 5.56509 25.8203 7.09428C25.1526 7.49311 24.3013 8.42577 23.4074 9.58668C23.0609 9.3635 22.6997 9.16115 22.3256 8.9814Z',
-    },
-  ],
-  [
-    {
-      d: 'M23.3288 6.69196C22.9015 6.79905 22.4544 6.61386 22.228 6.23596L21.4653 4.96334C19.8967 2.34555 16.1033 2.34555 14.5347 4.96334L13.772 6.23597C13.5456 6.61386 13.0985 6.79905 12.6712 6.69196L11.2321 6.33132C8.27179 5.58948 5.58948 8.27179 6.33132 11.2321L6.69196 12.6712C6.79905 13.0985 6.61386 13.5456 6.23597 13.772L4.96334 14.5347C2.34555 16.1033 2.34555 19.8967 4.96334 21.4653L6.23596 22.228C6.61386 22.4544 6.79905 22.9015 6.69196 23.3288L6.33132 24.7679C5.58948 27.7282 8.27179 30.4105 11.2321 29.6687L12.6712 29.308C13.0985 29.2009 13.5456 29.3861 13.772 29.764L14.5347 31.0367C16.1033 33.6544 19.8967 33.6544 21.4653 31.0367L22.228 29.764C22.4544 29.3861 22.9015 29.2009 23.3288 29.308L24.7679 29.6687C27.7282 30.4105 30.4105 27.7282 29.6687 24.7679L29.308 23.3288C29.2009 22.9015 29.3861 22.4544 29.764 22.228L31.0367 21.4653C33.6544 19.8967 33.6544 16.1033 31.0367 14.5347L29.764 13.772C29.3861 13.5456 29.2009 13.0985 29.308 12.6712L29.6687 11.2321C30.4105 8.27179 27.7282 5.58948 24.7679 6.33132L23.3288 6.69196ZM24.0387 3.4213C21.3051 -1.14043 14.6949 -1.14043 11.9613 3.4213C6.80276 2.12858 2.12858 6.80276 3.4213 11.9613C-1.14043 14.6949 -1.14043 21.3051 3.4213 24.0387C2.12858 29.1972 6.80276 33.8714 11.9613 32.5787C14.6948 37.1404 21.3051 37.1404 24.0387 32.5787C29.1972 33.8714 33.8714 29.1972 32.5787 24.0387C37.1404 21.3051 37.1404 14.6948 32.5787 11.9613C33.8714 6.80276 29.1972 2.12858 24.0387 3.4213Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M36 18C36 27.9411 27.9411 36 18 36C8.05887 36 0 27.9411 0 18C0 8.05887 8.05887 0 18 0C27.9411 0 36 8.05887 36 18Z',
-    },
-  ],
-  [
-    {
-      d: 'M5 3L5 20C5 27.1797 10.8203 33 18 33C25.1797 33 31 27.1797 31 20V3L5 3ZM18 36C26.8366 36 34 28.8366 34 20V0.193028C34 0.0864212 33.9136 -1.0416e-06 33.807 -1.05092e-06L2.19303 -3.8147e-06C2.08642 -3.8147e-06 2 0.08642 2 0.193027V20C2 28.8366 9.16344 36 18 36Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M32.5883 17.0062L18.9938 3.41167C18.445 2.86278 17.555 2.86278 17.0062 3.41166L3.41167 17.0061C2.86278 17.555 2.86278 18.445 3.41166 18.9938L17.0061 32.5883C17.555 33.1372 18.445 33.1372 18.9938 32.5883L32.5883 18.9938C33.1372 18.445 33.1372 17.555 32.5883 17.0062ZM21.1152 1.29035C19.3947 -0.430113 16.6053 -0.430117 14.8848 1.29034L1.29035 14.8848C-0.430113 16.6053 -0.430117 19.3947 1.29034 21.1152L14.8848 34.7097C16.6053 36.4301 19.3947 36.4301 21.1152 34.7097L34.7097 21.1152C36.4301 19.3947 36.4301 16.6053 34.7097 14.8848L21.1152 1.29035Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M2.42518 14.0533C7.4872 11.5821 11.5821 7.4872 14.0533 2.42518C14.8966 0.697682 16.5947 5.0071e-07 18 0C19.4053 -5.00709e-07 21.1034 0.69768 21.9467 2.42518C24.4179 7.4872 28.5128 11.5821 33.5748 14.0533C35.3023 14.8966 36 16.5947 36 18C36 19.4053 35.3023 21.1034 33.5748 21.9467C28.5128 24.4179 24.4179 28.5128 21.9467 33.5748C21.1034 35.3023 19.4053 36 18 36C16.5947 36 14.8966 35.3023 14.0533 33.5748C11.5821 28.5128 7.4872 24.4179 2.42518 21.9467C0.697682 21.1034 5.0071e-07 19.4053 0 18C-5.00709e-07 16.5947 0.69768 14.8966 2.42518 14.0533ZM19.1159 2.80717C18.6882 1.9312 17.3118 1.9312 16.8842 2.80717C14.1049 8.50011 8.50011 14.1049 2.80717 16.8842C1.9312 17.3118 1.9312 18.6882 2.80717 19.1159C8.50011 21.8951 14.1049 27.4999 16.8842 33.1928C17.3118 34.0688 18.6882 34.0688 19.1159 33.1928C21.8951 27.4999 27.4999 21.8951 33.1928 19.1159C34.0688 18.6882 34.0688 17.3118 33.1928 16.8842C27.4999 14.1049 21.8951 8.50011 19.1159 2.80717Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M18 36C27.9411 36 36 27.9411 36 18C36 8.05887 27.9411 0 18 0C8.05887 0 0 8.05887 0 18C0 27.9411 8.05887 36 18 36ZM18 33C26.2843 33 33 26.2843 33 18C33 9.71573 26.2843 3 18 3C9.71573 3 3 9.71573 3 18C3 26.2843 9.71573 33 18 33Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M11.9613 3.4213C14.6949 -1.14043 21.3051 -1.14043 24.0387 3.4213C29.1972 2.12858 33.8714 6.80276 32.5787 11.9613C37.1404 14.6948 37.1404 21.3051 32.5787 24.0387C33.8714 29.1972 29.1972 33.8714 24.0387 32.5787C21.3051 37.1404 14.6948 37.1404 11.9613 32.5787C6.80276 33.8714 2.12858 29.1972 3.4213 24.0387C-1.14043 21.3051 -1.14043 14.6949 3.4213 11.9613C2.12858 6.80276 6.80276 2.12858 11.9613 3.4213Z',
-    },
-  ],
-  [
-    {
-      d: 'M27 9C27 4.02944 22.9706 0 18 0C13.0294 0 9 4.02944 9 9C4.02944 9 0 13.0294 0 18C0 22.9706 4.02944 27 9 27C9 31.9706 13.0294 36 18 36C22.9706 36 27 31.9706 27 27C31.9706 27 36 22.9706 36 18C36 13.0294 31.9706 9 27 9Z',
-    },
-  ],
-  [
-    {
-      d: 'M0 8C0 3.58172 3.58172 0 8 0H28C32.4183 0 36 3.58172 36 8V28C36 32.4183 32.4183 36 28 36H8C3.58172 36 0 32.4183 0 28V8Z',
-    },
-  ],
-  [
-    {
-      d: 'M34 20C34 28.8366 26.8366 36 18 36C9.16344 36 2 28.8366 2 20L2 -3.8147e-06L34 -1.01717e-06V20Z',
-    },
-  ],
-  [
-    {
-      d: 'M13.4991 4.50029C13.499 2.01501 15.5135 0.000160128 17.9988 0H18.0012C20.4865 0.000160128 22.501 2.01501 22.5009 4.50029C22.5008 5.26131 22.3119 5.97819 21.9784 6.6066C21.787 6.96725 21.9316 7.44815 22.3087 7.60464V7.60464C22.6861 7.76121 23.1238 7.52106 23.2435 7.13046C23.4519 6.45025 23.8251 5.80975 24.3631 5.27166C26.1204 3.51419 28.9696 3.514 30.7271 5.27125L30.7288 5.27291C32.486 7.03038 32.4858 9.87963 30.7283 11.6369C30.1902 12.1749 29.5497 12.5482 28.8695 12.7568C28.479 12.8765 28.2389 13.3142 28.3954 13.6915V13.6915C28.5519 14.0686 29.0329 14.2133 29.3936 14.0218C30.022 13.6882 30.7388 13.4992 31.4997 13.4991C33.985 13.499 35.9998 15.5135 36 17.9988V18.0012C35.9998 20.4865 33.985 22.501 31.4997 22.5009C30.7387 22.5008 30.0218 22.3119 29.3934 21.9784C29.0328 21.787 28.5518 21.9316 28.3954 22.3087V22.3087C28.2388 22.6861 28.4789 23.1238 28.8695 23.2435C29.5497 23.4519 30.1903 23.8251 30.7283 24.3631C32.4858 26.1204 32.486 28.9696 30.7288 30.7271L30.7271 30.7288C28.9696 32.486 26.1204 32.4858 24.3631 30.7283C23.8251 30.1902 23.4518 29.5497 23.2432 28.8695C23.1235 28.479 22.6858 28.2389 22.3085 28.3954V28.3954C21.9314 28.5519 21.7867 29.0329 21.9782 29.3936C22.3118 30.022 22.5008 30.7388 22.5009 31.4997C22.501 33.985 20.4865 35.9998 18.0012 36H17.9988C15.5135 35.9998 13.499 33.985 13.4991 31.4997C13.4992 30.7387 13.6881 30.0218 14.0216 29.3934C14.213 29.0328 14.0684 28.5518 13.6913 28.3954V28.3954C13.3139 28.2388 12.8762 28.4789 12.7565 28.8695C12.5481 29.5497 12.1749 30.1903 11.6369 30.7283C9.87963 32.4858 7.03038 32.486 5.27291 30.7288L5.27125 30.7271C3.514 28.9696 3.51419 26.1204 5.27166 24.3631C5.8098 23.8251 6.45031 23.4518 7.13048 23.2432C7.52103 23.1235 7.76111 22.6858 7.60456 22.3085V22.3085C7.44806 21.9314 6.96706 21.7867 6.6064 21.9782C5.97803 22.3118 5.26122 22.5008 4.50029 22.5009C2.01501 22.501 0.000160128 20.4865 0 18.0012V17.9988C0.000160128 15.5135 2.01501 13.499 4.50029 13.4991C5.26131 13.4992 5.97819 13.6881 6.6066 14.0216C6.96725 14.213 7.44815 14.0684 7.60464 13.6913V13.6913C7.76121 13.3139 7.52106 12.8762 7.13046 12.7565C6.45025 12.5481 5.80975 12.1749 5.27166 11.6369C3.53614 9.90157 3.5381 7.00605 5.27291 5.27125C7.03038 3.514 9.87963 3.51419 11.6369 5.27166C12.1749 5.8098 12.5482 6.45031 12.7568 7.13048C12.8765 7.52102 13.3142 7.76111 13.6915 7.60456V7.60456C14.0686 7.44806 14.2133 6.96706 14.0218 6.6064C13.6882 5.97804 13.4992 5.26122 13.4991 4.50029Z',
-    },
-  ],
-  [
-    {
-      d: 'M16.9393 5.80583C13.8649 2.73139 8.88026 2.73139 5.80583 5.80583C2.73139 8.88026 2.73139 13.8649 5.80583 16.9393L6.86649 18L5.80583 19.0607C2.73139 22.1351 2.73139 27.1197 5.80583 30.1942C8.88026 33.2686 13.8649 33.2686 16.9393 30.1942L18 29.1335L19.0607 30.1942C22.1351 33.2686 27.1197 33.2686 30.1942 30.1942C33.2686 27.1197 33.2686 22.1351 30.1942 19.0607L29.1335 18L30.1942 16.9393C33.2686 13.8649 33.2686 8.88026 30.1942 5.80583C27.1197 2.73139 22.1351 2.73139 19.0607 5.80583L18 6.86649L16.9393 5.80583ZM18 2.75187C13.7362 -0.534636 7.59277 -0.223757 3.68451 3.68451C-0.223756 7.59277 -0.534636 13.7362 2.75187 18C-0.534636 22.2638 -0.223757 28.4072 3.68451 32.3155C7.59277 36.2238 13.7362 36.5346 18 33.2481C22.2638 36.5346 28.4072 36.2238 32.3155 32.3155C36.2238 28.4072 36.5346 22.2638 33.2481 18C36.5346 13.7362 36.2238 7.59277 32.3155 3.68451C28.4072 -0.223757 22.2638 -0.534636 18 2.75187Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M31 33V16C31 8.8203 25.1797 3 18 3C10.8203 3 5 8.8203 5 16V33H31ZM18 0C9.16344 0 2 7.16344 2 16V35.807C2 35.9136 2.08642 36 2.19303 36H33.807C33.9136 36 34 35.9136 34 35.807V16C34 7.16344 26.8366 0 18 0Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M32.9117 18C37.0295 13.8823 37.0295 7.20606 32.9117 3.08831C28.794 -1.02944 22.1178 -1.02944 18 3.08831C13.8823 -1.02944 7.20606 -1.02944 3.08831 3.08831C-1.02944 7.20606 -1.02944 13.8823 3.08831 18C-1.02944 22.1178 -1.02944 28.794 3.08831 32.9117C7.20606 37.0295 13.8823 37.0295 18 32.9117C22.1178 37.0295 28.794 37.0295 32.9117 32.9117C37.0295 28.794 37.0295 22.1178 32.9117 18Z',
-    },
-  ],
-  [
-    {
-      d: 'M6.46299 17.9895L7.23763 16.705L6.46299 17.9895C6.46882 17.993 6.47468 17.9965 6.48055 18C6.47468 18.0035 6.46883 18.007 6.46299 18.0105L7.23763 19.295L6.46299 18.0105C3.66342 19.6988 2.67064 23.3627 4.25251 26.2246C5.83226 29.0827 9.37566 30.0547 12.193 28.447C12.2242 31.6989 14.7179 34.5 18.0002 34.5C21.2824 34.5 23.7761 31.699 23.8074 28.4472C26.6247 30.0545 30.1678 29.0825 31.7475 26.2245C33.3294 23.3626 32.3366 19.6988 29.537 18.0105C29.5312 18.007 29.5254 18.0035 29.5195 18C29.5254 17.9965 29.5312 17.993 29.537 17.9895C32.3366 16.3012 33.3294 12.6374 31.7475 9.77547C30.1678 6.91754 26.6247 5.94548 23.8074 7.55278C23.7761 4.30101 21.2824 1.5 18.0002 1.5C14.7179 1.5 12.2242 4.30112 12.193 7.55297C9.37566 5.94533 5.83226 6.91734 4.25251 9.77542C2.67064 12.6373 3.66342 16.3012 6.46299 17.9895Z',
-    },
-  ],
-  [
-    {
-      d: 'M2 16C2 7.16344 9.16344 0 18 0C26.8366 0 34 7.16344 34 16V36H2V16Z',
-    },
-  ],
-  [
-    {
-      d: 'M18 2.76923C14.1765 2.76923 11.0769 5.8688 11.0769 9.69231V11.0769H9.69231C5.8688 11.0769 2.76923 14.1765 2.76923 18C2.76923 21.8235 5.8688 24.9231 9.69231 24.9231H11.0769V26.3077C11.0769 30.1312 14.1765 33.2308 18 33.2308C21.8235 33.2308 24.9231 30.1312 24.9231 26.3077V24.9231H26.3077C30.1312 24.9231 33.2308 21.8235 33.2308 18C33.2308 14.1765 30.1312 11.0769 26.3077 11.0769H24.9231V9.69231C24.9231 5.8688 21.8235 2.76923 18 2.76923ZM8.39391 8.39391C9.02837 3.65493 13.0874 0 18 0C22.9126 0 26.9716 3.65493 27.6061 8.39391C32.3451 9.02837 36 13.0874 36 18C36 22.9126 32.3451 26.9716 27.6061 27.6061C26.9716 32.3451 22.9126 36 18 36C13.0874 36 9.02837 32.3451 8.39391 27.6061C3.65493 26.9716 0 22.9126 0 18C0 13.0874 3.65493 9.02837 8.39391 8.39391Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-]
diff --git a/packages/ui/src/components/Unicon/Emblem.ts b/packages/ui/src/components/Unicon/Emblem.ts
index 9257dbbc82d..6726782a963 100644
--- a/packages/ui/src/components/Unicon/Emblem.ts
+++ b/packages/ui/src/components/Unicon/Emblem.ts
@@ -1,7 +1,5 @@
 /* eslint-disable max-lines */
-
-// dummy data to prevent errors importing
-export const emblemSvgPaths: React.SVGProps<SVGPathElement>[][] = [
+export const svgPaths: React.SVGProps<SVGPathElement>[][] = [
   [
     {
       d: 'M0 8C0 3.58172 3.58172 0 8 0V4C5.79086 4 4 5.79086 4 8H0ZM8 8L4 8C4 10.2091 5.79086 12 8 12V16C12.4183 16 16 12.4183 16 8H12C12 5.79086 10.2091 4 8 4L8 8ZM8 8L12 8C12 10.2091 10.2091 12 8 12L8 8Z',
diff --git a/packages/ui/src/components/Unicon/Emblem.web.ts b/packages/ui/src/components/Unicon/Emblem.web.ts
deleted file mode 100644
index b1c4c0eeb05..00000000000
--- a/packages/ui/src/components/Unicon/Emblem.web.ts
+++ /dev/null
@@ -1,627 +0,0 @@
-/* eslint-disable max-lines */
-export const emblemSvgPaths: React.SVGProps<SVGPathElement>[][] = [
-  [
-    {
-      d: 'M0 8C0 3.58172 3.58172 0 8 0V4C5.79086 4 4 5.79086 4 8H0ZM8 8L4 8C4 10.2091 5.79086 12 8 12V16C12.4183 16 16 12.4183 16 8H12C12 5.79086 10.2091 4 8 4L8 8ZM8 8L12 8C12 10.2091 10.2091 12 8 12L8 8Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M6.61962 1.57177C7.38198 0.809409 8.61802 0.80941 9.38038 1.57177L14.4282 6.61962C15.1906 7.38198 15.1906 8.61802 14.4282 9.38038L9.38038 14.4282C8.61802 15.1906 7.38198 15.1906 6.61962 14.4282L1.57177 9.38038C0.809409 8.61802 0.80941 7.38198 1.57177 6.61962L6.61962 1.57177Z',
-    },
-  ],
-  [
-    {
-      d: 'M8 4.33253L4.33253 8L8 11.6675L11.6675 8L8 4.33253ZM9.38038 1.57177C8.61802 0.80941 7.38198 0.809409 6.61962 1.57177L1.57177 6.61962C0.80941 7.38198 0.809409 8.61802 1.57177 9.38038L6.61962 14.4282C7.38198 15.1906 8.61802 15.1906 9.38038 14.4282L14.4282 9.38038C15.1906 8.61802 15.1906 7.38198 14.4282 6.61962L9.38038 1.57177Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z',
-    },
-    {
-      d: 'M16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8ZM4 5C4 4.44772 4.44772 4 5 4H11C11.5523 4 12 4.44772 12 5V11C12 11.5523 11.5523 12 11 12H5C4.44772 12 4 11.5523 4 11V5Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M16 8C12.2937 6.62854 9.37146 3.70632 8 0C6.62854 3.70632 3.70632 6.62854 0 8C3.70632 9.37146 6.62854 12.2937 8 16C9.37146 12.2937 12.2937 9.37146 16 8ZM8 11C9.65685 11 11 9.65685 11 8C11 6.34315 9.65685 5 8 5C6.34315 5 5 6.34315 5 8C5 9.65685 6.34315 11 8 11Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M9.38038 1.57177C8.61802 0.80941 7.38198 0.809409 6.61962 1.57177L1.57177 6.61962C0.80941 7.38198 0.809409 8.61802 1.57177 9.38038L6.61962 14.4282C7.38198 15.1906 8.61802 15.1906 9.38038 14.4282L14.4282 9.38038C15.1906 8.61802 15.1906 7.38198 14.4282 6.61962L9.38038 1.57177ZM8 11.1716C9.65685 11.1716 11 9.82842 11 8.17157C11 6.51472 9.65685 5.17157 8 5.17157C6.34315 5.17157 5 6.51472 5 8.17157C5 9.82842 6.34315 11.1716 8 11.1716Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M15 2C15 1.44772 14.5523 1 14 1H9C8.44772 1 8 1.44772 8 2V8H14C14.5523 8 15 7.55228 15 7V2Z',
-    },
-    {
-      d: 'M8 8H2C1.44771 8 1 8.44772 1 9V14C1 14.5523 1.44772 15 2 15H7C7.55228 15 8 14.5523 8 14V8Z',
-    },
-  ],
-  [
-    {
-      d: 'M0 8C0 3.58172 3.58172 0 8 0L8 4.41421C7.74408 4.41421 7.48816 4.51184 7.29289 4.70711L4.70711 7.29289C4.51184 7.48816 4.41421 7.74408 4.41421 8L0 8ZM8 8H4.41421C4.41421 8.25592 4.51184 8.51184 4.70711 8.70711L7.29289 11.2929C7.48816 11.4882 7.74408 11.5858 8 11.5858L8 16C12.4183 16 16 12.4183 16 8L11.5858 8C11.5858 7.74408 11.4882 7.48816 11.2929 7.29289L8.70711 4.70711C8.51184 4.51184 8.25592 4.41421 8 4.41421L8 8ZM8 8H11.5858C11.5858 8.25592 11.4882 8.51184 11.2929 8.70711L8.70711 11.2929C8.51184 11.4882 8.25592 11.5858 8 11.5858L8 8Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M1 2C1 1.44772 1.44772 1 2 1H7C7.55228 1 8 1.44772 8 2V8H2C1.44772 8 1 7.55228 1 7V2Z',
-    },
-    {
-      d: 'M8 8H14C14.5523 8 15 8.44772 15 9V14C15 14.5523 14.5523 15 14 15H9C8.44772 15 8 14.5523 8 14V8Z',
-    },
-  ],
-  [
-    {
-      d: 'M13.6569 2.34315C10.5327 -0.781049 5.46734 -0.781049 2.34315 2.34315L8 8L2.34315 13.6569C5.46734 16.781 10.5327 16.781 13.6569 13.6569L8 8L13.6569 2.34315Z',
-    },
-  ],
-  [
-    {
-      d: 'M8 0C3.58172 0 0 3.58172 0 8L8 8L8 16C12.4183 16 16 12.4183 16 8L8 8L8 0Z',
-    },
-  ],
-  [
-    {
-      d: 'M16 8C12.2937 6.62854 9.37146 3.70632 8 0C6.62854 3.70632 3.70632 6.62854 0 8C3.70632 9.37146 6.62854 12.2937 8 16C9.37146 12.2937 12.2937 9.37146 16 8ZM11 8L8 5L5 8L8 11L11 8Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M2 4.4C2 3.07452 3.07452 2 4.4 2H11.6C12.9255 2 14 3.07452 14 4.4V11.6C14 12.9255 12.9255 14 11.6 14H4.4C3.07452 14 2 12.9255 2 11.6V4.4Z',
-    },
-  ],
-  [
-    {
-      d: 'M5.17158 2.34315C4.39053 1.5621 3.1242 1.5621 2.34315 2.34315C1.5621 3.12419 1.5621 4.39052 2.34315 5.17157L4.46447 7.29289C4.85499 7.68342 4.85499 8.31658 4.46447 8.70711L2.34315 10.8284C1.5621 11.6095 1.5621 12.8758 2.34315 13.6569C3.1242 14.4379 4.39053 14.4379 5.17158 13.6569L7.2929 11.5355C7.68342 11.145 8.31659 11.145 8.70711 11.5355L10.8284 13.6569C11.6095 14.4379 12.8758 14.4379 13.6569 13.6569C14.4379 12.8758 14.4379 11.6095 13.6569 10.8284L11.5355 8.70711C11.145 8.31658 11.145 7.68342 11.5355 7.29289L13.6569 5.17157C14.4379 4.39052 14.4379 3.12419 13.6569 2.34315C12.8758 1.5621 11.6095 1.5621 10.8284 2.34315L8.70711 4.46447C8.31659 4.85499 7.68342 4.85499 7.2929 4.46447L5.17158 2.34315Z',
-    },
-  ],
-  [
-    {
-      d: 'M7 2C7 1.44772 7.44772 1 8 1C8.55228 1 9 1.44772 9 2V5C9 5.55228 8.55228 6 8 6C7.44772 6 7 5.55228 7 5V2Z',
-    },
-    {
-      d: 'M7 11C7 10.4477 7.44772 10 8 10C8.55228 10 9 10.4477 9 11V14C9 14.5523 8.55228 15 8 15C7.44772 15 7 14.5523 7 14V11Z',
-    },
-    {
-      d: 'M14 7C14.5523 7 15 7.44772 15 8C15 8.55228 14.5523 9 14 9H11C10.4477 9 10 8.55228 10 8C10 7.44772 10.4477 7 11 7H14Z',
-    },
-    {
-      d: 'M5 7C5.55228 7 6 7.44772 6 8C6 8.55228 5.55228 9 5 9H2C1.44772 9 1 8.55228 1 8C1 7.44772 1.44772 7 2 7H5Z',
-    },
-  ],
-  [
-    {
-      d: 'M15.9585 8.81981C15.9166 9.23189 15.5183 9.49613 15.112 9.41574L11.7175 8.74421C10.9132 8.5851 10.4734 9.64707 11.1547 10.1032L14.0293 12.0277C14.3735 12.2581 14.4683 12.7266 14.2068 13.0478C13.861 13.4725 13.4725 13.861 13.0478 14.2068C12.7266 14.4683 12.2581 14.3735 12.0277 14.0293L10.1032 11.1547C9.64707 10.4734 8.5851 10.9132 8.74421 11.7175L9.41574 15.112C9.49613 15.5183 9.23189 15.9166 8.81981 15.9585C8.55027 15.9859 8.27678 16 8 16C7.72322 16 7.44973 15.9859 7.18019 15.9585C6.76811 15.9166 6.50387 15.5183 6.58426 15.112L7.25579 11.7175C7.4149 10.9132 6.35293 10.4734 5.89682 11.1547L3.97232 14.0293C3.74188 14.3735 3.27344 14.4683 2.95224 14.2068C2.52755 13.861 2.13902 13.4725 1.79322 13.0478C1.53168 12.7266 1.62651 12.2581 1.9707 12.0277L4.84532 10.1032C5.52661 9.64707 5.08681 8.5851 4.28253 8.74421L0.888013 9.41574C0.481675 9.49613 0.0834376 9.23189 0.0414916 8.81981C0.0140555 8.55027 0 8.27678 0 8C0 7.72322 0.0140554 7.44973 0.0414915 7.18019C0.0834375 6.76811 0.481675 6.50387 0.888013 6.58426L4.28253 7.25579C5.08681 7.4149 5.52661 6.35293 4.84532 5.89683L1.9707 3.97232C1.6265 3.74188 1.53168 3.27344 1.79322 2.95224C2.13902 2.52755 2.52755 2.13902 2.95224 1.79322C3.27344 1.53168 3.74188 1.62651 3.97231 1.9707L5.89683 4.84533C6.35293 5.52661 7.4149 5.08681 7.25579 4.28253L6.58426 0.888013C6.50387 0.481675 6.76811 0.0834376 7.18019 0.0414915C7.44973 0.0140555 7.72322 0 8 0C8.27678 0 8.55027 0.0140554 8.81981 0.0414915C9.23189 0.0834375 9.49613 0.481675 9.41574 0.888013L8.74421 4.28253C8.5851 5.08681 9.64707 5.52661 10.1032 4.84532L12.0277 1.9707C12.2581 1.6265 12.7266 1.53168 13.0478 1.79322C13.4725 2.13902 13.861 2.52755 14.2068 2.95223C14.4683 3.27344 14.3735 3.74188 14.0293 3.97231L11.1547 5.89683C10.4734 6.35294 10.9132 7.4149 11.7175 7.25579L15.112 6.58426C15.5183 6.50387 15.9166 6.76811 15.9585 7.18019C15.9859 7.44973 16 7.72322 16 8C16 8.27678 15.9859 8.55027 15.9585 8.81981Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M10 2C10 0.895431 9.10457 0 8 0C6.89543 0 6 0.89543 6 2V5C6 5.55228 5.55228 6 5 6H2C0.895431 6 0 6.89543 0 8C0 9.10457 0.895431 10 2 10H5C5.55228 10 6 10.4477 6 11V14C6 15.1046 6.89543 16 8 16C9.10457 16 10 15.1046 10 14V11C10 10.4477 10.4477 10 11 10H14C15.1046 10 16 9.10457 16 8C16 6.89543 15.1046 6 14 6H11C10.4477 6 10 5.55228 10 5V2Z',
-    },
-  ],
-  [
-    {
-      d: 'M12 1.07026C9.60879 2.4535 8 5.03887 8 8V0C5.03887 0 2.4535 1.60879 1.07026 4C2.4535 6.39121 5.03887 8 8 8H0C0 10.9611 1.6088 13.5465 4 14.9297C6.39121 13.5465 8 10.9611 8 8L8 16C10.9611 16 13.5465 14.3912 14.9297 12C13.5469 9.60955 10.9628 8.00101 8.00279 8H16C16 5.03887 14.3912 2.4535 12 1.07026Z',
-    },
-  ],
-  [
-    {
-      d: 'M15.9831 8.52372L12.9894 8.33026C12.9964 8.22148 13 8.11137 13 8C13 7.88863 12.9964 7.77852 12.9894 7.66974L15.9831 7.47627C15.9943 7.64941 16 7.82404 16 8C16 8.17596 15.9943 8.35059 15.9831 8.52372ZM15.8477 6.4387L12.9048 7.02091C12.8622 6.80567 12.8058 6.59565 12.7366 6.39168L15.5774 5.42754C15.6887 5.75556 15.7794 6.09313 15.8477 6.4387ZM15.1766 4.46092L12.487 5.78982C12.3902 5.59393 12.2808 5.40497 12.1596 5.22403L14.6525 3.55507C14.8461 3.84425 15.0214 4.14676 15.1766 4.46092ZM14.0148 2.72519L11.7601 4.70411C11.6156 4.5395 11.4605 4.3844 11.2959 4.23992L13.2748 1.98518C13.5372 2.21551 13.7845 2.46275 14.0148 2.72519ZM12.4449 1.34748L10.776 3.84038C10.595 3.71924 10.4061 3.60981 10.2102 3.51302L11.5391 0.823408C11.8532 0.978631 12.1557 1.15388 12.4449 1.34748ZM10.5725 0.422581L9.60832 3.26343C9.40435 3.19421 9.19433 3.13782 8.97909 3.09524L9.5613 0.152272C9.90687 0.220637 10.2444 0.311259 10.5725 0.422581ZM8.52373 0.0168691L8.33026 3.01062C8.22148 3.0036 8.11137 3 8 3C7.88863 3 7.77852 3.0036 7.66974 3.01062L7.47627 0.0168691C7.64941 0.00568084 7.82404 0 8 0C8.17596 0 8.35059 0.00568083 8.52373 0.0168691ZM6.4387 0.152272L7.02091 3.09524C6.80567 3.13782 6.59565 3.19421 6.39168 3.26343L5.42754 0.422581C5.75556 0.311259 6.09313 0.220638 6.4387 0.152272ZM4.46092 0.823408L5.78982 3.51302C5.59393 3.60981 5.40497 3.71925 5.22403 3.84038L3.55507 1.34748C3.84425 1.15388 4.14676 0.978631 4.46092 0.823408ZM2.72519 1.98518L4.70411 4.23992C4.5395 4.3844 4.3844 4.5395 4.23992 4.70412L1.98517 2.7252C2.21551 2.46275 2.46275 2.21551 2.72519 1.98518ZM1.34748 3.55508L3.84038 5.22403C3.71924 5.40497 3.60981 5.59393 3.51302 5.78982L0.823408 4.46092C0.978631 4.14676 1.15388 3.84425 1.34748 3.55508ZM0.422581 5.42754L3.26343 6.39168C3.19421 6.59565 3.13782 6.80567 3.09524 7.02091L0.152272 6.4387C0.220637 6.09313 0.311259 5.75556 0.422581 5.42754ZM0.0168691 7.47627C0.00568083 7.64941 0 7.82404 0 8C0 8.17596 0.00568084 8.35059 0.0168691 8.52373L3.01062 8.33026C3.0036 8.22148 3 8.11137 3 8C3 7.88863 3.0036 7.77852 3.01062 7.66974L0.0168691 7.47627ZM0.152272 9.5613L3.09524 8.97909C3.13782 9.19433 3.19421 9.40435 3.26343 9.60832L0.422581 10.5725C0.311259 10.2444 0.220637 9.90687 0.152272 9.5613ZM0.823408 11.5391L3.51302 10.2102C3.60981 10.4061 3.71925 10.595 3.84038 10.776L1.34748 12.4449C1.15388 12.1557 0.978631 11.8532 0.823408 11.5391ZM1.98518 13.2748L4.23992 11.2959C4.3844 11.4605 4.5395 11.6156 4.70412 11.7601L2.7252 14.0148C2.46275 13.7845 2.21551 13.5372 1.98518 13.2748ZM3.55508 14.6525L5.22403 12.1596C5.40497 12.2808 5.59393 12.3902 5.78982 12.487L4.46092 15.1766C4.14676 15.0214 3.84425 14.8461 3.55508 14.6525ZM5.42754 15.5774L6.39168 12.7366C6.59565 12.8058 6.80567 12.8622 7.02091 12.9048L6.4387 15.8477C6.09313 15.7794 5.75556 15.6887 5.42754 15.5774ZM7.47628 15.9831L7.66974 12.9894C7.77852 12.9964 7.88863 13 8 13C8.11137 13 8.22148 12.9964 8.33026 12.9894L8.52373 15.9831C8.35059 15.9943 8.17596 16 8 16C7.82404 16 7.64941 15.9943 7.47628 15.9831ZM9.5613 15.8477L8.97909 12.9048C9.19433 12.8622 9.40435 12.8058 9.60832 12.7366L10.5725 15.5774C10.2444 15.6887 9.90687 15.7794 9.5613 15.8477ZM11.5391 15.1766L10.2102 12.487C10.4061 12.3902 10.595 12.2808 10.776 12.1596L12.4449 14.6525C12.1557 14.8461 11.8532 15.0214 11.5391 15.1766ZM13.2748 14.0148L11.2959 11.7601C11.4605 11.6156 11.6156 11.4605 11.7601 11.2959L14.0148 13.2748C13.7845 13.5372 13.5372 13.7845 13.2748 14.0148ZM14.6525 12.4449L12.1596 10.776C12.2808 10.595 12.3902 10.4061 12.487 10.2102L15.1766 11.5391C15.0214 11.8532 14.8461 12.1557 14.6525 12.4449ZM15.5774 10.5725L12.7366 9.60832C12.8058 9.40435 12.8622 9.19433 12.9048 8.97909L15.8477 9.5613C15.7794 9.90687 15.6887 10.2444 15.5774 10.5725Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-    {
-      d: 'M11 8C11 9.65685 9.65685 11 8 11C6.34315 11 5 9.65685 5 8C5 6.34315 6.34315 5 8 5C9.65685 5 11 6.34315 11 8Z',
-    },
-  ],
-  [
-    {
-      d: 'M15.9026 9.25189L12.939 8.78615C12.979 8.53177 13 8.26937 13 8C13 7.73063 12.979 7.46823 12.939 7.21385L15.9026 6.74811C15.9667 7.15599 16 7.57411 16 8C16 8.42589 15.9667 8.84401 15.9026 9.25189ZM15.4706 5.13214L12.6701 6.20789C12.4812 5.7162 12.2158 5.26012 11.8871 4.85468L14.2174 2.96533C14.7416 3.61188 15.167 4.34182 15.4706 5.13214ZM13.0347 1.78258L11.1453 4.11289C10.7399 3.78417 10.2838 3.51876 9.79211 3.32989L10.8679 0.529397C11.6582 0.832983 12.3881 1.25837 13.0347 1.78258ZM9.25189 0.0973803L8.78615 3.06101C8.53177 3.02103 8.26937 3 8 3C7.73063 3 7.46823 3.02103 7.21385 3.06101L6.74811 0.0973805C7.15599 0.0332797 7.57411 0 8 0C8.42589 0 8.84401 0.0332797 9.25189 0.0973803ZM5.13214 0.529397L6.20789 3.32989C5.7162 3.51876 5.26012 3.78417 4.85468 4.11289L2.96533 1.78258C3.61188 1.25837 4.34182 0.832983 5.13214 0.529397ZM1.78258 2.96533L4.11289 4.85468C3.78417 5.26012 3.51876 5.7162 3.32989 6.20789L0.529397 5.13214C0.832983 4.34182 1.25837 3.61188 1.78258 2.96533ZM0.0973804 6.74811C0.0332797 7.15599 0 7.57411 0 8C0 8.42589 0.0332797 8.84401 0.0973805 9.25189L3.06101 8.78615C3.02103 8.53177 3 8.26937 3 8C3 7.73063 3.02103 7.46823 3.06101 7.21386L0.0973804 6.74811ZM0.529397 10.8679L3.32989 9.79211C3.51876 10.2838 3.78417 10.7399 4.11289 11.1453L1.78258 13.0347C1.25837 12.3881 0.832983 11.6582 0.529397 10.8679ZM2.96533 14.2174L4.85468 11.8871C5.26012 12.2158 5.7162 12.4812 6.20789 12.6701L5.13214 15.4706C4.34182 15.167 3.61188 14.7416 2.96533 14.2174ZM6.74811 15.9026L7.21386 12.939C7.46823 12.979 7.73063 13 8 13C8.26937 13 8.53177 12.979 8.78615 12.939L9.25189 15.9026C8.84401 15.9667 8.42589 16 8 16C7.57411 16 7.15599 15.9667 6.74811 15.9026ZM10.8679 15.4706L9.79211 12.6701C10.2838 12.4812 10.7399 12.2158 11.1453 11.8871L13.0347 14.2174C12.3881 14.7416 11.6582 15.167 10.8679 15.4706ZM14.2174 13.0347L11.8871 11.1453C12.2158 10.7399 12.4812 10.2838 12.6701 9.79211L15.4706 10.8679C15.167 11.6582 14.7416 12.3881 14.2174 13.0347Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-    {
-      d: 'M11 8C11 9.65685 9.65685 11 8 11C6.34315 11 5 9.65685 5 8C5 6.34315 6.34315 5 8 5C9.65685 5 11 6.34315 11 8Z',
-    },
-  ],
-  [
-    {
-      d: 'M2 14C2 10.6863 4.68629 8 8 8C4.68629 8 2 5.31371 2 2H5C6.65685 2 8 3.34315 8 5C8 3.34315 9.34315 2 11 2H14C14 5.31352 11.3134 7.99969 8 8C11.3134 8.00031 14 10.6865 14 14H11C9.34315 14 8 12.6569 8 11C8 12.6569 6.65685 14 5 14L2 14Z',
-    },
-  ],
-  [
-    {
-      d: 'M8 8C11.3137 8 14 4.86599 14 1H2C2 4.86567 4.68667 7.99948 8 8C4.68667 8.00053 2 11.1343 2 15H14C14 11.134 11.3137 8 8 8Z',
-    },
-  ],
-  [
-    {
-      d: 'M15.9026 9.25189L12.939 8.78615C12.979 8.53177 13 8.26937 13 8C13 7.73063 12.979 7.46823 12.939 7.21385L15.9026 6.74811C15.9667 7.15599 16 7.57411 16 8C16 8.42589 15.9667 8.84401 15.9026 9.25189ZM15.4706 5.13214L12.6701 6.20789C12.4812 5.7162 12.2158 5.26012 11.8871 4.85468L14.2174 2.96533C14.7416 3.61188 15.167 4.34182 15.4706 5.13214ZM13.0347 1.78258L11.1453 4.11289C10.7399 3.78417 10.2838 3.51876 9.79211 3.32989L10.8679 0.529397C11.6582 0.832983 12.3881 1.25837 13.0347 1.78258ZM9.25189 0.0973803L8.78615 3.06101C8.53177 3.02103 8.26937 3 8 3C7.73063 3 7.46823 3.02103 7.21385 3.06101L6.74811 0.0973805C7.15599 0.0332797 7.57411 0 8 0C8.42589 0 8.84401 0.0332797 9.25189 0.0973803ZM5.13214 0.529397L6.20789 3.32989C5.7162 3.51876 5.26012 3.78417 4.85468 4.11289L2.96533 1.78258C3.61188 1.25837 4.34182 0.832983 5.13214 0.529397ZM1.78258 2.96533L4.11289 4.85468C3.78417 5.26012 3.51876 5.7162 3.32989 6.20789L0.529397 5.13214C0.832983 4.34182 1.25837 3.61188 1.78258 2.96533ZM0.0973804 6.74811C0.0332797 7.15599 0 7.57411 0 8C0 8.42589 0.0332797 8.84401 0.0973805 9.25189L3.06101 8.78615C3.02103 8.53177 3 8.26937 3 8C3 7.73063 3.02103 7.46823 3.06101 7.21386L0.0973804 6.74811ZM0.529397 10.8679L3.32989 9.79211C3.51876 10.2838 3.78417 10.7399 4.11289 11.1453L1.78258 13.0347C1.25837 12.3881 0.832983 11.6582 0.529397 10.8679ZM2.96533 14.2174L4.85468 11.8871C5.26012 12.2158 5.7162 12.4812 6.20789 12.6701L5.13214 15.4706C4.34182 15.167 3.61188 14.7416 2.96533 14.2174ZM6.74811 15.9026L7.21386 12.939C7.46823 12.979 7.73063 13 8 13C8.26937 13 8.53177 12.979 8.78615 12.939L9.25189 15.9026C8.84401 15.9667 8.42589 16 8 16C7.57411 16 7.15599 15.9667 6.74811 15.9026ZM10.8679 15.4706L9.79211 12.6701C10.2838 12.4812 10.7399 12.2158 11.1453 11.8871L13.0347 14.2174C12.3881 14.7416 11.6582 15.167 10.8679 15.4706ZM14.2174 13.0347L11.8871 11.1453C12.2158 10.7399 12.4812 10.2838 12.6701 9.79211L15.4706 10.8679C15.167 11.6582 14.7416 12.3881 14.2174 13.0347Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-    {
-      d: 'M8 5C8.64911 6.29822 9.70178 7.35089 11 8C9.70178 8.64911 8.64911 9.70178 8 11C7.35089 9.70178 6.29822 8.64911 5 8C6.29822 7.35089 7.35089 6.29822 8 5Z',
-    },
-  ],
-  [
-    {
-      d: 'M15.9831 8.52372L12.9894 8.33026C12.9964 8.22148 13 8.11137 13 8C13 7.88863 12.9964 7.77852 12.9894 7.66974L15.9831 7.47627C15.9943 7.64941 16 7.82404 16 8C16 8.17596 15.9943 8.35059 15.9831 8.52372ZM15.8477 6.4387L12.9048 7.02091C12.8622 6.80567 12.8058 6.59565 12.7366 6.39168L15.5774 5.42754C15.6887 5.75556 15.7794 6.09313 15.8477 6.4387ZM15.1766 4.46092L12.487 5.78982C12.3902 5.59393 12.2808 5.40497 12.1596 5.22403L14.6525 3.55507C14.8461 3.84425 15.0214 4.14676 15.1766 4.46092ZM14.0148 2.72519L11.7601 4.70411C11.6156 4.5395 11.4605 4.3844 11.2959 4.23992L13.2748 1.98518C13.5372 2.21551 13.7845 2.46275 14.0148 2.72519ZM12.4449 1.34748L10.776 3.84038C10.595 3.71924 10.4061 3.60981 10.2102 3.51302L11.5391 0.823408C11.8532 0.978631 12.1557 1.15388 12.4449 1.34748ZM10.5725 0.422581L9.60832 3.26343C9.40435 3.19421 9.19433 3.13782 8.97909 3.09524L9.5613 0.152272C9.90687 0.220637 10.2444 0.311259 10.5725 0.422581ZM8.52373 0.0168691L8.33026 3.01062C8.22148 3.0036 8.11137 3 8 3C7.88863 3 7.77852 3.0036 7.66974 3.01062L7.47627 0.0168691C7.64941 0.00568084 7.82404 0 8 0C8.17596 0 8.35059 0.00568083 8.52373 0.0168691ZM6.4387 0.152272L7.02091 3.09524C6.80567 3.13782 6.59565 3.19421 6.39168 3.26343L5.42754 0.422581C5.75556 0.311259 6.09313 0.220638 6.4387 0.152272ZM4.46092 0.823408L5.78982 3.51302C5.59393 3.60981 5.40497 3.71925 5.22403 3.84038L3.55507 1.34748C3.84425 1.15388 4.14676 0.978631 4.46092 0.823408ZM2.72519 1.98518L4.70411 4.23992C4.5395 4.3844 4.3844 4.5395 4.23992 4.70412L1.98517 2.7252C2.21551 2.46275 2.46275 2.21551 2.72519 1.98518ZM1.34748 3.55508L3.84038 5.22403C3.71924 5.40497 3.60981 5.59393 3.51302 5.78982L0.823408 4.46092C0.978631 4.14676 1.15388 3.84425 1.34748 3.55508ZM0.422581 5.42754L3.26343 6.39168C3.19421 6.59565 3.13782 6.80567 3.09524 7.02091L0.152272 6.4387C0.220637 6.09313 0.311259 5.75556 0.422581 5.42754ZM0.0168691 7.47627C0.00568083 7.64941 0 7.82404 0 8C0 8.17596 0.00568084 8.35059 0.0168691 8.52373L3.01062 8.33026C3.0036 8.22148 3 8.11137 3 8C3 7.88863 3.0036 7.77852 3.01062 7.66974L0.0168691 7.47627ZM0.152272 9.5613L3.09524 8.97909C3.13782 9.19433 3.19421 9.40435 3.26343 9.60832L0.422581 10.5725C0.311259 10.2444 0.220637 9.90687 0.152272 9.5613ZM0.823408 11.5391L3.51302 10.2102C3.60981 10.4061 3.71925 10.595 3.84038 10.776L1.34748 12.4449C1.15388 12.1557 0.978631 11.8532 0.823408 11.5391ZM1.98518 13.2748L4.23992 11.2959C4.3844 11.4605 4.5395 11.6156 4.70412 11.7601L2.7252 14.0148C2.46275 13.7845 2.21551 13.5372 1.98518 13.2748ZM3.55508 14.6525L5.22403 12.1596C5.40497 12.2808 5.59393 12.3902 5.78982 12.487L4.46092 15.1766C4.14676 15.0214 3.84425 14.8461 3.55508 14.6525ZM5.42754 15.5774L6.39168 12.7366C6.59565 12.8058 6.80567 12.8622 7.02091 12.9048L6.4387 15.8477C6.09313 15.7794 5.75556 15.6887 5.42754 15.5774ZM7.47628 15.9831L7.66974 12.9894C7.77852 12.9964 7.88863 13 8 13C8.11137 13 8.22148 12.9964 8.33026 12.9894L8.52373 15.9831C8.35059 15.9943 8.17596 16 8 16C7.82404 16 7.64941 15.9943 7.47628 15.9831ZM9.5613 15.8477L8.97909 12.9048C9.19433 12.8622 9.40435 12.8058 9.60832 12.7366L10.5725 15.5774C10.2444 15.6887 9.90687 15.7794 9.5613 15.8477ZM11.5391 15.1766L10.2102 12.487C10.4061 12.3902 10.595 12.2808 10.776 12.1596L12.4449 14.6525C12.1557 14.8461 11.8532 15.0214 11.5391 15.1766ZM13.2748 14.0148L11.2959 11.7601C11.4605 11.6156 11.6156 11.4605 11.7601 11.2959L14.0148 13.2748C13.7845 13.5372 13.5372 13.7845 13.2748 14.0148ZM14.6525 12.4449L12.1596 10.776C12.2808 10.595 12.3902 10.4061 12.487 10.2102L15.1766 11.5391C15.0214 11.8532 14.8461 12.1557 14.6525 12.4449ZM15.5774 10.5725L12.7366 9.60832C12.8058 9.40435 12.8622 9.19433 12.9048 8.97909L15.8477 9.5613C15.7794 9.90687 15.6887 10.2444 15.5774 10.5725Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-    {
-      d: 'M8 5C8.64911 6.29822 9.70178 7.35089 11 8C9.70178 8.64911 8.64911 9.70178 8 11C7.35089 9.70178 6.29822 8.64911 5 8C6.29822 7.35089 7.35089 6.29822 8 5Z',
-    },
-  ],
-  [
-    {
-      d: 'M15.8477 9.5613L8.03733 8.01617L14.6525 12.4449C14.0685 13.3173 13.3173 14.0685 12.4449 14.6525L8.01617 8.03733L9.5613 15.8477C9.05633 15.9476 8.53428 16 8 16C7.46572 16 6.94367 15.9476 6.4387 15.8477L7.98383 8.03733L3.55508 14.6525C2.68266 14.0685 1.93154 13.3173 1.34748 12.4449L7.96267 8.01617L0.152272 9.5613C0.0523756 9.05633 0 8.53428 0 8C0 7.46572 0.0523755 6.94367 0.152272 6.4387L7.96267 7.98383L1.34748 3.55508C1.93154 2.68266 2.68266 1.93154 3.55507 1.34748L7.98383 7.96267L6.4387 0.152272C6.94367 0.0523755 7.46572 0 8 0C8.53428 0 9.05633 0.0523755 9.5613 0.152272L8.01617 7.96267L12.4449 1.34748C13.3173 1.93154 14.0685 2.68266 14.6525 3.55507L8.03733 7.98383L15.8477 6.4387C15.9476 6.94367 16 7.46572 16 8C16 8.53428 15.9476 9.05633 15.8477 9.5613Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M2.34314 2.34314C3.12419 1.5621 4.39052 1.5621 5.17157 2.34314L7.29289 4.46447C7.68342 4.85499 8.31658 4.85499 8.70711 4.46447L10.8284 2.34314C11.6095 1.5621 12.8758 1.5621 13.6569 2.34314C14.4379 3.12419 14.4379 4.39052 13.6569 5.17157L11.5355 7.29289C11.145 7.68342 11.145 8.31658 11.5355 8.70711L13.6569 10.8284C14.4379 11.6095 14.4379 12.8758 13.6569 13.6569C12.8758 14.4379 11.6095 14.4379 10.8284 13.6569L8.70711 11.5355C8.31658 11.145 7.68342 11.145 7.29289 11.5355L5.17157 13.6569C4.39052 14.4379 3.12419 14.4379 2.34314 13.6569C1.5621 12.8758 1.5621 11.6095 2.34314 10.8284L4.46447 8.70711C4.85499 8.31658 4.85499 7.68342 4.46447 7.29289L2.34314 5.17157C1.5621 4.39052 1.5621 3.12419 2.34314 2.34314ZM8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M8 8C8 8 5.5 3.82101 5.5 2.46154C5.5 1.10207 6.61929 0 8 0C9.38071 0 10.5 1.10207 10.5 2.46154C10.5 3.82101 8 8 8 8Z',
-    },
-    {
-      d: 'M8 8C8 8 12.179 5.5 13.5385 5.5C14.8979 5.5 16 6.61929 16 8C16 9.38071 14.8979 10.5 13.5385 10.5C12.1803 10.5 8.00807 8.00483 8 8Z',
-    },
-    {
-      d: 'M8 8C8 8 10.5 12.179 10.5 13.5385C10.5 14.8979 9.38071 16 8 16C6.61929 16 5.5 14.8979 5.5 13.5385C5.5 12.1808 7.99339 8.01105 8 8Z',
-    },
-    {
-      d: 'M2.46154 5.5C3.82101 5.5 8 8 8 8C8 8 3.82101 10.5 2.46154 10.5C1.10207 10.5 0 9.38071 0 8C0 6.61929 1.10207 5.5 2.46154 5.5Z',
-    },
-  ],
-  [
-    {
-      d: 'M10.3195 2.46119C10.3195 3.82047 8.00012 7.99888 8.00012 7.99888C8.00012 7.99888 5.68069 3.82047 5.68069 2.46119C5.68069 1.10191 6.71913 0 8.00012 0C9.28111 0 10.3195 1.10191 10.3195 2.46119Z',
-    },
-    {
-      d: 'M2.20488 7.30932C3.34269 7.98896 8.00002 8 8.00002 8C7.97235 8.00007 3.33929 8.01307 2.20488 8.69068C1.06707 9.37032 0.66391 10.8517 1.3044 11.9994C1.9449 13.1472 3.3865 13.5267 4.52431 12.847C5.66058 12.1683 7.9937 8.01126 8.00002 8C8.0094 8.01672 10.3402 12.1687 11.4757 12.847C12.6135 13.5266 14.0551 13.1472 14.6956 11.9994C15.3361 10.8517 14.9329 9.37029 13.7951 8.69065C12.6833 8.02652 8.21072 8.00083 8.00717 8C8.21072 7.99917 12.6833 7.97348 13.7951 7.30935C14.9329 6.62971 15.3361 5.14833 14.6956 4.00059C14.0551 2.85285 12.6135 2.47337 11.4757 3.15301C10.3434 3.82938 8.02234 7.96026 8.00002 8C7.99376 7.98884 5.66059 3.83171 4.52431 3.15299C3.3865 2.47335 1.9449 2.85282 1.3044 4.00056C0.66391 5.1483 1.06707 6.62968 2.20488 7.30932Z',
-    },
-    {
-      d: 'M8.00012 8.00112C8.00012 8.00112 10.3195 12.1795 10.3195 13.5388C10.3195 14.8981 9.28111 16 8.00012 16C6.71913 16 5.68069 14.8981 5.68069 13.5388C5.68069 12.1795 8.00012 8.00112 8.00012 8.00112Z',
-    },
-  ],
-  [
-    {
-      d: 'M8 0C9.10457 0 10 0.895431 10 2V5C10 5.55228 10.4477 6 11 6H14C15.1046 6 16 6.89543 16 8C16 9.10457 15.1046 10 14 10H11C10.4477 10 10 10.4477 10 11V14C10 15.1046 9.10457 16 8 16C6.89543 16 6 15.1046 6 14V11C6 10.4477 5.55228 10 5 10H2C0.895431 10 0 9.10457 0 8C0 6.89543 0.895431 6 2 6H5C5.55228 6 6 5.55228 6 5V2C6 0.89543 6.89543 0 8 0ZM8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M15.9026 9.25189L12.939 8.78615C12.979 8.53177 13 8.26937 13 8C13 7.73063 12.979 7.46823 12.939 7.21385L15.9026 6.74811C15.9667 7.15599 16 7.57411 16 8C16 8.42589 15.9667 8.84401 15.9026 9.25189ZM15.4706 5.13214L12.6701 6.20789C12.4812 5.7162 12.2158 5.26012 11.8871 4.85468L14.2174 2.96533C14.7416 3.61188 15.167 4.34182 15.4706 5.13214ZM13.0347 1.78258L11.1453 4.11289C10.7399 3.78417 10.2838 3.51876 9.79211 3.32989L10.8679 0.529397C11.6582 0.832983 12.3881 1.25837 13.0347 1.78258ZM9.25189 0.0973803L8.78615 3.06101C8.53177 3.02103 8.26937 3 8 3C7.73063 3 7.46823 3.02103 7.21385 3.06101L6.74811 0.0973805C7.15599 0.0332797 7.57411 0 8 0C8.42589 0 8.84401 0.0332797 9.25189 0.0973803ZM5.13214 0.529397L6.20789 3.32989C5.7162 3.51876 5.26012 3.78417 4.85468 4.11289L2.96533 1.78258C3.61188 1.25837 4.34182 0.832983 5.13214 0.529397ZM1.78258 2.96533L4.11289 4.85468C3.78417 5.26012 3.51876 5.7162 3.32989 6.20789L0.529397 5.13214C0.832983 4.34182 1.25837 3.61188 1.78258 2.96533ZM0.0973804 6.74811C0.0332797 7.15599 0 7.57411 0 8C0 8.42589 0.0332797 8.84401 0.0973805 9.25189L3.06101 8.78615C3.02103 8.53177 3 8.26937 3 8C3 7.73063 3.02103 7.46823 3.06101 7.21386L0.0973804 6.74811ZM0.529397 10.8679L3.32989 9.79211C3.51876 10.2838 3.78417 10.7399 4.11289 11.1453L1.78258 13.0347C1.25837 12.3881 0.832983 11.6582 0.529397 10.8679ZM2.96533 14.2174L4.85468 11.8871C5.26012 12.2158 5.7162 12.4812 6.20789 12.6701L5.13214 15.4706C4.34182 15.167 3.61188 14.7416 2.96533 14.2174ZM6.74811 15.9026L7.21386 12.939C7.46823 12.979 7.73063 13 8 13C8.26937 13 8.53177 12.979 8.78615 12.939L9.25189 15.9026C8.84401 15.9667 8.42589 16 8 16C7.57411 16 7.15599 15.9667 6.74811 15.9026ZM10.8679 15.4706L9.79211 12.6701C10.2838 12.4812 10.7399 12.2158 11.1453 11.8871L13.0347 14.2174C12.3881 14.7416 11.6582 15.167 10.8679 15.4706ZM14.2174 13.0347L11.8871 11.1453C12.2158 10.7399 12.4812 10.2838 12.6701 9.79211L15.4706 10.8679C15.167 11.6582 14.7416 12.3881 14.2174 13.0347Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M11.923 8.78487L15.8477 9.5613C15.9476 9.05633 16 8.53428 16 8C16 7.46572 15.9476 6.94367 15.8477 6.4387L11.923 7.21513C11.8192 6.6932 11.6138 6.20786 11.3283 5.78059L14.6525 3.55507C14.0685 2.68266 13.3173 1.93154 12.4449 1.34748L10.2194 4.6717C9.79214 4.38621 9.3068 4.18081 8.78487 4.07697L9.5613 0.152272C9.05633 0.0523755 8.53428 0 8 0C7.46572 0 6.94367 0.0523755 6.4387 0.152272L7.21513 4.07697C6.6932 4.18082 6.20786 4.38621 5.78059 4.6717L3.55507 1.34748C2.68266 1.93154 1.93154 2.68266 1.34748 3.55508L4.6717 5.78059C4.38621 6.20786 4.18081 6.6932 4.07697 7.21513L0.152272 6.4387C0.0523755 6.94367 0 7.46572 0 8C0 8.53428 0.0523756 9.05633 0.152272 9.5613L4.07697 8.78487C4.18082 9.3068 4.38621 9.79214 4.6717 10.2194L1.34748 12.4449C1.93154 13.3173 2.68266 14.0685 3.55508 14.6525L5.78059 11.3283C6.20786 11.6138 6.6932 11.8192 7.21513 11.923L6.4387 15.8477C6.94367 15.9476 7.46572 16 8 16C8.53428 16 9.05633 15.9476 9.5613 15.8477L8.78487 11.923C9.3068 11.8192 9.79214 11.6138 10.2194 11.3283L12.4449 14.6525C13.3173 14.0685 14.0685 13.3173 14.6525 12.4449L11.3283 10.2194C11.6138 9.79214 11.8192 9.3068 11.923 8.78487ZM11.923 8.78487C11.9735 8.53108 12 8.26863 12 8C12 7.73137 11.9735 7.46892 11.923 7.21513L8.03733 7.98383L11.3283 5.78059C11.0353 5.34206 10.6579 4.9647 10.2194 4.6717L8.01617 7.96267L8.78487 4.07697C8.53108 4.02648 8.26863 4 8 4C7.73137 4 7.46892 4.02648 7.21513 4.07697L7.98383 7.96267L5.78059 4.6717C5.34206 4.9647 4.9647 5.34207 4.6717 5.78059L7.96267 7.98383L4.07697 7.21513C4.02648 7.46892 4 7.73137 4 8C4 8.26863 4.02648 8.53108 4.07697 8.78487L7.96267 8.01617L4.6717 10.2194C4.9647 10.6579 5.34207 11.0353 5.78059 11.3283L7.98383 8.03733L7.21513 11.923C7.46892 11.9735 7.73137 12 8 12C8.26863 12 8.53108 11.9735 8.78487 11.923L8.01617 8.03733L10.2194 11.3283C10.6579 11.0353 11.0353 10.6579 11.3283 10.2194L8.03733 8.01617L11.923 8.78487Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M10.9418 8.59077L15.8477 9.5613C15.9476 9.05633 16 8.53428 16 8C16 7.46572 15.9476 6.94367 15.8477 6.4387L10.9418 7.40923C10.98 7.60024 11 7.79778 11 8C11 8.20222 10.98 8.39977 10.9418 8.59077ZM10.4972 9.66303C10.277 9.99308 9.99308 10.277 9.66303 10.4972L12.4449 14.6525C13.3173 14.0685 14.0685 13.3173 14.6525 12.4449L10.4972 9.66303ZM8.59077 10.9418C8.39977 10.98 8.20222 11 8 11C7.79778 11 7.60024 10.98 7.40923 10.9418L6.4387 15.8477C6.94367 15.9476 7.46572 16 8 16C8.53428 16 9.05633 15.9476 9.5613 15.8477L8.59077 10.9418ZM6.33697 10.4972C6.00692 10.277 5.72299 9.99308 5.50276 9.66303L1.34748 12.4449C1.93154 13.3173 2.68266 14.0685 3.55508 14.6525L6.33697 10.4972ZM5.05815 8.59077C5.02001 8.39977 5 8.20222 5 8C5 7.79778 5.02001 7.60024 5.05815 7.40923L0.152272 6.4387C0.0523755 6.94367 0 7.46572 0 8C0 8.53428 0.0523756 9.05633 0.152272 9.5613L5.05815 8.59077ZM5.50276 6.33697C5.72299 6.00692 6.00692 5.72299 6.33697 5.50276L3.55507 1.34748C2.68266 1.93154 1.93154 2.68266 1.34748 3.55508L5.50276 6.33697ZM7.40923 5.05815C7.60024 5.02001 7.79778 5 8 5C8.20222 5 8.39977 5.02001 8.59077 5.05815L9.5613 0.152272C9.05633 0.0523755 8.53428 0 8 0C7.46572 0 6.94367 0.0523755 6.4387 0.152272L7.40923 5.05815ZM9.66303 5.50276L12.4449 1.34748C13.3173 1.93154 14.0685 2.68266 14.6525 3.55507L10.4972 6.33697C10.277 6.00692 9.99308 5.72299 9.66303 5.50276Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M6.65494 5.34506L8 4L9.34522 5.34522C9.85712 4.23711 10.3195 3.06813 10.3195 2.46119C10.3195 1.10191 9.28111 0 8.00012 0C6.71913 0 5.68069 1.10191 5.68069 2.46119C5.68069 3.0681 6.14307 4.237 6.65494 5.34506Z',
-    },
-    {
-      d: 'M6.48343 5.51657L4.20992 7.79008C3.35262 7.68776 2.58369 7.5356 2.20488 7.30932C1.06707 6.62968 0.66391 5.1483 1.3044 4.00056C1.9449 2.85282 3.3865 2.47335 4.52431 3.15299C5.04047 3.4613 5.80362 4.48739 6.48343 5.51657Z',
-    },
-    {
-      d: 'M4.20992 8.20992C3.35262 8.31224 2.58369 8.4644 2.20488 8.69068C1.06707 9.37032 0.66391 10.8517 1.3044 11.9994C1.9449 13.1472 3.3865 13.5267 4.52431 12.847C5.04047 12.5387 5.80362 11.5126 6.48343 10.4834L4.20992 8.20992Z',
-    },
-    {
-      d: 'M6.65494 10.6549C6.14307 11.763 5.68069 12.9319 5.68069 13.5388C5.68069 14.8981 6.71913 16 8.00012 16C9.28111 16 10.3195 14.8981 10.3195 13.5388C10.3195 12.9319 9.85712 11.7629 9.34522 10.6548L8 12L6.65494 10.6549Z',
-    },
-    {
-      d: 'M9.51659 10.4834C10.1964 11.5126 10.9595 12.5387 11.4757 12.847C12.6135 13.5266 14.0551 13.1472 14.6956 11.9994C15.3361 10.8517 14.9329 9.37029 13.7951 8.69065C13.4163 8.46437 12.6474 8.31221 11.7901 8.20989L9.51659 10.4834Z',
-    },
-    {
-      d: 'M11.7901 7.79011L9.5166 5.5166C10.1964 4.4874 10.9596 3.46132 11.4757 3.15301C12.6135 2.47337 14.0551 2.85285 14.6956 4.00059C15.3361 5.14833 14.9329 6.62971 13.7951 7.30935C13.4163 7.53563 12.6474 7.68779 11.7901 7.79011Z',
-    },
-    {
-      d: 'M8 6L10 8L8 10L6 8L8 6Z',
-    },
-  ],
-  [
-    {
-      d: 'M15.4055 4.96811C14.5941 2.98825 13.0118 1.40593 11.0319 0.5945C10.9114 0.68356 10.796 0.782639 10.6869 0.891746C10.2922 1.28636 9.86718 2.18783 9.47419 3.22087C9.00818 3.07729 8.51312 3 8 3C7.48688 3 6.99182 3.07729 6.52581 3.22087C6.13282 2.18783 5.70776 1.28636 5.31315 0.891746C5.20404 0.782638 5.08865 0.683558 4.96811 0.594498C2.98825 1.40593 1.40593 2.98825 0.594501 4.96812C0.68356 5.08865 0.78264 5.20404 0.891747 5.31315C1.28636 5.70776 2.18783 6.13282 3.22087 6.52581C3.07729 6.99182 3 7.48688 3 8C3 8.51312 3.07729 9.00818 3.22087 9.47419C2.18783 9.86718 1.28636 10.2922 0.891747 10.6869C0.782642 10.796 0.683564 10.9113 0.594506 11.0319C1.40594 13.0117 2.98825 14.5941 4.96812 15.4055C5.08866 15.3164 5.20404 15.2174 5.31315 15.1083C5.70776 14.7136 6.13282 13.8122 6.52581 12.7791C6.99182 12.9227 7.48688 13 8 13C8.51312 13 9.00818 12.9227 9.47419 12.7791C9.86718 13.8122 10.2922 14.7136 10.6869 15.1083C10.796 15.2174 10.9113 15.3164 11.0319 15.4055C13.0117 14.5941 14.5941 13.0117 15.4055 11.0319C15.3164 10.9113 15.2174 10.796 15.1083 10.6869C14.7136 10.2922 13.8122 9.86718 12.7791 9.47419C12.9227 9.00818 13 8.51312 13 8C13 7.48688 12.9227 6.99182 12.7791 6.52581C13.8122 6.13282 14.7136 5.70776 15.1083 5.31315C15.2174 5.20404 15.3164 5.08865 15.4055 4.96811ZM8 8C8 8 8.66996 5.33492 9.47419 3.22087C11.0501 3.70641 12.2936 4.94995 12.7791 6.52581C10.6651 7.33004 8 8 8 8ZM8 8C8 8 5.33492 8.66996 3.22087 9.47419C3.70641 11.0501 4.94995 12.2936 6.52581 12.7791C7.33004 10.6651 8 8 8 8ZM8 8C8 8 10.6651 8.66996 12.7791 9.47419C12.2936 11.0501 11.0501 12.2936 9.47419 12.7791C8.66996 10.6651 8 8 8 8ZM8 8C8 8 5.33492 7.33004 3.22087 6.52581C3.70641 4.94994 4.94995 3.7064 6.52581 3.22087C7.33004 5.33492 8 8 8 8Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M8 16C12.4183 16 16 12.4183 16 8C16 3.58172 12.4183 0 8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16ZM8 8C8 8 12.7852 6.79708 13.7592 5.82309C13.8476 5.73469 13.9278 5.64121 14 5.54355C13.3426 3.93944 12.0606 2.65743 10.4565 2C10.3588 2.07216 10.2653 2.15243 10.1769 2.24083C9.20292 3.21483 8 8 8 8ZM8 8C8 8 9.20292 12.7852 10.1769 13.7592C10.2653 13.8476 10.3588 13.9278 10.4565 14C12.0606 13.3426 13.3426 12.0606 14 10.4565C13.9278 10.3588 13.8476 10.2653 13.7592 10.1769C12.7852 9.20292 8 8 8 8ZM8 8C8 8 6.79708 12.7852 5.82309 13.7592C5.73469 13.8476 5.64121 13.9278 5.54355 14C3.93944 13.3426 2.65743 12.0606 2 10.4565C2.07216 10.3588 2.15243 10.2653 2.24083 10.1769C3.21483 9.20292 8 8 8 8ZM8 8C8 8 3.21483 6.79708 2.24083 5.82309C2.15243 5.73469 2.07216 5.6412 2 5.54354C2.65743 3.93944 3.93944 2.65743 5.54354 2C5.6412 2.07216 5.73469 2.15243 5.82309 2.24083C6.79708 3.21483 8 8 8 8Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M9.17157 1.17157C7.60948 2.73367 7.60948 5.26633 9.17157 6.82843C10.7337 8.39052 13.2663 8.39052 14.8284 6.82843C16.3905 5.26633 16.3905 2.73367 14.8284 1.17157C13.2663 -0.390524 10.7337 -0.390524 9.17157 1.17157Z',
-    },
-    {
-      d: 'M1.17157 14.8284C2.73367 16.3905 5.26633 16.3905 6.82843 14.8284C8.39052 13.2663 8.39052 10.7337 6.82843 9.17157C5.26633 7.60948 2.73367 7.60948 1.17157 9.17157C-0.390524 10.7337 -0.390524 13.2663 1.17157 14.8284Z',
-    },
-    {
-      d: 'M6.82843 1.17157C8.39052 2.73367 8.39052 5.26633 6.82843 6.82843C5.26633 8.39052 2.73367 8.39052 1.17157 6.82843C-0.390524 5.26633 -0.390524 2.73367 1.17157 1.17157C2.73367 -0.390524 5.26633 -0.390524 6.82843 1.17157Z',
-    },
-    {
-      d: 'M9.17157 14.8284C10.7337 16.3905 13.2663 16.3905 14.8284 14.8284C16.3905 13.2663 16.3905 10.7337 14.8284 9.17157C13.2663 7.60948 10.7337 7.60948 9.17157 9.17157C7.60948 10.7337 7.60948 13.2663 9.17157 14.8284Z',
-    },
-  ],
-  [
-    {
-      d: 'M13.6569 2.34313C12.0059 5.93367 12.0059 10.0663 13.6569 13.6568C10.0663 12.0058 5.93368 12.0058 2.34315 13.6568C3.99414 10.0663 3.99414 5.93367 2.34315 2.34313C5.93368 3.99413 10.0663 3.99413 13.6569 2.34313Z',
-    },
-  ],
-  [
-    {
-      d: 'M15.1083 5.31314C13.9061 6.5153 8 8 8 8C8 8 9.4847 2.09389 10.6869 0.891741C10.796 0.782636 10.9113 0.683558 11.0319 0.594499C13.0117 1.40593 14.5941 2.98825 15.4055 4.96812C15.3164 5.08865 15.2174 5.20404 15.1083 5.31314Z',
-    },
-    {
-      d: 'M15.4055 11.0319C15.3164 10.9113 15.2174 10.796 15.1083 10.6868C13.9061 9.48469 8 8 8 8C8 8 6.5153 2.09389 5.31315 0.891741C5.20404 0.782635 5.08866 0.683557 4.96812 0.594498C2.98825 1.40593 1.40593 2.98824 0.594501 4.96812C0.683561 5.08865 0.782639 5.20404 0.891746 5.31314C2.0939 6.5153 8 8 8 8C8 8 2.0939 9.48469 0.891746 10.6868C0.78264 10.796 0.683561 10.9113 0.594502 11.0319C1.40593 13.0117 2.98825 14.5941 4.96812 15.4055C5.08866 15.3164 5.20404 15.2174 5.31315 15.1082C6.5153 13.9061 8 8 8 8C8 8 9.4847 13.9061 10.6869 15.1082C10.796 15.2174 10.9113 15.3164 11.0319 15.4055C13.0117 14.5941 14.5941 13.0117 15.4055 11.0319Z',
-    },
-  ],
-  [
-    {
-      d: 'M8 0C8.33735 2.71168 11.5009 4.02205 13.6569 2.34315C11.9779 4.49913 13.2883 7.66266 16 8C13.2883 8.33735 11.9779 11.5009 13.6569 13.6569C11.5009 11.9779 8.33735 13.2883 8 16C7.66266 13.2883 4.49913 11.9779 2.34315 13.6569C4.02205 11.5009 2.71168 8.33735 0 8C2.71168 7.66266 4.02205 4.49913 2.34315 2.34315C4.49913 4.02205 7.66266 2.71168 8 0Z',
-    },
-  ],
-  [
-    {
-      d: 'M6.24244 4.40581C6.77293 4.14591 7.36943 4 8 4C8.63065 4 9.22722 4.14595 9.75776 4.40591C10.0814 3.6217 10.3195 2.89673 10.3195 2.46119C10.3195 1.10191 9.28111 0 8.00012 0C6.71913 0 5.68069 1.10191 5.68069 2.46119C5.68069 2.89671 5.9188 3.62164 6.24244 4.40581Z',
-    },
-    {
-      d: 'M5.86339 4.61784C4.80568 5.28742 4.08369 6.43949 4.00681 7.76466C3.23255 7.66304 2.55351 7.51757 2.20488 7.30932C1.06707 6.62968 0.66391 5.1483 1.3044 4.00056C1.9449 2.85282 3.3865 2.47335 4.52431 3.15299C4.88694 3.3696 5.37149 3.94049 5.86339 4.61784Z',
-    },
-    {
-      d: 'M4.00681 8.23534C3.23255 8.33696 2.5535 8.48244 2.20488 8.69068C1.06707 9.37032 0.66391 10.8517 1.3044 11.9994C1.9449 13.1472 3.3865 13.5267 4.52431 12.847C4.88694 12.6304 5.37149 12.0595 5.86339 11.3822C4.80568 10.7126 4.0837 9.56051 4.00681 8.23534Z',
-    },
-    {
-      d: 'M6.24244 11.5942C5.9188 12.3784 5.68069 13.1033 5.68069 13.5388C5.68069 14.8981 6.71913 16 8.00012 16C9.28111 16 10.3195 14.8981 10.3195 13.5388C10.3195 13.1033 10.0814 12.3783 9.75776 11.5941C9.22722 11.8541 8.63065 12 8 12C7.36943 12 6.77293 11.8541 6.24244 11.5942Z',
-    },
-    {
-      d: 'M10.1366 11.3821C10.6285 12.0595 11.1131 12.6304 11.4757 12.847C12.6135 13.5266 14.0551 13.1472 14.6956 11.9994C15.3361 10.8517 14.9329 9.37029 13.7951 8.69065C13.4465 8.4824 12.7675 8.33693 11.9932 8.23531C11.9163 9.56048 11.1943 10.7126 10.1366 11.3821Z',
-    },
-    {
-      d: 'M11.9932 7.76469C11.9163 6.43952 11.1943 5.28745 10.1366 4.61786C10.6285 3.94051 11.1131 3.36962 11.4757 3.15301C12.6135 2.47337 14.0551 2.85285 14.6956 4.00059C15.3361 5.14833 14.9329 6.62971 13.7951 7.30935C13.4465 7.5176 12.7675 7.66307 11.9932 7.76469Z',
-    },
-  ],
-  [
-    {
-      d: 'M8 0C9.37146 3.70632 12.2937 6.62854 16 8C12.2937 9.37146 9.37146 12.2937 8 16C6.62854 12.2937 3.70632 9.37146 0 8C3.70632 6.62854 6.62854 3.70632 8 0Z',
-    },
-  ],
-  [
-    {
-      d: 'M12 4C12 6.20914 10.2091 8 8 8C5.79086 8 4 6.20914 4 4C4 1.79086 5.79086 0 8 0C10.2091 0 12 1.79086 12 4Z',
-    },
-    {
-      d: 'M8 11C8 13.2091 6.20914 15 4 15C1.79086 15 0 13.2091 0 11C0 8.79086 1.79086 7 4 7C6.20914 7 8 8.79086 8 11Z',
-    },
-    {
-      d: 'M8 11C8 8.79086 9.79086 7 12 7C14.2091 7 16 8.79086 16 11C16 13.2091 14.2091 15 12 15C9.79086 15 8 13.2091 8 11Z',
-    },
-  ],
-  [
-    {
-      d: 'M8 16C12.4183 16 16 12.4183 16 8C16 3.58172 12.4183 0 8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16ZM5 4C4.44772 4 4 4.44772 4 5V11C4 11.5523 4.44772 12 5 12H11C11.5523 12 12 11.5523 12 11V5C12 4.44772 11.5523 4 11 4H5Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M8 16C12.4183 16 16 12.4183 16 8C16 3.58172 12.4183 0 8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16ZM12.7207 7.32562L8.67438 3.27934C8.30193 2.90689 7.69807 2.90689 7.32562 3.27934L3.27934 7.32562C2.90689 7.69807 2.90689 8.30193 3.27934 8.67438L7.32562 12.7207C7.69807 13.0931 8.30193 13.0931 8.67438 12.7207L12.7207 8.67438C13.0931 8.30193 13.0931 7.69807 12.7207 7.32562Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M10.3438 10.3438C10.9434 10.9431 11.7715 11.3137 12.6863 11.3137C14.5164 11.3137 16 9.83012 16 8.00001C16 6.1699 14.5164 4.6863 12.6863 4.6863C10.8562 4.6863 9.37259 6.1699 9.37259 8.00001C9.37259 8.91475 9.74323 9.74292 10.3425 10.3425C9.74292 9.74323 8.91475 9.37258 8 9.37258C7.08525 9.37258 6.25708 9.74323 5.65746 10.3425C6.25677 9.74292 6.62741 8.91475 6.62741 8.00001C6.62741 6.1699 5.14382 4.6863 3.31371 4.6863C1.4836 4.6863 -3.70335e-07 6.1699 0 8.00001C-4.9378e-07 9.83012 1.4836 11.3137 3.31371 11.3137C4.22845 11.3137 5.05663 10.9431 5.65625 10.3438C5.05695 10.9434 4.68629 11.7715 4.68629 12.6863C4.68629 14.5164 6.16989 16 8 16C9.83011 16 11.3137 14.5164 11.3137 12.6863C11.3137 11.7715 10.9431 10.9434 10.3438 10.3438Z',
-    },
-    {
-      d: 'M8 6.62742C6.16989 6.62742 4.68629 5.14382 4.68629 3.31371C4.68629 1.4836 6.16989 -7.40671e-08 8 0C9.83011 -7.40671e-08 11.3137 1.4836 11.3137 3.31371C11.3137 5.14382 9.83011 6.62742 8 6.62742Z',
-    },
-  ],
-  [
-    {
-      d: 'M13.6569 2.34315C11.5009 4.02205 8.33735 2.71168 8 0C7.66266 2.71168 4.49913 4.02205 2.34315 2.34315C4.02205 4.49913 2.71168 7.66266 0 8C2.71168 8.33735 4.02205 11.5009 2.34315 13.6569C4.49913 11.9779 7.66266 13.2883 8 16C8.33735 13.2883 11.5009 11.9779 13.6569 13.6569C11.9779 11.5009 13.2883 8.33735 16 8C13.2883 7.66266 11.9779 4.49913 13.6569 2.34315ZM8 11C9.65685 11 11 9.65685 11 8C11 6.34315 9.65685 5 8 5C6.34315 5 5 6.34315 5 8C5 9.65685 6.34315 11 8 11Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M11.9916 2.34459C12.451 1.88514 13.1959 1.88514 13.6554 2.34459C14.1149 2.80405 14.1149 3.54899 13.6554 4.00845L11.1596 6.50422C10.7002 6.96368 9.95524 6.96368 9.49578 6.50422C9.03632 6.04476 9.03632 5.29983 9.49578 4.84037L11.9916 2.34459Z',
-    },
-    {
-      d: 'M4.84037 9.49578C5.29983 9.03632 6.04476 9.03632 6.50422 9.49578C6.96368 9.95524 6.96368 10.7002 6.50422 11.1596L4.00845 13.6554C3.54899 14.1149 2.80405 14.1149 2.3446 13.6554C1.88514 13.1959 1.88514 12.451 2.3446 11.9916L4.84037 9.49578Z',
-    },
-    {
-      d: 'M13.6554 11.9916C14.1149 12.451 14.1149 13.1959 13.6554 13.6554C13.1959 14.1149 12.451 14.1149 11.9916 13.6554L9.49578 11.1596C9.03632 10.7002 9.03632 9.95524 9.49578 9.49578C9.95524 9.03632 10.7002 9.03632 11.1596 9.49578L13.6554 11.9916Z',
-    },
-    {
-      d: 'M6.50422 4.84037C6.96368 5.29983 6.96368 6.04476 6.50422 6.50422C6.04476 6.96368 5.29983 6.96368 4.84037 6.50422L2.34459 4.00845C1.88513 3.54899 1.88514 2.80405 2.3446 2.34459C2.80405 1.88513 3.54899 1.88514 4.00845 2.34459L6.50422 4.84037Z',
-    },
-  ],
-  [
-    {
-      d: 'M15 2C15 5.86599 11.866 9 8 9C4.13401 9 1 5.86599 1 2H4.5C6.433 2 8 3.567 8 5.5C8 3.567 9.567 2 11.5 2H15Z',
-    },
-    {
-      d: 'M1 9C1 12.866 4.13401 16 8 16C11.866 16 15 12.866 15 9H11.5C9.567 9 8 10.567 8 12.5C8 10.567 6.433 9 4.5 9H1Z',
-    },
-  ],
-  [
-    {
-      d: 'M7.99948 0C6.89491 7.11679e-05 5.99954 0.895559 5.99961 2.00013C5.99968 3.1047 6.8957 4.00007 8.00027 4C9.10484 4.00007 10.0003 3.1047 10.0004 2.00013C10.0005 0.895559 9.1051 7.11679e-05 8.00053 0H7.99948Z',
-    },
-    {
-      d: 'M4.00001 7.99973C4.00008 6.89516 3.10471 5.99968 2.00014 5.9996C0.895567 5.99953 7.87973e-05 6.89491 7.62939e-06 7.99948V8.00052C7.87973e-05 9.10509 0.895567 10.0005 2.00014 10.0004C3.10471 10.0003 4.00008 9.1043 4.00001 7.99973Z',
-    },
-    {
-      d: 'M16 7.99948C15.9999 6.89491 15.1044 5.99953 13.9999 5.99961C12.8953 5.99968 11.9999 6.8957 12 8.00027C11.9999 9.10484 12.8953 10.0003 13.9999 10.0004C15.1044 10.0005 15.9999 9.10509 16 8.00052V7.99948Z',
-    },
-    {
-      d: 'M7.99974 12C6.89517 11.9999 5.99968 12.8953 5.99961 13.9999C5.99954 15.1044 6.89491 15.9999 7.99948 16H8.00053C9.1051 15.9999 10.0005 15.1044 10.0004 13.9999C10.0003 12.8953 9.10431 11.9999 7.99974 12Z',
-    },
-    {
-      d: 'M8.00001 11C9.65686 11 11 9.65685 11 8C11 6.34315 9.65686 5 8.00001 5C6.34315 5 5.00001 6.34315 5.00001 8C5.00001 9.65685 6.34315 11 8.00001 11Z',
-    },
-  ],
-  [
-    {
-      d: 'M13.6569 2.34315C11.5009 4.02205 8.33735 2.71168 8 0C7.66266 2.71168 4.49913 4.02205 2.34315 2.34315C4.02205 4.49913 2.71168 7.66266 0 8C2.71168 8.33735 4.02205 11.5009 2.34315 13.6569C4.49913 11.9779 7.66266 13.2883 8 16C8.33735 13.2883 11.5009 11.9779 13.6569 13.6569C11.9779 11.5009 13.2883 8.33735 16 8C13.2883 7.66266 11.9779 4.49913 13.6569 2.34315ZM12 8L8 4L4 8L8 12L12 8Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8Z',
-    },
-  ],
-  [
-    {
-      d: 'M13.6569 13.6568C12.0059 10.0663 12.0059 5.93368 13.6569 2.34314C10.0663 3.99414 5.93368 3.99414 2.34315 2.34314C3.99414 5.93368 3.99414 10.0663 2.34315 13.6568C5.93368 12.0059 10.0663 12.0059 13.6569 13.6568ZM11 8L8 5L5 8L8 11L11 8Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M7.99948 0C6.89491 7.11679e-05 5.99954 0.895559 5.99961 2.00013C5.99968 3.1047 6.8957 4.00007 8.00027 4C9.10484 4.00007 10.0003 3.1047 10.0004 2.00013C10.0005 0.895559 9.1051 7.11679e-05 8.00053 0H7.99948Z',
-    },
-    {
-      d: 'M13.6565 2.34278C12.8754 1.56178 11.6091 1.56186 10.8281 2.34296C10.0471 3.12406 10.0475 4.39076 10.8286 5.17176C11.6096 5.95286 12.8759 5.95294 13.657 5.17194C14.4381 4.39094 14.4382 3.12461 13.6572 2.34352L13.6565 2.34278Z',
-    },
-    {
-      d: 'M5.17177 5.17139C5.95287 4.39039 5.95295 3.12406 5.17195 2.34296C4.39095 1.56186 3.12462 1.56178 2.34352 2.34278L2.34278 2.34352C1.56179 3.12462 1.56187 4.39094 2.34297 5.17194C3.12407 5.95294 4.39077 5.95249 5.17177 5.17139Z',
-    },
-    {
-      d: 'M4.00001 7.99973C4.00008 6.89516 3.10471 5.99968 2.00014 5.9996C0.895567 5.99953 7.87973e-05 6.89491 7.62939e-06 7.99948V8.00052C7.87973e-05 9.10509 0.895567 10.0005 2.00014 10.0004C3.10471 10.0003 4.00008 9.1043 4.00001 7.99973Z',
-    },
-    {
-      d: 'M16 7.99948C15.9999 6.89491 15.1044 5.99953 13.9999 5.99961C12.8953 5.99968 11.9999 6.8957 12 8.00027C11.9999 9.10484 12.8953 10.0003 13.9999 10.0004C15.1044 10.0005 15.9999 9.10509 16 8.00052V7.99948Z',
-    },
-    {
-      d: 'M5.1714 10.8282C4.3904 10.0471 3.12407 10.0471 2.34297 10.8281C1.56187 11.6091 1.56179 12.8754 2.34278 13.6565L2.34352 13.6572C3.12462 14.4382 4.39095 14.4381 5.17195 13.657C5.95295 12.8759 5.95249 11.6092 5.1714 10.8282Z',
-    },
-    {
-      d: 'M13.6572 13.6565C14.4382 12.8754 14.4381 11.6091 13.657 10.8281C12.8759 10.0471 11.6092 10.0475 10.8282 10.8286C10.0471 11.6096 10.0471 12.8759 10.8281 13.657C11.6091 14.4381 12.8754 14.4382 13.6565 13.6572L13.6572 13.6565Z',
-    },
-    {
-      d: 'M7.99974 12C6.89517 11.9999 5.99968 12.8953 5.99961 13.9999C5.99954 15.1044 6.89491 15.9999 7.99948 16H8.00053C9.1051 15.9999 10.0005 15.1044 10.0004 13.9999C10.0003 12.8953 9.10431 11.9999 7.99974 12Z',
-    },
-    {
-      d: 'M8.00001 11C9.65686 11 11 9.65685 11 8C11 6.34315 9.65686 5 8.00001 5C6.34315 5 5.00001 6.34315 5.00001 8C5.00001 9.65685 6.34315 11 8.00001 11Z',
-    },
-  ],
-  [
-    {
-      d: 'M8 8C8 8 13.1678 6.70089 14.2197 5.649C15.2716 4.59712 15.2583 2.87836 14.19 1.81004C13.1216 0.741719 11.4029 0.728395 10.351 1.78028C9.29911 2.83216 8 8 8 8Z',
-    },
-    {
-      d: 'M8 8C8 8 13.1678 9.29911 14.2197 10.351C15.2716 11.4029 15.2583 13.1216 14.19 14.19C13.1216 15.2583 11.4029 15.2716 10.351 14.2197C9.29911 13.1678 8 8 8 8Z',
-    },
-    {
-      d: 'M1.78028 10.351C2.83216 9.29911 8 8 8 8C8 8 6.70089 13.1678 5.649 14.2197C4.59712 15.2716 2.87836 15.2583 1.81004 14.19C0.741719 13.1216 0.728395 11.4029 1.78028 10.351Z',
-    },
-    {
-      d: 'M8 8C8 8 2.83216 6.70089 1.78028 5.649C0.728395 4.59712 0.741719 2.87836 1.81004 1.81004C2.87836 0.741719 4.59712 0.728395 5.649 1.78028C6.70089 2.83216 8 8 8 8Z',
-    },
-  ],
-  [
-    {
-      d: 'M8 16C12.4183 16 16 12.4183 16 8C16 3.58172 12.4183 0 8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16ZM8 13C10.7614 13 13 10.7614 13 8C13 5.23858 10.7614 3 8 3C5.23858 3 3 5.23858 3 8C3 10.7614 5.23858 13 8 13Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M13.6569 13.6568C12.0059 10.0663 12.0059 5.93368 13.6569 2.34314C10.0663 3.99414 5.93368 3.99414 2.34315 2.34314C3.99414 5.93368 3.99414 10.0663 2.34315 13.6568C5.93368 12.0059 10.0663 12.0059 13.6569 13.6568ZM8 11C9.65685 11 11 9.65686 11 8.00001C11 6.34315 9.65685 5.00001 8 5.00001C6.34315 5.00001 5 6.34315 5 8.00001C5 9.65686 6.34315 11 8 11Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M5.34749 1.59629C5.85108 0.646843 6.8496 0.000111103 7.99922 0H8.00078C9.1504 0.000111103 10.1489 0.646843 10.6525 1.59628C11.68 1.28102 12.8433 1.52977 13.6563 2.34259L13.6574 2.3437C14.4702 3.15668 14.719 4.32005 14.4037 5.34749C15.3532 5.85108 15.9999 6.8496 16 7.99922V8.00078C15.9999 9.1504 15.3532 10.1489 14.4037 10.6525C14.719 11.68 14.4702 12.8433 13.6574 13.6563L13.6563 13.6574C12.8433 14.4702 11.68 14.719 10.6525 14.4037C10.1489 15.3532 9.1504 15.9999 8.00078 16H7.99922C6.8496 15.9999 5.85108 15.3532 5.3475 14.4037C4.32005 14.719 3.15668 14.4702 2.3437 13.6574L2.34259 13.6563C1.52977 12.8433 1.28102 11.68 1.59629 10.6525C0.646843 10.1489 0.000111103 9.1504 0 8.00078V7.99922C0.000111103 6.8496 0.646843 5.85108 1.59628 5.34749C1.28102 4.32005 1.52977 3.15668 2.34259 2.3437L2.3437 2.34259C3.15668 1.52977 4.32005 1.28102 5.34749 1.59629ZM7.11693 5.86807C6.98022 6.12611 6.80322 6.3684 6.58593 6.58565C6.36868 6.80294 6.12611 6.98022 5.86807 7.11693C5.95387 7.39605 6.00003 7.69253 6 7.9998C6.00003 8.30706 5.95387 8.60395 5.86807 8.88307C6.12611 9.01978 6.3684 9.19678 6.58565 9.41407C6.80294 9.63132 6.98022 9.87389 7.11693 10.1319C7.39605 10.0461 7.69253 9.99997 7.9998 10C8.30706 9.99997 8.60394 10.0461 8.88307 10.1319C9.01978 9.87389 9.19678 9.6316 9.41407 9.41435C9.63132 9.19706 9.87389 9.01978 10.1319 8.88307C10.0461 8.60395 9.99997 8.30747 10 8.0002C9.99997 7.69294 10.0461 7.39605 10.1319 7.11693C9.87389 6.98022 9.6316 6.80322 9.41435 6.58593C9.19706 6.36868 9.01978 6.12611 8.88307 5.86807C8.60395 5.95387 8.30747 6.00003 8.0002 6C7.69294 6.00003 7.39605 5.95387 7.11693 5.86807Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M12.6045 11.8471C13.4757 10.8056 14 9.46402 14 8C14 6.53598 13.4756 5.19442 12.6045 4.15289L13.6832 2.76772C13.9157 2.46917 13.5308 2.08434 13.2323 2.31683L11.8471 3.39548C10.8056 2.52434 9.46402 2 8 2C6.53598 2 5.19443 2.52434 4.1529 3.39548L2.76773 2.31682C2.46918 2.08434 2.08435 2.46917 2.31684 2.76772L3.39549 4.15289C2.52435 5.19442 2 6.53598 2 8C2 9.46402 2.52435 10.8056 3.39548 11.8471L2.31684 13.2323C2.08435 13.5308 2.46918 13.9156 2.76773 13.6832L4.15289 12.6045C5.19442 13.4756 6.53598 14 8 14C9.46402 14 10.8056 13.4756 11.8471 12.6045L13.2323 13.6832C13.5308 13.9156 13.9156 13.5308 13.6832 13.2323L12.6045 11.8471ZM12.6045 11.8471L10.3747 8.9836L12.89 8.31882C13.2654 8.2721 13.2654 7.72787 12.8899 7.68116L10.3747 7.01637L12.6045 4.15289C12.375 3.87852 12.1215 3.62497 11.8471 3.39548L8.98361 5.62533L8.31883 3.11004C8.27212 2.73454 7.72788 2.73454 7.68117 3.11004L7.01639 5.62533L4.1529 3.39548C3.87853 3.62497 3.62498 3.87852 3.39549 4.15289L5.62535 7.01637L3.11005 7.68116C2.73455 7.72787 2.73455 8.27211 3.11005 8.31882L5.62535 8.9836L3.39548 11.8471C3.62497 12.1215 3.87852 12.375 4.15289 12.6045L7.01639 10.3746L7.68117 12.8899C7.72788 13.2654 8.27212 13.2654 8.31883 12.8899L8.98361 10.3746L11.8471 12.6045C12.1215 12.375 12.375 12.1215 12.6045 11.8471Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M8.53781 0.379548C8.35784 -0.126516 7.64216 -0.126516 7.4622 0.379548L6.25252 3.78121L2.99181 2.23124C2.50672 2.00065 2.00065 2.50672 2.23124 2.99181L3.78121 6.25252L0.379548 7.4622C-0.126516 7.64216 -0.126516 8.35784 0.379548 8.53781L3.78121 9.74748L2.23124 13.0082C2.00065 13.4933 2.50672 13.9993 2.99181 13.7688L6.25252 12.2188L7.4622 15.6205C7.64216 16.1265 8.35784 16.1265 8.53781 15.6205L9.74748 12.2188L13.0082 13.7688C13.4933 13.9993 13.9993 13.4933 13.7688 13.0082L12.2188 9.74748L15.6205 8.53781C16.1265 8.35784 16.1265 7.64216 15.6205 7.4622L12.2188 6.25252L13.7688 2.99181C13.9993 2.50672 13.4933 2.00065 13.0082 2.23124L9.74748 3.78121L8.53781 0.379548ZM7.99994 10.9999C9.65679 10.9999 10.9999 9.65679 10.9999 7.99994C10.9999 6.34308 9.65679 4.99994 7.99994 4.99994C6.34308 4.99994 4.99994 6.34308 4.99994 7.99994C4.99994 9.65679 6.34308 10.9999 7.99994 10.9999Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M7.4622 0.379548C7.64216 -0.126516 8.35784 -0.126516 8.53781 0.379548L9.74748 3.78121L13.0082 2.23124C13.4933 2.00065 13.9993 2.50672 13.7688 2.99181L12.2188 6.25252L15.6205 7.4622C16.1265 7.64216 16.1265 8.35784 15.6205 8.53781L12.2188 9.74748L13.7688 13.0082C13.9993 13.4933 13.4933 13.9993 13.0082 13.7688L9.74748 12.2188L8.53781 15.6205C8.35784 16.1265 7.64216 16.1265 7.4622 15.6205L6.25252 12.2188L2.99181 13.7688C2.50672 13.9993 2.00065 13.4933 2.23124 13.0082L3.78121 9.74748L0.379548 8.53781C-0.126516 8.35784 -0.126516 7.64216 0.379548 7.4622L3.78121 6.25252L2.23124 2.99181C2.00065 2.50672 2.50672 2.00065 2.99181 2.23124L6.25252 3.78121L7.4622 0.379548Z',
-    },
-  ],
-  [
-    {
-      d: 'M4.4 2C3.07452 2 2 3.07452 2 4.4V11.6C2 12.9255 3.07452 14 4.4 14H11.6C12.9255 14 14 12.9255 14 11.6V4.4C14 3.07452 12.9255 2 11.6 2H4.4ZM8.70711 4.70711C8.31658 4.31658 7.68342 4.31658 7.29289 4.70711L4.70711 7.29289C4.31658 7.68342 4.31658 8.31658 4.70711 8.70711L7.29289 11.2929C7.68342 11.6834 8.31658 11.6834 8.70711 11.2929L11.2929 8.70711C11.6834 8.31658 11.6834 7.68342 11.2929 7.29289L8.70711 4.70711Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M15 1C11.134 1 8 4.13401 8 8H15V1Z',
-    },
-    {
-      d: 'M1 15C4.86599 15 8 11.866 8 8H1V15Z',
-    },
-    {
-      d: 'M15 15C15 11.134 11.866 8 8 8L8 15H15Z',
-    },
-    {
-      d: 'M1 1C1 4.86599 4.13401 8 8 8V1L1 1Z',
-    },
-  ],
-  [
-    {
-      d: 'M8.31883 0.281623C8.27212 -0.0938759 7.72788 -0.0938737 7.68117 0.281626L7.46446 2.02358C4.57807 2.27888 2.27889 4.57807 2.02358 7.46446L0.281623 7.68117C-0.0938759 7.72788 -0.0938737 8.27212 0.281626 8.31883L2.02358 8.53554C2.27889 11.4219 4.57807 13.7211 7.46446 13.9764L7.68117 15.7184C7.72788 16.0939 8.27212 16.0939 8.31883 15.7184L8.53554 13.9764C11.4219 13.7211 13.7211 11.4219 13.9764 8.53554L15.7184 8.31883C16.0939 8.27212 16.0939 7.72788 15.7184 7.68117L13.9764 7.46446C13.7211 4.57806 11.4219 2.27888 8.53554 2.02357L8.31883 0.281623ZM8.53554 2.02357C8.35911 2.00797 8.18049 2 8.00001 2C7.81952 2 7.64089 2.00797 7.46446 2.02358L7.01639 5.62535L4.76773 4.31684C4.46918 4.08435 4.08435 4.46918 4.31684 4.76773L5.62535 7.01639L2.02358 7.46446C2.00798 7.64089 2.00001 7.81951 2.00001 8C2.00001 8.18048 2.00798 8.35911 2.02358 8.53554L5.62535 8.98361L4.31684 11.2323C4.08435 11.5308 4.46918 11.9157 4.76773 11.6832L7.01639 10.3747L7.46446 13.9764C7.64089 13.992 7.81952 14 8.00001 14C8.18049 14 8.35911 13.992 8.53554 13.9764L8.98361 10.3747L11.2323 11.6832C11.5308 11.9157 11.9157 11.5308 11.6832 11.2323L10.3747 8.98361L13.9764 8.53554C13.992 8.35911 14 8.18048 14 8C14 7.81952 13.992 7.64089 13.9764 7.46446L10.3747 7.01639L11.6832 4.76773C11.9157 4.46918 11.5308 4.08435 11.2323 4.31684L8.98361 5.62535L8.53554 2.02357Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M2.34315 2.34315C5.46734 -0.781049 10.5327 -0.781049 13.6569 2.34315L10 6L8.70711 4.70711C8.31658 4.31658 7.68342 4.31658 7.2929 4.70711L6 6L2.34315 2.34315ZM8 8L6 6L4.70711 7.29289C4.31658 7.68342 4.31658 8.31658 4.70711 8.70711L6 10L2.34315 13.6569C5.46734 16.781 10.5327 16.781 13.6569 13.6569L10 10L11.2929 8.70711C11.6834 8.31658 11.6834 7.68342 11.2929 7.29289L10 6L8 8ZM8 8L10 10L8.70711 11.2929C8.31658 11.6834 7.68342 11.6834 7.2929 11.2929L6 10L8 8Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M8.53781 0.379548C8.35784 -0.126516 7.64216 -0.126516 7.4622 0.379548L6.25252 3.78121L2.99181 2.23124C2.50672 2.00065 2.00065 2.50672 2.23124 2.99181L3.78121 6.25252L0.379548 7.4622C-0.126516 7.64216 -0.126516 8.35784 0.379548 8.53781L3.78121 9.74748L2.23124 13.0082C2.00065 13.4933 2.50672 13.9993 2.99181 13.7688L6.25252 12.2188L7.4622 15.6205C7.64216 16.1265 8.35784 16.1265 8.53781 15.6205L9.74748 12.2188L13.0082 13.7688C13.4933 13.9993 13.9993 13.4933 13.7688 13.0082L12.2188 9.74748L15.6205 8.53781C16.1265 8.35784 16.1265 7.64216 15.6205 7.4622L12.2188 6.25252L13.7688 2.99181C13.9993 2.50672 13.4933 2.00065 13.0082 2.23124L9.74748 3.78121L8.53781 0.379548ZM10.9999 7.99994L7.99994 4.99994L4.99994 7.99994L7.99994 10.9999L10.9999 7.99994Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M2.34315 2.34315C5.46734 -0.781049 10.5327 -0.781049 13.6569 2.34315L10.8284 5.17157C10.1046 4.44772 9.10457 4 8 4C6.89543 4 5.89543 4.44772 5.17157 5.17157L2.34315 2.34315ZM8 8L5.17157 5.17157C4.44772 5.89543 4 6.89543 4 8C4 9.10457 4.44772 10.1046 5.17157 10.8284L2.34315 13.6569C5.46734 16.781 10.5327 16.781 13.6569 13.6569L10.8284 10.8284C11.5523 10.1046 12 9.10457 12 8C12 6.89543 11.5523 5.89543 10.8284 5.17157L8 8ZM8 8L10.8284 10.8284C10.1046 11.5523 9.10457 12 8 12C6.89543 12 5.89543 11.5523 5.17157 10.8284L8 8Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M8.31882 0.281623C8.27211 -0.0938759 7.72788 -0.0938737 7.68116 0.281626L7.34298 2.99999H3V7.34299L0.281616 7.68117C-0.0938835 7.72788 -0.0938814 8.27212 0.281618 8.31883L3 8.65701V13H7.34298L7.68116 15.7184C7.72788 16.0939 8.27211 16.0939 8.31882 15.7184L8.657 13H13V8.65701L15.7184 8.31883C16.0939 8.27212 16.0939 7.72788 15.7184 7.68117L13 7.34299V2.99999H8.657L8.31882 0.281623ZM8.657 2.99999H7.34298L7.01638 5.62535L4.76772 4.31684C4.46917 4.08435 4.08434 4.46918 4.31683 4.76773L5.62534 7.01639L3 7.34299V8.65701L5.62534 8.98361L4.31683 11.2323C4.08434 11.5308 4.46917 11.9157 4.76772 11.6832L7.01638 10.3747L7.34298 13H8.657L8.98361 10.3747L11.2323 11.6832C11.5308 11.9157 11.9156 11.5308 11.6832 11.2323L10.3746 8.98361L13 8.65701V7.34299L10.3746 7.01639L11.6832 4.76773C11.9156 4.46918 11.5308 4.08435 11.2323 4.31684L8.98361 5.62535L8.657 2.99999Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M4.4 2C3.07452 2 2 3.07452 2 4.4V11.6C2 12.9255 3.07452 14 4.4 14H11.6C12.9255 14 14 12.9255 14 11.6V4.4C14 3.07452 12.9255 2 11.6 2H4.4ZM8 11C9.65685 11 11 9.65685 11 8C11 6.34315 9.65685 5 8 5C6.34315 5 5 6.34315 5 8C5 9.65685 6.34315 11 8 11Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M8 13C10.7614 13 13 10.7614 13 8C13 5.23858 10.7614 3 8 3C5.23858 3 3 5.23858 3 8C3 10.7614 5.23858 13 8 13ZM8 16C12.4183 16 16 12.4183 16 8C16 3.58172 12.4183 0 8 0C3.58172 0 0 3.58172 0 8C0 12.4183 3.58172 16 8 16Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-    {
-      d: 'M11 8C11 9.65685 9.65685 11 8 11C6.34315 11 5 9.65685 5 8C5 6.34315 6.34315 5 8 5C9.65685 5 11 6.34315 11 8Z',
-    },
-  ],
-  [
-    {
-      d: 'M2 3C5.31371 3 8 5.68629 8 9C8 5.68629 10.6863 3 14 3L14 9C14 12.3137 11.3137 15 8 15C4.68629 15 2 12.3137 2 9V3Z',
-    },
-  ],
-  [
-    {
-      d: 'M7.46226 0.379609C7.64222 -0.126455 8.3579 -0.126455 8.53787 0.379609L9.74754 3.78127L13.0082 2.2313C13.4933 2.00071 13.9994 2.50678 13.7688 2.99187L12.2189 6.25258L15.6205 7.46226C16.1266 7.64222 16.1266 8.3579 15.6205 8.53787L12.2189 9.74754L13.7688 13.0082C13.9994 13.4933 13.4933 13.9994 13.0082 13.7688L9.74754 12.2189L8.53787 15.6205C8.3579 16.1266 7.64222 16.1266 7.46226 15.6205L6.25258 12.2189L2.99187 13.7688C2.50678 13.9994 2.00071 13.4933 2.2313 13.0082L3.78127 9.74754L0.379609 8.53787C-0.126455 8.3579 -0.126455 7.64222 0.379609 7.46226L3.78127 6.25258L2.2313 2.99187C2.00071 2.50678 2.50678 2.00071 2.99187 2.2313L6.25258 3.78127L7.46226 0.379609Z',
-    },
-  ],
-  [
-    {
-      d: 'M8 10C9.10457 10 10 9.10457 10 8C10 6.89543 9.10457 6 8 6C6.89543 6 6 6.89543 6 8C6 9.10457 6.89543 10 8 10Z',
-    },
-    {
-      d: 'M16 8C16 12.4183 12.4183 16 8 16C3.58172 16 0 12.4183 0 8C0 3.58172 3.58172 0 8 0C12.4183 0 16 3.58172 16 8ZM8.67438 3.27934L12.7207 7.32562C13.0931 7.69807 13.0931 8.30193 12.7207 8.67438L8.67438 12.7207C8.30193 13.0931 7.69807 13.0931 7.32562 12.7207L3.27934 8.67438C2.90689 8.30193 2.90689 7.69807 3.27934 7.32562L7.32562 3.27934C7.69807 2.90689 8.30193 2.90689 8.67438 3.27934Z',
-      fillRule: 'evenodd',
-      clipRule: 'evenodd',
-    },
-  ],
-  [
-    {
-      d: 'M13.2323 2.31683C13.5308 2.08434 13.9156 2.46917 13.6832 2.76772L10.3747 7.01637L12.8899 7.68116C13.2654 7.72787 13.2654 8.2721 12.89 8.31882L10.3747 8.9836L13.6832 13.2323C13.9156 13.5308 13.5308 13.9156 13.2323 13.6832L8.98361 10.3746L8.31883 12.8899C8.27212 13.2654 7.72788 13.2654 7.68117 12.8899L7.01639 10.3746L2.76773 13.6832C2.46918 13.9156 2.08435 13.5308 2.31684 13.2323L5.62535 8.9836L3.11005 8.31882C2.73455 8.27211 2.73455 7.72787 3.11005 7.68116L5.62535 7.01637L2.31684 2.76772C2.08435 2.46917 2.46918 2.08434 2.76773 2.31682L7.01639 5.62533L7.68117 3.11004C7.72788 2.73454 8.27212 2.73454 8.31883 3.11004L8.98361 5.62533L13.2323 2.31683Z',
-    },
-  ],
-  [
-    {
-      d: 'M7.68116 0.281626C7.72788 -0.0938737 8.27211 -0.0938759 8.31882 0.281623L8.98361 5.62535L11.2323 4.31684C11.5308 4.08435 11.9156 4.46918 11.6832 4.76773L10.3746 7.01639L15.7184 7.68117C16.0939 7.72788 16.0939 8.27212 15.7184 8.31883L10.3746 8.98361L11.6832 11.2323C11.9156 11.5308 11.5308 11.9157 11.2323 11.6832L8.98361 10.3747L8.31882 15.7184C8.27211 16.0939 7.72788 16.0939 7.68116 15.7184L7.01638 10.3747L4.76772 11.6832C4.46917 11.9157 4.08434 11.5308 4.31683 11.2323L5.62534 8.98361L0.281618 8.31883C-0.0938814 8.27212 -0.0938835 7.72788 0.281616 7.68117L5.62534 7.01639L4.31683 4.76773C4.08434 4.46918 4.46917 4.08435 4.76772 4.31684L7.01638 5.62535L7.68116 0.281626Z',
-    },
-  ],
-  [
-    {
-      d: 'M14 13C10.6863 13 8 10.3137 8 7C8 10.3137 5.31371 13 2 13L2 7C2 3.68629 4.68629 0.999999 8 1C11.3137 0.999999 14 3.68629 14 7L14 13Z',
-    },
-  ],
-]
diff --git a/packages/ui/src/components/Unicon/index.tsx b/packages/ui/src/components/Unicon/index.tsx
index 84732e8b23b..dd18e0b092e 100644
--- a/packages/ui/src/components/Unicon/index.tsx
+++ b/packages/ui/src/components/Unicon/index.tsx
@@ -153,8 +153,6 @@ interface Props {
   randomSeed?: number
   border?: boolean
   mobile?: boolean
-  showBorder?: boolean
-  backgroundColor?: string
 }
 
 function _Unicon({ address, size = 24, randomSeed = 0, mobile }: Props): JSX.Element | null {
diff --git a/packages/ui/src/components/Unicon/index.web.tsx b/packages/ui/src/components/Unicon/index.web.tsx
deleted file mode 100644
index 76cb9e50b1f..00000000000
--- a/packages/ui/src/components/Unicon/index.web.tsx
+++ /dev/null
@@ -1,195 +0,0 @@
-//TODO (EXT-63): this is mostly copy and paste from interface. Can it be used by the interface as well?
-
-import React, { memo, useMemo } from 'react'
-
-import {
-  blurs,
-  UniconAttributeData,
-  UniconAttributes,
-  UniconAttributesToIndices,
-} from './types.web'
-import { deriveUniconAttributeIndices, getUniconAttributeData, isEthAddress } from './utils.web'
-
-const ORIGINAL_CONTAINER_SIZE = 36
-const EMBLEM_XY_SHIFT = 10
-
-function PathMask({
-  id,
-  paths,
-  scale,
-  shift = 0,
-}: {
-  id: string
-  paths: React.SVGProps<SVGPathElement>[]
-  scale: number
-  shift?: number
-}): JSX.Element {
-  return (
-    <mask id={id}>
-      <rect fill="white" height="100%" width="100%" x="0" y="0" />
-      <g transform={`scale(${scale}) \n translate(${shift}, ${shift})`}>
-        {paths.map((pathProps) => (
-          <path key={pathProps.d as string} {...pathProps} fill="black" />
-        ))}
-      </g>
-    </mask>
-  )
-}
-
-type UniconMaskProps = {
-  maskId: string
-  attributeData: UniconAttributeData
-  size: number
-}
-function UniconMask({ maskId, attributeData, size }: UniconMaskProps): JSX.Element {
-  const shapeMaskId = `shape-${maskId}`
-  const containerMaskId = `container-${maskId}`
-
-  return (
-    <defs>
-      <PathMask
-        id={containerMaskId}
-        paths={attributeData[UniconAttributes.Container]}
-        scale={size / ORIGINAL_CONTAINER_SIZE}
-      />
-      <PathMask
-        id={shapeMaskId}
-        paths={attributeData[UniconAttributes.Shape]}
-        scale={size / ORIGINAL_CONTAINER_SIZE}
-        shift={EMBLEM_XY_SHIFT}
-      />
-      <mask id={maskId}>
-        <g fill="white">
-          <g mask={`url(#${shapeMaskId})`}>
-            <g transform={`scale(${size / ORIGINAL_CONTAINER_SIZE})`}>
-              {attributeData[UniconAttributes.Container].map((pathProps) => (
-                <path key={pathProps.d as string} {...pathProps} />
-              ))}
-            </g>
-          </g>
-          <g mask={`url(#${containerMaskId})`}>
-            <g
-              transform={`scale(${size / ORIGINAL_CONTAINER_SIZE})
-        translate(10, 10)`}>
-              {attributeData[UniconAttributes.Shape].map((pathProps) => (
-                <path key={pathProps.d as string} {...pathProps} />
-              ))}
-            </g>
-          </g>
-        </g>
-      </mask>
-    </defs>
-  )
-}
-
-type UniconGradientProps = {
-  gradientId: string
-  attributeData: UniconAttributeData
-}
-function UniconGradient({ gradientId, attributeData }: UniconGradientProps): JSX.Element {
-  return (
-    <linearGradient id={gradientId}>
-      <stop offset="0%" stopColor={attributeData[UniconAttributes.GradientStart]} />
-      <stop offset="100%" stopColor={attributeData[UniconAttributes.GradientEnd]} />
-    </linearGradient>
-  )
-}
-
-function UniconBlur({ blurId, size }: { blurId: string; size: number }): JSX.Element {
-  return (
-    <filter height="200%" id={blurId} width="200%" x="-50%" y="-50%">
-      <feGaussianBlur in="SourceGraphic" stdDeviation={size / 3} />
-    </filter>
-  )
-}
-
-function UniconSvg({
-  attributeIndices,
-  size,
-  address,
-}: {
-  attributeIndices: UniconAttributesToIndices
-  size: number
-  address: string
-  mobile?: boolean
-}): JSX.Element | null {
-  // const isDarkMode = useIsDarkMode()
-  const isDarkMode = false
-  const attributeData = useMemo(() => getUniconAttributeData(attributeIndices), [attributeIndices])
-
-  const gradientId = `gradient${address + size}`
-  const maskId = `mask${address + size}`
-  const blurId = `blur${address + size}`
-  const svgProps = {
-    viewBox: `0 0 ${size} ${size}`,
-  }
-
-  if (!attributeIndices || !attributeData) {
-    return null
-  }
-
-  return (
-    <svg {...svgProps}>
-      <defs>
-        <UniconMask attributeData={attributeData} maskId={maskId} size={size} />
-        <UniconGradient attributeData={attributeData} gradientId={gradientId} />
-        <UniconBlur blurId={blurId} size={size} />
-      </defs>
-
-      <g mask={`url(#${maskId})`}>
-        <rect fill={`url(#${gradientId})`} height="100%" width="100%" x="0" y="0" />
-        {!isDarkMode && <rect fill="black" height="100%" opacity={0.08} width="100%" x="0" y="0" />}
-        <ellipse
-          cx={size / 2}
-          cy={0}
-          fill={blurs[attributeIndices[UniconAttributes.GradientStart]]}
-          filter={`url(#${blurId})`}
-          rx={size / 2}
-          ry={size / 2}
-        />
-      </g>
-    </svg>
-  )
-}
-
-interface Props {
-  address: string
-  size?: number
-  randomSeed?: number
-  border?: boolean
-  mobile?: boolean
-}
-
-function _Unicon({ address, size = 24, randomSeed = 0, mobile }: Props): JSX.Element | null {
-  const attributeIndices = useMemo(
-    () => deriveUniconAttributeIndices(address, randomSeed),
-    [address, randomSeed]
-  )
-
-  if (!address || !isEthAddress(address) || !attributeIndices) {
-    return null
-  }
-
-  return (
-    // eslint-disable-next-line react-native/no-inline-styles
-    <div style={{ height: size, width: size, position: 'relative' }}>
-      <div
-        // eslint-disable-next-line react-native/no-inline-styles
-        style={{
-          height: size,
-          width: size,
-          overflow: 'visible',
-          position: 'absolute',
-        }}>
-        <UniconSvg
-          address={address}
-          attributeIndices={attributeIndices}
-          mobile={mobile}
-          size={size}
-        />
-      </div>
-    </div>
-  )
-}
-
-export const Unicon = memo(_Unicon)
diff --git a/packages/ui/src/components/Unicon/types.ts b/packages/ui/src/components/Unicon/types.ts
index a366834778d..749ed5c99a4 100644
--- a/packages/ui/src/components/Unicon/types.ts
+++ b/packages/ui/src/components/Unicon/types.ts
@@ -1,7 +1,5 @@
-import { containerSvgPaths } from './Container'
-import { emblemSvgPaths } from './Emblem'
-
-// dummy data to prevent errors importing
+import { svgPaths as containerPaths } from './Container'
+import { svgPaths as emblemPaths } from './Emblem'
 
 export enum UniconAttributes {
   GradientStart = 0,
@@ -73,6 +71,6 @@ export const gradientEnds = [
 export const UniconNumOptions = {
   [UniconAttributes.GradientStart]: gradientStarts.length,
   [UniconAttributes.GradientEnd]: gradientEnds.length,
-  [UniconAttributes.Container]: containerSvgPaths.length,
-  [UniconAttributes.Shape]: emblemSvgPaths.length,
+  [UniconAttributes.Container]: containerPaths.length,
+  [UniconAttributes.Shape]: emblemPaths.length,
 }
diff --git a/packages/ui/src/components/Unicon/types.web.ts b/packages/ui/src/components/Unicon/types.web.ts
deleted file mode 100644
index 42a2c38dcbd..00000000000
--- a/packages/ui/src/components/Unicon/types.web.ts
+++ /dev/null
@@ -1,76 +0,0 @@
-import { containerSvgPaths } from './Container.web'
-import { emblemSvgPaths } from './Emblem.web'
-
-export enum UniconAttributes {
-  GradientStart = 0,
-  GradientEnd = 1,
-  Container = 2,
-  Shape = 3,
-}
-
-export const UniconAttributesArray: UniconAttributes[] = [
-  UniconAttributes.GradientStart,
-  UniconAttributes.GradientEnd,
-  UniconAttributes.Container,
-  UniconAttributes.Shape,
-]
-
-export interface UniconAttributesToIndices {
-  [UniconAttributes.GradientStart]: number
-  [UniconAttributes.GradientEnd]: number
-  [UniconAttributes.Container]: number
-  [UniconAttributes.Shape]: number
-}
-
-export interface UniconAttributeData {
-  [UniconAttributes.GradientStart]: string
-  [UniconAttributes.GradientEnd]: string
-  [UniconAttributes.Container]: React.SVGProps<SVGPathElement>[]
-  [UniconAttributes.Shape]: React.SVGProps<SVGPathElement>[]
-}
-
-export const gradientStarts = [
-  '#6100FF',
-  '#5065FD',
-  '#36DBFF',
-  '#5CFE9D',
-  '#B1F13C',
-  '#F9F40B',
-  '#FF6F1E',
-  '#F14544',
-  '#FC72FF',
-  '#C0C0C0',
-]
-
-export const blurs = [
-  '#D3EBA3',
-  '#F06DF3',
-  '#9D99F5',
-  '#EDE590',
-  '#B0EDFE',
-  '#FBAA7F',
-  '#C8BB9B',
-  '#9D99F5',
-  '#A26AF3',
-  '#D3EBA3',
-]
-
-export const gradientEnds = [
-  '#D0B2F3',
-  '#BDB8FA',
-  '#63CDE8',
-  '#76D191',
-  '#9BCD46',
-  '#EDE590',
-  '#FBAA7F',
-  '#FEA79B',
-  '#F5A1F5',
-  '#B8C3B7',
-]
-
-export const UniconNumOptions = {
-  [UniconAttributes.GradientStart]: gradientStarts.length,
-  [UniconAttributes.GradientEnd]: gradientEnds.length,
-  [UniconAttributes.Container]: containerSvgPaths.length,
-  [UniconAttributes.Shape]: emblemSvgPaths.length,
-}
diff --git a/packages/ui/src/components/Unicon/utils.ts b/packages/ui/src/components/Unicon/utils.ts
index a95fcb54a34..51c7c854327 100644
--- a/packages/ui/src/components/Unicon/utils.ts
+++ b/packages/ui/src/components/Unicon/utils.ts
@@ -1,9 +1,7 @@
-// dummy file to make sure we don't get an error when importing Unicon
-
 import { isAddress } from 'ethers/lib/utils'
 
-import { containerSvgPaths } from './Container'
-import { emblemSvgPaths } from './Emblem'
+import { svgPaths as containerPaths } from './Container'
+import { svgPaths as emblemPaths } from './Emblem'
 import {
   blurs,
   gradientEnds,
@@ -13,7 +11,7 @@ import {
   UniconAttributesArray,
   UniconAttributesToIndices,
   UniconNumOptions,
-} from './types.web'
+} from './types'
 
 const NUM_CHARS_TO_USE_PER_ATTRIBUTE = 2
 
@@ -55,8 +53,8 @@ export const getUniconAttributeData = (
     [UniconAttributes.GradientStart]:
       gradientStarts[attributeIndices[UniconAttributes.GradientStart]],
     [UniconAttributes.GradientEnd]: gradientEnds[attributeIndices[UniconAttributes.GradientEnd]],
-    [UniconAttributes.Container]: containerSvgPaths[attributeIndices[UniconAttributes.Container]],
-    [UniconAttributes.Shape]: emblemSvgPaths[attributeIndices[UniconAttributes.Shape]],
+    [UniconAttributes.Container]: containerPaths[attributeIndices[UniconAttributes.Container]],
+    [UniconAttributes.Shape]: emblemPaths[attributeIndices[UniconAttributes.Shape]],
   } as UniconAttributeData
 }
 
diff --git a/packages/ui/src/components/Unicon/utils.web.ts b/packages/ui/src/components/Unicon/utils.web.ts
deleted file mode 100644
index 38af0b30e0f..00000000000
--- a/packages/ui/src/components/Unicon/utils.web.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { isAddress } from 'ethers/lib/utils'
-
-import { containerSvgPaths } from './Container.web'
-import { emblemSvgPaths } from './Emblem.web'
-import {
-  blurs,
-  gradientEnds,
-  gradientStarts,
-  UniconAttributeData,
-  UniconAttributes,
-  UniconAttributesArray,
-  UniconAttributesToIndices,
-  UniconNumOptions,
-} from './types.web'
-
-const NUM_CHARS_TO_USE_PER_ATTRIBUTE = 2
-
-export const isEthAddress = (address: string): boolean => {
-  return address.startsWith('0x') && isAddress(address.toLowerCase())
-}
-
-export const deriveUniconAttributeIndices = (
-  address: string,
-  randomSeed = 0
-): UniconAttributesToIndices | undefined => {
-  if (!isEthAddress(address)) {
-    return
-  }
-
-  const hexAddr = address.slice(-40)
-  const newIndices = {
-    [UniconAttributes.GradientStart]: 0,
-    [UniconAttributes.GradientEnd]: 0,
-    [UniconAttributes.Container]: 0,
-    [UniconAttributes.Shape]: 0,
-  } as UniconAttributesToIndices
-  for (const a of UniconAttributesArray) {
-    const optionHex = hexAddr.slice(
-      NUM_CHARS_TO_USE_PER_ATTRIBUTE * a,
-      NUM_CHARS_TO_USE_PER_ATTRIBUTE * (a + 1)
-    )
-    const optionDec = parseInt(optionHex, 16) + randomSeed
-    const optionIndex = optionDec % UniconNumOptions[a]
-    newIndices[a] = optionIndex
-  }
-  return newIndices
-}
-
-export const getUniconAttributeData = (
-  attributeIndices: UniconAttributesToIndices
-): UniconAttributeData => {
-  return {
-    [UniconAttributes.GradientStart]:
-      gradientStarts[attributeIndices[UniconAttributes.GradientStart]],
-    [UniconAttributes.GradientEnd]: gradientEnds[attributeIndices[UniconAttributes.GradientEnd]],
-    [UniconAttributes.Container]: containerSvgPaths[attributeIndices[UniconAttributes.Container]],
-    [UniconAttributes.Shape]: emblemSvgPaths[attributeIndices[UniconAttributes.Shape]],
-  } as UniconAttributeData
-}
-
-export const useUniconColors = (
-  activeAddress: string | undefined
-): {
-  glow: string
-  gradientStart: string
-  gradientEnd: string
-} => {
-  const attributeIndices = deriveUniconAttributeIndices(activeAddress || '')
-  if (!attributeIndices) {
-    return {
-      gradientStart: '$accent1',
-      gradientEnd: '$accent2',
-      glow: '$accent1',
-    }
-  }
-
-  const attributeData = getUniconAttributeData(attributeIndices)
-  const blurColor = blurs[attributeIndices[UniconAttributes.GradientStart]]
-  if (!blurColor) {
-    return {
-      gradientStart: '$accent1',
-      gradientEnd: '$accent2',
-      glow: '$accent1',
-    }
-  }
-
-  return {
-    gradientStart: attributeData[UniconAttributes.GradientStart].toString(),
-    gradientEnd: attributeData[UniconAttributes.GradientEnd].toString(),
-    glow: blurColor.toString(),
-  }
-}
-
-// Adapted from https://natclark.com/tutorials/javascript-lighten-darken-hex-color/
-export function adjustColor(hexColor: string, magnitude: number): string {
-  hexColor = hexColor.replace(`#`, ``)
-  if (hexColor.length === 6) {
-    const decimalColor = parseInt(hexColor, 16)
-    // eslint-disable-next-line no-bitwise
-    let r = (decimalColor >> 16) + magnitude
-    r > 255 && (r = 255)
-    r < 0 && (r = 0)
-    // eslint-disable-next-line no-bitwise
-    let g = (decimalColor & 0x0000ff) + magnitude
-    g > 255 && (g = 255)
-    g < 0 && (g = 0)
-    // eslint-disable-next-line no-bitwise
-    let b = ((decimalColor >> 8) & 0x00ff) + magnitude
-    b > 255 && (b = 255)
-    b < 0 && (b = 0)
-    // eslint-disable-next-line no-bitwise
-    return `#${(g | (b << 8) | (r << 16)).toString(16)}`
-  } else {
-    return hexColor
-  }
-}
diff --git a/packages/ui/src/components/button/Button.tsx b/packages/ui/src/components/button/Button.tsx
index 80299545f4e..83dcf3930db 100644
--- a/packages/ui/src/components/button/Button.tsx
+++ b/packages/ui/src/components/button/Button.tsx
@@ -71,20 +71,6 @@ const CustomButtonFrame = styled(XStack, {
       },
     },
 
-    backgroundless: {
-      true: {
-        backgroundColor: 'transparent',
-        hoverStyle: {
-          backgroundColor: 'transparent',
-          opacity: 0.9,
-        },
-        pressStyle: {
-          backgroundColor: 'transparent',
-          opacity: 0.7,
-        },
-      },
-    },
-
     disabled: {
       true: {
         opacity: 0.4,
diff --git a/packages/ui/src/components/factories/createIcon.tsx b/packages/ui/src/components/factories/createIcon.tsx
index 0bce0d27784..e89b8f2a479 100644
--- a/packages/ui/src/components/factories/createIcon.tsx
+++ b/packages/ui/src/components/factories/createIcon.tsx
@@ -3,11 +3,11 @@ import { createElement, forwardRef } from 'react'
 import { Svg, SvgProps } from 'react-native-svg'
 import {
   ColorTokens,
+  isWeb,
   SpecificTokens,
   Stack,
-  ThemeKeys,
-  isWeb,
   styled,
+  ThemeKeys,
   usePropsAndStyle,
 } from 'tamagui'
 import { DynamicColor } from 'ui/src/hooks/useSporeColors'
diff --git a/packages/ui/src/components/icons/AaveIcon.tsx b/packages/ui/src/components/icons/AaveIcon.tsx
index 6549311504a..4198e7882e3 100644
--- a/packages/ui/src/components/icons/AaveIcon.tsx
+++ b/packages/ui/src/components/icons/AaveIcon.tsx
@@ -1,4 +1,4 @@
-import { Defs, LinearGradient, Path, Stop, Svg, Circle as _Circle } from 'react-native-svg'
+import { Circle as _Circle, Defs, LinearGradient, Path, Stop, Svg } from 'react-native-svg'
 
 // eslint-disable-next-line no-relative-import-paths/no-relative-import-paths
 import { createIcon } from '../factories/createIcon'
diff --git a/packages/ui/src/components/icons/ArrowDownCircle.tsx b/packages/ui/src/components/icons/ArrowDownCircle.tsx
index 0b61f0800f6..408f9dd16ce 100644
--- a/packages/ui/src/components/icons/ArrowDownCircle.tsx
+++ b/packages/ui/src/components/icons/ArrowDownCircle.tsx
@@ -6,13 +6,30 @@ import { createIcon } from '../factories/createIcon'
 export const [ArrowDownCircle, AnimatedArrowDownCircle] = createIcon({
   name: 'ArrowDownCircle',
   getIcon: (props) => (
-    <Svg fill="none" viewBox="0 0 25 26" {...props}>
+    <Svg fill="none" viewBox="0 0 16 16" {...props}>
       <Path
-        clipRule="evenodd"
-        d="M0 13C0 6.09625 5.59625 0.499999 12.5 0.499999C19.4037 0.499999 25 6.09625 25 13C25 19.9037 19.4037 25.5 12.5 25.5C5.59625 25.5 0 19.9037 0 13ZM13.25 7.75C13.25 7.33579 12.9142 7 12.5 7C12.0858 7 11.75 7.33579 11.75 7.75V15.4737C11.75 15.8846 11.75 16.0901 11.6265 16.1413C11.5031 16.1924 11.3578 16.0471 11.0672 15.7565L7.78033 12.4697C7.48744 12.1768 7.01256 12.1768 6.71967 12.4697C6.42678 12.7626 6.42678 13.2374 6.71967 13.5303L11.9697 18.7803C12.2626 19.0732 12.7374 19.0732 13.0303 18.7803L18.2803 13.5303C18.5732 13.2374 18.5732 12.7626 18.2803 12.4697C17.9874 12.1768 17.5126 12.1768 17.2197 12.4697L13.9328 15.7565C13.6422 16.0471 13.4969 16.1924 13.3735 16.1413C13.25 16.0901 13.25 15.8846 13.25 15.4737V7.75Z"
-        fill="currentColor"
-        fillRule="evenodd"
+        d="M8.00004 14.6667C11.6819 14.6667 14.6667 11.6819 14.6667 8.00003C14.6667 4.31813 11.6819 1.33337 8.00004 1.33337C4.31814 1.33337 1.33337 4.31813 1.33337 8.00003C1.33337 11.6819 4.31814 14.6667 8.00004 14.6667Z"
+        fill={'currentColor' ?? '#FFFFFF'}
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
+      />
+      <Path
+        d="M5.33337 8L8.00004 10.6667L10.6667 8"
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
+      />
+      <Path
+        d="M8 5.33337V10.6667"
+        stroke="currentColor"
+        strokeLinecap="round"
+        strokeLinejoin="round"
+        strokeWidth="1.5"
       />
     </Svg>
   ),
+  defaultFill: '#FFFFFF',
 })
diff --git a/packages/ui/src/components/icons/DiamondExclamation.tsx b/packages/ui/src/components/icons/DiamondExclamation.tsx
deleted file mode 100644
index 6aa72a7ba19..00000000000
--- a/packages/ui/src/components/icons/DiamondExclamation.tsx
+++ /dev/null
@@ -1,17 +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 [DiamondExclamation, AnimatedDiamondExclamation] = createIcon({
-  name: 'DiamondExclamation',
-  getIcon: (props) => (
-    <Svg fill="none" viewBox="0 0 20 20" {...props}>
-      <Path
-        d="M17.5243 8.04627L11.9534 2.47539C10.8743 1.39622 9.12509 1.39622 8.04676 2.47539L2.47588 8.04627C1.39671 9.12544 1.39671 10.8746 2.47588 11.9529L8.04676 17.5238C9.12593 18.603 10.8751 18.603 11.9534 17.5238L17.5243 11.9529C18.6035 10.8746 18.6035 9.12461 17.5243 8.04627ZM9.37509 7.08293C9.37509 6.73793 9.65509 6.45793 10.0001 6.45793C10.3451 6.45793 10.6251 6.73793 10.6251 7.08293V10.4163C10.6251 10.7613 10.3451 11.0413 10.0001 11.0413C9.65509 11.0413 9.37509 10.7613 9.37509 10.4163V7.08293ZM10.0168 13.7496C9.55677 13.7496 9.17917 13.3763 9.17917 12.9163C9.17917 12.4563 9.54843 12.0829 10.0084 12.0829H10.0168C10.4776 12.0829 10.8501 12.4563 10.8501 12.9163C10.8501 13.3763 10.4768 13.7496 10.0168 13.7496Z"
-        fill={'currentColor' ?? '#7D7D7D'}
-      />
-    </Svg>
-  ),
-  defaultFill: '#7D7D7D',
-})
diff --git a/packages/ui/src/components/icons/EmptySpinner.tsx b/packages/ui/src/components/icons/EmptySpinner.tsx
index a1855027cdd..369a1814cf7 100644
--- a/packages/ui/src/components/icons/EmptySpinner.tsx
+++ b/packages/ui/src/components/icons/EmptySpinner.tsx
@@ -1,4 +1,4 @@
-import { Svg, Circle as _Circle } from 'react-native-svg'
+import { Circle as _Circle, Svg } from 'react-native-svg'
 
 // eslint-disable-next-line no-relative-import-paths/no-relative-import-paths
 import { createIcon } from '../factories/createIcon'
diff --git a/packages/ui/src/components/icons/EmptyStatePicture.tsx b/packages/ui/src/components/icons/EmptyStatePicture.tsx
index 5b34aeab2de..474d3273ddf 100644
--- a/packages/ui/src/components/icons/EmptyStatePicture.tsx
+++ b/packages/ui/src/components/icons/EmptyStatePicture.tsx
@@ -1,4 +1,4 @@
-import { Path, Rect, Svg, Circle as _Circle } from 'react-native-svg'
+import { Circle as _Circle, Path, Rect, Svg } from 'react-native-svg'
 
 // eslint-disable-next-line no-relative-import-paths/no-relative-import-paths
 import { createIcon } from '../factories/createIcon'
diff --git a/packages/ui/src/components/icons/EthLightIcon.tsx b/packages/ui/src/components/icons/EthLightIcon.tsx
index d2f047ba554..5c735f5f813 100644
--- a/packages/ui/src/components/icons/EthLightIcon.tsx
+++ b/packages/ui/src/components/icons/EthLightIcon.tsx
@@ -1,4 +1,4 @@
-import { Path, Svg, Circle as _Circle } from 'react-native-svg'
+import { Circle as _Circle, Path, Svg } from 'react-native-svg'
 
 // eslint-disable-next-line no-relative-import-paths/no-relative-import-paths
 import { createIcon } from '../factories/createIcon'
diff --git a/packages/ui/src/components/icons/Info.tsx b/packages/ui/src/components/icons/Info.tsx
new file mode 100644
index 00000000000..e882abc8f53
--- /dev/null
+++ b/packages/ui/src/components/icons/Info.tsx
@@ -0,0 +1,62 @@
+import type { IconProps } from '@tamagui/helpers-icon'
+import { forwardRef, memo } from 'react'
+import { Path, Svg } from 'react-native-svg'
+import { getTokenValue } from 'tamagui'
+import { useSporeColors } from 'ui/src/hooks/useSporeColors'
+
+const Icon = forwardRef<Svg, IconProps>((props, ref) => {
+  // isWeb currentColor to maintain backwards compat a bit better, on native uses theme color
+  const {
+    color: colorProp = '#99A1BD24',
+    size: sizeProp = '$true',
+    strokeWidth: strokeWidthProp,
+    ...restProps
+  } = props
+  const colors = useSporeColors()
+
+  const size =
+    getTokenValue(
+      // @ts-expect-error it falls back to undefined
+      sizeProp,
+      'size'
+    ) ?? sizeProp
+
+  const strokeWidth =
+    getTokenValue(
+      // @ts-expect-error it falls back to undefined
+      strokeWidthProp,
+      'size'
+    ) ?? strokeWidthProp
+
+  const color =
+    // @ts-expect-error its fine to access colorProp undefined
+    colors[colorProp]?.get() ?? colorProp ?? colors.color.get()
+
+  const svgProps = {
+    ...restProps,
+    size,
+    strokeWidth,
+    color,
+  }
+
+  return (
+    <Svg ref={ref} fill="none" height={size} viewBox="0 0 24 24" width={size} {...svgProps}>
+      <Path
+        d="M12 2C6.477 2 2 6.477 2 12C2 17.523 6.477 22 12 22C17.523 22 22 17.523 22 12C22 6.477 17.523 2 12 2Z"
+        fill={color ?? '#99A1BD24'}
+      />
+      <Path
+        d="M11.9851 16.75C12.3991 16.75 12.7351 16.414 12.7351 16V11.429C12.7351 11.015 12.3991 10.679 11.9851 10.679C11.5711 10.679 11.2351 11.015 11.2351 11.429V16C11.2351 16.414 11.5711 16.75 11.9851 16.75Z"
+        fill={color}
+      />
+      <Path
+        d="M11 8C11 8.552 11.4531 9 12.0051 9C12.5571 9 13.0051 8.552 13.0051 8C13.0051 7.448 12.5581 7 12.0051 7H11.9951C11.4431 7 11 7.448 11 8Z"
+        fill={color}
+      />
+    </Svg>
+  )
+})
+
+Icon.displayName = 'Info'
+
+export const Info = memo<IconProps>(Icon)
diff --git a/packages/ui/src/components/icons/Laptop.tsx b/packages/ui/src/components/icons/Laptop.tsx
deleted file mode 100644
index ea909fef242..00000000000
--- a/packages/ui/src/components/icons/Laptop.tsx
+++ /dev/null
@@ -1,17 +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 [Laptop, AnimatedLaptop] = createIcon({
-  name: 'Laptop',
-  getIcon: (props) => (
-    <Svg fill="none" viewBox="0 0 24 24" {...props}>
-      <Path
-        d="M20 7V14.2C20 14.366 19.866 14.5 19.7 14.5H4.30005C4.13405 14.5 4 14.366 4 14.2V7C4 5 5 4 7 4H17C19 4 20 5 20 7ZM20.7 16H3.30005C3.13405 16 3 16.134 3 16.3V17C3 18.333 3.667 19 5 19H19C20.333 19 21 18.333 21 17V16.3C21 16.134 20.866 16 20.7 16Z"
-        fill={'currentColor' ?? '#FF5F52'}
-      />
-    </Svg>
-  ),
-  defaultFill: '#FF5F52',
-})
diff --git a/packages/ui/src/components/icons/LoadingSpinnerInner.tsx b/packages/ui/src/components/icons/LoadingSpinnerInner.tsx
index 5c49894f282..c7216b3807d 100644
--- a/packages/ui/src/components/icons/LoadingSpinnerInner.tsx
+++ b/packages/ui/src/components/icons/LoadingSpinnerInner.tsx
@@ -1,4 +1,4 @@
-import { Path, Svg, Circle as _Circle } from 'react-native-svg'
+import { Circle as _Circle, Path, Svg } from 'react-native-svg'
 
 // eslint-disable-next-line no-relative-import-paths/no-relative-import-paths
 import { createIcon } from '../factories/createIcon'
diff --git a/packages/ui/src/components/icons/Multichain.tsx b/packages/ui/src/components/icons/Multichain.tsx
new file mode 100644
index 00000000000..10f06e65cea
--- /dev/null
+++ b/packages/ui/src/components/icons/Multichain.tsx
@@ -0,0 +1,71 @@
+import type { IconProps } from '@tamagui/helpers-icon'
+import { forwardRef, memo } from 'react'
+import { Path, Svg } from 'react-native-svg'
+import { getTokenValue } from 'tamagui'
+import { useSporeColors } from 'ui/src/hooks/useSporeColors'
+
+const Icon = forwardRef<Svg, IconProps>((props, ref) => {
+  // isWeb currentColor to maintain backwards compat a bit better, on native uses theme color
+  const {
+    color: colorProp = '#FC72FF',
+    size: sizeProp = '$true',
+    strokeWidth: strokeWidthProp,
+    ...restProps
+  } = props
+  const colors = useSporeColors()
+
+  const size =
+    getTokenValue(
+      // @ts-expect-error it falls back to undefined
+      sizeProp,
+      'size'
+    ) ?? sizeProp
+
+  const strokeWidth =
+    getTokenValue(
+      // @ts-expect-error it falls back to undefined
+      strokeWidthProp,
+      'size'
+    ) ?? strokeWidthProp
+
+  const color =
+    // @ts-expect-error its fine to access colorProp undefined
+    colors[colorProp]?.get() ?? colorProp ?? colors.color.get()
+
+  const svgProps = {
+    ...restProps,
+    size,
+    strokeWidth,
+    color,
+  }
+
+  return (
+    <Svg ref={ref} fill="none" height={size} viewBox="0 0 22 21" width={size} {...svgProps}>
+      <Path
+        d="M13.5906 13.7387C13.4248 13.7387 13.259 13.6756 13.1329 13.5487L8.40881 8.82463L3.68472 13.5487C3.43167 13.8017 3.02144 13.8017 2.7684 13.5487C2.51535 13.2956 2.51535 12.8854 2.7684 12.6323L7.95022 7.45053C8.20326 7.19748 8.61349 7.19748 8.86654 7.45053L13.5906 12.1746L18.3147 7.45053C18.5678 7.19748 18.978 7.19748 19.231 7.45053C19.4841 7.70357 19.4841 8.11383 19.231 8.36687L14.0492 13.5487C13.9223 13.6756 13.7564 13.7387 13.5906 13.7387Z"
+        fill={color ?? '#FC72FF'}
+        opacity="0.4"
+      />
+      <Path
+        d="M18.7902 9.63716C17.8367 9.63716 17.0586 8.86334 17.0586 7.90989C17.0586 6.95644 17.8272 6.18262 18.7815 6.18262H18.7902C19.7436 6.18262 20.5175 6.95644 20.5175 7.90989C20.5175 8.86334 19.7445 9.63716 18.7902 9.63716Z"
+        fill={color ?? '#FC72FF'}
+      />
+      <Path
+        d="M8.42642 9.63716C7.47296 9.63716 6.69482 8.86334 6.69482 7.90989C6.69482 6.95644 7.46346 6.18262 8.41777 6.18262H8.42642C9.37987 6.18262 10.1537 6.95644 10.1537 7.90989C10.1537 8.86334 9.38074 9.63716 8.42642 9.63716Z"
+        fill={color ?? '#FC72FF'}
+      />
+      <Path
+        d="M13.6081 14.8188C12.6546 14.8188 11.8765 14.045 11.8765 13.0915C11.8765 12.1381 12.6451 11.3643 13.5994 11.3643H13.6081C14.5615 11.3643 15.3353 12.1381 15.3353 13.0915C15.3353 14.045 14.5624 14.8188 13.6081 14.8188Z"
+        fill={color ?? '#FC72FF'}
+      />
+      <Path
+        d="M3.24429 14.8188C2.29084 14.8188 1.5127 14.045 1.5127 13.0915C1.5127 12.1381 2.28133 11.3643 3.23565 11.3643H3.24429C4.19774 11.3643 4.97156 12.1381 4.97156 13.0915C4.97156 14.045 4.19861 14.8188 3.24429 14.8188Z"
+        fill={color ?? '#FC72FF'}
+      />
+    </Svg>
+  )
+})
+
+Icon.displayName = 'Multichain'
+
+export const Multichain = memo<IconProps>(Icon)
diff --git a/packages/ui/src/components/icons/NoTransactions.tsx b/packages/ui/src/components/icons/NoTransactions.tsx
deleted file mode 100644
index 1d39bc66f97..00000000000
--- a/packages/ui/src/components/icons/NoTransactions.tsx
+++ /dev/null
@@ -1,31 +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 [NoTransactions, AnimatedNoTransactions] = createIcon({
-  name: 'NoTransactions',
-  getIcon: (props) => (
-    <Svg fill="none" viewBox="0 0 114 96" {...props}>
-      <Path
-        clipRule="evenodd"
-        d="M26.5247 10.001L11.2535 14.3799C7.53727 15.4455 5.38851 19.322 6.45413 23.0382L19.6601 69.093C20.7257 72.8092 24.6022 74.958 28.3184 73.8924L62.817 64H37.5247C31.4495 64 26.5247 59.0752 26.5247 53V10.001Z"
-        fill={'currentColor' ?? '#CECECE'}
-        fillRule="evenodd"
-      />
-      <Path
-        clipRule="evenodd"
-        d="M37.5244 1C33.6584 1 30.5244 4.13401 30.5244 8V53C30.5244 56.866 33.6584 60 37.5244 60H62.7608C66.618 52.6192 73.9151 47.3207 82.5244 46.2321V8C82.5244 4.13401 79.3904 1 75.5244 1H37.5244ZM43.0244 20C44.4051 20 45.5244 18.8807 45.5244 17.5C45.5244 16.1193 44.4051 15 43.0244 15C41.6437 15 40.5244 16.1193 40.5244 17.5C40.5244 18.8807 41.6437 20 43.0244 20ZM45.5244 30.5C45.5244 31.8807 44.4051 33 43.0244 33C41.6437 33 40.5244 31.8807 40.5244 30.5C40.5244 29.1193 41.6437 28 43.0244 28C44.4051 28 45.5244 29.1193 45.5244 30.5ZM43.0244 46C44.4051 46 45.5244 44.8807 45.5244 43.5C45.5244 42.1193 44.4051 41 43.0244 41C41.6437 41 40.5244 42.1193 40.5244 43.5C40.5244 44.8807 41.6437 46 43.0244 46ZM50.5244 17.5C50.5244 16.1193 51.6437 15 53.0244 15H70.0244C71.4051 15 72.5244 16.1193 72.5244 17.5C72.5244 18.8807 71.4051 20 70.0244 20H53.0244C51.6437 20 50.5244 18.8807 50.5244 17.5ZM53.0244 28C51.6437 28 50.5244 29.1193 50.5244 30.5C50.5244 31.8807 51.6437 33 53.0244 33H70.0244C71.4051 33 72.5244 31.8807 72.5244 30.5C72.5244 29.1193 71.4051 28 70.0244 28H53.0244ZM50.5244 43.5C50.5244 42.1193 51.6437 41 53.0244 41H70.0244C71.4051 41 72.5244 42.1193 72.5244 43.5C72.5244 44.8807 71.4051 46 70.0244 46H53.0244C51.6437 46 50.5244 44.8807 50.5244 43.5Z"
-        fill={'currentColor' ?? '#CECECE'}
-        fillRule="evenodd"
-      />
-      <Path
-        clipRule="evenodd"
-        d="M85.8188 94.0254C97.9691 94.0254 107.819 84.1757 107.819 72.0254C107.819 59.8751 97.9691 50.0254 85.8188 50.0254C73.6686 50.0254 63.8188 59.8751 63.8188 72.0254C63.8188 84.1757 73.6686 94.0254 85.8188 94.0254ZM94.0682 72.0251L85.8185 63.7754L77.5689 72.0251L85.8185 80.2748L94.0682 72.0251Z"
-        fill={'currentColor' ?? '#CECECE'}
-        fillRule="evenodd"
-      />
-    </Svg>
-  ),
-  defaultFill: '#CECECE',
-})
diff --git a/packages/ui/src/components/icons/PenLine.tsx b/packages/ui/src/components/icons/PenLine.tsx
deleted file mode 100644
index bddb6074562..00000000000
--- a/packages/ui/src/components/icons/PenLine.tsx
+++ /dev/null
@@ -1,17 +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 [PenLine, AnimatedPenLine] = createIcon({
-  name: 'PenLine',
-  getIcon: (props) => (
-    <Svg fill="none" viewBox="0 0 19 19" {...props}>
-      <Path
-        d="M14.0371 9.00194L5 18H0V13L8.99805 3.963C9.11505 3.845 9.3051 3.845 9.4231 3.963L14.0381 8.57799C14.1551 8.69499 14.1551 8.88494 14.0371 9.00194ZM15.1079 7.52794C15.2249 7.64494 15.415 7.64494 15.532 7.52794L17.4099 5.65001C18.1939 4.86601 18.1939 3.59405 17.4099 2.81005L15.1899 0.589953C14.4059 -0.194047 13.1341 -0.194047 12.3501 0.589953L10.4719 2.468C10.3549 2.58501 10.3549 2.77496 10.4719 2.89196L15.1079 7.52794ZM18 17.25H11C10.586 17.25 10.25 17.586 10.25 18C10.25 18.414 10.586 18.75 11 18.75H18C18.414 18.75 18.75 18.414 18.75 18C18.75 17.586 18.414 17.25 18 17.25Z"
-        fill={'currentColor' ?? '#CECECE'}
-      />
-    </Svg>
-  ),
-  defaultFill: '#CECECE',
-})
diff --git a/packages/ui/src/components/icons/QuestionInCircleFilled.tsx b/packages/ui/src/components/icons/QuestionInCircleFilled.tsx
deleted file mode 100644
index 452631ac878..00000000000
--- a/packages/ui/src/components/icons/QuestionInCircleFilled.tsx
+++ /dev/null
@@ -1,33 +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 [QuestionInCircleFilled, AnimatedQuestionInCircleFilled] = createIcon({
-  name: 'QuestionInCircle',
-  getIcon: (props) => (
-    <Svg fill="#CECECE" viewBox="0 0 24 24" {...props}>
-      <Path
-        d="M12 22C17.5228 22 22 17.5228 22 12C22 6.47715 17.5228 2 12 2C6.47715 2 2 6.47715 2 12C2 17.5228 6.47715 22 12 22Z"
-        stroke="currentColor"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        strokeWidth="1.5"
-      />
-      <Path
-        d="M9.08997 9.00001C9.32507 8.33167 9.78912 7.76811 10.3999 7.40914C11.0107 7.05016 11.7289 6.91894 12.4271 7.03872C13.1254 7.15849 13.7588 7.52153 14.215 8.06353C14.6713 8.60554 14.921 9.29153 14.92 10C14.92 12 11.92 13 11.92 13"
-        stroke="currentColor"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        strokeWidth="1.5"
-      />
-      <Path
-        d="M12 17H12.01"
-        stroke="currentColor"
-        strokeLinecap="round"
-        strokeLinejoin="round"
-        strokeWidth="1.5"
-      />
-    </Svg>
-  ),
-})
diff --git a/packages/ui/src/components/icons/StickyNoteSquare.tsx b/packages/ui/src/components/icons/StickyNoteSquare.tsx
deleted file mode 100644
index c2cd20896b0..00000000000
--- a/packages/ui/src/components/icons/StickyNoteSquare.tsx
+++ /dev/null
@@ -1,17 +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 [StickyNoteSquare, AnimatedStickyNoteSquare] = createIcon({
-  name: 'StickyNoteSquare',
-  getIcon: (props) => (
-    <Svg fill="currentColor" viewBox="0 0 16 16" {...props}>
-      <Path
-        d="M14 4.24666V8.56665C14 8.71332 13.9866 8.86 13.9533 9H11.2533C10.0066 9 9 10.0067 9 11.2533V13.9534C8.86 13.9867 8.7134 14 8.56673 14H4.25326C2.74659 14 2 13.2467 2 11.7467V4.24666C2 2.74666 2.74659 2 4.25326 2H11.7467C13.2534 2 14 2.74666 14 4.24666ZM10 11.2533V13.48C10.06 13.44 10.1067 13.3933 10.16 13.34L13.34 10.16C13.3933 10.1067 13.44 10.06 13.48 10H11.2533C10.5599 10 10 10.56 10 11.2533Z"
-        fill={'currentColor' ?? '#FC74FE'}
-      />
-    </Svg>
-  ),
-  defaultFill: '#FC74FE',
-})
diff --git a/packages/ui/src/components/icons/TrashFilled.tsx b/packages/ui/src/components/icons/TrashFilled.tsx
deleted file mode 100644
index fd2377a9830..00000000000
--- a/packages/ui/src/components/icons/TrashFilled.tsx
+++ /dev/null
@@ -1,18 +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 [TrashFilled, AnimatedTrashFilled] = createIcon({
-  name: 'TrashFilled',
-  getIcon: (props) => (
-    <Svg fill="none" viewBox="0 0 24 24" {...props}>
-      <Path
-        d="M8.214 5.75H8.52001L8.65924 5.47751C8.77151 5.25781 8.85397 5.01821 8.93013 4.79074L8.93041 4.78989L9.13235 4.18311C9.26824 3.77544 9.65004 3.5 10.081 3.5H13.919C14.35 3.5 14.7318 3.77544 14.8677 4.18311L15.0696 4.78989L15.0699 4.79074C15.146 5.01821 15.2285 5.25781 15.3408 5.47751L15.48 5.75H15.786H20C20.1379 5.75 20.25 5.86214 20.25 6C20.25 6.13786 20.1379 6.25 20 6.25H4C3.86214 6.25 3.75 6.13786 3.75 6C3.75 5.86214 3.86214 5.75 4 5.75H8.214ZM5.65398 8.25H18.346L17.6912 18.1653C17.6912 18.1655 17.6912 18.1658 17.6912 18.166C17.641 18.8842 17.4313 19.4571 17.0592 19.8476C16.696 20.2289 16.1172 20.5 15.19 20.5H8.81C7.88279 20.5 7.30399 20.2289 6.94075 19.8476C6.56874 19.4571 6.35899 18.8843 6.30885 18.1662C6.30883 18.1659 6.30881 18.1656 6.30879 18.1653L5.65398 8.25ZM11.25 11C11.25 10.3139 10.6861 9.75 10 9.75C9.31386 9.75 8.75 10.3139 8.75 11V16C8.75 16.6861 9.31386 17.25 10 17.25C10.6861 17.25 11.25 16.6861 11.25 16V11ZM15.25 11C15.25 10.3139 14.6861 9.75 14 9.75C13.3139 9.75 12.75 10.3139 12.75 11V16C12.75 16.6861 13.3139 17.25 14 17.25C14.6861 17.25 15.25 16.6861 15.25 16V11Z"
-        fill={'currentColor' ?? '#FF5F52'}
-        stroke="currentColor"
-      />
-    </Svg>
-  ),
-  defaultFill: '#FF5F52',
-})
diff --git a/packages/ui/src/components/icons/Twitter.tsx b/packages/ui/src/components/icons/Twitter.tsx
new file mode 100644
index 00000000000..f6cbfc98a0e
--- /dev/null
+++ b/packages/ui/src/components/icons/Twitter.tsx
@@ -0,0 +1,16 @@
+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 [Twitter, AnimatedTwitter] = createIcon({
+  name: 'Twitter',
+  getIcon: (props) => (
+    <Svg fill="none" viewBox="0 0 16 13" {...props}>
+      <Path
+        d="M13.955 2.99252C13.9625 3.12002 13.9625 3.25501 13.9625 3.39001C13.9625 7.39501 10.8725 12.0075 5.21749 12.0075C3.47749 12.0075 1.8575 11.5125 0.5 10.65C0.7475 10.68 0.987504 10.6875 1.2425 10.6875C2.6825 10.6875 4.0025 10.2075 5.06 9.39751C3.71 9.36751 2.5775 8.49751 2.1875 7.29751C2.375 7.32751 2.57 7.34251 2.765 7.34251C3.0425 7.34251 3.32 7.30501 3.575 7.23751C2.165 6.95251 1.1075 5.73751 1.1075 4.26751V4.23001C1.52 4.45501 1.9925 4.59751 2.495 4.61251C1.67 4.06501 1.1225 3.14251 1.1225 2.09251C1.1225 1.53001 1.2725 1.01251 1.5425 0.562511C3.0575 2.40001 5.33 3.60001 7.88 3.73501C7.835 3.51001 7.805 3.27751 7.805 3.04501C7.805 1.37251 9.1775 0.0150146 10.88 0.0150146C11.765 0.0150146 12.5675 0.382506 13.1225 0.967506C13.82 0.840006 14.48 0.585017 15.0725 0.240017C14.8475 0.945017 14.36 1.53751 13.7225 1.90501C14.3375 1.83751 14.9375 1.67251 15.4925 1.44001C15.0725 2.04001 14.5475 2.57251 13.9475 3.00751L13.955 2.99252Z"
+        fill="currentColor"
+      />
+    </Svg>
+  ),
+})
diff --git a/packages/ui/src/components/icons/Unitag.tsx b/packages/ui/src/components/icons/Unitag.tsx
new file mode 100644
index 00000000000..219361e1a13
--- /dev/null
+++ b/packages/ui/src/components/icons/Unitag.tsx
@@ -0,0 +1,34 @@
+import { Path, Rect, Svg } from 'react-native-svg'
+
+// eslint-disable-next-line no-relative-import-paths/no-relative-import-paths
+import { createIcon } from '../factories/createIcon'
+
+export const [Unitag, AnimatedUnitag] = createIcon({
+  name: 'Unitag',
+  getIcon: (props) => (
+    <Svg fill="none" viewBox="0 0 24 24" {...props}>
+      <Rect
+        fill={'currentColor' ?? '#FFEFFF'}
+        height="22.7303"
+        rx="10.2495"
+        width="22.7302"
+        x="0.634923"
+        y="0.634923"
+      />
+      <Path
+        d="M11.9067 17.2489C9.54223 17.2489 7.97778 15.9867 7.97778 13.3022V8.21775H10.1111V13.2844C10.1111 14.6711 10.6445 15.4356 11.9067 15.4356C13.1689 15.4356 13.7022 14.6711 13.7022 13.2844V8.21775H15.8356V13.3022C15.8356 15.9867 14.2711 17.2489 11.9067 17.2489Z"
+        fill={'currentColor' ?? '#FC72FF'}
+      />
+      <Rect
+        height="22.7303"
+        rx="10.2495"
+        stroke="currentColor"
+        strokeWidth="1.26985"
+        width="22.7302"
+        x="0.634923"
+        y="0.634923"
+      />
+    </Svg>
+  ),
+  defaultFill: '#FFEFFF',
+})
diff --git a/packages/ui/src/components/icons/UserSquare.tsx b/packages/ui/src/components/icons/UserSquare.tsx
deleted file mode 100644
index b49f6ad5a4b..00000000000
--- a/packages/ui/src/components/icons/UserSquare.tsx
+++ /dev/null
@@ -1,17 +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 [UserSquare, AnimatedUserSquare] = createIcon({
-  name: 'UserSquare',
-  getIcon: (props) => (
-    <Svg fill="none" viewBox="0 0 20 20" {...props}>
-      <Path
-        d="M14.6875 2.5H5.3125C3.4375 2.5 2.5 3.4375 2.5 5.3125V14.6875C2.5 16.5625 3.4375 17.5 5.3125 17.5H14.6875C16.5625 17.5 17.5 16.5625 17.5 14.6875V5.3125C17.5 3.4375 16.5625 2.5 14.6875 2.5ZM10.0067 5.83333C11.3875 5.83333 12.5067 6.9525 12.5067 8.33333C12.5067 9.71417 11.3875 10.8333 10.0067 10.8333C8.62588 10.8333 7.50671 9.71417 7.50671 8.33333C7.50671 6.9525 8.62588 5.83333 10.0067 5.83333ZM14.6833 16.25H5.31667C5.20834 16.25 5.10834 16.25 5.00834 16.2417C5.11667 14.825 5.9167 12.975 8.57503 12.975H11.425C14.075 12.975 14.8833 14.8417 14.9917 16.2417C14.8917 16.25 14.7917 16.25 14.6833 16.25Z"
-        fill={'currentColor' ?? '#FC72FF'}
-      />
-    </Svg>
-  ),
-  defaultFill: '#FC72FF',
-})
diff --git a/packages/ui/src/components/icons/XTwitter.tsx b/packages/ui/src/components/icons/XTwitter.tsx
deleted file mode 100644
index 0260b20c958..00000000000
--- a/packages/ui/src/components/icons/XTwitter.tsx
+++ /dev/null
@@ -1,13 +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 [XTwitter, AnimatedXTwitter] = createIcon({
-  name: 'XTwitter',
-  getIcon: (props) => (
-    <Svg fill="currentColor" viewBox="0 0 512 512" {...props}>
-      <Path d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z" />
-    </Svg>
-  ),
-})
diff --git a/packages/ui/src/components/icons/allIcons.tsx b/packages/ui/src/components/icons/allIcons.tsx
index 197182f5707..2b323dc6d2a 100644
--- a/packages/ui/src/components/icons/allIcons.tsx
+++ b/packages/ui/src/components/icons/allIcons.tsx
@@ -1,6 +1,5 @@
-export * from '.'
+export * from './'
 export { BackArrow } from './BackArrow'
 export { AnimatedCaretChange, Caret } from './Caret'
 export { OSDynamicCloudIcon } from './OSDynamicCloudIcon'
-export { AnimatedQuestionInCircleFilled, QuestionInCircleFilled } from './QuestionInCircleFilled'
 export { RotatableChevron } from './RotatableChevron'
diff --git a/packages/ui/src/components/icons/index.ts b/packages/ui/src/components/icons/index.ts
index 7e8b04471e5..24b8f892e43 100644
--- a/packages/ui/src/components/icons/index.ts
+++ b/packages/ui/src/components/icons/index.ts
@@ -45,7 +45,6 @@ export * from './CopyFilled'
 export * from './CopySheets'
 export * from './DaiIcon'
 export * from './Dash'
-export * from './DiamondExclamation'
 export * from './Dollar'
 export * from './DoubleChevron'
 export * from './Edit'
@@ -60,8 +59,8 @@ export * from './EthIcon'
 export * from './EthLightIcon'
 export * from './ExternalLink'
 export * from './Eye'
-export * from './EyeOff'
 export * from './Eyeball'
+export * from './EyeOff'
 export * from './Faceid'
 export * from './FaceidThin'
 export * from './FileListLock'
@@ -84,7 +83,6 @@ export * from './InformationIcon'
 export * from './Key'
 export * from './KeyIcon'
 export * from './Language'
-export * from './Laptop'
 export * from './LeftArrow'
 export * from './Lightning'
 export * from './LikeSquare'
@@ -101,10 +99,8 @@ export * from './MessageQuestion'
 export * from './MoneyBillSend'
 export * from './Moon'
 export * from './More'
-export * from './NoTransactions'
 export * from './PaperStack'
 export * from './Paste'
-export * from './PenLine'
 export * from './Pencil'
 export * from './PencilBox'
 export * from './PencilDetailed'
@@ -145,7 +141,6 @@ export * from './Sparkle'
 export * from './Stacked'
 export * from './Star'
 export * from './StarGroup'
-export * from './StickyNoteSquare'
 export * from './StickyNoteTextSquare'
 export * from './Sun'
 export * from './SwapActionButton'
@@ -157,17 +152,16 @@ export * from './Ticket'
 export * from './ToggleOnAlt'
 export * from './Tooltip'
 export * from './Trash'
-export * from './TrashFilled'
 export * from './TrendDown'
 export * from './TrendUp'
 export * from './TripleDots'
+export * from './Twitter'
 export * from './UniswapLogo'
-export * from './UserSquare'
+export * from './Unitag'
 export * from './Verified'
 export * from './Wallet'
-export * from './WalletFilled'
 export * from './Walletconnect'
+export * from './WalletFilled'
 export * from './WifiSlash'
 export * from './X'
 export * from './XOctagon'
-export * from './XTwitter'
diff --git a/packages/ui/src/components/layout/Flex.tsx b/packages/ui/src/components/layout/Flex.tsx
index b1bf65e4a13..3b8b769d7bd 100644
--- a/packages/ui/src/components/layout/Flex.tsx
+++ b/packages/ui/src/components/layout/Flex.tsx
@@ -1,5 +1,5 @@
-import Animated from 'react-native-reanimated'
 import { Stack, StackProps, styled } from 'tamagui'
+import { withAnimated } from 'ui/src/components/factories/animated'
 
 export const flexStyles = {
   fill: { flex: 1 },
@@ -52,5 +52,4 @@ export const Flex = styled(Stack, {
   } as const,
 })
 
-export const AnimatedFlex = Animated.createAnimatedComponent(Flex)
-AnimatedFlex.displayName = 'AnimatedFlex'
+export const AnimatedFlex = withAnimated(Flex)
diff --git a/packages/ui/src/components/logos/EthereumLogo.tsx b/packages/ui/src/components/logos/EthereumLogo.tsx
index ede762b2b16..2edaa037704 100644
--- a/packages/ui/src/components/logos/EthereumLogo.tsx
+++ b/packages/ui/src/components/logos/EthereumLogo.tsx
@@ -1,4 +1,4 @@
-import { ClipPath, Defs, G, Path, Rect, Svg, Circle as _Circle } from 'react-native-svg'
+import { Circle as _Circle, ClipPath, Defs, G, Path, Rect, Svg } from 'react-native-svg'
 
 // eslint-disable-next-line no-relative-import-paths/no-relative-import-paths
 import { createIcon } from '../factories/createIcon'
diff --git a/packages/ui/src/components/touchable/TouchableArea.web.tsx b/packages/ui/src/components/touchable/TouchableArea.web.tsx
index b1a5624f107..960ca640d07 100644
--- a/packages/ui/src/components/touchable/TouchableArea.web.tsx
+++ b/packages/ui/src/components/touchable/TouchableArea.web.tsx
@@ -6,4 +6,9 @@ import { styled, YStack } from 'tamagui'
 
 export const TouchableArea = styled(YStack, {
   cursor: 'pointer',
+  animation: 'quick',
+
+  pressStyle: {
+    backgroundColor: '$backgroundPress',
+  },
 })
diff --git a/packages/ui/src/index.ts b/packages/ui/src/index.ts
index abc4de84e7c..f4983be092b 100644
--- a/packages/ui/src/index.ts
+++ b/packages/ui/src/index.ts
@@ -10,23 +10,22 @@ export {
   Anchor,
   AnimatePresence,
   Circle,
+  getToken,
+  getTokenValue,
   Image,
   Input,
   ListItem,
   Popover,
   ScrollView,
   Sheet,
-  Square,
+  styled,
   Switch,
   Tabs,
   TamaguiProvider,
   Theme,
-  YGroup,
-  getToken,
-  getTokenValue,
-  styled,
   useMedia,
   usePropsAndStyle,
+  YGroup,
 } from 'tamagui'
 export type {
   Adapt,
@@ -45,11 +44,6 @@ export {
   AnimatedBottomSheetFlashList,
   AnimatedFlashList,
 } from './components/AnimatedFlashList/AnimatedFlashList'
-export * from './components/Unicon'
-export * from './components/Unicon/Container'
-export * from './components/Unicon/Emblem'
-export * from './components/Unicon/types'
-export * from './components/Unicon/utils'
 export { Button } from './components/button/Button'
 export { withAnimated } from './components/factories/animated'
 export type { GeneratedIcon, IconProps } from './components/factories/createIcon'
@@ -59,17 +53,18 @@ export * from './components/input/utils'
 export {
   AnimatedFlex,
   Flex,
+  flexStyles,
   Inset,
   Separator,
-  flexStyles,
   type FlexProps,
 } from './components/layout'
 export * as Logos from './components/logos'
 export * from './components/text'
 export * from './components/touchable'
+export * from './components/Unicon'
+export * from './components/Unicon/utils'
 export { useDeviceDimensions } from './hooks/useDeviceDimensions'
 export { useDeviceInsets } from './hooks/useDeviceInsets'
-export { useIsDarkMode } from './hooks/useIsDarkMode'
 export { useSporeColors, type DynamicColor } from './hooks/useSporeColors'
 export * from './loading/FlexLoader'
 export * from './loading/Loader'
diff --git a/packages/ui/src/loading/Loader.tsx b/packages/ui/src/loading/Loader.tsx
index 1ceeb96d760..c9eccfa16af 100644
--- a/packages/ui/src/loading/Loader.tsx
+++ b/packages/ui/src/loading/Loader.tsx
@@ -1,10 +1,9 @@
 import React, { memo, useMemo } from 'react'
 import { getToken } from 'tamagui'
 import { Flex } from 'ui/src/components/layout'
-import { FlexLoader, FlexLoaderProps } from 'ui/src/loading/FlexLoader'
+import { FlexLoader } from 'ui/src/loading/FlexLoader'
 import { NftCardLoader } from 'ui/src/loading/NftCardLoader'
 import { Skeleton } from 'ui/src/loading/Skeleton'
-import { TokenLoader } from 'ui/src/loading/TokenLoader'
 import { TransactionLoader } from './TransactionLoader'
 
 export const Transaction = memo(function _Transaction({
@@ -25,28 +24,6 @@ export const Transaction = memo(function _Transaction({
   )
 })
 
-function Box(props: FlexLoaderProps): JSX.Element {
-  return (
-    <Skeleton>
-      <FlexLoader {...props} />
-    </Skeleton>
-  )
-}
-
-function Token({ repeat = 1, contrast }: { repeat?: number; contrast?: boolean }): JSX.Element {
-  return (
-    <Skeleton contrast={contrast}>
-      <Flex grow gap="$spacing4">
-        {new Array(repeat).fill(null).map((_, i, { length }) => (
-          <React.Fragment key={i}>
-            <TokenLoader opacity={(length - i) / length} />
-          </React.Fragment>
-        ))}
-      </Flex>
-    </Skeleton>
-  )
-}
-
 function NFT({ repeat = 1 }: { repeat?: number }): JSX.Element {
   const loader = useMemo(
     () =>
@@ -80,9 +57,7 @@ function Image(): JSX.Element {
 }
 
 export const Loader = {
-  Box,
   NFT,
   Image,
-  Token,
   Transaction,
 }
diff --git a/packages/ui/src/tamagui.config.ts b/packages/ui/src/tamagui.config.ts
index 9da53ae5851..1f8b19222d0 100644
--- a/packages/ui/src/tamagui.config.ts
+++ b/packages/ui/src/tamagui.config.ts
@@ -28,15 +28,14 @@ export const config = createTamagui({
   themes,
   tokens,
   media: createMedia({
-    // the order here is important: least strong to most
-    xxxl: { maxWidth: breakpoints.xxxl },
-    xxl: { maxWidth: breakpoints.xxl },
-    xl: { maxWidth: breakpoints.xl },
-    lg: { maxWidth: breakpoints.lg },
-    md: { maxWidth: breakpoints.md },
-    sm: { maxWidth: breakpoints.sm },
-    xs: { maxWidth: breakpoints.xs },
     xxs: { maxWidth: breakpoints.xxs },
+    xs: { maxWidth: breakpoints.xs },
+    sm: { maxWidth: breakpoints.sm },
+    md: { maxWidth: breakpoints.md },
+    lg: { maxWidth: breakpoints.lg },
+    xl: { maxWidth: breakpoints.xl },
+    xxl: { maxWidth: breakpoints.xxl },
+    xxxl: { maxWidth: breakpoints.xxxl },
     short: { maxHeight: heightBreakpoints.short },
   }),
   settings: {
diff --git a/packages/ui/src/theme/fonts.ts b/packages/ui/src/theme/fonts.ts
index 9ef53a1a210..6df3da0e903 100644
--- a/packages/ui/src/theme/fonts.ts
+++ b/packages/ui/src/theme/fonts.ts
@@ -1,13 +1,13 @@
+import { getLocales } from 'expo-localization'
 import { Platform } from 'react-native'
 import { createFont, isWeb } from 'tamagui'
-import { getDeviceLocales } from 'utilities/src/device/locales'
 
 // TODO(EXT-148): remove this type and use Tamagui's FontTokens
 export type TextVariantTokens = keyof typeof fonts
 
 // make React Native font rendering more visually similar to the web and Figma
 // Except for CJK languages (only Chinese and Japanese for now)
-const languageCode = getDeviceLocales()[0]?.languageCode
+const languageCode = getLocales()[0]?.languageCode
 const adjustedSize = (fontSize: number): number => {
   if (Platform.OS === 'web' || languageCode === 'zh' || languageCode === 'ja') {
     return fontSize
diff --git a/packages/ui/src/theme/iconSizes.ts b/packages/ui/src/theme/iconSizes.ts
index 5a4cc28b11e..c1b5eede08f 100644
--- a/packages/ui/src/theme/iconSizes.ts
+++ b/packages/ui/src/theme/iconSizes.ts
@@ -8,5 +8,4 @@ export const iconSizes = {
   icon36: 36,
   icon40: 40,
   icon64: 64,
-  icon100: 100,
 }
diff --git a/packages/ui/src/theme/imageSizes.ts b/packages/ui/src/theme/imageSizes.ts
index d8de273a902..55aee8a25f7 100644
--- a/packages/ui/src/theme/imageSizes.ts
+++ b/packages/ui/src/theme/imageSizes.ts
@@ -7,6 +7,5 @@ export const imageSizes = {
   image36: 36,
   image40: 40,
   image48: 48,
-  image64: 64,
   image100: 100,
 }
diff --git a/packages/ui/src/theme/spacing.ts b/packages/ui/src/theme/spacing.ts
index d299f4456d5..ecbf8e58c02 100644
--- a/packages/ui/src/theme/spacing.ts
+++ b/packages/ui/src/theme/spacing.ts
@@ -6,7 +6,6 @@ export const spacing = {
   spacing8: 8,
   spacing12: 12,
   spacing16: 16,
-  spacing20: 20,
   spacing24: 24,
   spacing28: 28,
   spacing32: 32,
diff --git a/packages/ui/src/theme/tokens.ts b/packages/ui/src/theme/tokens.ts
index 2834a3b1feb..07d79600d92 100644
--- a/packages/ui/src/theme/tokens.ts
+++ b/packages/ui/src/theme/tokens.ts
@@ -23,7 +23,6 @@ const iconSize = {
   36: iconSizes.icon36,
   40: iconSizes.icon40,
   64: iconSizes.icon64,
-  100: iconSizes.icon100,
 }
 
 export type IconSizeTokens = `$icon.${keyof typeof iconSize}`
diff --git a/packages/ui/tsconfig.json b/packages/ui/tsconfig.json
index bb985bc0d70..4a65d366b49 100644
--- a/packages/ui/tsconfig.json
+++ b/packages/ui/tsconfig.json
@@ -3,9 +3,4 @@
   "include": [
     "src"
   ],
-  "references": [
-    {
-      "path": "../utilities"
-    },
-  ],
 }
diff --git a/packages/utilities/.depcheckrc b/packages/utilities/.depcheckrc
index 1122626e43b..b09f4df7f19 100644
--- a/packages/utilities/.depcheckrc
+++ b/packages/utilities/.depcheckrc
@@ -1,6 +1,7 @@
 ignores: [
     # Dependencies that depcheck thinks are missing but are actually present
     ## Internal packages / workspaces
+    "eslint-config-custom",
     "tsconfig",
     "utilities",
   ]
diff --git a/packages/utilities/.eslintrc.js b/packages/utilities/.eslintrc.js
index b859d3c44d4..d9b887dffb0 100644
--- a/packages/utilities/.eslintrc.js
+++ b/packages/utilities/.eslintrc.js
@@ -1,6 +1,6 @@
 module.exports = {
   root: true,
-  extends: ['@uniswap/eslint-config/native'],
+  extends: ['custom'],
   ignorePatterns: ['node_modules', '.turbo', '.eslintrc.js', 'codegen.ts'],
   parserOptions: {
     project: 'tsconfig.json',
diff --git a/packages/utilities/package.json b/packages/utilities/package.json
index 620f3de019a..71de7993239 100644
--- a/packages/utilities/package.json
+++ b/packages/utilities/package.json
@@ -7,13 +7,11 @@
     "@amplitude/analytics-react-native": "1.4.0",
     "@amplitude/analytics-types": "0.13.0",
     "@react-navigation/core": "6.2.2",
-    "@sentry/react": "7.80.0",
     "@sentry/react-native": "5.5.0",
     "@uniswap/analytics": "1.7.0",
     "@uniswap/analytics-events": "2.29.0",
     "@uniswap/sdk-core": "4.0.7",
     "dayjs": "1.11.7",
-    "expo-localization": "14.1.1",
     "jsbi": "3.2.5",
     "react": "18.2.0",
     "react-native": "0.71.13",
@@ -25,15 +23,13 @@
     "@testing-library/react": "13.4.0",
     "@testing-library/react-hooks": "7.0.2",
     "@types/react": "^18.0.15",
-    "@uniswap/eslint-config": "workspace:^",
     "eslint": "8.44.0",
     "jest": "29.6.4",
-    "typescript": "5.3.3"
+    "typescript": "4.9.4"
   },
   "main": "src/index.ts",
   "private": true,
   "scripts": {
-    "build": "tsc -b",
     "check:deps:usage": "depcheck",
     "lint": "eslint . --ext ts,tsx --max-warnings=0",
     "lint:fix": "eslint . --ext ts,tsx --fix",
diff --git a/packages/utilities/src/device/locales.ts b/packages/utilities/src/device/locales.ts
deleted file mode 100644
index 37471f56038..00000000000
--- a/packages/utilities/src/device/locales.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import { getLocales, Locale } from 'expo-localization'
-import { logger } from 'utilities/src/logger/logger'
-
-export function getDeviceLocales(): Locale[] {
-  try {
-    return getLocales()
-  } catch (e) {
-    const isKnownError = e instanceof Error && e.message.includes('Unsupported ISO 3166 country')
-    if (!isKnownError) {
-      logger.error(e, {
-        level: 'warning',
-        tags: { file: 'utils.ts', function: 'getDeviceLocales' },
-      })
-    }
-  }
-  return [
-    {
-      languageCode: 'en',
-      languageTag: 'en-US',
-      regionCode: null,
-      currencyCode: null,
-      currencySymbol: null,
-      decimalSeparator: null,
-      digitGroupingSeparator: null,
-      textDirection: null,
-      measurementSystem: null,
-    },
-  ]
-}
diff --git a/packages/utilities/src/format/localeBased.ts b/packages/utilities/src/format/localeBased.ts
index 35475b26e05..d7164f7e10d 100644
--- a/packages/utilities/src/format/localeBased.ts
+++ b/packages/utilities/src/format/localeBased.ts
@@ -2,8 +2,8 @@ import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import {
   FormatterRule,
   StandardCurrency,
-  TYPE_TO_FORMATTER_RULES,
   TwoDecimalsCurrency,
+  TYPE_TO_FORMATTER_RULES,
 } from 'utilities/src/format/localeBasedFormats'
 import { NumberType } from 'utilities/src/format/types'
 
diff --git a/packages/utilities/src/logger/Sentry.web.ts b/packages/utilities/src/logger/Sentry.web.ts
index 129695083e1..ca83414efb5 100644
--- a/packages/utilities/src/logger/Sentry.web.ts
+++ b/packages/utilities/src/logger/Sentry.web.ts
@@ -1,4 +1,3 @@
-import * as SentryReact from '@sentry/react'
 import { CaptureContext, SeverityLevel } from '@sentry/types'
 import { ISentry } from './Sentry'
 
@@ -9,7 +8,8 @@ import { ISentry } from './Sentry'
  * @param context Context from where this method is called
  */
 export function captureException(error: unknown, captureContext?: CaptureContext): void {
-  SentryReact.captureException(error, captureContext)
+  // eslint-disable-next-line no-console
+  console.warn(error, captureContext)
 }
 
 /**
@@ -27,11 +27,8 @@ export function captureMessage(
   message: string,
   ...extraArgs: unknown[]
 ): void {
-  SentryReact.captureMessage(message, {
-    level,
-    tags: { webContext: context },
-    ...(extraArgs ? { extra: { data: extraArgs } } : {}),
-  })
+  // eslint-disable-next-line no-console
+  console.log(context, message, ...extraArgs)
 }
 
 export const Sentry: ISentry = {
diff --git a/packages/utilities/src/primitives/array.test.ts b/packages/utilities/src/primitives/array.test.ts
index 3251d6accf2..cdae94b6dc6 100644
--- a/packages/utilities/src/primitives/array.test.ts
+++ b/packages/utilities/src/primitives/array.test.ts
@@ -1,4 +1,4 @@
-import { arraysAreEqual, bubbleToTop, differenceWith, next } from './array'
+import { bubbleToTop, differenceWith, next } from './array'
 
 it('returns undefined for empty arrays', () => {
   expect(next([], '123')).toBe(undefined)
@@ -45,15 +45,3 @@ describe('bubbleToTop', () => {
     expect(result).toEqual(inputArray) // The array should remain unchanged
   })
 })
-
-describe('arraysAreEqual', () => {
-  it('should return false for mismatched length', () => {
-    expect(arraysAreEqual([1, 1], [1, 1, 1])).toBe(false)
-  })
-  it('should return false for mismatched contents', () => {
-    expect(arraysAreEqual([1, 1], [1, 2])).toBe(false)
-  })
-  it('should return true for equal arrays', () => {
-    expect(arraysAreEqual([1, 1], [1, 1])).toBe(true)
-  })
-})
diff --git a/packages/utilities/src/primitives/array.ts b/packages/utilities/src/primitives/array.ts
index 7a1b8f98756..8fdbe9f4a36 100644
--- a/packages/utilities/src/primitives/array.ts
+++ b/packages/utilities/src/primitives/array.ts
@@ -30,20 +30,6 @@ export function differenceWith<T>(
   })
 }
 
-export function arraysAreEqual<T>(arr1: T[], arr2: T[]): boolean {
-  if (arr1.length !== arr2.length) {
-    return false
-  }
-
-  for (let i = 0; i < arr1.length; i++) {
-    if (arr1[i] !== arr2[i]) {
-      return false
-    }
-  }
-
-  return true
-}
-
 export function bubbleToTop<T>(arr: T[], predicate: (element: T) => boolean): T[] {
   if (!arr.length) {
     return arr
diff --git a/packages/utilities/src/time/duration.test.ts b/packages/utilities/src/time/duration.test.ts
deleted file mode 100644
index d050dc934b8..00000000000
--- a/packages/utilities/src/time/duration.test.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import { ONE_DAY_MS, ONE_MINUTE_MS, ONE_SECOND_MS } from 'utilities/src/time/time'
-import { getDurationRemainingString } from './duration'
-
-describe('getDurationRemainingString', () => {
-  it('should include h for durations > 1hr', () => {
-    expect(getDurationRemainingString(Date.now() + ONE_DAY_MS)).toContain('h')
-  })
-  it('should not include h for durations < 1hr', () => {
-    expect(getDurationRemainingString(Date.now() + ONE_MINUTE_MS)).not.toContain('h')
-  })
-  it('should include m for durations < 1m', () => {
-    expect(getDurationRemainingString(Date.now() + ONE_SECOND_MS * 30)).not.toContain('m')
-  })
-})
diff --git a/packages/utilities/src/time/duration.ts b/packages/utilities/src/time/duration.ts
deleted file mode 100644
index 3d6da151271..00000000000
--- a/packages/utilities/src/time/duration.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { ONE_HOUR_MS, ONE_MINUTE_MS, ONE_SECOND_MS } from './time'
-
-export function getDurationRemainingString(expirationTime: number): string {
-  const timeLeft = expirationTime - Date.now()
-  const s = ((timeLeft % ONE_MINUTE_MS) / ONE_SECOND_MS).toFixed(0)
-  if (timeLeft <= ONE_MINUTE_MS) {
-    return `${s}s`
-  }
-  const m = Math.floor(timeLeft / ONE_MINUTE_MS)
-  if (timeLeft <= ONE_HOUR_MS) {
-    return `${m}m ${s}s`
-  }
-  const h = Math.floor(timeLeft / ONE_HOUR_MS)
-  return `${h}h ${m}m ${s}s`
-}
diff --git a/packages/wallet/.depcheckrc b/packages/wallet/.depcheckrc
index 2809e092046..c939053383e 100644
--- a/packages/wallet/.depcheckrc
+++ b/packages/wallet/.depcheckrc
@@ -4,12 +4,10 @@ ignores: [
     "jest-presets",
     # Dependencies that depcheck thinks are missing but are actually present or never used
     ## Internal packages / workspaces
+    "eslint-config-custom",
     "wallet",
     "src",
     "tsconfig",
     # types
     "@types/chrome",
-    ## GraphQL
-    "@graphql-codegen/*",
-    "get-graphql-schema",
   ]
diff --git a/packages/wallet/.eslintrc.js b/packages/wallet/.eslintrc.js
index b859d3c44d4..d9b887dffb0 100644
--- a/packages/wallet/.eslintrc.js
+++ b/packages/wallet/.eslintrc.js
@@ -1,6 +1,6 @@
 module.exports = {
   root: true,
-  extends: ['@uniswap/eslint-config/native'],
+  extends: ['custom'],
   ignorePatterns: ['node_modules', '.turbo', '.eslintrc.js', 'codegen.ts'],
   parserOptions: {
     project: 'tsconfig.json',
diff --git a/packages/wallet/.gitignore b/packages/wallet/.gitignore
index 63c0259c570..9687411666f 100644
--- a/packages/wallet/.gitignore
+++ b/packages/wallet/.gitignore
@@ -5,6 +5,3 @@ tsconfig.tsbuildinfo
 
 # Generated contract types
 src/abis/types
-
-# generated graphql and api files
-src/**/__generated__
diff --git a/packages/wallet/jest-setup.js b/packages/wallet/jest-setup.js
deleted file mode 100644
index 5e7e6380186..00000000000
--- a/packages/wallet/jest-setup.js
+++ /dev/null
@@ -1,19 +0,0 @@
-import { localizeMock as mockRNLocalize } from 'react-native-localize/mock'
-import { AppearanceSettingType } from 'wallet/src/features/appearance/slice'
-import { MockLocalizationContext } from 'wallet/src/test/utils'
-
-jest.mock('react-native-localize', () => mockRNLocalize)
-jest.mock('wallet/src/features/language/LocalizationContext', () => MockLocalizationContext)
-
-// Mock the appearance hook for all tests
-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/packages/wallet/jest.config.js b/packages/wallet/jest.config.js
index 67831bf0856..df6724d88f8 100644
--- a/packages/wallet/jest.config.js
+++ b/packages/wallet/jest.config.js
@@ -24,9 +24,6 @@ module.exports = {
     // avoid native because wallet tests assume no .native.ts
     platforms: ['web', 'ios', 'android'],
   },
-  setupFiles: [
-    './jest-setup.js',
-  ],
   // we map core to tamagui's test bundle, this just makes setup simpler for jest
   moduleNameMapper: {
     ...preset.moduleNameMapper,
diff --git a/packages/wallet/openapitools.json b/packages/wallet/openapitools.json
deleted file mode 100644
index e73b9758309..00000000000
--- a/packages/wallet/openapitools.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "$schema": "./node_modules/@openapitools/openapi-generator-cli/config.schema.json",
-  "spaces": 2,
-  "generator-cli": {
-    "version": "7.2.0"
-  }
-}
diff --git a/packages/wallet/package.json b/packages/wallet/package.json
index 42c5350f685..cbec76744f0 100644
--- a/packages/wallet/package.json
+++ b/packages/wallet/package.json
@@ -1,30 +1,11 @@
 {
   "name": "wallet",
   "version": "0.0.0",
-  "scripts": {
-    "prepare": "yarn contracts && yarn tradingapi:generate",
-    "contracts:compile:abi": "typechain --target ethers-v5 --out-dir src/abis/types \"./src/abis/**/*.json\"",
-    "contracts:compile:v3": "typechain --target ethers-v5 --out-dir src/abis/types/v3 \"../../node_modules/@uniswap/**/artifacts/contracts/**/*[!dbg].json\"",
-    "contracts": "yarn contracts:compile:abi && yarn contracts:compile:v3",
-    "graphql:generate": "graphql-codegen --config codegen.ts",
-    "graphql:schema": "get-graphql-schema https://api.uniswap.org/v1/graphql -h Origin=https://app.uniswap.org > ./src/data/schema.graphql",
-    "check:deps:usage": "depcheck",
-    "lint": "eslint . --ext ts,tsx --max-warnings=0 && eslint src/i18n/locales/en-US.json",
-    "lint:fix": "eslint . --ext ts,tsx --fix && eslint src/i18n/locales/en-US.json --fix",
-    "test": "jest",
-    "tradingapi:schema": "curl https://api.uniswap.org/v2/trade/api.json -o ./src/data/tradingApi/api.json",
-    "tradingapi:generate": "openapi-generator-cli generate -i  ./src/data/tradingApi/api.json -g typescript-axios -o ./src/data/tradingApi/__generated__/ --additional-properties=ngVersion=6.1.7,npmName=restClient,supportsES6=true,npmVersion=6.9.0,withInterfaces=true",
-    "snapshots": "jest -u",
-    "typecheck": "tsc -b"
-  },
   "dependencies": {
     "@apollo/client": "3.7.11",
     "@ethersproject/bignumber": "5.7.0",
-    "@ethersproject/constants": "5.7.0",
     "@ethersproject/providers": "5.7.2",
     "@ethersproject/units": "5.7.0",
-    "@gorhom/bottom-sheet": "4.5.1",
-    "@openapitools/openapi-generator-cli": "2.9.0",
     "@react-native-community/netinfo": "9.3.0",
     "@react-navigation/core": "6.2.2",
     "@redux-saga/core": "1.2.3",
@@ -36,21 +17,15 @@
     "@uniswap/router-sdk": "1.7.1",
     "@uniswap/sdk-core": "4.0.7",
     "@uniswap/universal-router-sdk": "1.5.8",
-    "@uniswap/v2-sdk": "4.1.0",
-    "@uniswap/v3-sdk": "3.10.2",
+    "@uniswap/v2-sdk": "3.2.3",
+    "@uniswap/v3-sdk": "3.10.0",
     "apollo-link-rest": "0.9.0",
-    "axios": "1.6.5",
     "dayjs": "1.11.7",
     "ethers": "5.7.2",
-    "expo-blur": "12.2.2",
-    "expo-clipboard": "4.1.2",
     "expo-haptics": "12.0.1",
-    "expo-web-browser": "12.0.0",
-    "fuse.js": "6.5.3",
+    "expo-localization": "14.1.1",
     "graphql": "16.6.0",
     "i18next": "21.9.1",
-    "jsbi": "3.2.5",
-    "lodash": "4.17.21",
     "mockdate": "3.0.5",
     "react": "18.2.0",
     "react-i18next": "11.18.6",
@@ -59,23 +34,19 @@
     "react-native-device-info": "10.0.2",
     "react-native-dotenv": "3.2.0",
     "react-native-fast-image": "8.6.3",
-    "react-native-gesture-handler": "2.9.0",
     "react-native-image-colors": "1.5.2",
-    "react-native-localize": "2.2.6",
-    "react-native-reanimated": "3.6.2",
+    "react-native-reanimated": "3.3.0",
     "react-native-restart": "0.0.27",
     "react-native-svg": "13.9.0",
     "react-native-webview": "11.23.1",
     "react-redux": "8.0.5",
-    "react-virtualized-auto-sizer": "1.0.20",
-    "react-window": "1.8.9",
     "redux": "4.2.1",
     "redux-saga": "1.2.2",
     "redux-saga-test-plan": "4.0.4",
     "statsig-react-native": "4.11.0",
-    "tamagui": "1.88.18",
+    "tamagui": "1.74.16",
     "typed-redux-saga": "1.5.0",
-    "ua-parser-js": "1.0.37",
+    "ua-parser-js": "1.0.35",
     "ui": "workspace:^",
     "utilities": "workspace:^",
     "uuid": "9.0.0",
@@ -84,35 +55,34 @@
   },
   "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",
-    "@graphql-codegen/typescript-operations": "^3.0.2",
-    "@graphql-codegen/typescript-react-apollo": "^3.3.7",
-    "@graphql-codegen/typescript-resolvers": "^3.2.1",
     "@graphql-tools/graphql-file-loader": "8.0.0",
     "@graphql-tools/load": "8.0.1",
     "@graphql-tools/merge": "9.0.1",
     "@graphql-tools/mock": "9.0.0",
-    "@testing-library/react-hooks": "7.0.2",
     "@testing-library/react-native": "11.5.0",
     "@types/react": "^18.0.15",
-    "@types/react-window": "1.8.2",
     "@types/ua-parser-js": "0.7.31",
     "@types/zxcvbn": "4.4.2",
-    "@uniswap/eslint-config": "workspace:^",
     "depcheck": "1.4.7",
     "eslint": "8.44.0",
-    "get-graphql-schema": "^2.1.2",
     "graphql-scalars": "1.22.4",
     "jest": "29.6.4",
     "jest-presets": "workspace:^",
     "react-test-renderer": "18.2.0",
     "typechain": "5.2.0",
-    "typescript": "5.3.3"
+    "typescript": "4.9.4"
   },
   "main": "src/index.ts",
   "private": true,
+  "scripts": {
+    "check:deps:usage": "depcheck",
+    "lint": "eslint . --ext ts,tsx --max-warnings=0 && eslint src/i18n/locales/en-US.json",
+    "lint:fix": "eslint . --ext ts,tsx --fix && eslint src/i18n/locales/en-US.json --fix",
+    "test": "jest",
+    "snapshots": "jest -u",
+    "typecheck": "tsc -b",
+    "prepare": "typechain --target ethers-v5 --out-dir src/abis/types './src/abis/**/*.json'"
+  },
   "sideEffects": [
     "*.css"
   ]
diff --git a/packages/wallet/src/components/BaseCard/BaseCard.tsx b/packages/wallet/src/components/BaseCard/BaseCard.tsx
index 7a2feb3e211..79954cc4f14 100644
--- a/packages/wallet/src/components/BaseCard/BaseCard.tsx
+++ b/packages/wallet/src/components/BaseCard/BaseCard.tsx
@@ -1,16 +1,8 @@
 import { ComponentProps, ReactNode } from 'react'
 import { useTranslation } from 'react-i18next'
-import {
-  ColorTokens,
-  Flex,
-  FlexProps,
-  Icons,
-  Text,
-  TouchableArea,
-  useIsDarkMode,
-  useSporeColors,
-} from 'ui/src'
+import { ColorTokens, Flex, FlexProps, Icons, Text, TouchableArea, useSporeColors } from 'ui/src'
 import { opacify } from 'ui/src/theme'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 
 export const SHADOW_OFFSET_SMALL = { width: 0, height: 2 } as const
 
@@ -97,8 +89,8 @@ function EmptyState({
   icon,
 }: EmptyStateProps): JSX.Element {
   return (
-    <Flex centered gap="$spacing16" width="100%">
-      <Flex centered gap="$spacing4">
+    <Flex centered gap="$spacing24" p="$spacing12" width="100%">
+      <Flex centered gap="$spacing16">
         {icon}
         <Flex centered gap="$spacing8">
           {title && (
diff --git a/packages/wallet/src/components/BaseCard/__snapshots__/BaseCard.test.tsx.snap b/packages/wallet/src/components/BaseCard/__snapshots__/BaseCard.test.tsx.snap
index b5b6b6a69e9..33657117709 100644
--- a/packages/wallet/src/components/BaseCard/__snapshots__/BaseCard.test.tsx.snap
+++ b/packages/wallet/src/components/BaseCard/__snapshots__/BaseCard.test.tsx.snap
@@ -6,8 +6,12 @@ exports[`EmptyState renders without error 1`] = `
     {
       "alignItems": "center",
       "flexDirection": "column",
-      "gap": 16,
+      "gap": 24,
       "justifyContent": "center",
+      "paddingBottom": 12,
+      "paddingLeft": 12,
+      "paddingRight": 12,
+      "paddingTop": 12,
       "width": "100%",
     }
   }
@@ -17,7 +21,7 @@ exports[`EmptyState renders without error 1`] = `
       {
         "alignItems": "center",
         "flexDirection": "column",
-        "gap": 4,
+        "gap": 16,
         "justifyContent": "center",
       }
     }
@@ -53,6 +57,7 @@ exports[`EmptyState renders without error 1`] = `
   <View
     style={
       {
+        "alignItems": "stretch",
         "flexDirection": "row",
         "gap": 16,
       }
@@ -119,6 +124,7 @@ exports[`ErrorState renders without error 1`] = `
   <View
     style={
       {
+        "alignItems": "stretch",
         "flexDirection": "row",
       }
     }
@@ -189,6 +195,7 @@ exports[`Header renders without error 1`] = `
     <View
       style={
         {
+          "alignItems": "stretch",
           "flexDirection": "column",
           "gap": 4,
         }
@@ -438,6 +445,7 @@ exports[`Shadow renders without error 1`] = `
 <View
   style={
     {
+      "alignItems": "stretch",
       "backgroundColor": "#FFFFFFff",
       "borderBottomLeftRadius": 16,
       "borderBottomRightRadius": 16,
diff --git a/packages/wallet/src/components/CurrencyLogo/NetworkLogo.tsx b/packages/wallet/src/components/CurrencyLogo/NetworkLogo.tsx
index c57176c2508..396718b7547 100644
--- a/packages/wallet/src/components/CurrencyLogo/NetworkLogo.tsx
+++ b/packages/wallet/src/components/CurrencyLogo/NetworkLogo.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { Image, ImageResizeMode, StyleSheet } from 'react-native'
 import { Flex, FlexProps } from 'ui/src'
 import { iconSizes } from 'ui/src/theme'
-import { CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
+import { ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
 
 type NetworkLogoProps = FlexProps & {
   chainId: ChainId
diff --git a/packages/wallet/src/components/CurrencyLogo/TokenLogo.tsx b/packages/wallet/src/components/CurrencyLogo/TokenLogo.tsx
index 07895c708c2..25a1bb557cb 100644
--- a/packages/wallet/src/components/CurrencyLogo/TokenLogo.tsx
+++ b/packages/wallet/src/components/CurrencyLogo/TokenLogo.tsx
@@ -1,11 +1,12 @@
-import { memo, useMemo } from 'react'
+import { memo } from 'react'
 import { Image } from 'react-native'
-import { Flex, Text, useIsDarkMode, useSporeColors } from 'ui/src'
-import { fonts, iconSizes, spacing } from 'ui/src/theme'
+import { Flex, Text, useSporeColors } from 'ui/src'
+import { iconSizes, spacing } from 'ui/src/theme'
 import { isSVGUri, uriToHttp } from 'utilities/src/format/urls'
 import { STATUS_RATIO } from 'wallet/src/components/CurrencyLogo/CurrencyLogo'
-import { THIN_BORDER, style } from 'wallet/src/components/CurrencyLogo/styles'
+import { style, THIN_BORDER } from 'wallet/src/components/CurrencyLogo/styles'
 import { ChainId } from 'wallet/src/constants/chains'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { RemoteSvg } from 'wallet/src/features/images/RemoteSvg'
 import { useLogolessColorScheme } from 'wallet/src/utils/colors'
 import { NetworkLogo } from './NetworkLogo'
@@ -75,11 +76,6 @@ export const TokenLogo = memo(function _TokenLogo({
     ? logolessColorScheme.dark
     : logolessColorScheme.light
 
-  const textStyle = useMemo(
-    () => ({ color: foreground, fontFamily: fonts.buttonLabel3.family, fontWeight: '500' }),
-    [foreground]
-  )
-
   return (
     <Flex alignItems="center" height={size} justifyContent="center" width={size}>
       {httpUri ? (
@@ -98,7 +94,7 @@ export const TokenLogo = memo(function _TokenLogo({
             lineHeight={size * 0.5}
             minimumFontScale={0.5}
             numberOfLines={1}
-            style={textStyle}
+            style={{ color: foreground }}
             textAlign="center">
             {symbol?.slice(0, 3)}
           </Text>
diff --git a/packages/wallet/src/components/CurrencyLogo/__snapshots__/index.test.tsx.snap b/packages/wallet/src/components/CurrencyLogo/__snapshots__/index.test.tsx.snap
index 05d4cfd9aa7..87ee6ac6d1f 100644
--- a/packages/wallet/src/components/CurrencyLogo/__snapshots__/index.test.tsx.snap
+++ b/packages/wallet/src/components/CurrencyLogo/__snapshots__/index.test.tsx.snap
@@ -37,6 +37,7 @@ exports[`renders a currency logo with network logo 1`] = `
   <View
     style={
       {
+        "alignItems": "stretch",
         "borderBottomColor": "#FFFFFF",
         "borderBottomLeftRadius": 8,
         "borderBottomRightRadius": 8,
diff --git a/packages/wallet/src/components/TokenSelector/TokenSectionBaseList.native.tsx b/packages/wallet/src/components/TokenSelector/TokenSectionBaseList.native.tsx
deleted file mode 100644
index c03f51a3965..00000000000
--- a/packages/wallet/src/components/TokenSelector/TokenSectionBaseList.native.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-import { BottomSheetSectionList } from '@gorhom/bottom-sheet'
-import { useEffect, useRef } from 'react'
-import { SectionList } from 'react-native'
-import { useDeviceInsets } from 'ui/src'
-import { TokenSectionBaseListProps } from 'wallet/src/components/TokenSelector/TokenSectionBaseList'
-import {
-  SuggestedTokenSection,
-  TokenOption,
-  TokenSection,
-} from 'wallet/src/components/TokenSelector/types'
-
-export function TokenSectionBaseList({
-  sectionListRef,
-  ListEmptyComponent,
-  focusHook,
-  keyExtractor,
-  renderItem,
-  renderSectionHeader,
-  sections,
-}: TokenSectionBaseListProps): JSX.Element {
-  const insets = useDeviceInsets()
-  const ref = useRef<SectionList<TokenOption>>(null)
-
-  useEffect(() => {
-    if (sectionListRef) {
-      sectionListRef.current = {
-        scrollToLocation: ({ itemIndex, sectionIndex, animated }): void => {
-          ref.current?.scrollToLocation({ itemIndex, sectionIndex, animated })
-        },
-      }
-    }
-  }, [sectionListRef])
-
-  return (
-    <BottomSheetSectionList<TokenOption | TokenOption[], SuggestedTokenSection | TokenSection>
-      ref={ref}
-      ListEmptyComponent={ListEmptyComponent}
-      bounces={true}
-      contentContainerStyle={{ paddingBottom: insets.bottom }}
-      focusHook={focusHook}
-      keyExtractor={keyExtractor}
-      keyboardDismissMode="on-drag"
-      keyboardShouldPersistTaps="always"
-      renderItem={renderItem}
-      renderSectionHeader={renderSectionHeader}
-      sections={sections ?? []}
-      showsVerticalScrollIndicator={false}
-      stickySectionHeadersEnabled={true}
-      windowSize={4}
-    />
-  )
-}
diff --git a/packages/wallet/src/components/TokenSelector/TokenSectionBaseList.tsx b/packages/wallet/src/components/TokenSelector/TokenSectionBaseList.tsx
deleted file mode 100644
index 38c2dbaa5fe..00000000000
--- a/packages/wallet/src/components/TokenSelector/TokenSectionBaseList.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { EffectCallback, MutableRefObject } from 'react'
-import { NotImplementedError } from 'utilities/src/errors'
-import {
-  SuggestedTokenSection,
-  TokenOption,
-  TokenSection,
-  TokenSelectorListSections,
-} from 'wallet/src/components/TokenSelector/types'
-
-export type SectionHeaderProps = Pick<TokenSection, 'title' | 'rightElement'>
-
-export interface TokenSectionBaseListRef {
-  scrollToLocation: (params: { itemIndex: number; sectionIndex: number; animated: boolean }) => void
-}
-
-export type SectionRowInfo = { section: SectionHeaderProps }
-
-export interface ItemRowInfo {
-  item: TokenOption | TokenOption[]
-  section: SuggestedTokenSection | TokenSection
-  index: number
-}
-
-export interface TokenSectionBaseListProps {
-  sectionListRef?: MutableRefObject<TokenSectionBaseListRef | undefined>
-  ListEmptyComponent?: JSX.Element
-  focusHook?: (callback: EffectCallback) => void
-  keyExtractor?: (item: TokenOption | TokenOption[], index: number) => string
-  renderItem: (info: ItemRowInfo) => JSX.Element | null
-  renderSectionHeader?: (info: SectionRowInfo) => JSX.Element
-  sections: TokenSelectorListSections
-}
-
-export function TokenSectionBaseList(_props: TokenSectionBaseListProps): JSX.Element {
-  throw new NotImplementedError('TokenSectionBaseList')
-}
diff --git a/packages/wallet/src/components/TokenSelector/TokenSectionBaseList.web.tsx b/packages/wallet/src/components/TokenSelector/TokenSectionBaseList.web.tsx
deleted file mode 100644
index 97d9ca105ba..00000000000
--- a/packages/wallet/src/components/TokenSelector/TokenSectionBaseList.web.tsx
+++ /dev/null
@@ -1,140 +0,0 @@
-import { CSSProperties, Key, useEffect, useMemo, useRef } from 'react'
-import AutoSizer from 'react-virtualized-auto-sizer'
-import { VariableSizeList as List } from 'react-window'
-import { Flex } from 'ui/src'
-import {
-  ItemRowInfo,
-  SectionRowInfo,
-  TokenSectionBaseListProps,
-} from 'wallet/src/components/TokenSelector/TokenSectionBaseList'
-
-const SECTION_HEADER_HEIGHT = 40
-const ITEM_ROW_HEIGHT = 72
-
-type BaseListRowInfo = {
-  key: Key | undefined
-}
-type BaseListSectionRowInfo = SectionRowInfo &
-  BaseListRowInfo &
-  Pick<TokenSectionBaseListProps, 'renderSectionHeader'>
-type BaseListItemRowInfo = ItemRowInfo &
-  BaseListRowInfo &
-  Pick<TokenSectionBaseListProps, 'renderItem'>
-
-type BaseListData = (BaseListItemRowInfo | BaseListSectionRowInfo)[]
-
-function isSectionHeader(
-  rowInfo: BaseListSectionRowInfo | BaseListItemRowInfo
-): rowInfo is BaseListSectionRowInfo {
-  return !('renderItem' in rowInfo)
-}
-
-export function TokenSectionBaseList({
-  ListEmptyComponent,
-  keyExtractor,
-  renderItem,
-  renderSectionHeader,
-  sections,
-  sectionListRef,
-}: TokenSectionBaseListProps): JSX.Element {
-  const ref = useRef<List>(null)
-
-  useEffect(() => {
-    if (sectionListRef) {
-      sectionListRef.current = {
-        scrollToLocation: ({ itemIndex, sectionIndex }): void => {
-          let listIndex = 0
-          for (let i = 0; i < sectionIndex; i++) {
-            const section = sections[i]
-            listIndex += section?.data?.length ?? 0
-          }
-          listIndex += itemIndex
-
-          ref.current?.scrollToItem(listIndex)
-        },
-      }
-    }
-  }, [sectionListRef, sections])
-
-  const items = useMemo(() => {
-    return sections.reduce((acc: BaseListData, section) => {
-      const sectionInfo: BaseListSectionRowInfo = {
-        section: { title: section.title, rightElement: section.rightElement },
-        key: section.title,
-        renderSectionHeader,
-      }
-      acc.push(sectionInfo)
-
-      return acc.concat(
-        section.data.map((item, index) => {
-          const itemInfo: BaseListItemRowInfo = {
-            item,
-            section,
-            index,
-            key: keyExtractor?.(item, index),
-            renderItem,
-          }
-          return itemInfo
-        })
-      )
-    }, [])
-  }, [sections, keyExtractor, renderSectionHeader, renderItem])
-
-  function getItemSize(index: number): number {
-    const item = items[index]
-    if (!item) {
-      return 0
-    } else if (isSectionHeader(item)) {
-      return SECTION_HEADER_HEIGHT
-    }
-    return ITEM_ROW_HEIGHT
-  }
-
-  return (
-    <Flex grow>
-      {!sections.length && ListEmptyComponent}
-      <AutoSizer disableWidth>
-        {({ height }: { height: number }): JSX.Element => {
-          return (
-            <List
-              ref={ref}
-              height={height}
-              itemCount={items.length}
-              itemData={items}
-              itemSize={getItemSize}
-              // eslint-disable-next-line react-native/no-inline-styles
-              style={{ overflowX: 'clip' }}
-              width="100%">
-              {TokenSectionBaseListRow}
-            </List>
-          )
-        }}
-      </AutoSizer>
-    </Flex>
-  )
-}
-
-function TokenSectionBaseListRow({
-  index,
-  data,
-  style,
-}: {
-  index: number
-  data: BaseListData
-  style: CSSProperties
-}): JSX.Element {
-  const itemData = data[index]
-
-  return (
-    <Flex
-      key={itemData?.key ?? index}
-      row
-      // eslint-disable-next-line react-native/no-inline-styles
-      style={{ ...style, overflowX: 'scroll' }}>
-      {itemData &&
-        (isSectionHeader(itemData)
-          ? itemData.renderSectionHeader?.(itemData)
-          : itemData.renderItem(itemData))}
-    </Flex>
-  )
-}
diff --git a/packages/wallet/src/components/accounts/AccountDetails.test.tsx b/packages/wallet/src/components/accounts/AccountDetails.test.tsx
deleted file mode 100644
index 173a3dcf4b5..00000000000
--- a/packages/wallet/src/components/accounts/AccountDetails.test.tsx
+++ /dev/null
@@ -1,19 +0,0 @@
-import { AccountDetails } from 'wallet/src/components/accounts/AccountDetails'
-import { account } from 'wallet/src/test/fixtures'
-import { renderWithProviders } from 'wallet/src/test/render'
-
-describe(AccountDetails, () => {
-  it('renders without error', () => {
-    const tree = renderWithProviders(<AccountDetails address={account.address} iconSize={50} />)
-
-    expect(tree.toJSON()).toMatchSnapshot()
-  })
-
-  it('renders without error with chevron', () => {
-    const tree = renderWithProviders(
-      <AccountDetails chevron address={account.address} iconSize={50} />
-    )
-
-    expect(tree.toJSON()).toMatchSnapshot()
-  })
-})
diff --git a/packages/wallet/src/components/accounts/AnimatedUnitagDisplayName.tsx b/packages/wallet/src/components/accounts/AnimatedUnitagDisplayName.tsx
deleted file mode 100644
index 4f589e1f324..00000000000
--- a/packages/wallet/src/components/accounts/AnimatedUnitagDisplayName.tsx
+++ /dev/null
@@ -1,95 +0,0 @@
-import { impactAsync } from 'expo-haptics'
-import { useState } from 'react'
-import { LayoutChangeEvent } from 'react-native'
-import { AnimatePresence, Flex, Icons, Text, TouchableArea } from 'ui/src'
-import Unitag from 'ui/src/assets/graphics/unitag.svg'
-import { IconSizeTokens, iconSizes } from 'ui/src/theme'
-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 { sanitizeAddressText, shortenAddress } from 'wallet/src/utils/addresses'
-import { setClipboard } from 'wallet/src/utils/clipboard'
-
-type AnimatedUnitagDisplayNameProps = {
-  displayName: DisplayName
-  unitagIconSize?: IconSizeTokens | number
-  address?: string
-}
-
-export function AnimatedUnitagDisplayName({
-  displayName,
-  unitagIconSize = iconSizes.icon24,
-  address,
-}: AnimatedUnitagDisplayNameProps): JSX.Element {
-  const dispatch = useAppDispatch()
-  const [showUnitagSuffix, setShowUnitagSuffix] = useState(false)
-  const [textWidth, setTextWidth] = useState(0)
-  const isUnitag = displayName?.type === DisplayNameType.Unitag
-
-  const onTextLayout = (event: LayoutChangeEvent): void => {
-    setTextWidth(event.nativeEvent.layout.width)
-  }
-
-  const onPressUnitag = (): void => {
-    setShowUnitagSuffix(!showUnitagSuffix)
-  }
-
-  const onPressCopyAddress = async (): Promise<void> => {
-    if (!address) {
-      return
-    }
-
-    await impactAsync()
-    await setClipboard(address)
-    dispatch(
-      pushNotification({
-        type: AppNotificationType.Copied,
-        copyType: CopyNotificationType.Address,
-      })
-    )
-  }
-
-  return (
-    <Flex onPress={isUnitag ? onPressUnitag : undefined}>
-      <Flex row>
-        <Text color="$neutral1" variant="subheading1">
-          {displayName.name}
-        </Text>
-        <AnimatePresence>
-          <Flex row animation="quick" marginLeft={-textWidth} x={showUnitagSuffix ? textWidth : 0}>
-            <Flex onLayout={onTextLayout}>
-              <Text
-                animation="quick"
-                color="$neutral3"
-                opacity={showUnitagSuffix ? 1 : 0}
-                variant="subheading1">
-                {UNITAG_SUFFIX}
-              </Text>
-            </Flex>
-            {isUnitag ? (
-              <Flex animation="quick" pl="$spacing2">
-                <Unitag height={unitagIconSize} width={unitagIconSize} />
-              </Flex>
-            ) : null}
-            {address && (
-              <TouchableArea
-                hapticFeedback
-                hitSlop={20}
-                pl="$spacing8"
-                onPress={onPressCopyAddress}>
-                <Flex row alignItems="center" gap="$spacing4">
-                  <Text color="$neutral3" numberOfLines={1} variant="body2">
-                    {sanitizeAddressText(shortenAddress(address))}
-                  </Text>
-                  <Icons.CopyAlt color="$neutral3" size="$icon.16" />
-                </Flex>
-              </TouchableArea>
-            )}
-          </Flex>
-        </AnimatePresence>
-      </Flex>
-    </Flex>
-  )
-}
diff --git a/packages/wallet/src/components/accounts/DisplayNameText.test.tsx b/packages/wallet/src/components/accounts/DisplayNameText.test.tsx
deleted file mode 100644
index 86ea52877df..00000000000
--- a/packages/wallet/src/components/accounts/DisplayNameText.test.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { AccountDetails } from 'wallet/src/components/accounts/AccountDetails'
-import { DisplayNameText } from 'wallet/src/components/accounts/DisplayNameText'
-import { DisplayName, DisplayNameType } from 'wallet/src/features/wallet/types'
-import { account } from 'wallet/src/test/fixtures'
-import { render } from 'wallet/src/test/test-utils'
-
-const unitagDisplayName: DisplayName = { name: 'luni', type: DisplayNameType.Unitag }
-const ensDisplayName: DisplayName = { name: 'vitalik.eth', type: DisplayNameType.ENS }
-const localDisplayName: DisplayName = { name: 'Wallet 1', type: DisplayNameType.Local }
-const addressDisplayName: DisplayName = { name: account.address, type: DisplayNameType.Address }
-
-describe(AccountDetails, () => {
-  it('renders unitag without error', () => {
-    const tree = render(<DisplayNameText displayName={unitagDisplayName} />)
-    expect(tree.toJSON()).toMatchSnapshot()
-  })
-
-  it('renders ens display name without error', () => {
-    const tree = render(<DisplayNameText displayName={ensDisplayName} />)
-    expect(tree.toJSON()).toMatchSnapshot()
-  })
-
-  it('renders local display name without error', () => {
-    const tree = render(<DisplayNameText displayName={localDisplayName} />)
-    expect(tree.toJSON()).toMatchSnapshot()
-  })
-
-  it('renders address display name without error', () => {
-    const tree = render(<DisplayNameText displayName={addressDisplayName} />)
-    expect(tree.toJSON()).toMatchSnapshot()
-  })
-})
diff --git a/packages/wallet/src/components/accounts/DisplayNameText.tsx b/packages/wallet/src/components/accounts/DisplayNameText.tsx
deleted file mode 100644
index 59be80e783c..00000000000
--- a/packages/wallet/src/components/accounts/DisplayNameText.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Flex, FlexProps, Text, TextProps } from 'ui/src'
-import Unitag from 'ui/src/assets/graphics/unitag.svg'
-import { IconSizeTokens, iconSizes } from 'ui/src/theme'
-import { DisplayName, DisplayNameType } from 'wallet/src/features/wallet/types'
-
-type DisplayNameProps = {
-  displayName?: DisplayName
-  unitagIconSize?: IconSizeTokens | number
-  textProps?: TextProps
-} & FlexProps
-
-export function DisplayNameText({
-  displayName,
-  unitagIconSize = iconSizes.icon24,
-  textProps,
-  ...rest
-}: DisplayNameProps): JSX.Element {
-  const isUnitag = displayName?.type === DisplayNameType.Unitag
-
-  return (
-    <Flex centered row gap="$spacing2" {...rest}>
-      <Text {...textProps} color={textProps?.color ?? '$neutral1'} flexShrink={1} numberOfLines={1}>
-        {displayName?.name}
-      </Text>
-      {isUnitag ? (
-        <Flex>
-          <Unitag height={unitagIconSize} width={unitagIconSize} />
-        </Flex>
-      ) : null}
-    </Flex>
-  )
-}
diff --git a/packages/wallet/src/components/accounts/__snapshots__/AccountDetails.test.tsx.snap b/packages/wallet/src/components/accounts/__snapshots__/AccountDetails.test.tsx.snap
deleted file mode 100644
index f97466fd6ed..00000000000
--- a/packages/wallet/src/components/accounts/__snapshots__/AccountDetails.test.tsx.snap
+++ /dev/null
@@ -1,764 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AccountDetails renders without error 1`] = `
-<View
-  style={
-    {
-      "alignItems": "center",
-      "flexDirection": "row",
-      "flexShrink": 1,
-      "gap": 16,
-      "justifyContent": "space-between",
-    }
-  }
->
-  <View
-    style={
-      {
-        "flex": 1,
-        "flexDirection": "row",
-        "flexShrink": 1,
-      }
-    }
-  >
-    <View
-      style={
-        {
-          "alignItems": "center",
-          "flexDirection": "row",
-          "gap": 8,
-        }
-      }
-    >
-      <View
-        style={
-          {
-            "backgroundColor": "transparent",
-            "borderBottomColor": "transparent",
-            "borderBottomLeftRadius": 999999,
-            "borderBottomRightRadius": 999999,
-            "borderBottomWidth": 0,
-            "borderLeftColor": "transparent",
-            "borderLeftWidth": 0,
-            "borderRightColor": "transparent",
-            "borderRightWidth": 0,
-            "borderStyle": "solid",
-            "borderTopColor": "transparent",
-            "borderTopLeftRadius": 999999,
-            "borderTopRightRadius": 999999,
-            "borderTopWidth": 0,
-            "flexDirection": "column",
-            "position": "relative",
-          }
-        }
-      >
-        <View
-          style={
-            {
-              "alignItems": "center",
-              "borderBottomLeftRadius": 999999,
-              "borderBottomRightRadius": 999999,
-              "borderTopLeftRadius": 999999,
-              "borderTopRightRadius": 999999,
-              "flexDirection": "column",
-              "height": 50,
-              "justifyContent": "center",
-              "paddingBottom": 0,
-              "paddingLeft": 0,
-              "paddingRight": 0,
-              "paddingTop": 0,
-              "width": 50,
-            }
-          }
-        >
-          <div
-            style={
-              {
-                "height": 50,
-                "position": "relative",
-                "width": 50,
-              }
-            }
-          >
-            <div
-              style={
-                {
-                  "height": 50,
-                  "overflow": "visible",
-                  "position": "absolute",
-                  "width": 50,
-                }
-              }
-            >
-              <svg
-                viewBox="0 0 50 50"
-              >
-                <defs>
-                  <defs>
-                    <mask
-                      id="container-mask0x82D56A352367453f74FC0dC7B071b311da373Fa650"
-                    >
-                      <rect
-                        fill="white"
-                        height="100%"
-                        width="100%"
-                        x="0"
-                        y="0"
-                      />
-                      <g
-                        transform="scale(1.3888888888888888) 
- translate(0, 0)"
-                      >
-                        <path
-                          clipRule="evenodd"
-                          d="M31 33V16C31 8.8203 25.1797 3 18 3C10.8203 3 5 8.8203 5 16V33H31ZM18 0C9.16344 0 2 7.16344 2 16V35.807C2 35.9136 2.08642 36 2.19303 36H33.807C33.9136 36 34 35.9136 34 35.807V16C34 7.16344 26.8366 0 18 0Z"
-                          fill="black"
-                          fillRule="evenodd"
-                        />
-                      </g>
-                    </mask>
-                    <mask
-                      id="shape-mask0x82D56A352367453f74FC0dC7B071b311da373Fa650"
-                    >
-                      <rect
-                        fill="white"
-                        height="100%"
-                        width="100%"
-                        x="0"
-                        y="0"
-                      />
-                      <g
-                        transform="scale(1.3888888888888888) 
- translate(10, 10)"
-                      >
-                        <path
-                          d="M8 8C8 8 13.1678 6.70089 14.2197 5.649C15.2716 4.59712 15.2583 2.87836 14.19 1.81004C13.1216 0.741719 11.4029 0.728395 10.351 1.78028C9.29911 2.83216 8 8 8 8Z"
-                          fill="black"
-                        />
-                        <path
-                          d="M8 8C8 8 13.1678 9.29911 14.2197 10.351C15.2716 11.4029 15.2583 13.1216 14.19 14.19C13.1216 15.2583 11.4029 15.2716 10.351 14.2197C9.29911 13.1678 8 8 8 8Z"
-                          fill="black"
-                        />
-                        <path
-                          d="M1.78028 10.351C2.83216 9.29911 8 8 8 8C8 8 6.70089 13.1678 5.649 14.2197C4.59712 15.2716 2.87836 15.2583 1.81004 14.19C0.741719 13.1216 0.728395 11.4029 1.78028 10.351Z"
-                          fill="black"
-                        />
-                        <path
-                          d="M8 8C8 8 2.83216 6.70089 1.78028 5.649C0.728395 4.59712 0.741719 2.87836 1.81004 1.81004C2.87836 0.741719 4.59712 0.728395 5.649 1.78028C6.70089 2.83216 8 8 8 8Z"
-                          fill="black"
-                        />
-                      </g>
-                    </mask>
-                    <mask
-                      id="mask0x82D56A352367453f74FC0dC7B071b311da373Fa650"
-                    >
-                      <g
-                        fill="white"
-                      >
-                        <g
-                          mask="url(#shape-mask0x82D56A352367453f74FC0dC7B071b311da373Fa650)"
-                        >
-                          <g
-                            transform="scale(1.3888888888888888)"
-                          >
-                            <path
-                              clipRule="evenodd"
-                              d="M31 33V16C31 8.8203 25.1797 3 18 3C10.8203 3 5 8.8203 5 16V33H31ZM18 0C9.16344 0 2 7.16344 2 16V35.807C2 35.9136 2.08642 36 2.19303 36H33.807C33.9136 36 34 35.9136 34 35.807V16C34 7.16344 26.8366 0 18 0Z"
-                              fillRule="evenodd"
-                            />
-                          </g>
-                        </g>
-                        <g
-                          mask="url(#container-mask0x82D56A352367453f74FC0dC7B071b311da373Fa650)"
-                        >
-                          <g
-                            transform="scale(1.3888888888888888)
-        translate(10, 10)"
-                          >
-                            <path
-                              d="M8 8C8 8 13.1678 6.70089 14.2197 5.649C15.2716 4.59712 15.2583 2.87836 14.19 1.81004C13.1216 0.741719 11.4029 0.728395 10.351 1.78028C9.29911 2.83216 8 8 8 8Z"
-                            />
-                            <path
-                              d="M8 8C8 8 13.1678 9.29911 14.2197 10.351C15.2716 11.4029 15.2583 13.1216 14.19 14.19C13.1216 15.2583 11.4029 15.2716 10.351 14.2197C9.29911 13.1678 8 8 8 8Z"
-                            />
-                            <path
-                              d="M1.78028 10.351C2.83216 9.29911 8 8 8 8C8 8 6.70089 13.1678 5.649 14.2197C4.59712 15.2716 2.87836 15.2583 1.81004 14.19C0.741719 13.1216 0.728395 11.4029 1.78028 10.351Z"
-                            />
-                            <path
-                              d="M8 8C8 8 2.83216 6.70089 1.78028 5.649C0.728395 4.59712 0.741719 2.87836 1.81004 1.81004C2.87836 0.741719 4.59712 0.728395 5.649 1.78028C6.70089 2.83216 8 8 8 8Z"
-                            />
-                          </g>
-                        </g>
-                      </g>
-                    </mask>
-                  </defs>
-                  <linearGradient
-                    id="gradient0x82D56A352367453f74FC0dC7B071b311da373Fa650"
-                  >
-                    <stop
-                      offset="0%"
-                      stopColor="#6100FF"
-                    />
-                    <stop
-                      offset="100%"
-                      stopColor="#76D191"
-                    />
-                  </linearGradient>
-                  <filter
-                    height="200%"
-                    id="blur0x82D56A352367453f74FC0dC7B071b311da373Fa650"
-                    width="200%"
-                    x="-50%"
-                    y="-50%"
-                  >
-                    <feGaussianBlur
-                      in="SourceGraphic"
-                      stdDeviation={16.666666666666668}
-                    />
-                  </filter>
-                </defs>
-                <g
-                  mask="url(#mask0x82D56A352367453f74FC0dC7B071b311da373Fa650)"
-                >
-                  <rect
-                    fill="url(#gradient0x82D56A352367453f74FC0dC7B071b311da373Fa650)"
-                    height="100%"
-                    width="100%"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="black"
-                    height="100%"
-                    opacity={0.08}
-                    width="100%"
-                    x="0"
-                    y="0"
-                  />
-                  <ellipse
-                    cx={25}
-                    cy={0}
-                    fill="#D3EBA3"
-                    filter="url(#blur0x82D56A352367453f74FC0dC7B071b311da373Fa650)"
-                    rx={25}
-                    ry={25}
-                  />
-                </g>
-              </svg>
-            </div>
-          </div>
-        </View>
-      </View>
-      <View
-        style={
-          {
-            "alignItems": "flex-start",
-            "flexDirection": "column",
-            "flexShrink": 1,
-            "gap": 0,
-          }
-        }
-      >
-        <View
-          style={
-            {
-              "alignItems": "center",
-              "flexDirection": "row",
-              "gap": 12,
-              "justifyContent": "center",
-            }
-          }
-        >
-          <View
-            style={
-              {
-                "alignItems": "center",
-                "flexDirection": "row",
-                "gap": 2,
-                "justifyContent": "center",
-              }
-            }
-          >
-            <Text
-              adjustsFontSizeToFit={true}
-              allowFontScaling={true}
-              maxFontSizeMultiplier={1.4}
-              numberOfLines={1}
-              style={
-                {
-                  "color": "#222222",
-                  "flexShrink": 1,
-                  "fontFamily": "Basel-Book",
-                  "fontSize": 15,
-                  "lineHeight": 20,
-                }
-              }
-              suppressHighlighting={true}
-              testID="address-display/name/0x​82D5...3Fa6"
-            >
-              0x​82D5...3Fa6
-            </Text>
-          </View>
-        </View>
-      </View>
-    </View>
-  </View>
-  <View
-    style={
-      {
-        "alignItems": "center",
-        "flex": 1,
-        "flexDirection": "row",
-        "flexShrink": 1,
-        "gap": 4,
-        "justifyContent": "flex-end",
-      }
-    }
-  >
-    <Text
-      allowFontScaling={true}
-      maxFontSizeMultiplier={1.4}
-      style={
-        {
-          "color": "#7D7D7D",
-          "fontFamily": "Basel-Book",
-          "fontSize": 15,
-          "lineHeight": 20,
-        }
-      }
-      suppressHighlighting={true}
-    >
-      0x82D5...3Fa6
-    </Text>
-  </View>
-</View>
-`;
-
-exports[`AccountDetails renders without error with chevron 1`] = `
-<View
-  style={
-    {
-      "alignItems": "center",
-      "flexDirection": "row",
-      "flexShrink": 1,
-      "gap": 16,
-      "justifyContent": "space-between",
-    }
-  }
->
-  <View
-    style={
-      {
-        "flex": 1,
-        "flexDirection": "row",
-        "flexShrink": 1,
-      }
-    }
-  >
-    <View
-      style={
-        {
-          "alignItems": "center",
-          "flexDirection": "row",
-          "gap": 8,
-        }
-      }
-    >
-      <View
-        style={
-          {
-            "backgroundColor": "transparent",
-            "borderBottomColor": "transparent",
-            "borderBottomLeftRadius": 999999,
-            "borderBottomRightRadius": 999999,
-            "borderBottomWidth": 0,
-            "borderLeftColor": "transparent",
-            "borderLeftWidth": 0,
-            "borderRightColor": "transparent",
-            "borderRightWidth": 0,
-            "borderStyle": "solid",
-            "borderTopColor": "transparent",
-            "borderTopLeftRadius": 999999,
-            "borderTopRightRadius": 999999,
-            "borderTopWidth": 0,
-            "flexDirection": "column",
-            "position": "relative",
-          }
-        }
-      >
-        <View
-          style={
-            {
-              "alignItems": "center",
-              "borderBottomLeftRadius": 999999,
-              "borderBottomRightRadius": 999999,
-              "borderTopLeftRadius": 999999,
-              "borderTopRightRadius": 999999,
-              "flexDirection": "column",
-              "height": 50,
-              "justifyContent": "center",
-              "paddingBottom": 0,
-              "paddingLeft": 0,
-              "paddingRight": 0,
-              "paddingTop": 0,
-              "width": 50,
-            }
-          }
-        >
-          <div
-            style={
-              {
-                "height": 50,
-                "position": "relative",
-                "width": 50,
-              }
-            }
-          >
-            <div
-              style={
-                {
-                  "height": 50,
-                  "overflow": "visible",
-                  "position": "absolute",
-                  "width": 50,
-                }
-              }
-            >
-              <svg
-                viewBox="0 0 50 50"
-              >
-                <defs>
-                  <defs>
-                    <mask
-                      id="container-mask0x82D56A352367453f74FC0dC7B071b311da373Fa650"
-                    >
-                      <rect
-                        fill="white"
-                        height="100%"
-                        width="100%"
-                        x="0"
-                        y="0"
-                      />
-                      <g
-                        transform="scale(1.3888888888888888) 
- translate(0, 0)"
-                      >
-                        <path
-                          clipRule="evenodd"
-                          d="M31 33V16C31 8.8203 25.1797 3 18 3C10.8203 3 5 8.8203 5 16V33H31ZM18 0C9.16344 0 2 7.16344 2 16V35.807C2 35.9136 2.08642 36 2.19303 36H33.807C33.9136 36 34 35.9136 34 35.807V16C34 7.16344 26.8366 0 18 0Z"
-                          fill="black"
-                          fillRule="evenodd"
-                        />
-                      </g>
-                    </mask>
-                    <mask
-                      id="shape-mask0x82D56A352367453f74FC0dC7B071b311da373Fa650"
-                    >
-                      <rect
-                        fill="white"
-                        height="100%"
-                        width="100%"
-                        x="0"
-                        y="0"
-                      />
-                      <g
-                        transform="scale(1.3888888888888888) 
- translate(10, 10)"
-                      >
-                        <path
-                          d="M8 8C8 8 13.1678 6.70089 14.2197 5.649C15.2716 4.59712 15.2583 2.87836 14.19 1.81004C13.1216 0.741719 11.4029 0.728395 10.351 1.78028C9.29911 2.83216 8 8 8 8Z"
-                          fill="black"
-                        />
-                        <path
-                          d="M8 8C8 8 13.1678 9.29911 14.2197 10.351C15.2716 11.4029 15.2583 13.1216 14.19 14.19C13.1216 15.2583 11.4029 15.2716 10.351 14.2197C9.29911 13.1678 8 8 8 8Z"
-                          fill="black"
-                        />
-                        <path
-                          d="M1.78028 10.351C2.83216 9.29911 8 8 8 8C8 8 6.70089 13.1678 5.649 14.2197C4.59712 15.2716 2.87836 15.2583 1.81004 14.19C0.741719 13.1216 0.728395 11.4029 1.78028 10.351Z"
-                          fill="black"
-                        />
-                        <path
-                          d="M8 8C8 8 2.83216 6.70089 1.78028 5.649C0.728395 4.59712 0.741719 2.87836 1.81004 1.81004C2.87836 0.741719 4.59712 0.728395 5.649 1.78028C6.70089 2.83216 8 8 8 8Z"
-                          fill="black"
-                        />
-                      </g>
-                    </mask>
-                    <mask
-                      id="mask0x82D56A352367453f74FC0dC7B071b311da373Fa650"
-                    >
-                      <g
-                        fill="white"
-                      >
-                        <g
-                          mask="url(#shape-mask0x82D56A352367453f74FC0dC7B071b311da373Fa650)"
-                        >
-                          <g
-                            transform="scale(1.3888888888888888)"
-                          >
-                            <path
-                              clipRule="evenodd"
-                              d="M31 33V16C31 8.8203 25.1797 3 18 3C10.8203 3 5 8.8203 5 16V33H31ZM18 0C9.16344 0 2 7.16344 2 16V35.807C2 35.9136 2.08642 36 2.19303 36H33.807C33.9136 36 34 35.9136 34 35.807V16C34 7.16344 26.8366 0 18 0Z"
-                              fillRule="evenodd"
-                            />
-                          </g>
-                        </g>
-                        <g
-                          mask="url(#container-mask0x82D56A352367453f74FC0dC7B071b311da373Fa650)"
-                        >
-                          <g
-                            transform="scale(1.3888888888888888)
-        translate(10, 10)"
-                          >
-                            <path
-                              d="M8 8C8 8 13.1678 6.70089 14.2197 5.649C15.2716 4.59712 15.2583 2.87836 14.19 1.81004C13.1216 0.741719 11.4029 0.728395 10.351 1.78028C9.29911 2.83216 8 8 8 8Z"
-                            />
-                            <path
-                              d="M8 8C8 8 13.1678 9.29911 14.2197 10.351C15.2716 11.4029 15.2583 13.1216 14.19 14.19C13.1216 15.2583 11.4029 15.2716 10.351 14.2197C9.29911 13.1678 8 8 8 8Z"
-                            />
-                            <path
-                              d="M1.78028 10.351C2.83216 9.29911 8 8 8 8C8 8 6.70089 13.1678 5.649 14.2197C4.59712 15.2716 2.87836 15.2583 1.81004 14.19C0.741719 13.1216 0.728395 11.4029 1.78028 10.351Z"
-                            />
-                            <path
-                              d="M8 8C8 8 2.83216 6.70089 1.78028 5.649C0.728395 4.59712 0.741719 2.87836 1.81004 1.81004C2.87836 0.741719 4.59712 0.728395 5.649 1.78028C6.70089 2.83216 8 8 8 8Z"
-                            />
-                          </g>
-                        </g>
-                      </g>
-                    </mask>
-                  </defs>
-                  <linearGradient
-                    id="gradient0x82D56A352367453f74FC0dC7B071b311da373Fa650"
-                  >
-                    <stop
-                      offset="0%"
-                      stopColor="#6100FF"
-                    />
-                    <stop
-                      offset="100%"
-                      stopColor="#76D191"
-                    />
-                  </linearGradient>
-                  <filter
-                    height="200%"
-                    id="blur0x82D56A352367453f74FC0dC7B071b311da373Fa650"
-                    width="200%"
-                    x="-50%"
-                    y="-50%"
-                  >
-                    <feGaussianBlur
-                      in="SourceGraphic"
-                      stdDeviation={16.666666666666668}
-                    />
-                  </filter>
-                </defs>
-                <g
-                  mask="url(#mask0x82D56A352367453f74FC0dC7B071b311da373Fa650)"
-                >
-                  <rect
-                    fill="url(#gradient0x82D56A352367453f74FC0dC7B071b311da373Fa650)"
-                    height="100%"
-                    width="100%"
-                    x="0"
-                    y="0"
-                  />
-                  <rect
-                    fill="black"
-                    height="100%"
-                    opacity={0.08}
-                    width="100%"
-                    x="0"
-                    y="0"
-                  />
-                  <ellipse
-                    cx={25}
-                    cy={0}
-                    fill="#D3EBA3"
-                    filter="url(#blur0x82D56A352367453f74FC0dC7B071b311da373Fa650)"
-                    rx={25}
-                    ry={25}
-                  />
-                </g>
-              </svg>
-            </div>
-          </div>
-        </View>
-      </View>
-      <View
-        style={
-          {
-            "alignItems": "flex-start",
-            "flexDirection": "column",
-            "flexShrink": 1,
-            "gap": 0,
-          }
-        }
-      >
-        <View
-          style={
-            {
-              "alignItems": "center",
-              "flexDirection": "row",
-              "gap": 12,
-              "justifyContent": "center",
-            }
-          }
-        >
-          <View
-            style={
-              {
-                "alignItems": "center",
-                "flexDirection": "row",
-                "gap": 2,
-                "justifyContent": "center",
-              }
-            }
-          >
-            <Text
-              adjustsFontSizeToFit={true}
-              allowFontScaling={true}
-              maxFontSizeMultiplier={1.4}
-              numberOfLines={1}
-              style={
-                {
-                  "color": "#222222",
-                  "flexShrink": 1,
-                  "fontFamily": "Basel-Book",
-                  "fontSize": 15,
-                  "lineHeight": 20,
-                }
-              }
-              suppressHighlighting={true}
-              testID="address-display/name/0x​82D5...3Fa6"
-            >
-              0x​82D5...3Fa6
-            </Text>
-          </View>
-        </View>
-      </View>
-    </View>
-  </View>
-  <View
-    style={
-      {
-        "alignItems": "center",
-        "flex": 1,
-        "flexDirection": "row",
-        "flexShrink": 1,
-        "gap": 4,
-        "justifyContent": "flex-end",
-      }
-    }
-  >
-    <Text
-      allowFontScaling={true}
-      maxFontSizeMultiplier={1.4}
-      style={
-        {
-          "color": "#7D7D7D",
-          "fontFamily": "Basel-Book",
-          "fontSize": 15,
-          "lineHeight": 20,
-        }
-      }
-      suppressHighlighting={true}
-    >
-      0x82D5...3Fa6
-    </Text>
-    <View
-      style={
-        {
-          "alignItems": "center",
-          "borderBottomLeftRadius": 999999,
-          "borderBottomRightRadius": 999999,
-          "borderTopLeftRadius": 999999,
-          "borderTopRightRadius": 999999,
-          "flexDirection": "column",
-          "justifyContent": "center",
-          "transform": [
-            {
-              "rotate": "180deg",
-            },
-          ],
-        }
-      }
-    >
-      <RNSVGSvgView
-        align="xMidYMid"
-        bbHeight="50"
-        bbWidth="50"
-        fill="none"
-        focusable={false}
-        meetOrSlice={0}
-        minX={0}
-        minY={0}
-        stroke="currentColor"
-        strokeWidth={8}
-        style={
-          [
-            {
-              "backgroundColor": "transparent",
-              "borderWidth": 0,
-            },
-            {
-              "color": "#7D7D7D",
-              "height": 50,
-              "width": 50,
-            },
-            {
-              "flex": 0,
-              "height": 50,
-              "width": 50,
-            },
-          ]
-        }
-        tintColor="#7D7D7D"
-        vbHeight={24}
-        vbWidth={24}
-      >
-        <RNSVGGroup
-          fill={null}
-          propList={
-            [
-              "fill",
-              "stroke",
-              "strokeWidth",
-            ]
-          }
-          stroke={
-            {
-              "type": 2,
-            }
-          }
-          strokeWidth="8"
-        >
-          <RNSVGPath
-            d="M15 6L9 12L15 18"
-            fill={
-              {
-                "payload": 4278190080,
-                "type": 0,
-              }
-            }
-            propList={
-              [
-                "stroke",
-                "strokeWidth",
-                "strokeLinecap",
-                "strokeLinejoin",
-              ]
-            }
-            stroke={
-              {
-                "type": 2,
-              }
-            }
-            strokeLinecap={1}
-            strokeLinejoin={1}
-            strokeWidth="3"
-          />
-        </RNSVGGroup>
-      </RNSVGSvgView>
-    </View>
-  </View>
-</View>
-`;
diff --git a/packages/wallet/src/components/accounts/__snapshots__/DisplayNameText.test.tsx.snap b/packages/wallet/src/components/accounts/__snapshots__/DisplayNameText.test.tsx.snap
deleted file mode 100644
index 0aedd4d1ccb..00000000000
--- a/packages/wallet/src/components/accounts/__snapshots__/DisplayNameText.test.tsx.snap
+++ /dev/null
@@ -1,138 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`AccountDetails renders address display name without error 1`] = `
-<View
-  style={
-    {
-      "alignItems": "center",
-      "flexDirection": "row",
-      "gap": 2,
-      "justifyContent": "center",
-    }
-  }
->
-  <Text
-    allowFontScaling={true}
-    maxFontSizeMultiplier={1.4}
-    numberOfLines={1}
-    style={
-      {
-        "color": "#222222",
-        "flexShrink": 1,
-        "fontFamily": "Basel-Book",
-        "fontSize": 17,
-        "lineHeight": 24,
-      }
-    }
-    suppressHighlighting={true}
-  >
-    0x82D56A352367453f74FC0dC7B071b311da373Fa6
-  </Text>
-</View>
-`;
-
-exports[`AccountDetails renders ens display name without error 1`] = `
-<View
-  style={
-    {
-      "alignItems": "center",
-      "flexDirection": "row",
-      "gap": 2,
-      "justifyContent": "center",
-    }
-  }
->
-  <Text
-    allowFontScaling={true}
-    maxFontSizeMultiplier={1.4}
-    numberOfLines={1}
-    style={
-      {
-        "color": "#222222",
-        "flexShrink": 1,
-        "fontFamily": "Basel-Book",
-        "fontSize": 17,
-        "lineHeight": 24,
-      }
-    }
-    suppressHighlighting={true}
-  >
-    vitalik.eth
-  </Text>
-</View>
-`;
-
-exports[`AccountDetails renders local display name without error 1`] = `
-<View
-  style={
-    {
-      "alignItems": "center",
-      "flexDirection": "row",
-      "gap": 2,
-      "justifyContent": "center",
-    }
-  }
->
-  <Text
-    allowFontScaling={true}
-    maxFontSizeMultiplier={1.4}
-    numberOfLines={1}
-    style={
-      {
-        "color": "#222222",
-        "flexShrink": 1,
-        "fontFamily": "Basel-Book",
-        "fontSize": 17,
-        "lineHeight": 24,
-      }
-    }
-    suppressHighlighting={true}
-  >
-    Wallet 1
-  </Text>
-</View>
-`;
-
-exports[`AccountDetails renders unitag without error 1`] = `
-<View
-  style={
-    {
-      "alignItems": "center",
-      "flexDirection": "row",
-      "gap": 2,
-      "justifyContent": "center",
-    }
-  }
->
-  <Text
-    allowFontScaling={true}
-    maxFontSizeMultiplier={1.4}
-    numberOfLines={1}
-    style={
-      {
-        "color": "#222222",
-        "flexShrink": 1,
-        "fontFamily": "Basel-Book",
-        "fontSize": 17,
-        "lineHeight": 24,
-      }
-    }
-    suppressHighlighting={true}
-  >
-    luni
-  </Text>
-  <View
-    style={
-      {
-        "flexDirection": "column",
-      }
-    }
-  >
-    <svg
-      data-file-name="SvgUnitag"
-      height={24}
-      width={24}
-    />
-  </View>
-</View>
-`;
diff --git a/packages/wallet/src/components/modals/BottomSheetModal.native.tsx b/packages/wallet/src/components/modals/BottomSheetModal.native.tsx
deleted file mode 100644
index 61827289c52..00000000000
--- a/packages/wallet/src/components/modals/BottomSheetModal.native.tsx
+++ /dev/null
@@ -1,415 +0,0 @@
-import {
-  BottomSheetModal as BaseModal,
-  BottomSheetBackdrop,
-  BottomSheetBackdropProps,
-  BottomSheetHandleProps,
-  BottomSheetView,
-  // eslint-disable-next-line no-restricted-imports
-  BottomSheetTextInput as GorhomBottomSheetTextInput,
-  useBottomSheetDynamicSnapPoints,
-} from '@gorhom/bottom-sheet'
-import { BlurView } from 'expo-blur'
-import React, {
-  ComponentProps,
-  forwardRef,
-  useCallback,
-  useEffect,
-  useImperativeHandle,
-  useRef,
-  useState,
-} from 'react'
-import { BackHandler, Keyboard, StyleProp, StyleSheet, ViewStyle } from 'react-native'
-import Animated, {
-  Extrapolate,
-  interpolate,
-  useAnimatedStyle,
-  useSharedValue,
-} from 'react-native-reanimated'
-import {
-  Flex,
-  useDeviceDimensions,
-  useDeviceInsets,
-  useIsDarkMode,
-  useMedia,
-  useSporeColors,
-} from 'ui/src'
-import { borderRadii, spacing } from 'ui/src/theme'
-import { Trace } from 'utilities/src/telemetry/trace/Trace'
-import {
-  BottomSheetModalProps,
-  BottomSheetModalRef,
-} from 'wallet/src/components/modals/BottomSheetModalProps'
-import { isAndroid, isIOS } from 'wallet/src/utils/platform'
-import { useKeyboardLayout } from 'wallet/src/utils/useKeyboardLayout'
-import { BottomSheetContextProvider } from './BottomSheetContext'
-import { HandleBar } from './HandleBar'
-
-/**
- * (android only)
- * Adds a back handler to the modal that dismisses it when the back button is pressed.
- *
- * @param modalRef - ref to the modal
- * @param enabled - whether to enable the back handler
- */
-function useModalBackHandler(modalRef: React.RefObject<BaseModal>, enabled: boolean): void {
-  useEffect(() => {
-    if (enabled) {
-      const subscription = BackHandler.addEventListener('hardwareBackPress', () => {
-        modalRef.current?.close()
-        return true
-      })
-
-      return subscription.remove
-    }
-  }, [modalRef, enabled])
-}
-
-const BACKDROP_APPEARS_ON_INDEX = 0
-const DISAPPEARS_ON_INDEX = -1
-const DRAG_ACTIVATION_OFFSET = 40
-
-const Backdrop = (props: BottomSheetBackdropProps): JSX.Element => {
-  return (
-    <BottomSheetBackdrop
-      {...props}
-      appearsOnIndex={BACKDROP_APPEARS_ON_INDEX}
-      disappearsOnIndex={DISAPPEARS_ON_INDEX}
-      opacity={0.4}
-    />
-  )
-}
-
-const CONTENT_HEIGHT_SNAP_POINTS = ['CONTENT_HEIGHT']
-
-export const BottomSheetModal = forwardRef<BottomSheetModalRef, BottomSheetModalProps>(
-  function _BottomSheetModal(
-    {
-      children,
-      name,
-      onClose,
-      snapPoints = CONTENT_HEIGHT_SNAP_POINTS,
-      stackBehavior = 'push',
-      animatedPosition: providedAnimatedPosition,
-      containerComponent,
-      footerComponent,
-      fullScreen,
-      hideHandlebar,
-      backgroundColor,
-      blurredBackground = false,
-      dismissOnBackPress = true,
-      isDismissible = true,
-      overrideInnerContainer = false,
-      renderBehindTopInset = false,
-      renderBehindBottomInset = false,
-      hideKeyboardOnDismiss = false,
-      hideKeyboardOnSwipeDown = false,
-      // keyboardBehavior="extend" does not work and it's hard to figure why,
-      // probably it requires usage of <BottomSheetTextInput>
-      extendOnKeyboardVisible = false,
-    },
-    ref
-  ): JSX.Element {
-    const dimensions = useDeviceDimensions()
-    const insets = useDeviceInsets()
-    const modalRef = useRef<BaseModal>(null)
-    const keyboard = useKeyboardLayout()
-
-    const { animatedHandleHeight, animatedSnapPoints, animatedContentHeight, handleContentLayout } =
-      useBottomSheetDynamicSnapPoints(snapPoints)
-    const [isSheetReady, setIsSheetReady] = useState(false)
-
-    useModalBackHandler(modalRef, isDismissible && dismissOnBackPress)
-
-    useEffect(() => {
-      modalRef.current?.present()
-      // Close modal when it is unmounted
-      return modalRef.current?.close
-    }, [modalRef])
-
-    useEffect(() => {
-      if (extendOnKeyboardVisible && keyboard.isVisible) {
-        modalRef.current?.expand()
-      }
-    }, [extendOnKeyboardVisible, keyboard.isVisible])
-
-    const internalAnimatedPosition = useSharedValue(0)
-    const animatedPosition = providedAnimatedPosition ?? internalAnimatedPosition
-
-    const colors = useSporeColors()
-    const isDarkMode = useIsDarkMode()
-    const media = useMedia()
-
-    const backgroundColorValue = blurredBackground
-      ? colors.transparent.val
-      : backgroundColor ?? colors.surface1.get()
-
-    const renderBackdrop = useCallback(
-      (props: BottomSheetBackdropProps) => (
-        <BottomSheetBackdrop
-          {...props}
-          appearsOnIndex={BACKDROP_APPEARS_ON_INDEX}
-          disappearsOnIndex={DISAPPEARS_ON_INDEX}
-          opacity={blurredBackground ? 0.2 : 0.4}
-          pressBehavior={isDismissible ? 'close' : 'none'}
-        />
-      ),
-      [blurredBackground, isDismissible]
-    )
-
-    const renderHandleBar = useCallback(
-      (props: BottomSheetHandleProps) => {
-        // This adds an extra gap of unwanted space
-        if (renderBehindTopInset && hideHandlebar) {
-          return null
-        }
-        return (
-          <HandleBar
-            {...props}
-            backgroundColor={backgroundColorValue}
-            containerFlexStyles={{
-              paddingBottom: spacing.spacing12,
-              paddingTop: spacing.spacing16,
-            }}
-            hidden={hideHandlebar}
-          />
-        )
-      },
-      [backgroundColorValue, hideHandlebar, renderBehindTopInset]
-    )
-
-    const animatedBorderRadius = useAnimatedStyle(() => {
-      const interpolatedRadius = interpolate(
-        animatedPosition.value,
-        [0, insets.top],
-        [0, borderRadius ?? borderRadii.rounded24],
-        Extrapolate.CLAMP
-      )
-      return { borderTopLeftRadius: interpolatedRadius, borderTopRightRadius: interpolatedRadius }
-    })
-
-    const renderBlurredBg = useCallback(
-      () => (
-        <Animated.View style={[blurViewStyle.base, animatedBorderRadius]}>
-          {isIOS ? (
-            <BlurView
-              intensity={90}
-              style={blurViewStyle.base}
-              tint={isDarkMode ? 'dark' : 'light'}
-            />
-          ) : (
-            <Flex fill bg="$surface2" />
-          )}
-        </Animated.View>
-      ),
-      [isDarkMode, animatedBorderRadius]
-    )
-
-    // onAnimate is called when the sheet is about to animate to a new position.
-    // `About to` is crucial here, because we want to trigger these actions as soon as possible.
-    // See here: https://gorhom.github.io/react-native-bottom-sheet/props#onanimate
-    const onAnimate = useCallback(
-      // We want to start hiding the keyboard during the process of hiding the sheet.
-      (fromIndex: number, toIndex: number): void => {
-        if (
-          (hideKeyboardOnDismiss && toIndex === DISAPPEARS_ON_INDEX) ||
-          (hideKeyboardOnSwipeDown && toIndex < fromIndex)
-        ) {
-          Keyboard.dismiss()
-        }
-
-        // When a sheet has too much content it can lag and take a while to begin opening, so we want to delay rendering some of the content until the sheet is ready.
-        // We consider the sheet to be "ready" as soon as it starts animating from the bottom to the top.
-        // We add a short delay given that this callback is called when the sheet is "about to" animate.
-        if (!isSheetReady && fromIndex === -1 && toIndex === 0) {
-          setTimeout(() => setIsSheetReady(true), 50)
-        }
-      },
-      [hideKeyboardOnDismiss, hideKeyboardOnSwipeDown, isSheetReady]
-    )
-
-    // on screens < xs (iPhone SE), assume no rounded corners on screen and remove rounded corners from fullscreen modal
-    const borderRadius = media.short ? borderRadii.none : borderRadii.rounded24
-
-    const hiddenHandlebarStyle = {
-      borderTopLeftRadius: borderRadius,
-      borderTopRightRadius: borderRadius,
-    }
-
-    const background = blurredBackground ? { backgroundComponent: renderBlurredBg } : undefined
-    const backdrop = { backdropComponent: renderBackdrop }
-
-    const backgroundStyle = {
-      backgroundColor: backgroundColorValue,
-    }
-
-    const bottomSheetViewStyles: StyleProp<ViewStyle> = [{ backgroundColor: backgroundColorValue }]
-
-    const handleBarHeight = hideHandlebar
-      ? 0
-      : spacing.spacing12 + spacing.spacing16 + spacing.spacing4
-    let fullContentHeight = dimensions.fullHeight - insets.top - handleBarHeight
-
-    if (renderBehindTopInset) {
-      bottomSheetViewStyles.push(bottomSheetStyle.behindInset)
-      if (hideHandlebar) {
-        bottomSheetViewStyles.push(animatedBorderRadius)
-      }
-      fullContentHeight += insets.top
-    } else if (hideHandlebar) {
-      bottomSheetViewStyles.push(hiddenHandlebarStyle)
-    }
-    if (!renderBehindBottomInset) {
-      bottomSheetViewStyles.push({ paddingBottom: insets.bottom })
-    }
-    // Add the calculated height only if the sheet is full screen
-    // (otherwise, rely on the dynamic sizing of the sheet)
-    if (fullScreen) {
-      bottomSheetViewStyles.push({ height: fullContentHeight })
-    }
-
-    useImperativeHandle(
-      ref,
-      () => ({
-        handleContentLayout,
-      }),
-      [handleContentLayout]
-    )
-
-    return (
-      <BaseModal
-        {...background}
-        {...backdrop}
-        ref={modalRef}
-        // This is required for android to make scrollable containers work
-        // and allow closing the modal by dragging the content
-        // (adding this property on iOS breaks closing the modal by dragging the content)
-        activeOffsetY={isAndroid ? [-DRAG_ACTIVATION_OFFSET, DRAG_ACTIVATION_OFFSET] : undefined}
-        animatedPosition={animatedPosition}
-        backgroundStyle={backgroundStyle}
-        containerComponent={containerComponent}
-        contentHeight={animatedContentHeight}
-        enableContentPanningGesture={isDismissible}
-        enableHandlePanningGesture={isDismissible}
-        footerComponent={footerComponent}
-        handleComponent={renderHandleBar}
-        handleHeight={animatedHandleHeight}
-        snapPoints={animatedSnapPoints}
-        stackBehavior={stackBehavior}
-        topInset={renderBehindTopInset ? 0 : insets.top}
-        onAnimate={onAnimate}
-        onDismiss={onClose}>
-        <Trace logImpression modal={name}>
-          {overrideInnerContainer ? (
-            children
-          ) : (
-            <BottomSheetView style={bottomSheetViewStyles} onLayout={handleContentLayout}>
-              <BottomSheetContextProvider isSheetReady={isSheetReady}>
-                {children}
-              </BottomSheetContextProvider>
-            </BottomSheetView>
-          )}
-        </Trace>
-      </BaseModal>
-    )
-  }
-)
-
-export function BottomSheetDetachedModal({
-  children,
-  name,
-  onClose,
-  snapPoints = CONTENT_HEIGHT_SNAP_POINTS,
-  stackBehavior = 'push',
-  isDismissible = true,
-  dismissOnBackPress = true,
-  fullScreen,
-  hideHandlebar,
-  backgroundColor,
-}: BottomSheetModalProps): JSX.Element {
-  const insets = useDeviceInsets()
-  const dimensions = useDeviceDimensions()
-  const modalRef = useRef<BaseModal>(null)
-  const colors = useSporeColors()
-
-  const { animatedHandleHeight, animatedSnapPoints, animatedContentHeight, handleContentLayout } =
-    useBottomSheetDynamicSnapPoints(snapPoints)
-
-  useModalBackHandler(modalRef, isDismissible && dismissOnBackPress)
-
-  useEffect(() => {
-    modalRef.current?.present()
-    // Close modal when it is unmounted
-    return modalRef.current?.close
-  }, [modalRef])
-
-  const renderHandleBar = useCallback(
-    (props: BottomSheetHandleProps) => {
-      return <HandleBar {...props} backgroundColor={backgroundColor} hidden={hideHandlebar} />
-    },
-    [backgroundColor, hideHandlebar]
-  )
-
-  const backgroundStyle = hideHandlebar
-    ? bottomSheetStyle.modalTransparent
-    : {
-        backgroundColor: backgroundColor ?? colors.surface1.get(),
-      }
-  const handleBarHeight = hideHandlebar ? 0 : spacing.spacing4
-  const fullContentHeight = dimensions.fullHeight - insets.top - handleBarHeight
-
-  return (
-    <BaseModal
-      ref={modalRef}
-      // This is required for android to make scrollable containers work
-      // and allow closing the modal by dragging the content
-      // (adding this property on iOS breaks closing the modal by dragging the content)
-      activeOffsetY={isAndroid ? [-DRAG_ACTIVATION_OFFSET, DRAG_ACTIVATION_OFFSET] : undefined}
-      backdropComponent={Backdrop}
-      backgroundStyle={backgroundStyle}
-      bottomInset={insets.bottom}
-      contentHeight={animatedContentHeight}
-      detached={true}
-      enableContentPanningGesture={isDismissible}
-      handleComponent={renderHandleBar}
-      handleHeight={animatedHandleHeight}
-      snapPoints={animatedSnapPoints}
-      stackBehavior={stackBehavior}
-      style={bottomSheetStyle.detached}
-      topInset={insets.top}
-      onDismiss={onClose}>
-      <Trace logImpression modal={name}>
-        <BottomSheetView
-          style={fullScreen ? { height: fullContentHeight } : undefined}
-          onLayout={handleContentLayout}>
-          {children}
-        </BottomSheetView>
-      </Trace>
-    </BaseModal>
-  )
-}
-
-const bottomSheetStyle = StyleSheet.create({
-  behindInset: {
-    overflow: 'hidden',
-  },
-  detached: {
-    marginHorizontal: spacing.spacing12,
-  },
-  modalTransparent: {
-    backgroundColor: 'transparent',
-    borderRadius: 0,
-  },
-})
-
-const blurViewStyle = StyleSheet.create({
-  base: {
-    ...StyleSheet.absoluteFillObject,
-    overflow: 'hidden',
-  },
-})
-
-export function BottomSheetTextInput(
-  props: ComponentProps<typeof GorhomBottomSheetTextInput>
-): JSX.Element {
-  return <GorhomBottomSheetTextInput {...props} />
-}
diff --git a/packages/wallet/src/components/modals/BottomSheetModal.tsx b/packages/wallet/src/components/modals/BottomSheetModal.tsx
deleted file mode 100644
index dd20e2773bf..00000000000
--- a/packages/wallet/src/components/modals/BottomSheetModal.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-// eslint-disable-next-line no-restricted-imports
-import { BottomSheetTextInput as GorhomBottomSheetTextInput } from '@gorhom/bottom-sheet'
-import { ComponentProps, forwardRef } from 'react'
-import { NotImplementedError } from 'utilities/src/errors'
-import { TextInput } from 'wallet/src/components/input/TextInput'
-import {
-  BottomSheetModalProps,
-  BottomSheetModalRef,
-} from 'wallet/src/components/modals/BottomSheetModalProps'
-
-export const BottomSheetModal = forwardRef<BottomSheetModalRef, BottomSheetModalProps>(
-  function _BottomSheetModal(_: BottomSheetModalProps): JSX.Element {
-    throw new NotImplementedError('See `.native.tsx` and `.web.tsx` files.')
-  }
-)
-
-export function BottomSheetDetachedModal(_: BottomSheetModalProps): JSX.Element {
-  throw new NotImplementedError('See `.native.tsx` and `.web.tsx` files.')
-}
-
-export function BottomSheetTextInput(
-  _: ComponentProps<typeof GorhomBottomSheetTextInput | typeof TextInput>
-): JSX.Element {
-  throw new NotImplementedError('See `.native.tsx` and `.web.tsx` files.')
-}
diff --git a/packages/wallet/src/components/modals/BottomSheetModal.web.tsx b/packages/wallet/src/components/modals/BottomSheetModal.web.tsx
deleted file mode 100644
index 1982b288722..00000000000
--- a/packages/wallet/src/components/modals/BottomSheetModal.web.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-import { pick } from 'lodash'
-import { ComponentProps, forwardRef } from 'react'
-import { Flex, Sheet } from 'ui/src'
-import { Trace } from 'utilities/src/telemetry/trace/Trace'
-import { TextInput } from 'wallet/src/components/input/TextInput'
-import { BottomSheetContextProvider } from 'wallet/src/components/modals/BottomSheetContext'
-import {
-  BottomSheetModalProps,
-  BottomSheetModalRef,
-} from 'wallet/src/components/modals/BottomSheetModalProps'
-
-export type WebBottomSheetProps = Pick<
-  BottomSheetModalProps,
-  | 'children'
-  | 'name'
-  | 'onClose'
-  | 'fullScreen'
-  | 'backgroundColor'
-  | 'isModalOpen'
-  | 'isDismissible'
->
-
-export const BottomSheetModal = forwardRef<BottomSheetModalRef, BottomSheetModalProps>(
-  function _BottomSheetModal(props: BottomSheetModalProps): JSX.Element {
-    const supportedProps = pick(props, [
-      'name',
-      'onClose',
-      'fullScreen',
-      'backgroundColor',
-      'isModalOpen',
-      'children',
-      'isDismissible',
-    ])
-
-    return <WebBottomSheetModal {...supportedProps} />
-  }
-)
-
-// No detached mode necessary yet in web
-export function BottomSheetDetachedModal(props: BottomSheetModalProps): JSX.Element {
-  const supportedProps = pick(props, [
-    'name',
-    'onClose',
-    'fullScreen',
-    'backgroundColor',
-    'isModalOpen',
-    'children',
-    'isDismissible',
-  ])
-
-  return <WebBottomSheetModal {...supportedProps} />
-}
-
-function WebBottomSheetModal({
-  children,
-  name,
-  isModalOpen = true,
-  onClose,
-  fullScreen,
-  backgroundColor,
-  isDismissible = true,
-}: WebBottomSheetProps): JSX.Element {
-  return (
-    <Trace logImpression={isModalOpen} modal={name}>
-      <BottomSheetContextProvider isSheetReady={true}>
-        <Sheet
-          disableDrag
-          modal
-          animation="200ms"
-          dismissOnOverlayPress={false}
-          dismissOnSnapToBottom={false}
-          open={isModalOpen}
-          onOpenChange={(open: boolean): void => {
-            !open && onClose?.()
-          }}>
-          <Sheet.Overlay
-            animation="lazy"
-            backgroundColor="$transparent"
-            height="100%"
-            // eslint-disable-next-line react-native/no-inline-styles
-            style={{ backdropFilter: 'blur(6px)' }}
-            onPress={(): void => {
-              isDismissible && onClose?.()
-            }}
-          />
-          <Sheet.Frame
-            backgroundColor="$transparent"
-            flex={1}
-            justifyContent="flex-end"
-            padding="$spacing12">
-            <Flex
-              borderRadius="$rounded24"
-              height={fullScreen ? '100%' : undefined}
-              p="$spacing12"
-              shadowColor="$neutral3"
-              shadowOpacity={0.04}
-              shadowRadius="$spacing12"
-              style={{ backgroundColor }}
-              width="100%">
-              {children}
-            </Flex>
-          </Sheet.Frame>
-        </Sheet>
-      </BottomSheetContextProvider>
-    </Trace>
-  )
-}
-
-export function BottomSheetTextInput(props: ComponentProps<typeof TextInput>): JSX.Element {
-  return <TextInput {...props} />
-}
diff --git a/packages/wallet/src/components/modals/BottomSheetModalProps.tsx b/packages/wallet/src/components/modals/BottomSheetModalProps.tsx
deleted file mode 100644
index 7ef59737765..00000000000
--- a/packages/wallet/src/components/modals/BottomSheetModalProps.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { BottomSheetModal as BaseModal } from '@gorhom/bottom-sheet'
-import { ComponentProps, PropsWithChildren } from 'react'
-import { LayoutChangeEvent } from 'react-native'
-import Animated from 'react-native-reanimated'
-import { DynamicColor } from 'ui/src'
-import { ModalNameType } from 'wallet/src/telemetry/constants'
-
-export type BottomSheetModalProps = PropsWithChildren<{
-  animatedPosition?: Animated.SharedValue<number>
-  hideHandlebar?: boolean
-  name: ModalNameType
-  // TODO MOB-2526 refactor BottomSheetModal to more platform-agnostic
-  // Currently only used for web
-  isModalOpen?: boolean
-  onClose?: () => void
-  snapPoints?: Array<string | number>
-  stackBehavior?: ComponentProps<typeof BaseModal>['stackBehavior']
-  containerComponent?: ComponentProps<typeof BaseModal>['containerComponent']
-  footerComponent?: ComponentProps<typeof BaseModal>['footerComponent']
-  fullScreen?: boolean
-  backgroundColor?: DynamicColor
-  blurredBackground?: boolean
-  dismissOnBackPress?: boolean
-  isDismissible?: boolean
-  overrideInnerContainer?: boolean
-  renderBehindTopInset?: boolean
-  renderBehindBottomInset?: boolean
-  hideKeyboardOnDismiss?: boolean
-  hideKeyboardOnSwipeDown?: boolean
-  // extend the sheet to its maximum snap point when keyboard is visible
-  extendOnKeyboardVisible?: boolean
-}>
-
-export type BottomSheetModalRef = {
-  handleContentLayout: (event: LayoutChangeEvent) => void
-}
diff --git a/packages/wallet/src/components/modals/WarningModal/BlockedAddressModal.tsx b/packages/wallet/src/components/modals/WarningModal/BlockedAddressModal.tsx
deleted file mode 100644
index 87b0a429db3..00000000000
--- a/packages/wallet/src/components/modals/WarningModal/BlockedAddressModal.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { useTranslation } from 'react-i18next'
-import { WarningModal } from 'wallet/src/components/modals/WarningModal/WarningModal'
-import { WarningSeverity } from 'wallet/src/features/transactions/WarningModal/types'
-import { ModalName } from 'wallet/src/telemetry/constants'
-
-export function BlockedAddressModal({ onClose }: { onClose: () => void }): JSX.Element {
-  const { t } = useTranslation()
-
-  return (
-    <WarningModal
-      caption={t(
-        'This address is blocked on Uniswap Wallet because it is associated with one or more blocked activities. If you believe this is an error, please email compliance@uniswap.org.'
-      )}
-      closeText={t('I understand')}
-      modalName={ModalName.BlockedAddress}
-      severity={WarningSeverity.None}
-      title={t('Blocked address')}
-      onClose={onClose}
-    />
-  )
-}
diff --git a/packages/wallet/src/components/nfts/NftsList.tsx b/packages/wallet/src/components/nfts/NftsList.tsx
index a0e7d4598a1..5ceca47cc83 100644
--- a/packages/wallet/src/components/nfts/NftsList.tsx
+++ b/packages/wallet/src/components/nfts/NftsList.tsx
@@ -15,9 +15,9 @@ import {
 import NoNFTsIcon from 'ui/src/assets/icons/empty-state-picture.svg'
 import { BaseCard } from 'wallet/src/components/BaseCard/BaseCard'
 import { HiddenNftsRowLeft, HiddenNftsRowRight } from 'wallet/src/components/nfts/NFTHiddenRow'
-import { useNftsTabQuery } from 'wallet/src/data/__generated__/types-and-hooks'
 import { GQLQueries } from 'wallet/src/data/queries'
 import { isError, isNonPollingRequestInFlight } from 'wallet/src/data/utils'
+import { useNftsTabQuery } from 'wallet/src/data/__generated__/types-and-hooks'
 import {
   EMPTY_NFT_ITEM,
   ESTIMATED_NFT_LIST_ITEM_SIZE,
diff --git a/packages/wallet/src/components/text/LearnMoreLink.test.tsx b/packages/wallet/src/components/text/LearnMoreLink.test.tsx
deleted file mode 100644
index c84da50179d..00000000000
--- a/packages/wallet/src/components/text/LearnMoreLink.test.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-import { fireEvent } from '@testing-library/react-native'
-import { ON_PRESS_EVENT_PAYLOAD } from 'wallet/src/test/eventFixtures'
-import { renderWithProviders } from 'wallet/src/test/render'
-import { openUri } from 'wallet/src/utils/linking'
-import { LearnMoreLink } from './LearnMoreLink'
-
-jest.mock('wallet/src/utils/linking', () => ({
-  openUri: jest.fn(),
-}))
-
-describe(LearnMoreLink, () => {
-  it('renders without error', () => {
-    const tree = renderWithProviders(<LearnMoreLink url="https://example.com" />)
-
-    expect(tree).toMatchSnapshot()
-  })
-
-  it('renders a learn more link', () => {
-    const { queryByText } = renderWithProviders(<LearnMoreLink url="https://example.com" />)
-
-    const learnMoreLink = queryByText('Learn more')
-
-    expect(learnMoreLink).toBeTruthy()
-  })
-
-  it('calls openUri when pressed', () => {
-    const { getByText } = renderWithProviders(<LearnMoreLink url="https://example.com" />)
-
-    const learnMoreLink = getByText('Learn more')
-    fireEvent.press(learnMoreLink, ON_PRESS_EVENT_PAYLOAD)
-
-    expect(openUri).toHaveBeenCalledTimes(1)
-    expect(openUri).toHaveBeenCalledWith('https://example.com')
-  })
-})
diff --git a/packages/wallet/src/components/text/RelativeChange.tsx b/packages/wallet/src/components/text/RelativeChange.tsx
index fbdd8777c07..f2670814bd1 100644
--- a/packages/wallet/src/components/text/RelativeChange.tsx
+++ b/packages/wallet/src/components/text/RelativeChange.tsx
@@ -1,5 +1,5 @@
 import { ColorTokens, Flex, Icons, Text } from 'ui/src'
-import { IconSizeTokens, fonts } from 'ui/src/theme'
+import { fonts, IconSizeTokens } from 'ui/src/theme'
 import { NumberType } from 'utilities/src/format/types'
 import { useAppFiatCurrencyInfo } from 'wallet/src/features/fiatCurrency/hooks'
 import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
diff --git a/packages/wallet/src/components/text/__snapshots__/LearnMoreLink.test.tsx.snap b/packages/wallet/src/components/text/__snapshots__/LearnMoreLink.test.tsx.snap
deleted file mode 100644
index 0d418a48dad..00000000000
--- a/packages/wallet/src/components/text/__snapshots__/LearnMoreLink.test.tsx.snap
+++ /dev/null
@@ -1,63 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`LearnMoreLink renders without error 1`] = `
-<View
-  accessibilityState={
-    {
-      "busy": undefined,
-      "checked": undefined,
-      "disabled": undefined,
-      "expanded": undefined,
-      "selected": undefined,
-    }
-  }
-  accessibilityValue={
-    {
-      "max": undefined,
-      "min": undefined,
-      "now": undefined,
-      "text": undefined,
-    }
-  }
-  accessible={true}
-  collapsable={false}
-  focusable={true}
-  hitSlop={
-    {
-      "bottom": 5,
-      "left": 5,
-      "right": 5,
-      "top": 5,
-    }
-  }
-  onClick={[Function]}
-  onResponderGrant={[Function]}
-  onResponderMove={[Function]}
-  onResponderRelease={[Function]}
-  onResponderTerminate={[Function]}
-  onResponderTerminationRequest={[Function]}
-  onStartShouldSetResponder={[Function]}
-  style={
-    {
-      "opacity": 1,
-    }
-  }
->
-  <Text
-    allowFontScaling={true}
-    maxFontSizeMultiplier={1.2}
-    style={
-      {
-        "color": "#FC72FF",
-        "fontFamily": "Basel-Medium",
-        "fontSize": 17,
-        "fontWeight": "500",
-        "lineHeight": 24,
-      }
-    }
-    suppressHighlighting={true}
-  >
-    Learn more
-  </Text>
-</View>
-`;
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 b84a86a1162..474d7a48036 100644
--- a/packages/wallet/src/components/text/__snapshots__/RelativeChange.test.tsx.snap
+++ b/packages/wallet/src/components/text/__snapshots__/RelativeChange.test.tsx.snap
@@ -76,6 +76,7 @@ exports[`renders a relative change 1`] = `
   <View
     style={
       {
+        "alignItems": "stretch",
         "flexDirection": "column",
       }
     }
@@ -175,6 +176,7 @@ exports[`renders placeholders with absolute change 1`] = `
   <View
     style={
       {
+        "alignItems": "stretch",
         "flexDirection": "column",
       }
     }
@@ -212,6 +214,7 @@ exports[`renders placeholders without a change 1`] = `
   <View
     style={
       {
+        "alignItems": "stretch",
         "flexDirection": "column",
       }
     }
diff --git a/packages/wallet/src/config.ts b/packages/wallet/src/config.ts
index e1b6ea159ec..00f8f42ab1e 100644
--- a/packages/wallet/src/config.ts
+++ b/packages/wallet/src/config.ts
@@ -1,8 +1,10 @@
 import {
   APPSFLYER_API_KEY,
   APPSFLYER_APP_ID,
-  FIAT_ON_RAMP_API_URL,
   INFURA_PROJECT_ID,
+  MELD_API_KEY,
+  MELD_API_URL,
+  MELD_API_VERSION,
   MOONPAY_API_KEY,
   MOONPAY_API_URL,
   MOONPAY_WIDGET_API_URL,
@@ -12,7 +14,6 @@ import {
   SIMPLEHASH_API_KEY,
   SIMPLEHASH_API_URL,
   STATSIG_PROXY_URL,
-  TRADING_API_KEY,
   UNISWAP_API_BASE_URL,
   UNISWAP_API_KEY,
   UNISWAP_APP_URL,
@@ -24,7 +25,9 @@ import { isNonJestDev } from 'utilities/src/environment'
 export interface Config {
   appsflyerApiKey: string
   appsflyerAppId: string
-  fiatOnRampApiUrl: string
+  meldApiKey: string
+  meldApiVersion: string
+  meldApiUrl: string
   moonpayApiKey: string
   moonpayApiUrl: string
   moonpayWidgetApiUrl: string
@@ -40,13 +43,14 @@ export interface Config {
   walletConnectProjectId: string
   quicknodeBnbRpcUrl: string
   unitagsApiUrl: string
-  tradingApiKey: string
 }
 
 const _config: Config = {
   appsflyerApiKey: process.env.APPSFLYER_API_KEY || APPSFLYER_API_KEY,
   appsflyerAppId: process.env.APPSFLYER_APP_ID || APPSFLYER_APP_ID,
-  fiatOnRampApiUrl: process.env.FIAT_ON_RAMP_API_URL || FIAT_ON_RAMP_API_URL,
+  meldApiKey: process.env.MELD_API_KEY || MELD_API_KEY,
+  meldApiVersion: process.env.MELD_API_VERSION || MELD_API_VERSION,
+  meldApiUrl: process.env.MELD_API_URL || MELD_API_URL,
   moonpayApiKey: process.env.MOONPAY_API_KEY || MOONPAY_API_KEY,
   moonpayApiUrl: process.env.MOONPAY_API_URL || MOONPAY_API_URL,
   moonpayWidgetApiUrl: process.env.MOONPAY_WIDGET_API_URL || MOONPAY_WIDGET_API_URL,
@@ -62,7 +66,6 @@ const _config: Config = {
   walletConnectProjectId: process.env.WALLETCONNECT_PROJECT_ID || WALLETCONNECT_PROJECT_ID,
   quicknodeBnbRpcUrl: process.env.QUICKNODE_BNB_RPC_URL || QUICKNODE_BNB_RPC_URL,
   unitagsApiUrl: process.env.UNITAGS_API_URL || UNITAGS_API_URL,
-  tradingApiKey: process.env.TRADING_API_KEY || TRADING_API_KEY,
 }
 
 export const config = Object.freeze(_config)
diff --git a/packages/wallet/src/constants/addresses.ts b/packages/wallet/src/constants/addresses.ts
index 438516e1a0b..4c8e68569d2 100644
--- a/packages/wallet/src/constants/addresses.ts
+++ b/packages/wallet/src/constants/addresses.ts
@@ -1,4 +1,4 @@
-import { CHAIN_INFO, ChainId } from './chains'
+import { ChainId, CHAIN_INFO } from './chains'
 
 const MATIC_MAINNET_ADDRESS = '0x7d1afa7b718fb893db30a3abc0cfc608aacfebb0'
 const MATIC_BNB_ADDRESS = '0xcc42724c6683b7e57334c4e856f4c9965ed682bd'
diff --git a/packages/wallet/src/constants/chains.ts b/packages/wallet/src/constants/chains.ts
index 254c21d94b2..6876c938823 100644
--- a/packages/wallet/src/constants/chains.ts
+++ b/packages/wallet/src/constants/chains.ts
@@ -15,7 +15,7 @@ import {
 import { config } from 'wallet/src/config'
 
 /** Address that represents native currencies on ETH, Arbitrum, etc. */
-export const DEFAULT_NATIVE_ADDRESS = '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'
+const DEFAULT_NATIVE_ADDRESS = '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'
 
 export enum RPCType {
   Public = 'public',
diff --git a/packages/wallet/src/constants/tokens.ts b/packages/wallet/src/constants/tokens.ts
index 10d01296872..815d3ce721e 100644
--- a/packages/wallet/src/constants/tokens.ts
+++ b/packages/wallet/src/constants/tokens.ts
@@ -1,7 +1,7 @@
 // Copied from https://github.com/Uniswap/interface/blob/main/src/constants/tokens.ts
 import { Token } from '@uniswap/sdk-core'
 import { UNI_ADDRESS } from 'wallet/src/constants/addresses'
-import { CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
+import { ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
 
 export const DAI = new Token(
   ChainId.Mainnet,
diff --git a/packages/wallet/src/constants/urls.ts b/packages/wallet/src/constants/urls.ts
index ffbb3a4e580..9341d93c7fe 100644
--- a/packages/wallet/src/constants/urls.ts
+++ b/packages/wallet/src/constants/urls.ts
@@ -3,8 +3,6 @@ import { isAndroid } from 'wallet/src/utils/platform'
 
 export const UNISWAP_APP_HOSTNAME = 'app.uniswap.org'
 
-const TRADING_API_BASE_PATH = '/v2/trade'
-
 const helpUrl = 'https://support.uniswap.org'
 
 export const uniswapUrls = {
@@ -22,7 +20,6 @@ export const uniswapUrls = {
     walletHelp: `${helpUrl}/hc/en-us/categories/11301970439565-Uniswap-Wallet`,
   },
   apiBaseUrl: getUniswapApiBaseUrl(),
-  apiBaseExtensionUrl: getExtensionApiBaseUrl(),
   apiBaseUrlCloudflare: getCloudflareApiBaseUrl(),
   appBaseUrl: 'https://uniswap.org/app',
   gasServicePath: getUniswapGasServicePath(),
@@ -33,15 +30,9 @@ export const uniswapUrls = {
   statsigProxyUrl: getUniswapStatsigProxyUrl(),
   termsOfServiceUrl: 'https://uniswap.org/terms-of-service',
   privacyPolicyUrl: 'https://uniswap.org/privacy-policy',
-  reportUnitagUrl: 'https://support.uniswap.org/hc/en-us/requests/new',
   appUrl: `https://${UNISWAP_APP_HOSTNAME}`,
   interfaceUrl: `https://${UNISWAP_APP_HOSTNAME}/#/swap`,
   unitagsApiUrl: getUnitagsApiUrl(),
-  tradingApiPaths: {
-    quote: getTradingApiQuotePath(),
-    approval: getTradingApiApprovalPath(),
-    swap: getTradingApiSwapPath(),
-  },
 }
 
 function getCloudflareApiBaseUrl(): string {
@@ -52,10 +43,6 @@ function getUniswapApiBaseUrl(): string {
   return config.uniswapApiBaseUrl
 }
 
-function getExtensionApiBaseUrl(): string {
-  return 'https://gateway.uniswap.org/v2'
-}
-
 function getUniswapRoutingApiUrl(): string {
   return `${config.uniswapApiBaseUrl}/v1`
 }
@@ -83,15 +70,3 @@ function getUniswapStatsigProxyUrl(): string {
 function getUnitagsApiUrl(): string {
   return config.unitagsApiUrl
 }
-
-function getTradingApiQuotePath(): string {
-  return `${TRADING_API_BASE_PATH}/quote`
-}
-
-function getTradingApiApprovalPath(): string {
-  return `${TRADING_API_BASE_PATH}/check_approval`
-}
-
-function getTradingApiSwapPath(): string {
-  return `${TRADING_API_BASE_PATH}/swap`
-}
diff --git a/packages/wallet/src/contexts/WalletNavigationContext.tsx b/packages/wallet/src/contexts/WalletNavigationContext.tsx
deleted file mode 100644
index f7f1997e7c4..00000000000
--- a/packages/wallet/src/contexts/WalletNavigationContext.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { createContext, ReactNode, useContext } from 'react'
-import { TransactionState } from 'wallet/src/features/transactions/transactionState/types'
-
-export type NavigateToSwapFlowArgs = { initialState: TransactionState } | undefined
-
-export type WalletNavigationContextState = {
-  navigateToAccountTokenList: () => void
-  navigateToAccountActivityList: () => void
-  navigateToSwapFlow: (args: NavigateToSwapFlowArgs) => void
-  navigateToTokenDetails: (currencyId: string) => void
-}
-
-export const WalletNavigationContext = createContext<WalletNavigationContextState | undefined>(
-  undefined
-)
-
-export function WalletNavigationProvider({
-  children,
-  ...props
-}: {
-  children: ReactNode
-} & WalletNavigationContextState): JSX.Element {
-  return (
-    <WalletNavigationContext.Provider value={props}>{children}</WalletNavigationContext.Provider>
-  )
-}
-
-export const useWalletNavigation = (): WalletNavigationContextState => {
-  const walletNavigationContext = useContext(WalletNavigationContext)
-
-  if (walletNavigationContext === undefined) {
-    throw new Error('`useWalletNavigation` must be used inside of `WalletNavigationProvider`')
-  }
-
-  return walletNavigationContext
-}
diff --git a/packages/wallet/src/data/schema.graphql b/packages/wallet/src/data/__generated__/schema.graphql
similarity index 100%
rename from packages/wallet/src/data/schema.graphql
rename to packages/wallet/src/data/__generated__/schema.graphql
diff --git a/packages/wallet/src/data/__generated__/types-and-hooks.ts b/packages/wallet/src/data/__generated__/types-and-hooks.ts
new file mode 100644
index 00000000000..b5513ab67a1
--- /dev/null
+++ b/packages/wallet/src/data/__generated__/types-and-hooks.ts
@@ -0,0 +1,4602 @@
+import { GraphQLResolveInfo, GraphQLScalarType, GraphQLScalarTypeConfig } from 'graphql';
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+export type Maybe<T> = T | null;
+export type InputMaybe<T> = Maybe<T>;
+export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };
+export type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };
+export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
+export type RequireFields<T, K extends keyof T> = Omit<T, K> & { [P in K]-?: NonNullable<T[P]> };
+const defaultOptions = {} as const;
+/** All built-in and custom scalars, mapped to their actual values */
+export type Scalars = {
+  ID: string;
+  String: string;
+  Boolean: boolean;
+  Int: number;
+  Float: number;
+  /**
+   * The `AWSJSON` scalar type provided by AWS AppSync, represents a JSON string that
+   * complies with [RFC 8259](https://tools.ietf.org/html/rfc8259).  Maps like
+   * "**{\\"upvotes\\": 10}**", lists like "**[1,2,3]**", and scalar values like
+   * "**\\"AWSJSON example string\\"**", "**1**", and "**true**" are accepted as
+   * valid JSON and will automatically be parsed and loaded in the resolver mapping
+   * templates as Maps, Lists, or Scalar values rather than as the literal input
+   * strings.  Invalid JSON strings like "**{a: 1}**", "**{'a': 1}**" and "**Unquoted
+   * string**" will throw GraphQL validation errors.
+   */
+  AWSJSON: any;
+};
+
+/**
+ *  Types, unions, and inputs (alphabetized):
+ * These are colocated to highlight the relationship between some types and their inputs.
+ */
+export type ActivityDetails = SwapOrderDetails | TransactionDetails;
+
+export type ActivityDetailsInput = {
+  transactionDetails?: InputMaybe<TransactionDetailsInput>;
+};
+
+/**
+ *  Enums (alphabetized):
+ * deprecated and replaced with TransactionType, please do not use this
+ */
+export enum ActivityType {
+  Approve = 'APPROVE',
+  Borrow = 'BORROW',
+  Burn = 'BURN',
+  Cancel = 'CANCEL',
+  Claim = 'CLAIM',
+  Deployment = 'DEPLOYMENT',
+  Lend = 'LEND',
+  Mint = 'MINT',
+  Nft = 'NFT',
+  Receive = 'RECEIVE',
+  Repay = 'REPAY',
+  Send = 'SEND',
+  Stake = 'STAKE',
+  Swap = 'SWAP',
+  SwapOrder = 'SWAP_ORDER',
+  Staking = 'Staking',
+  Unknown = 'UNKNOWN',
+  Unstake = 'UNSTAKE',
+  Withdraw = 'WITHDRAW',
+  Market = 'market',
+  Money = 'money'
+}
+
+export type Amount = IAmount & {
+  __typename?: 'Amount';
+  currency?: Maybe<Currency>;
+  id: Scalars['ID'];
+  value: Scalars['Float'];
+};
+
+export type AmountChange = {
+  __typename?: 'AmountChange';
+  absolute?: Maybe<Amount>;
+  id: Scalars['ID'];
+  percentage?: Maybe<Amount>;
+};
+
+export type AmountInput = {
+  currency?: InputMaybe<Currency>;
+  value: Scalars['Float'];
+};
+
+export type ApplicationContract = IContract & {
+  __typename?: 'ApplicationContract';
+  address: Scalars['String'];
+  chain: Chain;
+  icon?: Maybe<Image>;
+  id: Scalars['ID'];
+  name?: Maybe<Scalars['String']>;
+};
+
+export type ApplicationContractInput = {
+  address: Scalars['String'];
+  chain: Chain;
+  icon?: InputMaybe<ImageInput>;
+  name?: InputMaybe<Scalars['String']>;
+};
+
+export type AssetActivity = {
+  __typename?: 'AssetActivity';
+  addresses?: Maybe<Array<Scalars['String']>>;
+  /** @deprecated use assetChanges field in details */
+  assetChanges: Array<Maybe<AssetChange>>;
+  chain: Chain;
+  details: ActivityDetails;
+  /** @deprecated not required, remove usage */
+  gasUsed?: Maybe<Scalars['Float']>;
+  id: Scalars['ID'];
+  timestamp: Scalars['Int'];
+  /** @deprecated use fields from details */
+  transaction: Transaction;
+  /** @deprecated use type field in details */
+  type: ActivityType;
+};
+
+export type AssetActivityInput = {
+  chain: Chain;
+  details: ActivityDetailsInput;
+  timestamp: Scalars['Int'];
+};
+
+export enum AssetActivitySwitch {
+  Alternate = 'ALTERNATE',
+  Legacy = 'LEGACY'
+}
+
+export type AssetChange = NftApproval | NftApproveForAll | NftTransfer | TokenApproval | TokenTransfer;
+
+export type AssetChangeInput = {
+  nftApproval?: InputMaybe<NftApprovalInput>;
+  nftApproveForAll?: InputMaybe<NftApproveForAllInput>;
+  nftTransfer?: InputMaybe<NftTransferInput>;
+  tokenApproval?: InputMaybe<TokenApprovalInput>;
+  tokenTransfer?: InputMaybe<TokenTransferInput>;
+};
+
+export enum Chain {
+  Arbitrum = 'ARBITRUM',
+  Avalanche = 'AVALANCHE',
+  Base = 'BASE',
+  Bnb = 'BNB',
+  Celo = 'CELO',
+  Ethereum = 'ETHEREUM',
+  EthereumGoerli = 'ETHEREUM_GOERLI',
+  EthereumSepolia = 'ETHEREUM_SEPOLIA',
+  Optimism = 'OPTIMISM',
+  Polygon = 'POLYGON',
+  UnknownChain = 'UNKNOWN_CHAIN'
+}
+
+export enum CollectionSortableField {
+  Volume = 'VOLUME'
+}
+
+export type ContractInput = {
+  address?: InputMaybe<Scalars['String']>;
+  chain: Chain;
+};
+
+export enum Currency {
+  Aud = 'AUD',
+  Brl = 'BRL',
+  Cad = 'CAD',
+  Cny = 'CNY',
+  Eth = 'ETH',
+  Eur = 'EUR',
+  Gbp = 'GBP',
+  Hkd = 'HKD',
+  Idr = 'IDR',
+  Inr = 'INR',
+  Jpy = 'JPY',
+  Matic = 'MATIC',
+  Ngn = 'NGN',
+  Pkr = 'PKR',
+  Rub = 'RUB',
+  Sgd = 'SGD',
+  Thb = 'THB',
+  Try = 'TRY',
+  Uah = 'UAH',
+  Usd = 'USD',
+  Vnd = 'VND'
+}
+
+export type CurrencyAmountInput = {
+  currency: Currency;
+  value: Scalars['Float'];
+};
+
+export type DescriptionTranslations = {
+  __typename?: 'DescriptionTranslations';
+  descriptionEnUs?: Maybe<Scalars['String']>;
+  descriptionEs419?: Maybe<Scalars['String']>;
+  descriptionEsEs?: Maybe<Scalars['String']>;
+  descriptionEsUs?: Maybe<Scalars['String']>;
+  descriptionFrFr?: Maybe<Scalars['String']>;
+  descriptionHiIn?: Maybe<Scalars['String']>;
+  descriptionIdId?: Maybe<Scalars['String']>;
+  descriptionJaJp?: Maybe<Scalars['String']>;
+  descriptionMsMy?: Maybe<Scalars['String']>;
+  descriptionNlNl?: Maybe<Scalars['String']>;
+  descriptionPtPt?: Maybe<Scalars['String']>;
+  descriptionRuRu?: Maybe<Scalars['String']>;
+  descriptionThTh?: Maybe<Scalars['String']>;
+  descriptionTrTr?: Maybe<Scalars['String']>;
+  descriptionUkUa?: Maybe<Scalars['String']>;
+  descriptionUrPk?: Maybe<Scalars['String']>;
+  descriptionViVn?: Maybe<Scalars['String']>;
+  descriptionZhHans?: Maybe<Scalars['String']>;
+  descriptionZhHant?: Maybe<Scalars['String']>;
+  id: Scalars['ID'];
+};
+
+export type Dimensions = {
+  __typename?: 'Dimensions';
+  height?: Maybe<Scalars['Float']>;
+  id: Scalars['ID'];
+  width?: Maybe<Scalars['Float']>;
+};
+
+export type DimensionsInput = {
+  height?: InputMaybe<Scalars['Float']>;
+  width?: InputMaybe<Scalars['Float']>;
+};
+
+export enum HighLow {
+  High = 'HIGH',
+  Low = 'LOW'
+}
+
+export enum HistoryDuration {
+  Day = 'DAY',
+  Hour = 'HOUR',
+  Max = 'MAX',
+  Month = 'MONTH',
+  Week = 'WEEK',
+  Year = 'YEAR'
+}
+
+/**   Interfaces (alphabetized): */
+export type IAmount = {
+  currency?: Maybe<Currency>;
+  value: Scalars['Float'];
+};
+
+export type IContract = {
+  address?: Maybe<Scalars['String']>;
+  chain: Chain;
+};
+
+export type Image = {
+  __typename?: 'Image';
+  dimensions?: Maybe<Dimensions>;
+  id: Scalars['ID'];
+  url: Scalars['String'];
+};
+
+export type ImageInput = {
+  dimensions?: InputMaybe<DimensionsInput>;
+  url: Scalars['String'];
+};
+
+export enum MediaType {
+  Audio = 'AUDIO',
+  Image = 'IMAGE',
+  Raw = 'RAW',
+  Video = 'VIDEO'
+}
+
+export type Mutation = {
+  __typename?: 'Mutation';
+  assetActivity: AssetActivity;
+  heartbeat: Status;
+  unsubscribe: Status;
+};
+
+
+export type MutationAssetActivityArgs = {
+  input: AssetActivityInput;
+};
+
+
+export type MutationHeartbeatArgs = {
+  subscriptionId: Scalars['ID'];
+  type: SubscriptionType;
+};
+
+
+export type MutationUnsubscribeArgs = {
+  subscriptionId: Scalars['ID'];
+  type: SubscriptionType;
+};
+
+export type NftActivity = {
+  __typename?: 'NftActivity';
+  address: Scalars['String'];
+  asset?: Maybe<NftAsset>;
+  fromAddress: Scalars['String'];
+  id: Scalars['ID'];
+  marketplace?: Maybe<Scalars['String']>;
+  orderStatus?: Maybe<OrderStatus>;
+  price?: Maybe<Amount>;
+  quantity?: Maybe<Scalars['Int']>;
+  timestamp: Scalars['Int'];
+  toAddress?: Maybe<Scalars['String']>;
+  tokenId?: Maybe<Scalars['String']>;
+  transactionHash?: Maybe<Scalars['String']>;
+  type: NftActivityType;
+  url?: Maybe<Scalars['String']>;
+};
+
+export type NftActivityConnection = {
+  __typename?: 'NftActivityConnection';
+  edges: Array<NftActivityEdge>;
+  pageInfo: PageInfo;
+};
+
+export type NftActivityEdge = {
+  __typename?: 'NftActivityEdge';
+  cursor: Scalars['String'];
+  node: NftActivity;
+};
+
+export type NftActivityFilterInput = {
+  activityTypes?: InputMaybe<Array<NftActivityType>>;
+  address?: InputMaybe<Scalars['String']>;
+  tokenId?: InputMaybe<Scalars['String']>;
+};
+
+export enum NftActivityType {
+  CancelListing = 'CANCEL_LISTING',
+  Listing = 'LISTING',
+  Sale = 'SALE',
+  Transfer = 'TRANSFER'
+}
+
+export type NftApproval = {
+  __typename?: 'NftApproval';
+  approvedAddress: Scalars['String'];
+  /**   can be erc721, erc1155, noncompliant */
+  asset: NftAsset;
+  id: Scalars['ID'];
+  nftStandard: NftStandard;
+};
+
+export type NftApprovalInput = {
+  approvedAddress: Scalars['String'];
+  asset: NftAssetInput;
+  nftStandard: NftStandard;
+};
+
+export type NftApproveForAll = {
+  __typename?: 'NftApproveForAll';
+  approved: Scalars['Boolean'];
+  /**   can be erc721, erc1155, noncompliant */
+  asset: NftAsset;
+  id: Scalars['ID'];
+  nftStandard: NftStandard;
+  operatorAddress: Scalars['String'];
+};
+
+export type NftApproveForAllInput = {
+  approved: Scalars['Boolean'];
+  asset: NftAssetInput;
+  nftStandard: NftStandard;
+  operatorAddress: Scalars['String'];
+};
+
+export type NftAsset = {
+  __typename?: 'NftAsset';
+  animationUrl?: Maybe<Scalars['String']>;
+  collection?: Maybe<NftCollection>;
+  creator?: Maybe<NftProfile>;
+  description?: Maybe<Scalars['String']>;
+  flaggedBy?: Maybe<Scalars['String']>;
+  id: Scalars['ID'];
+  image?: Maybe<Image>;
+  /** @deprecated Field no longer supported */
+  imageUrl?: Maybe<Scalars['String']>;
+  isSpam?: Maybe<Scalars['Boolean']>;
+  listings?: Maybe<NftOrderConnection>;
+  mediaType?: Maybe<MediaType>;
+  metadataUrl?: Maybe<Scalars['String']>;
+  name?: Maybe<Scalars['String']>;
+  nftContract?: Maybe<NftContract>;
+  originalImage?: Maybe<Image>;
+  /**   TODO: may need to be array to support erc1155 cases. not needed at the moment so will revisit. */
+  ownerAddress?: Maybe<Scalars['String']>;
+  rarities?: Maybe<Array<NftAssetRarity>>;
+  smallImage?: Maybe<Image>;
+  /** @deprecated Field no longer supported */
+  smallImageUrl?: Maybe<Scalars['String']>;
+  suspiciousFlag?: Maybe<Scalars['Boolean']>;
+  thumbnail?: Maybe<Image>;
+  /** @deprecated Field no longer supported */
+  thumbnailUrl?: Maybe<Scalars['String']>;
+  tokenId: Scalars['String'];
+  traits?: Maybe<Array<NftAssetTrait>>;
+};
+
+
+export type NftAssetListingsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  asc?: InputMaybe<Scalars['Boolean']>;
+  before?: InputMaybe<Scalars['String']>;
+  chain?: InputMaybe<Chain>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+};
+
+export type NftAssetConnection = {
+  __typename?: 'NftAssetConnection';
+  edges: Array<NftAssetEdge>;
+  pageInfo: PageInfo;
+  totalCount?: Maybe<Scalars['Int']>;
+};
+
+export type NftAssetEdge = {
+  __typename?: 'NftAssetEdge';
+  cursor: Scalars['String'];
+  node: NftAsset;
+};
+
+export type NftAssetInput = {
+  animationUrl?: InputMaybe<Scalars['String']>;
+  collection?: InputMaybe<NftCollectionInput>;
+  description?: InputMaybe<Scalars['String']>;
+  image?: InputMaybe<ImageInput>;
+  isSpam?: InputMaybe<Scalars['Boolean']>;
+  mediaType?: InputMaybe<MediaType>;
+  name?: InputMaybe<Scalars['String']>;
+  nftContract?: InputMaybe<NftContractInput>;
+  smallImage?: InputMaybe<ImageInput>;
+  thumbnail?: InputMaybe<ImageInput>;
+  tokenId: Scalars['String'];
+};
+
+export type NftAssetRarity = {
+  __typename?: 'NftAssetRarity';
+  id: Scalars['ID'];
+  provider?: Maybe<NftRarityProvider>;
+  rank?: Maybe<Scalars['Int']>;
+  score?: Maybe<Scalars['Float']>;
+};
+
+export enum NftAssetSortableField {
+  Price = 'PRICE',
+  Rarity = 'RARITY'
+}
+
+export type NftAssetTrait = {
+  __typename?: 'NftAssetTrait';
+  id: Scalars['ID'];
+  name?: Maybe<Scalars['String']>;
+  rarity?: Maybe<Scalars['Float']>;
+  value?: Maybe<Scalars['String']>;
+};
+
+export type NftAssetTraitInput = {
+  name: Scalars['String'];
+  values: Array<Scalars['String']>;
+};
+
+export type NftAssetsFilterInput = {
+  listed?: InputMaybe<Scalars['Boolean']>;
+  marketplaces?: InputMaybe<Array<NftMarketplace>>;
+  maxPrice?: InputMaybe<Scalars['String']>;
+  minPrice?: InputMaybe<Scalars['String']>;
+  tokenIds?: InputMaybe<Array<Scalars['String']>>;
+  tokenSearchQuery?: InputMaybe<Scalars['String']>;
+  traits?: InputMaybe<Array<NftAssetTraitInput>>;
+};
+
+export type NftBalance = {
+  __typename?: 'NftBalance';
+  id: Scalars['ID'];
+  lastPrice?: Maybe<TimestampedAmount>;
+  listedMarketplaces?: Maybe<Array<NftMarketplace>>;
+  listingFees?: Maybe<Array<Maybe<NftFee>>>;
+  ownedAsset?: Maybe<NftAsset>;
+  quantity?: Maybe<Scalars['Int']>;
+};
+
+export type NftBalanceAssetInput = {
+  address: Scalars['String'];
+  tokenId: Scalars['String'];
+};
+
+export type NftBalanceConnection = {
+  __typename?: 'NftBalanceConnection';
+  edges: Array<NftBalanceEdge>;
+  pageInfo: PageInfo;
+};
+
+export type NftBalanceEdge = {
+  __typename?: 'NftBalanceEdge';
+  cursor: Scalars['String'];
+  node: NftBalance;
+};
+
+export type NftBalancesFilterInput = {
+  addresses?: InputMaybe<Array<Scalars['String']>>;
+  assets?: InputMaybe<Array<NftBalanceAssetInput>>;
+  filterSpam?: InputMaybe<Scalars['Boolean']>;
+};
+
+export type NftCollection = {
+  __typename?: 'NftCollection';
+  bannerImage?: Maybe<Image>;
+  /**
+   *  TODO: support querying for collection assets here
+   * assets(page: Int, pageSize: Int, orderBy: NftAssetSortableField): [NftAsset]
+   * @deprecated Field no longer supported
+   */
+  bannerImageUrl?: Maybe<Scalars['String']>;
+  collectionId: Scalars['String'];
+  creator?: Maybe<NftProfile>;
+  description?: Maybe<Scalars['String']>;
+  discordUrl?: Maybe<Scalars['String']>;
+  homepageUrl?: Maybe<Scalars['String']>;
+  id: Scalars['ID'];
+  image?: Maybe<Image>;
+  /** @deprecated Field no longer supported */
+  imageUrl?: Maybe<Scalars['String']>;
+  instagramName?: Maybe<Scalars['String']>;
+  isVerified?: Maybe<Scalars['Boolean']>;
+  markets?: Maybe<Array<NftCollectionMarket>>;
+  name?: Maybe<Scalars['String']>;
+  nftContracts?: Maybe<Array<NftContract>>;
+  numAssets?: Maybe<Scalars['Int']>;
+  /** @deprecated Field no longer supported */
+  openseaUrl?: Maybe<Scalars['String']>;
+  traits?: Maybe<Array<NftCollectionTrait>>;
+  twitterName?: Maybe<Scalars['String']>;
+};
+
+
+export type NftCollectionMarketsArgs = {
+  currencies: Array<Currency>;
+};
+
+export type NftCollectionBalance = {
+  __typename?: 'NftCollectionBalance';
+  address: Scalars['String'];
+  balance: Scalars['Float'];
+  id: Scalars['ID'];
+  logoImage?: Maybe<Image>;
+  name: Scalars['String'];
+};
+
+export type NftCollectionBalanceConnection = {
+  __typename?: 'NftCollectionBalanceConnection';
+  edges: Array<NftCollectionBalanceEdge>;
+  pageInfo: PageInfo;
+};
+
+export type NftCollectionBalanceEdge = {
+  __typename?: 'NftCollectionBalanceEdge';
+  cursor: Scalars['String'];
+  node: NftCollectionBalance;
+};
+
+export type NftCollectionConnection = {
+  __typename?: 'NftCollectionConnection';
+  edges: Array<NftCollectionEdge>;
+  pageInfo: PageInfo;
+};
+
+export type NftCollectionEdge = {
+  __typename?: 'NftCollectionEdge';
+  cursor: Scalars['String'];
+  node: NftCollection;
+};
+
+export type NftCollectionInput = {
+  collectionId: Scalars['String'];
+  name?: InputMaybe<Scalars['String']>;
+  nftContracts?: InputMaybe<Array<NftContractInput>>;
+};
+
+export type NftCollectionMarket = {
+  __typename?: 'NftCollectionMarket';
+  floorPrice?: Maybe<TimestampedAmount>;
+  floorPricePercentChange?: Maybe<TimestampedAmount>;
+  id: Scalars['ID'];
+  listings?: Maybe<TimestampedAmount>;
+  marketplaces?: Maybe<Array<NftCollectionMarketplace>>;
+  nftContracts?: Maybe<Array<NftContract>>;
+  owners?: Maybe<Scalars['Int']>;
+  percentListed?: Maybe<TimestampedAmount>;
+  percentUniqueOwners?: Maybe<TimestampedAmount>;
+  sales?: Maybe<TimestampedAmount>;
+  totalVolume?: Maybe<TimestampedAmount>;
+  volume?: Maybe<TimestampedAmount>;
+  /** @deprecated Field no longer supported */
+  volume24h?: Maybe<Amount>;
+  volumePercentChange?: Maybe<TimestampedAmount>;
+};
+
+
+export type NftCollectionMarketFloorPricePercentChangeArgs = {
+  duration?: InputMaybe<HistoryDuration>;
+};
+
+
+export type NftCollectionMarketMarketplacesArgs = {
+  marketplaces?: InputMaybe<Array<NftMarketplace>>;
+};
+
+
+export type NftCollectionMarketSalesArgs = {
+  duration?: InputMaybe<HistoryDuration>;
+};
+
+
+export type NftCollectionMarketVolumeArgs = {
+  duration?: InputMaybe<HistoryDuration>;
+};
+
+
+export type NftCollectionMarketVolumePercentChangeArgs = {
+  duration?: InputMaybe<HistoryDuration>;
+};
+
+export type NftCollectionMarketplace = {
+  __typename?: 'NftCollectionMarketplace';
+  floorPrice?: Maybe<Scalars['Float']>;
+  id: Scalars['ID'];
+  listings?: Maybe<Scalars['Int']>;
+  marketplace?: Maybe<NftMarketplace>;
+};
+
+export type NftCollectionTrait = {
+  __typename?: 'NftCollectionTrait';
+  id: Scalars['ID'];
+  name?: Maybe<Scalars['String']>;
+  stats?: Maybe<Array<NftCollectionTraitStats>>;
+  values?: Maybe<Array<Scalars['String']>>;
+};
+
+export type NftCollectionTraitStats = {
+  __typename?: 'NftCollectionTraitStats';
+  assets?: Maybe<Scalars['Int']>;
+  id: Scalars['ID'];
+  listings?: Maybe<Scalars['Int']>;
+  name?: Maybe<Scalars['String']>;
+  value?: Maybe<Scalars['String']>;
+};
+
+export type NftCollectionsFilterInput = {
+  addresses?: InputMaybe<Array<Scalars['String']>>;
+  nameQuery?: InputMaybe<Scalars['String']>;
+};
+
+export type NftContract = IContract & {
+  __typename?: 'NftContract';
+  address: Scalars['String'];
+  chain: Chain;
+  id: Scalars['ID'];
+  name?: Maybe<Scalars['String']>;
+  standard?: Maybe<NftStandard>;
+  symbol?: Maybe<Scalars['String']>;
+  totalSupply?: Maybe<Scalars['Int']>;
+};
+
+export type NftContractInput = {
+  address: Scalars['String'];
+  chain: Chain;
+  name?: InputMaybe<Scalars['String']>;
+  standard?: InputMaybe<NftStandard>;
+  symbol?: InputMaybe<Scalars['String']>;
+  totalSupply?: InputMaybe<Scalars['Int']>;
+};
+
+export type NftFee = {
+  __typename?: 'NftFee';
+  basisPoints: Scalars['Int'];
+  id: Scalars['ID'];
+  payoutAddress: Scalars['String'];
+};
+
+export enum NftMarketplace {
+  Cryptopunks = 'CRYPTOPUNKS',
+  Foundation = 'FOUNDATION',
+  Looksrare = 'LOOKSRARE',
+  Nft20 = 'NFT20',
+  Nftx = 'NFTX',
+  Opensea = 'OPENSEA',
+  Sudoswap = 'SUDOSWAP',
+  X2Y2 = 'X2Y2'
+}
+
+export type NftOrder = {
+  __typename?: 'NftOrder';
+  address: Scalars['String'];
+  auctionType?: Maybe<Scalars['String']>;
+  createdAt: Scalars['Float'];
+  endAt?: Maybe<Scalars['Float']>;
+  id: Scalars['ID'];
+  maker: Scalars['String'];
+  marketplace: NftMarketplace;
+  marketplaceUrl: Scalars['String'];
+  orderHash?: Maybe<Scalars['String']>;
+  poolPrices?: Maybe<Array<Scalars['String']>>;
+  price: Amount;
+  protocolParameters?: Maybe<Scalars['AWSJSON']>;
+  quantity: Scalars['Int'];
+  startAt: Scalars['Float'];
+  status: OrderStatus;
+  taker?: Maybe<Scalars['String']>;
+  tokenId?: Maybe<Scalars['String']>;
+  type: OrderType;
+};
+
+export type NftOrderConnection = {
+  __typename?: 'NftOrderConnection';
+  edges: Array<NftOrderEdge>;
+  pageInfo: PageInfo;
+};
+
+export type NftOrderEdge = {
+  __typename?: 'NftOrderEdge';
+  cursor: Scalars['String'];
+  node: NftOrder;
+};
+
+export type NftProfile = {
+  __typename?: 'NftProfile';
+  address: Scalars['String'];
+  id: Scalars['ID'];
+  isVerified?: Maybe<Scalars['Boolean']>;
+  profileImage?: Maybe<Image>;
+  username?: Maybe<Scalars['String']>;
+};
+
+export enum NftRarityProvider {
+  RaritySniper = 'RARITY_SNIPER'
+}
+
+export type NftRouteResponse = {
+  __typename?: 'NftRouteResponse';
+  calldata: Scalars['String'];
+  id: Scalars['ID'];
+  route?: Maybe<Array<NftTrade>>;
+  sendAmount: TokenAmount;
+  toAddress: Scalars['String'];
+};
+
+export enum NftStandard {
+  Erc721 = 'ERC721',
+  Erc1155 = 'ERC1155',
+  Noncompliant = 'NONCOMPLIANT'
+}
+
+export type NftTrade = {
+  __typename?: 'NftTrade';
+  amount: Scalars['Int'];
+  contractAddress: Scalars['String'];
+  id: Scalars['ID'];
+  marketplace: NftMarketplace;
+  /**   price represents the current price of the NFT, which can be different from quotePrice */
+  price: TokenAmount;
+  /**   quotePrice represents the last quoted price of the NFT */
+  quotePrice?: Maybe<TokenAmount>;
+  tokenId: Scalars['String'];
+  tokenType?: Maybe<NftStandard>;
+};
+
+export type NftTradeInput = {
+  amount: Scalars['Int'];
+  contractAddress: Scalars['String'];
+  id: Scalars['ID'];
+  marketplace: NftMarketplace;
+  quotePrice?: InputMaybe<TokenAmountInput>;
+  tokenId: Scalars['String'];
+  tokenType?: InputMaybe<NftStandard>;
+};
+
+export type NftTransfer = {
+  __typename?: 'NftTransfer';
+  asset: NftAsset;
+  direction: TransactionDirection;
+  id: Scalars['ID'];
+  nftStandard: NftStandard;
+  recipient: Scalars['String'];
+  sender: Scalars['String'];
+};
+
+export type NftTransferInput = {
+  asset: NftAssetInput;
+  direction: TransactionDirection;
+  nftStandard: NftStandard;
+  recipient: Scalars['String'];
+  sender: Scalars['String'];
+};
+
+export enum OrderStatus {
+  Cancelled = 'CANCELLED',
+  Executed = 'EXECUTED',
+  Expired = 'EXPIRED',
+  Valid = 'VALID'
+}
+
+export enum OrderType {
+  Listing = 'LISTING',
+  Offer = 'OFFER'
+}
+
+export type PageInfo = {
+  __typename?: 'PageInfo';
+  endCursor?: Maybe<Scalars['String']>;
+  hasNextPage?: Maybe<Scalars['Boolean']>;
+  hasPreviousPage?: Maybe<Scalars['Boolean']>;
+  startCursor?: Maybe<Scalars['String']>;
+};
+
+/**   v2 pool parameters as defined by https://github.com/Uniswap/v2-sdk/blob/main/src/entities/pair.ts */
+export type PairInput = {
+  tokenAmountA: TokenAmountInput;
+  tokenAmountB: TokenAmountInput;
+};
+
+export type PermitDetailsInput = {
+  amount: Scalars['String'];
+  expiration: Scalars['String'];
+  nonce: Scalars['String'];
+  token: Scalars['String'];
+};
+
+export type PermitInput = {
+  details: PermitDetailsInput;
+  sigDeadline: Scalars['String'];
+  signature: Scalars['String'];
+  spender: Scalars['String'];
+};
+
+/**   v3 pool parameters as defined by https://github.com/Uniswap/v3-sdk/blob/main/src/entities/pool.ts */
+export type PoolInput = {
+  fee: Scalars['Int'];
+  liquidity: Scalars['String'];
+  sqrtRatioX96: Scalars['String'];
+  tickCurrent: Scalars['String'];
+  tokenA: TokenInput;
+  tokenB: TokenInput;
+};
+
+export type Portfolio = {
+  __typename?: 'Portfolio';
+  assetActivities?: Maybe<Array<Maybe<AssetActivity>>>;
+  id: Scalars['ID'];
+  /**   TODO: (michael.zhang) replace with paginated query */
+  nftBalances?: Maybe<Array<Maybe<NftBalance>>>;
+  ownerAddress: Scalars['String'];
+  tokenBalances?: Maybe<Array<Maybe<TokenBalance>>>;
+  tokensTotalDenominatedValue?: Maybe<Amount>;
+  tokensTotalDenominatedValueChange?: Maybe<AmountChange>;
+};
+
+
+export type PortfolioAssetActivitiesArgs = {
+  _fs?: InputMaybe<AssetActivitySwitch>;
+  chains?: InputMaybe<Array<Chain>>;
+  includeOffChain?: InputMaybe<Scalars['Boolean']>;
+  page?: InputMaybe<Scalars['Int']>;
+  pageSize?: InputMaybe<Scalars['Int']>;
+};
+
+
+export type PortfolioTokensTotalDenominatedValueChangeArgs = {
+  duration?: InputMaybe<HistoryDuration>;
+};
+
+/**   Specify how the portfolio value should be calculated for each `ownerAddress`. */
+export type PortfolioValueModifier = {
+  includeSmallBalances?: InputMaybe<Scalars['Boolean']>;
+  includeSpamTokens?: InputMaybe<Scalars['Boolean']>;
+  ownerAddress: Scalars['String'];
+  tokenExcludeOverrides?: InputMaybe<Array<ContractInput>>;
+  tokenIncludeOverrides?: InputMaybe<Array<ContractInput>>;
+};
+
+export enum PriceSource {
+  SubgraphV2 = 'SUBGRAPH_V2',
+  SubgraphV3 = 'SUBGRAPH_V3'
+}
+
+export enum ProtocolVersion {
+  V2 = 'V2',
+  V3 = 'V3'
+}
+
+export type PushNotification = {
+  __typename?: 'PushNotification';
+  contents: Scalars['AWSJSON'];
+  id: Scalars['ID'];
+  notifyAddress: Scalars['String'];
+  signerHeader: Scalars['AWSJSON'];
+  viewerHeader: Scalars['AWSJSON'];
+};
+
+export type Query = {
+  __typename?: 'Query';
+  convert?: Maybe<Amount>;
+  nftActivity?: Maybe<NftActivityConnection>;
+  nftAssets?: Maybe<NftAssetConnection>;
+  nftBalances?: Maybe<NftBalanceConnection>;
+  nftCollectionBalances?: Maybe<NftCollectionBalanceConnection>;
+  nftCollections?: Maybe<NftCollectionConnection>;
+  nftRoute?: Maybe<NftRouteResponse>;
+  portfolios?: Maybe<Array<Maybe<Portfolio>>>;
+  searchTokens?: Maybe<Array<Maybe<Token>>>;
+  /**
+   *  token consumes chain and address instead of contract because the apollo client request cache can only use
+   * keys from the response, and the token response does not contain a contract, but does contain an unwrapped
+   * contract: chain and address.
+   */
+  token?: Maybe<Token>;
+  tokenProjects?: Maybe<Array<Maybe<TokenProject>>>;
+  tokens?: Maybe<Array<Maybe<Token>>>;
+  topCollections?: Maybe<NftCollectionConnection>;
+  topTokens?: Maybe<Array<Maybe<Token>>>;
+  /**   returns top v2 pairs sorted by total value locked in desc order */
+  topV2Pairs?: Maybe<Array<V2Pair>>;
+  /**   returns top v3 pools sorted by total value locked in desc order */
+  topV3Pools?: Maybe<Array<V3Pool>>;
+  transactionNotification?: Maybe<TransactionNotification>;
+};
+
+
+export type QueryConvertArgs = {
+  fromAmount: CurrencyAmountInput;
+  toCurrency: Currency;
+};
+
+
+export type QueryNftActivityArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  chain?: InputMaybe<Chain>;
+  filter?: InputMaybe<NftActivityFilterInput>;
+  first?: InputMaybe<Scalars['Int']>;
+};
+
+
+export type QueryNftAssetsArgs = {
+  address: Scalars['String'];
+  after?: InputMaybe<Scalars['String']>;
+  asc?: InputMaybe<Scalars['Boolean']>;
+  before?: InputMaybe<Scalars['String']>;
+  chain?: InputMaybe<Chain>;
+  filter?: InputMaybe<NftAssetsFilterInput>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  orderBy?: InputMaybe<NftAssetSortableField>;
+};
+
+
+export type QueryNftBalancesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  chain?: InputMaybe<Chain>;
+  filter?: InputMaybe<NftBalancesFilterInput>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  ownerAddress: Scalars['String'];
+};
+
+
+export type QueryNftCollectionBalancesArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  before?: InputMaybe<Scalars['String']>;
+  chain?: InputMaybe<Chain>;
+  first?: InputMaybe<Scalars['Int']>;
+  last?: InputMaybe<Scalars['Int']>;
+  ownerAddress: Scalars['String'];
+};
+
+
+export type QueryNftCollectionsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  chain?: InputMaybe<Chain>;
+  filter?: InputMaybe<NftCollectionsFilterInput>;
+  first?: InputMaybe<Scalars['Int']>;
+};
+
+
+export type QueryNftRouteArgs = {
+  chain?: InputMaybe<Chain>;
+  nftTrades: Array<NftTradeInput>;
+  senderAddress: Scalars['String'];
+  tokenTrades?: InputMaybe<Array<TokenTradeInput>>;
+};
+
+
+export type QueryPortfoliosArgs = {
+  chains?: InputMaybe<Array<Chain>>;
+  lookupTokens?: InputMaybe<Array<ContractInput>>;
+  ownerAddresses: Array<Scalars['String']>;
+  valueModifiers?: InputMaybe<Array<PortfolioValueModifier>>;
+};
+
+
+export type QuerySearchTokensArgs = {
+  chains?: InputMaybe<Array<Chain>>;
+  searchQuery: Scalars['String'];
+};
+
+
+export type QueryTokenArgs = {
+  address?: InputMaybe<Scalars['String']>;
+  chain: Chain;
+};
+
+
+export type QueryTokenProjectsArgs = {
+  contracts: Array<ContractInput>;
+};
+
+
+export type QueryTokensArgs = {
+  contracts: Array<ContractInput>;
+};
+
+
+export type QueryTopCollectionsArgs = {
+  after?: InputMaybe<Scalars['String']>;
+  chains?: InputMaybe<Array<Chain>>;
+  cursor?: InputMaybe<Scalars['String']>;
+  duration?: InputMaybe<HistoryDuration>;
+  first?: InputMaybe<Scalars['Int']>;
+  limit?: InputMaybe<Scalars['Int']>;
+  orderBy?: InputMaybe<CollectionSortableField>;
+};
+
+
+export type QueryTopTokensArgs = {
+  chain?: InputMaybe<Chain>;
+  orderBy?: InputMaybe<TokenSortableField>;
+  page?: InputMaybe<Scalars['Int']>;
+  pageSize?: InputMaybe<Scalars['Int']>;
+};
+
+
+export type QueryTopV2PairsArgs = {
+  chain: Chain;
+  first: Scalars['Int'];
+  tokenFilter?: InputMaybe<Scalars['String']>;
+  tvlCursor?: InputMaybe<Scalars['Float']>;
+};
+
+
+export type QueryTopV3PoolsArgs = {
+  chain: Chain;
+  first: Scalars['Int'];
+  tokenFilter?: InputMaybe<Scalars['String']>;
+  tvlCursor?: InputMaybe<Scalars['Float']>;
+};
+
+
+export type QueryTransactionNotificationArgs = {
+  address: Scalars['String'];
+  chain: Chain;
+  transactionHash: Scalars['String'];
+};
+
+export enum SafetyLevel {
+  Blocked = 'BLOCKED',
+  MediumWarning = 'MEDIUM_WARNING',
+  StrongWarning = 'STRONG_WARNING',
+  Verified = 'VERIFIED'
+}
+
+export type Status = {
+  __typename?: 'Status';
+  success: Scalars['Boolean'];
+};
+
+export type Subscription = {
+  __typename?: 'Subscription';
+  onAssetActivity?: Maybe<AssetActivity>;
+};
+
+
+export type SubscriptionOnAssetActivityArgs = {
+  addresses: Array<Scalars['String']>;
+  subscriptionId: Scalars['ID'];
+};
+
+export enum SubscriptionType {
+  AssetActivity = 'ASSET_ACTIVITY'
+}
+
+export type SwapOrderDetails = {
+  __typename?: 'SwapOrderDetails';
+  expiry: Scalars['Int'];
+  hash: Scalars['String'];
+  id: Scalars['ID'];
+  inputToken: Token;
+  inputTokenQuantity: Scalars['String'];
+  offerer: Scalars['String'];
+  outputToken: Token;
+  outputTokenQuantity: Scalars['String'];
+  /** @deprecated use swapOrderStatus to disambiguate from transactionStatus */
+  status: SwapOrderStatus;
+  swapOrderStatus: SwapOrderStatus;
+};
+
+export enum SwapOrderStatus {
+  Error = 'ERROR',
+  Expired = 'EXPIRED',
+  InsufficientFunds = 'INSUFFICIENT_FUNDS',
+  Open = 'OPEN'
+}
+
+export type TimestampedAmount = IAmount & {
+  __typename?: 'TimestampedAmount';
+  currency?: Maybe<Currency>;
+  id: Scalars['ID'];
+  timestamp: Scalars['Int'];
+  value: Scalars['Float'];
+};
+
+export type Token = IContract & {
+  __typename?: 'Token';
+  address?: Maybe<Scalars['String']>;
+  chain: Chain;
+  decimals?: Maybe<Scalars['Int']>;
+  id: Scalars['ID'];
+  market?: Maybe<TokenMarket>;
+  name?: Maybe<Scalars['String']>;
+  project?: Maybe<TokenProject>;
+  standard?: Maybe<TokenStandard>;
+  symbol?: Maybe<Scalars['String']>;
+};
+
+
+export type TokenMarketArgs = {
+  currency?: InputMaybe<Currency>;
+};
+
+export type TokenAmount = {
+  __typename?: 'TokenAmount';
+  currency: Currency;
+  id: Scalars['ID'];
+  value: Scalars['String'];
+};
+
+export type TokenAmountInput = {
+  amount: Scalars['String'];
+  token: TokenInput;
+};
+
+export type TokenApproval = {
+  __typename?: 'TokenApproval';
+  approvedAddress: Scalars['String'];
+  /**   can be erc20 or native */
+  asset: Token;
+  id: Scalars['ID'];
+  quantity: Scalars['String'];
+  tokenStandard: TokenStandard;
+};
+
+export type TokenApprovalInput = {
+  approvedAddress: Scalars['String'];
+  asset: TokenAssetInput;
+  quantity: Scalars['String'];
+  tokenStandard: TokenStandard;
+};
+
+export type TokenAssetInput = {
+  address?: InputMaybe<Scalars['String']>;
+  chain: Chain;
+  decimals?: InputMaybe<Scalars['Int']>;
+  name?: InputMaybe<Scalars['String']>;
+  standard?: InputMaybe<TokenStandard>;
+  symbol?: InputMaybe<Scalars['String']>;
+};
+
+export type TokenBalance = {
+  __typename?: 'TokenBalance';
+  blockNumber?: Maybe<Scalars['Int']>;
+  blockTimestamp?: Maybe<Scalars['Int']>;
+  denominatedValue?: Maybe<Amount>;
+  id: Scalars['ID'];
+  isHidden?: Maybe<Scalars['Boolean']>;
+  ownerAddress: Scalars['String'];
+  quantity?: Maybe<Scalars['Float']>;
+  token?: Maybe<Token>;
+  tokenProjectMarket?: Maybe<TokenProjectMarket>;
+};
+
+export type TokenInput = {
+  address: Scalars['String'];
+  chainId: Scalars['Int'];
+  decimals: Scalars['Int'];
+  isNative: Scalars['Boolean'];
+};
+
+export type TokenMarket = {
+  __typename?: 'TokenMarket';
+  fullyDilutedValuation?: Maybe<Amount>;
+  id: Scalars['ID'];
+  price?: Maybe<Amount>;
+  priceHighLow?: Maybe<Amount>;
+  priceHistory?: Maybe<Array<Maybe<TimestampedAmount>>>;
+  pricePercentChange?: Maybe<Amount>;
+  priceSource: PriceSource;
+  token: Token;
+  totalValueLocked?: Maybe<Amount>;
+  volume?: Maybe<Amount>;
+};
+
+
+export type TokenMarketPriceHighLowArgs = {
+  duration: HistoryDuration;
+  highLow: HighLow;
+};
+
+
+export type TokenMarketPriceHistoryArgs = {
+  duration: HistoryDuration;
+};
+
+
+export type TokenMarketPricePercentChangeArgs = {
+  duration: HistoryDuration;
+};
+
+
+export type TokenMarketVolumeArgs = {
+  duration: HistoryDuration;
+};
+
+export type TokenProject = {
+  __typename?: 'TokenProject';
+  description?: Maybe<Scalars['String']>;
+  descriptionTranslations?: Maybe<DescriptionTranslations>;
+  homepageUrl?: Maybe<Scalars['String']>;
+  id: Scalars['ID'];
+  isSpam?: Maybe<Scalars['Boolean']>;
+  logo?: Maybe<Image>;
+  /** @deprecated use logo */
+  logoUrl?: Maybe<Scalars['String']>;
+  markets?: Maybe<Array<Maybe<TokenProjectMarket>>>;
+  name?: Maybe<Scalars['String']>;
+  safetyLevel?: Maybe<SafetyLevel>;
+  /** @deprecated use logo */
+  smallLogo?: Maybe<Image>;
+  spamCode?: Maybe<Scalars['Int']>;
+  tokens: Array<Token>;
+  twitterName?: Maybe<Scalars['String']>;
+};
+
+
+export type TokenProjectMarketsArgs = {
+  currencies: Array<Currency>;
+};
+
+export type TokenProjectMarket = {
+  __typename?: 'TokenProjectMarket';
+  currency: Currency;
+  fullyDilutedValuation?: Maybe<Amount>;
+  id: Scalars['ID'];
+  marketCap?: Maybe<Amount>;
+  price?: Maybe<Amount>;
+  priceHigh52w?: Maybe<Amount>;
+  priceHighLow?: Maybe<Amount>;
+  priceHistory?: Maybe<Array<Maybe<TimestampedAmount>>>;
+  priceLow52w?: Maybe<Amount>;
+  pricePercentChange?: Maybe<Amount>;
+  pricePercentChange24h?: Maybe<Amount>;
+  tokenProject: TokenProject;
+};
+
+
+export type TokenProjectMarketPriceHighLowArgs = {
+  duration: HistoryDuration;
+  highLow: HighLow;
+};
+
+
+export type TokenProjectMarketPriceHistoryArgs = {
+  duration: HistoryDuration;
+};
+
+
+export type TokenProjectMarketPricePercentChangeArgs = {
+  duration: HistoryDuration;
+};
+
+export enum TokenSortableField {
+  MarketCap = 'MARKET_CAP',
+  Popularity = 'POPULARITY',
+  TotalValueLocked = 'TOTAL_VALUE_LOCKED',
+  Volume = 'VOLUME'
+}
+
+export enum TokenStandard {
+  Erc20 = 'ERC20',
+  Native = 'NATIVE'
+}
+
+export type TokenTradeInput = {
+  permit?: InputMaybe<PermitInput>;
+  routes?: InputMaybe<TokenTradeRoutesInput>;
+  slippageToleranceBasisPoints?: InputMaybe<Scalars['Int']>;
+  tokenAmount: TokenAmountInput;
+};
+
+export type TokenTradeRouteInput = {
+  inputAmount: TokenAmountInput;
+  outputAmount: TokenAmountInput;
+  pools: Array<TradePoolInput>;
+};
+
+export type TokenTradeRoutesInput = {
+  mixedRoutes?: InputMaybe<Array<TokenTradeRouteInput>>;
+  tradeType: TokenTradeType;
+  v2Routes?: InputMaybe<Array<TokenTradeRouteInput>>;
+  v3Routes?: InputMaybe<Array<TokenTradeRouteInput>>;
+};
+
+export enum TokenTradeType {
+  ExactInput = 'EXACT_INPUT',
+  ExactOutput = 'EXACT_OUTPUT'
+}
+
+export type TokenTransfer = {
+  __typename?: 'TokenTransfer';
+  asset: Token;
+  direction: TransactionDirection;
+  id: Scalars['ID'];
+  quantity: Scalars['String'];
+  recipient: Scalars['String'];
+  sender: Scalars['String'];
+  tokenStandard: TokenStandard;
+  transactedValue?: Maybe<Amount>;
+};
+
+export type TokenTransferInput = {
+  asset: TokenAssetInput;
+  direction: TransactionDirection;
+  quantity: Scalars['String'];
+  recipient: Scalars['String'];
+  sender: Scalars['String'];
+  tokenStandard: TokenStandard;
+  transactedValue?: InputMaybe<AmountInput>;
+};
+
+export type TradePoolInput = {
+  pair?: InputMaybe<PairInput>;
+  pool?: InputMaybe<PoolInput>;
+};
+
+export type Transaction = {
+  __typename?: 'Transaction';
+  blockNumber: Scalars['Int'];
+  from: Scalars['String'];
+  gasLimit?: Maybe<Scalars['Float']>;
+  hash: Scalars['String'];
+  id: Scalars['ID'];
+  maxFeePerGas?: Maybe<Scalars['Float']>;
+  nonce: Scalars['Int'];
+  status: TransactionStatus;
+  to: Scalars['String'];
+};
+
+export type TransactionDetails = {
+  __typename?: 'TransactionDetails';
+  application?: Maybe<ApplicationContract>;
+  assetChanges: Array<Maybe<AssetChange>>;
+  from: Scalars['String'];
+  hash: Scalars['String'];
+  id: Scalars['ID'];
+  nonce: Scalars['Int'];
+  /** @deprecated use transactionStatus to disambiguate from swapOrderStatus */
+  status: TransactionStatus;
+  to: Scalars['String'];
+  transactionStatus: TransactionStatus;
+  type: TransactionType;
+};
+
+export type TransactionDetailsInput = {
+  application?: InputMaybe<ApplicationContractInput>;
+  assetChanges: Array<InputMaybe<AssetChangeInput>>;
+  from: Scalars['String'];
+  hash: Scalars['String'];
+  nonce: Scalars['Int'];
+  status?: InputMaybe<TransactionStatus>;
+  to: Scalars['String'];
+  transactionStatus: TransactionStatus;
+  type: TransactionType;
+};
+
+export enum TransactionDirection {
+  In = 'IN',
+  Out = 'OUT',
+  Self = 'SELF'
+}
+
+export type TransactionNotification = {
+  __typename?: 'TransactionNotification';
+  hash: Scalars['String'];
+  id: Scalars['ID'];
+  push: Array<PushNotification>;
+};
+
+export enum TransactionStatus {
+  Confirmed = 'CONFIRMED',
+  Failed = 'FAILED',
+  Pending = 'PENDING'
+}
+
+export enum TransactionType {
+  Approve = 'APPROVE',
+  Borrow = 'BORROW',
+  Cancel = 'CANCEL',
+  Claim = 'CLAIM',
+  Deployment = 'DEPLOYMENT',
+  Lend = 'LEND',
+  Mint = 'MINT',
+  Receive = 'RECEIVE',
+  Repay = 'REPAY',
+  Send = 'SEND',
+  Stake = 'STAKE',
+  Swap = 'SWAP',
+  SwapOrder = 'SWAP_ORDER',
+  Unknown = 'UNKNOWN',
+  Unstake = 'UNSTAKE',
+  Withdraw = 'WITHDRAW'
+}
+
+export type V2Pair = {
+  __typename?: 'V2Pair';
+  address: Scalars['String'];
+  chain: Chain;
+  createdAtTimestamp?: Maybe<Scalars['Int']>;
+  cumulativeVolume?: Maybe<Amount>;
+  id: Scalars['ID'];
+  protocolVersion: ProtocolVersion;
+  token0?: Maybe<Token>;
+  token0Supply?: Maybe<Scalars['Float']>;
+  token1?: Maybe<Token>;
+  token1Supply?: Maybe<Scalars['Float']>;
+  totalLiquidity?: Maybe<Amount>;
+  txCount?: Maybe<Scalars['Int']>;
+};
+
+
+export type V2PairCumulativeVolumeArgs = {
+  duration?: InputMaybe<HistoryDuration>;
+};
+
+export type V3Pool = {
+  __typename?: 'V3Pool';
+  address: Scalars['String'];
+  chain: Chain;
+  createdAtTimestamp?: Maybe<Scalars['Int']>;
+  cumulativeVolume?: Maybe<Amount>;
+  feeTier?: Maybe<Scalars['Float']>;
+  id: Scalars['ID'];
+  protocolVersion: ProtocolVersion;
+  token0?: Maybe<Token>;
+  token0Supply?: Maybe<Scalars['Float']>;
+  token1?: Maybe<Token>;
+  token1Supply?: Maybe<Scalars['Float']>;
+  totalLiquidity?: Maybe<Amount>;
+  txCount?: Maybe<Scalars['Int']>;
+};
+
+
+export type V3PoolCumulativeVolumeArgs = {
+  duration?: InputMaybe<HistoryDuration>;
+};
+
+export type TokenPriceHistoryQueryVariables = Exact<{
+  contract: ContractInput;
+  duration?: InputMaybe<HistoryDuration>;
+}>;
+
+
+export type TokenPriceHistoryQuery = { __typename?: 'Query', tokenProjects?: Array<{ __typename?: 'TokenProject', id: string, name?: string | null, markets?: Array<{ __typename?: 'TokenProjectMarket', id: string, price?: { __typename?: 'Amount', value: number } | null, pricePercentChange24h?: { __typename?: 'Amount', value: number } | null, priceHistory?: Array<{ __typename?: 'TimestampedAmount', timestamp: number, value: number } | null> | null } | null> | null, tokens: Array<{ __typename?: 'Token', id: string, chain: Chain, address?: string | null, symbol?: string | null, decimals?: number | null, market?: { __typename?: 'TokenMarket', id: string, price?: { __typename?: 'Amount', value: number } | null, pricePercentChange24h?: { __typename?: 'Amount', value: number } | null, priceHistory?: Array<{ __typename?: 'TimestampedAmount', timestamp: number, value: number } | null> | null } | null }> } | null> | null };
+
+export type AccountListQueryVariables = Exact<{
+  addresses: Array<Scalars['String']> | Scalars['String'];
+  valueModifiers?: InputMaybe<Array<PortfolioValueModifier> | PortfolioValueModifier>;
+}>;
+
+
+export type AccountListQuery = { __typename?: 'Query', portfolios?: Array<{ __typename?: 'Portfolio', id: string, ownerAddress: string, tokensTotalDenominatedValue?: { __typename?: 'Amount', value: number } | null } | null> | null };
+
+export type SearchPopularNftCollectionsQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type SearchPopularNftCollectionsQuery = { __typename?: 'Query', topCollections?: { __typename?: 'NftCollectionConnection', edges: Array<{ __typename?: 'NftCollectionEdge', node: { __typename?: 'NftCollection', id: string, name?: string | null, collectionId: string, isVerified?: boolean | null, nftContracts?: Array<{ __typename?: 'NftContract', id: string, chain: Chain, address: string }> | null, image?: { __typename?: 'Image', id: string, url: string } | null } }> } | null };
+
+export type SearchPopularTokensQueryVariables = Exact<{ [key: string]: never; }>;
+
+
+export type SearchPopularTokensQuery = { __typename?: 'Query', topTokens?: Array<{ __typename?: 'Token', id: string, address?: string | null, chain: Chain, symbol?: string | null, decimals?: number | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, logoUrl?: string | null, safetyLevel?: SafetyLevel | null } | null } | null> | null, eth?: Array<{ __typename?: 'Token', id: string, address?: string | null, chain: Chain, symbol?: string | null, decimals?: number | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, logoUrl?: string | null, safetyLevel?: SafetyLevel | null } | null } | null> | null };
+
+export type NftsQueryVariables = Exact<{
+  ownerAddress: Scalars['String'];
+}>;
+
+
+export type NftsQuery = { __typename?: 'Query', portfolios?: Array<{ __typename?: 'Portfolio', id: string, nftBalances?: Array<{ __typename?: 'NftBalance', id: string, ownedAsset?: { __typename?: 'NftAsset', id: string, description?: string | null, name?: string | null, tokenId: string, collection?: { __typename?: 'NftCollection', id: string, collectionId: string, description?: string | null, isVerified?: boolean | null, name?: string | null, numAssets?: number | null, image?: { __typename?: 'Image', id: string, url: string } | null, markets?: Array<{ __typename?: 'NftCollectionMarket', id: string, owners?: number | null, floorPrice?: { __typename?: 'TimestampedAmount', value: number } | null, volume24h?: { __typename?: 'Amount', value: number } | null, totalVolume?: { __typename?: 'TimestampedAmount', value: number } | null }> | null } | null, image?: { __typename?: 'Image', id: string, url: string } | null, nftContract?: { __typename?: 'NftContract', id: string, address: string, chain: Chain, standard?: NftStandard | null } | null, thumbnail?: { __typename?: 'Image', id: string, url: string } | null, creator?: { __typename?: 'NftProfile', id: string, address: string, username?: string | null } | null } | null } | null> | null } | null> | null };
+
+export type NftItemScreenQueryVariables = Exact<{
+  contractAddress: Scalars['String'];
+  filter?: InputMaybe<NftAssetsFilterInput>;
+  activityFilter?: InputMaybe<NftActivityFilterInput>;
+}>;
+
+
+export type NftItemScreenQuery = { __typename?: 'Query', nftAssets?: { __typename?: 'NftAssetConnection', edges: Array<{ __typename?: 'NftAssetEdge', node: { __typename?: 'NftAsset', id: string, ownerAddress?: string | null, description?: string | null, name?: string | null, tokenId: string, collection?: { __typename?: 'NftCollection', id: string, collectionId: string, description?: string | null, isVerified?: boolean | null, name?: string | null, numAssets?: number | null, image?: { __typename?: 'Image', id: string, url: string } | null, markets?: Array<{ __typename?: 'NftCollectionMarket', id: string, owners?: number | null, floorPrice?: { __typename?: 'TimestampedAmount', value: number } | null, totalVolume?: { __typename?: 'TimestampedAmount', value: number } | null }> | null, nftContracts?: Array<{ __typename?: 'NftContract', id: string, address: string }> | null } | null, image?: { __typename?: 'Image', id: string, url: string, dimensions?: { __typename?: 'Dimensions', width?: number | null, height?: number | null } | null } | null, nftContract?: { __typename?: 'NftContract', id: string, address: string, chain: Chain, standard?: NftStandard | null } | null, creator?: { __typename?: 'NftProfile', id: string, address: string, username?: string | null } | null, traits?: Array<{ __typename?: 'NftAssetTrait', id: string, name?: string | null, rarity?: number | null, value?: string | null }> | null, listings?: { __typename?: 'NftOrderConnection', edges: Array<{ __typename?: 'NftOrderEdge', node: { __typename?: 'NftOrder', id: string, price: { __typename?: 'Amount', currency?: Currency | null, value: number } } }> } | null } }> } | null, nftActivity?: { __typename?: 'NftActivityConnection', edges: Array<{ __typename?: 'NftActivityEdge', node: { __typename?: 'NftActivity', id: string, quantity?: number | null, price?: { __typename?: 'Amount', currency?: Currency | null, value: number } | null } }> } | null };
+
+export type NftCollectionScreenQueryVariables = Exact<{
+  contractAddress: Scalars['String'];
+  first?: InputMaybe<Scalars['Int']>;
+  after?: InputMaybe<Scalars['String']>;
+}>;
+
+
+export type NftCollectionScreenQuery = { __typename?: 'Query', nftCollections?: { __typename?: 'NftCollectionConnection', edges: Array<{ __typename?: 'NftCollectionEdge', node: { __typename?: 'NftCollection', id: string, isVerified?: boolean | null, numAssets?: number | null, description?: string | null, homepageUrl?: string | null, twitterName?: string | null, name?: string | null, bannerImage?: { __typename?: 'Image', id: string, url: string } | null, image?: { __typename?: 'Image', id: string, url: string } | null, markets?: Array<{ __typename?: 'NftCollectionMarket', id: string, owners?: number | null, floorPrice?: { __typename?: 'TimestampedAmount', value: number } | null, volume24h?: { __typename?: 'Amount', value: number } | null, totalVolume?: { __typename?: 'TimestampedAmount', value: number } | null }> | null } }> } | null, nftAssets?: { __typename?: 'NftAssetConnection', edges: Array<{ __typename?: 'NftAssetEdge', node: { __typename?: 'NftAsset', ownerAddress?: string | null, id: string, name?: string | null, tokenId: string, nftContract?: { __typename?: 'NftContract', id: string, address: string } | null, collection?: { __typename?: 'NftCollection', id: string, collectionId: string, name?: string | null } | null, image?: { __typename?: 'Image', id: string, url: string, dimensions?: { __typename?: 'Dimensions', width?: number | null, height?: number | null } | null } | null, listings?: { __typename?: 'NftOrderConnection', edges: Array<{ __typename?: 'NftOrderEdge', node: { __typename?: 'NftOrder', id: string, price: { __typename?: 'Amount', currency?: Currency | null, value: number } } }> } | null } }>, pageInfo: { __typename?: 'PageInfo', endCursor?: string | null, hasNextPage?: boolean | null, hasPreviousPage?: boolean | null, startCursor?: string | null } } | null };
+
+export type NftsTabQueryVariables = Exact<{
+  ownerAddress: Scalars['String'];
+  first?: InputMaybe<Scalars['Int']>;
+  after?: InputMaybe<Scalars['String']>;
+  filter?: InputMaybe<NftBalancesFilterInput>;
+}>;
+
+
+export type NftsTabQuery = { __typename?: 'Query', nftBalances?: { __typename?: 'NftBalanceConnection', edges: Array<{ __typename?: 'NftBalanceEdge', node: { __typename?: 'NftBalance', ownedAsset?: { __typename?: 'NftAsset', id: string, name?: string | null, tokenId: string, description?: string | null, isSpam?: boolean | null, collection?: { __typename?: 'NftCollection', id: string, name?: string | null, isVerified?: boolean | null, markets?: Array<{ __typename?: 'NftCollectionMarket', id: string, floorPrice?: { __typename?: 'TimestampedAmount', value: number } | null }> | null } | null, image?: { __typename?: 'Image', id: string, url: string, dimensions?: { __typename?: 'Dimensions', width?: number | null, height?: number | null } | null } | null, nftContract?: { __typename?: 'NftContract', id: string, address: string } | null } | null } }>, pageInfo: { __typename?: 'PageInfo', endCursor?: string | null, hasNextPage?: boolean | null, hasPreviousPage?: boolean | null, startCursor?: string | null } } | null };
+
+export type PortfolioBalancesQueryVariables = Exact<{
+  ownerAddress: Scalars['String'];
+  valueModifiers?: InputMaybe<Array<PortfolioValueModifier> | PortfolioValueModifier>;
+}>;
+
+
+export type PortfolioBalancesQuery = { __typename?: 'Query', portfolios?: Array<{ __typename?: 'Portfolio', id: string, tokensTotalDenominatedValue?: { __typename?: 'Amount', value: number } | null, tokensTotalDenominatedValueChange?: { __typename?: 'AmountChange', absolute?: { __typename?: 'Amount', value: number } | null, percentage?: { __typename?: 'Amount', value: number } | null } | null, tokenBalances?: Array<{ __typename?: 'TokenBalance', id: string, quantity?: number | null, isHidden?: boolean | null, denominatedValue?: { __typename?: 'Amount', currency?: Currency | null, value: number } | null, token?: { __typename?: 'Token', chain: Chain, address?: string | null, symbol?: string | null, decimals?: number | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, logoUrl?: string | null, safetyLevel?: SafetyLevel | null, isSpam?: boolean | null } | null } | null, tokenProjectMarket?: { __typename?: 'TokenProjectMarket', relativeChange24?: { __typename?: 'Amount', value: number } | null } | null } | null> | null } | null> | null };
+
+export type MultiplePortfolioBalancesQueryVariables = Exact<{
+  ownerAddresses: Array<Scalars['String']> | Scalars['String'];
+  valueModifiers?: InputMaybe<Array<PortfolioValueModifier> | PortfolioValueModifier>;
+}>;
+
+
+export type MultiplePortfolioBalancesQuery = { __typename?: 'Query', portfolios?: Array<{ __typename?: 'Portfolio', id: string, tokensTotalDenominatedValue?: { __typename?: 'Amount', value: number } | null, tokensTotalDenominatedValueChange?: { __typename?: 'AmountChange', absolute?: { __typename?: 'Amount', value: number } | null, percentage?: { __typename?: 'Amount', value: number } | null } | null, tokenBalances?: Array<{ __typename?: 'TokenBalance', id: string, quantity?: number | null, isHidden?: boolean | null, denominatedValue?: { __typename?: 'Amount', currency?: Currency | null, value: number } | null, token?: { __typename?: 'Token', chain: Chain, address?: string | null, symbol?: string | null, decimals?: number | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, logoUrl?: string | null, safetyLevel?: SafetyLevel | null, isSpam?: boolean | null } | null } | null, tokenProjectMarket?: { __typename?: 'TokenProjectMarket', relativeChange24?: { __typename?: 'Amount', value: number } | null } | null } | null> | null } | null> | null };
+
+export type SelectWalletScreenQueryVariables = Exact<{
+  ownerAddresses: Array<Scalars['String']> | Scalars['String'];
+}>;
+
+
+export type SelectWalletScreenQuery = { __typename?: 'Query', portfolios?: Array<{ __typename?: 'Portfolio', id: string, ownerAddress: string, tokensTotalDenominatedValue?: { __typename?: 'Amount', value: number } | null } | null> | null };
+
+export type TransactionHistoryUpdaterQueryVariables = Exact<{
+  addresses: Array<Scalars['String']> | Scalars['String'];
+}>;
+
+
+export type TransactionHistoryUpdaterQuery = { __typename?: 'Query', portfolios?: Array<{ __typename?: 'Portfolio', id: string, ownerAddress: string, assetActivities?: Array<{ __typename?: 'AssetActivity', id: string, timestamp: number, details: { __typename?: 'SwapOrderDetails' } | { __typename?: 'TransactionDetails', id: string, hash: string } } | null> | null } | null> | null };
+
+export type TokenQueryVariables = Exact<{
+  chain: Chain;
+  address?: InputMaybe<Scalars['String']>;
+}>;
+
+
+export type TokenQuery = { __typename?: 'Query', token?: { __typename?: 'Token', symbol?: string | null, decimals?: number | null, chain: Chain, address?: string | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, logoUrl?: string | null, safetyLevel?: SafetyLevel | null, isSpam?: boolean | null } | null } | null };
+
+export type TokenDetailsScreenQueryVariables = Exact<{
+  chain: Chain;
+  address?: InputMaybe<Scalars['String']>;
+  includeSpanish?: InputMaybe<Scalars['Boolean']>;
+  includeFrench?: InputMaybe<Scalars['Boolean']>;
+  includeJapanese?: InputMaybe<Scalars['Boolean']>;
+  includePortuguese?: InputMaybe<Scalars['Boolean']>;
+  includeChineseSimplified?: InputMaybe<Scalars['Boolean']>;
+  includeChineseTraditional?: InputMaybe<Scalars['Boolean']>;
+}>;
+
+
+export type TokenDetailsScreenQuery = { __typename?: 'Query', token?: { __typename?: 'Token', address?: string | null, chain: Chain, symbol?: string | null, name?: string | null, market?: { __typename?: 'TokenMarket', id: string, volume?: { __typename?: 'Amount', value: number } | null, price?: { __typename?: 'Amount', value: number } | null, priceHigh52W?: { __typename?: 'Amount', value: number } | null, priceLow52W?: { __typename?: 'Amount', value: number } | null } | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, description?: string | null, homepageUrl?: string | null, twitterName?: string | null, safetyLevel?: SafetyLevel | null, logoUrl?: string | null, descriptionTranslations?: { __typename?: 'DescriptionTranslations', descriptionEsEs?: string | null, descriptionFrFr?: string | null, descriptionJaJp?: string | null, descriptionPtPt?: string | null, descriptionZhHans?: string | null, descriptionZhHant?: string | null } | null, markets?: Array<{ __typename?: 'TokenProjectMarket', id: string, price?: { __typename?: 'Amount', value: number } | null, marketCap?: { __typename?: 'Amount', value: number } | null, fullyDilutedValuation?: { __typename?: 'Amount', value: number } | null, priceHigh52W?: { __typename?: 'Amount', value: number } | null, priceLow52W?: { __typename?: 'Amount', value: number } | null } | null> | null, tokens: Array<{ __typename?: 'Token', chain: Chain, address?: string | null }> } | null } | null };
+
+export type TokenProjectsQueryVariables = Exact<{
+  contracts: Array<ContractInput> | ContractInput;
+}>;
+
+
+export type TokenProjectsQuery = { __typename?: 'Query', tokenProjects?: Array<{ __typename?: 'TokenProject', id: string, name?: string | null, logoUrl?: string | null, safetyLevel?: SafetyLevel | null, tokens: Array<{ __typename?: 'Token', chain: Chain, address?: string | null, decimals?: number | null, symbol?: string | null }> } | null> | null };
+
+export type TransactionListQueryVariables = Exact<{
+  address: Scalars['String'];
+}>;
+
+
+export type TransactionListQuery = { __typename?: 'Query', portfolios?: Array<{ __typename?: 'Portfolio', id: string, assetActivities?: Array<{ __typename?: 'AssetActivity', id: string, timestamp: number, chain: Chain, details: { __typename?: 'SwapOrderDetails' } | { __typename?: 'TransactionDetails', id: string, to: string, type: TransactionType, hash: string, from: string, status: TransactionStatus, assetChanges: Array<{ __typename: 'NftApproval' } | { __typename: 'NftApproveForAll' } | { __typename: 'NftTransfer', id: string, nftStandard: NftStandard, sender: string, recipient: string, direction: TransactionDirection, asset: { __typename?: 'NftAsset', id: string, name?: string | null, isSpam?: boolean | null, tokenId: string, nftContract?: { __typename?: 'NftContract', id: string, chain: Chain, address: string } | null, image?: { __typename?: 'Image', id: string, url: string } | null, collection?: { __typename?: 'NftCollection', id: string, name?: string | null } | null } } | { __typename: 'TokenApproval', id: string, tokenStandard: TokenStandard, approvedAddress: string, quantity: string, asset: { __typename?: 'Token', id: string, symbol?: string | null, decimals?: number | null, address?: string | null, chain: Chain } } | { __typename: 'TokenTransfer', id: string, tokenStandard: TokenStandard, quantity: string, sender: string, recipient: string, direction: TransactionDirection, asset: { __typename?: 'Token', id: string, symbol?: string | null, address?: string | null, decimals?: number | null, chain: Chain, project?: { __typename?: 'TokenProject', id: string, isSpam?: boolean | null, spamCode?: number | null } | null }, transactedValue?: { __typename?: 'Amount', id: string, currency?: Currency | null, value: number } | null } | null> } } | null> | null } | null> | null };
+
+export type FeedTransactionListQueryVariables = Exact<{
+  addresses: Array<Scalars['String']> | Scalars['String'];
+}>;
+
+
+export type FeedTransactionListQuery = { __typename?: 'Query', portfolios?: Array<{ __typename?: 'Portfolio', id: string, ownerAddress: string, assetActivities?: Array<{ __typename?: 'AssetActivity', id: string, timestamp: number, chain: Chain, details: { __typename?: 'SwapOrderDetails' } | { __typename?: 'TransactionDetails', id: string, to: string, type: TransactionType, hash: string, from: string, status: TransactionStatus, assetChanges: Array<{ __typename: 'NftApproval' } | { __typename: 'NftApproveForAll' } | { __typename: 'NftTransfer', id: string, nftStandard: NftStandard, sender: string, recipient: string, direction: TransactionDirection, asset: { __typename?: 'NftAsset', id: string, name?: string | null, isSpam?: boolean | null, tokenId: string, nftContract?: { __typename?: 'NftContract', id: string, chain: Chain, address: string } | null, image?: { __typename?: 'Image', id: string, url: string } | null, collection?: { __typename?: 'NftCollection', id: string, name?: string | null } | null } } | { __typename: 'TokenApproval', id: string, tokenStandard: TokenStandard, approvedAddress: string, quantity: string, asset: { __typename?: 'Token', id: string, symbol?: string | null, decimals?: number | null, address?: string | null, chain: Chain } } | { __typename: 'TokenTransfer', id: string, tokenStandard: TokenStandard, quantity: string, sender: string, recipient: string, direction: TransactionDirection, asset: { __typename?: 'Token', id: string, symbol?: string | null, address?: string | null, decimals?: number | null, chain: Chain, project?: { __typename?: 'TokenProject', id: string, isSpam?: boolean | null, spamCode?: number | null } | null }, transactedValue?: { __typename?: 'Amount', currency?: Currency | null, value: number } | null } | null> } } | null> | null } | null> | null };
+
+export type TopTokensQueryVariables = Exact<{
+  chain?: InputMaybe<Chain>;
+  page?: InputMaybe<Scalars['Int']>;
+  pageSize?: InputMaybe<Scalars['Int']>;
+  orderBy?: InputMaybe<TokenSortableField>;
+}>;
+
+
+export type TopTokensQuery = { __typename?: 'Query', topTokens?: Array<{ __typename?: 'Token', address?: string | null, chain: Chain, decimals?: number | null, symbol?: string | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, isSpam?: boolean | null, logoUrl?: string | null, safetyLevel?: SafetyLevel | null } | null } | null> | null };
+
+export type SearchTokensQueryVariables = Exact<{
+  searchQuery: Scalars['String'];
+  chains?: InputMaybe<Array<Chain> | Chain>;
+}>;
+
+
+export type SearchTokensQuery = { __typename?: 'Query', searchTokens?: Array<{ __typename?: 'Token', id: string, chain: Chain, address?: string | null, decimals?: number | null, symbol?: string | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, logoUrl?: string | null, safetyLevel?: SafetyLevel | null } | null } | null> | null };
+
+export type ExploreSearchQueryVariables = Exact<{
+  searchQuery: Scalars['String'];
+  nftCollectionsFilter: NftCollectionsFilterInput;
+}>;
+
+
+export type ExploreSearchQuery = { __typename?: 'Query', searchTokens?: Array<{ __typename?: 'Token', chain: Chain, address?: string | null, decimals?: number | null, symbol?: string | null, market?: { __typename?: 'TokenMarket', volume?: { __typename?: 'Amount', value: number } | null } | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, logoUrl?: string | null, safetyLevel?: SafetyLevel | null } | null } | null> | null, nftCollections?: { __typename?: 'NftCollectionConnection', edges: Array<{ __typename?: 'NftCollectionEdge', node: { __typename?: 'NftCollection', id: string, name?: string | null, collectionId: string, isVerified?: boolean | null, nftContracts?: Array<{ __typename?: 'NftContract', id: string, chain: Chain, address: string }> | null, image?: { __typename?: 'Image', id: string, url: string } | null } }> } | null };
+
+export type TopTokenPartsFragment = { __typename?: 'Token', symbol?: string | null, chain: Chain, address?: string | null, market?: { __typename?: 'TokenMarket', id: string, totalValueLocked?: { __typename?: 'Amount', value: number } | null, volume?: { __typename?: 'Amount', value: number } | null } | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, logoUrl?: string | null, markets?: Array<{ __typename?: 'TokenProjectMarket', id: string, price?: { __typename?: 'Amount', value: number } | null, pricePercentChange24h?: { __typename?: 'Amount', value: number } | null, marketCap?: { __typename?: 'Amount', value: number } | null } | null> | null } | null };
+
+export type ExploreTokensTabQueryVariables = Exact<{
+  topTokensOrderBy: TokenSortableField;
+}>;
+
+
+export type ExploreTokensTabQuery = { __typename?: 'Query', topTokens?: Array<{ __typename?: 'Token', symbol?: string | null, chain: Chain, address?: string | null, market?: { __typename?: 'TokenMarket', id: string, totalValueLocked?: { __typename?: 'Amount', value: number } | null, volume?: { __typename?: 'Amount', value: number } | null } | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, logoUrl?: string | null, markets?: Array<{ __typename?: 'TokenProjectMarket', id: string, price?: { __typename?: 'Amount', value: number } | null, pricePercentChange24h?: { __typename?: 'Amount', value: number } | null, marketCap?: { __typename?: 'Amount', value: number } | null } | null> | null } | null } | null> | null, eth?: { __typename?: 'Token', symbol?: string | null, chain: Chain, address?: string | null, market?: { __typename?: 'TokenMarket', id: string, totalValueLocked?: { __typename?: 'Amount', value: number } | null, volume?: { __typename?: 'Amount', value: number } | null } | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, logoUrl?: string | null, markets?: Array<{ __typename?: 'TokenProjectMarket', id: string, price?: { __typename?: 'Amount', value: number } | null, pricePercentChange24h?: { __typename?: 'Amount', value: number } | null, marketCap?: { __typename?: 'Amount', value: number } | null } | null> | null } | null } | null };
+
+export type FavoriteTokenCardQueryVariables = Exact<{
+  chain: Chain;
+  address?: InputMaybe<Scalars['String']>;
+}>;
+
+
+export type FavoriteTokenCardQuery = { __typename?: 'Query', token?: { __typename?: 'Token', symbol?: string | null, chain: Chain, address?: string | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, logoUrl?: string | null, markets?: Array<{ __typename?: 'TokenProjectMarket', id: string, price?: { __typename?: 'Amount', value: number } | null, pricePercentChange24h?: { __typename?: 'Amount', value: number } | null } | null> | null } | null } | null };
+
+export type TokensQueryVariables = Exact<{
+  contracts: Array<ContractInput> | ContractInput;
+}>;
+
+
+export type TokensQuery = { __typename?: 'Query', tokens?: Array<{ __typename?: 'Token', symbol?: string | null, chain: Chain, address?: string | null, project?: { __typename?: 'TokenProject', name?: string | null } | null } | null> | null };
+
+export type ConvertQueryVariables = Exact<{
+  fromCurrency: Currency;
+  toCurrency: Currency;
+}>;
+
+
+export type ConvertQuery = { __typename?: 'Query', convert?: { __typename?: 'Amount', value: number, currency?: Currency | null } | null };
+
+export type PortfolioBalanceQueryVariables = Exact<{
+  owner: Scalars['String'];
+  valueModifiers?: InputMaybe<Array<PortfolioValueModifier> | PortfolioValueModifier>;
+}>;
+
+
+export type PortfolioBalanceQuery = { __typename?: 'Query', portfolios?: Array<{ __typename?: 'Portfolio', id: string, tokensTotalDenominatedValue?: { __typename?: 'Amount', value: number } | null, tokensTotalDenominatedValueChange?: { __typename?: 'AmountChange', absolute?: { __typename?: 'Amount', value: number } | null, percentage?: { __typename?: 'Amount', value: number } | null } | null } | null> | null };
+
+export type PortfolioTokenBalancesQueryVariables = Exact<{
+  ownerAddress: Scalars['String'];
+}>;
+
+
+export type PortfolioTokenBalancesQuery = { __typename?: 'Query', portfolios?: Array<{ __typename?: 'Portfolio', id: string, tokenBalances?: Array<{ __typename?: 'TokenBalance', id: string, quantity?: number | null, denominatedValue?: { __typename?: 'Amount', currency?: Currency | null, value: number } | null, token?: { __typename?: 'Token', id: string, chain: Chain, address?: string | null, symbol?: string | null, decimals?: number | null, project?: { __typename?: 'TokenProject', id: string, name?: string | null, logoUrl?: string | null, safetyLevel?: SafetyLevel | null, isSpam?: boolean | null } | null } | null, tokenProjectMarket?: { __typename?: 'TokenProjectMarket', relativeChange24?: { __typename?: 'Amount', value: number } | null } | null } | null> | null } | null> | null };
+
+export const TopTokenPartsFragmentDoc = gql`
+    fragment TopTokenParts on Token {
+  symbol
+  chain
+  address
+  market {
+    id
+    totalValueLocked {
+      value
+    }
+    volume(duration: DAY) {
+      value
+    }
+  }
+  project {
+    id
+    name
+    logoUrl
+    markets(currencies: [USD]) {
+      id
+      price {
+        value
+      }
+      pricePercentChange24h {
+        value
+      }
+      marketCap {
+        value
+      }
+    }
+  }
+}
+    `;
+export const TokenPriceHistoryDocument = gql`
+    query TokenPriceHistory($contract: ContractInput!, $duration: HistoryDuration = DAY) {
+  tokenProjects(contracts: [$contract]) {
+    id
+    name
+    markets(currencies: [USD]) {
+      id
+      price {
+        value
+      }
+      pricePercentChange24h {
+        value
+      }
+      priceHistory(duration: $duration) {
+        timestamp
+        value
+      }
+    }
+    tokens {
+      id
+      chain
+      address
+      symbol
+      decimals
+      market(currency: USD) {
+        id
+        price {
+          value
+        }
+        pricePercentChange24h: pricePercentChange(duration: DAY) {
+          value
+        }
+        priceHistory(duration: $duration) {
+          timestamp
+          value
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useTokenPriceHistoryQuery__
+ *
+ * To run a query within a React component, call `useTokenPriceHistoryQuery` and pass it any options that fit your needs.
+ * When your component renders, `useTokenPriceHistoryQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useTokenPriceHistoryQuery({
+ *   variables: {
+ *      contract: // value for 'contract'
+ *      duration: // value for 'duration'
+ *   },
+ * });
+ */
+export function useTokenPriceHistoryQuery(baseOptions: Apollo.QueryHookOptions<TokenPriceHistoryQuery, TokenPriceHistoryQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<TokenPriceHistoryQuery, TokenPriceHistoryQueryVariables>(TokenPriceHistoryDocument, options);
+      }
+export function useTokenPriceHistoryLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<TokenPriceHistoryQuery, TokenPriceHistoryQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<TokenPriceHistoryQuery, TokenPriceHistoryQueryVariables>(TokenPriceHistoryDocument, options);
+        }
+export type TokenPriceHistoryQueryHookResult = ReturnType<typeof useTokenPriceHistoryQuery>;
+export type TokenPriceHistoryLazyQueryHookResult = ReturnType<typeof useTokenPriceHistoryLazyQuery>;
+export type TokenPriceHistoryQueryResult = Apollo.QueryResult<TokenPriceHistoryQuery, TokenPriceHistoryQueryVariables>;
+export const AccountListDocument = gql`
+    query AccountList($addresses: [String!]!, $valueModifiers: [PortfolioValueModifier!]) {
+  portfolios(
+    ownerAddresses: $addresses
+    chains: [ETHEREUM, POLYGON, ARBITRUM, OPTIMISM, BASE, BNB]
+    valueModifiers: $valueModifiers
+  ) {
+    id
+    ownerAddress
+    tokensTotalDenominatedValue {
+      value
+    }
+  }
+}
+    `;
+
+/**
+ * __useAccountListQuery__
+ *
+ * To run a query within a React component, call `useAccountListQuery` and pass it any options that fit your needs.
+ * When your component renders, `useAccountListQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useAccountListQuery({
+ *   variables: {
+ *      addresses: // value for 'addresses'
+ *      valueModifiers: // value for 'valueModifiers'
+ *   },
+ * });
+ */
+export function useAccountListQuery(baseOptions: Apollo.QueryHookOptions<AccountListQuery, AccountListQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<AccountListQuery, AccountListQueryVariables>(AccountListDocument, options);
+      }
+export function useAccountListLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<AccountListQuery, AccountListQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<AccountListQuery, AccountListQueryVariables>(AccountListDocument, options);
+        }
+export type AccountListQueryHookResult = ReturnType<typeof useAccountListQuery>;
+export type AccountListLazyQueryHookResult = ReturnType<typeof useAccountListLazyQuery>;
+export type AccountListQueryResult = Apollo.QueryResult<AccountListQuery, AccountListQueryVariables>;
+export const SearchPopularNftCollectionsDocument = gql`
+    query SearchPopularNFTCollections {
+  topCollections(chains: [ETHEREUM], orderBy: VOLUME, duration: DAY, first: 2) {
+    edges {
+      node {
+        id
+        name
+        collectionId
+        isVerified
+        nftContracts {
+          id
+          chain
+          address
+        }
+        image {
+          id
+          url
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useSearchPopularNftCollectionsQuery__
+ *
+ * To run a query within a React component, call `useSearchPopularNftCollectionsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useSearchPopularNftCollectionsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useSearchPopularNftCollectionsQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useSearchPopularNftCollectionsQuery(baseOptions?: Apollo.QueryHookOptions<SearchPopularNftCollectionsQuery, SearchPopularNftCollectionsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<SearchPopularNftCollectionsQuery, SearchPopularNftCollectionsQueryVariables>(SearchPopularNftCollectionsDocument, options);
+      }
+export function useSearchPopularNftCollectionsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<SearchPopularNftCollectionsQuery, SearchPopularNftCollectionsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<SearchPopularNftCollectionsQuery, SearchPopularNftCollectionsQueryVariables>(SearchPopularNftCollectionsDocument, options);
+        }
+export type SearchPopularNftCollectionsQueryHookResult = ReturnType<typeof useSearchPopularNftCollectionsQuery>;
+export type SearchPopularNftCollectionsLazyQueryHookResult = ReturnType<typeof useSearchPopularNftCollectionsLazyQuery>;
+export type SearchPopularNftCollectionsQueryResult = Apollo.QueryResult<SearchPopularNftCollectionsQuery, SearchPopularNftCollectionsQueryVariables>;
+export const SearchPopularTokensDocument = gql`
+    query SearchPopularTokens {
+  topTokens(chain: ETHEREUM, orderBy: VOLUME, page: 1, pageSize: 2) {
+    id
+    address
+    chain
+    symbol
+    decimals
+    project {
+      id
+      name
+      logoUrl
+      safetyLevel
+    }
+  }
+  eth: tokens(contracts: [{address: null, chain: ETHEREUM}]) {
+    id
+    address
+    chain
+    symbol
+    decimals
+    project {
+      id
+      name
+      logoUrl
+      safetyLevel
+    }
+  }
+}
+    `;
+
+/**
+ * __useSearchPopularTokensQuery__
+ *
+ * To run a query within a React component, call `useSearchPopularTokensQuery` and pass it any options that fit your needs.
+ * When your component renders, `useSearchPopularTokensQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useSearchPopularTokensQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useSearchPopularTokensQuery(baseOptions?: Apollo.QueryHookOptions<SearchPopularTokensQuery, SearchPopularTokensQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<SearchPopularTokensQuery, SearchPopularTokensQueryVariables>(SearchPopularTokensDocument, options);
+      }
+export function useSearchPopularTokensLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<SearchPopularTokensQuery, SearchPopularTokensQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<SearchPopularTokensQuery, SearchPopularTokensQueryVariables>(SearchPopularTokensDocument, options);
+        }
+export type SearchPopularTokensQueryHookResult = ReturnType<typeof useSearchPopularTokensQuery>;
+export type SearchPopularTokensLazyQueryHookResult = ReturnType<typeof useSearchPopularTokensLazyQuery>;
+export type SearchPopularTokensQueryResult = Apollo.QueryResult<SearchPopularTokensQuery, SearchPopularTokensQueryVariables>;
+export const NftsDocument = gql`
+    query Nfts($ownerAddress: String!) {
+  portfolios(ownerAddresses: [$ownerAddress]) {
+    id
+    nftBalances {
+      id
+      ownedAsset {
+        id
+        collection {
+          id
+          collectionId
+          description
+          image {
+            id
+            url
+          }
+          isVerified
+          name
+          numAssets
+          markets(currencies: [USD]) {
+            id
+            floorPrice {
+              value
+            }
+            owners
+            volume24h {
+              value
+            }
+            totalVolume {
+              value
+            }
+          }
+        }
+        description
+        image {
+          id
+          url
+        }
+        name
+        nftContract {
+          id
+          address
+          chain
+          standard
+        }
+        thumbnail {
+          id
+          url
+        }
+        tokenId
+        creator {
+          id
+          address
+          username
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useNftsQuery__
+ *
+ * To run a query within a React component, call `useNftsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useNftsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useNftsQuery({
+ *   variables: {
+ *      ownerAddress: // value for 'ownerAddress'
+ *   },
+ * });
+ */
+export function useNftsQuery(baseOptions: Apollo.QueryHookOptions<NftsQuery, NftsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<NftsQuery, NftsQueryVariables>(NftsDocument, options);
+      }
+export function useNftsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<NftsQuery, NftsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<NftsQuery, NftsQueryVariables>(NftsDocument, options);
+        }
+export type NftsQueryHookResult = ReturnType<typeof useNftsQuery>;
+export type NftsLazyQueryHookResult = ReturnType<typeof useNftsLazyQuery>;
+export type NftsQueryResult = Apollo.QueryResult<NftsQuery, NftsQueryVariables>;
+export const NftItemScreenDocument = gql`
+    query NFTItemScreen($contractAddress: String!, $filter: NftAssetsFilterInput, $activityFilter: NftActivityFilterInput) {
+  nftAssets(address: $contractAddress, filter: $filter) {
+    edges {
+      node {
+        id
+        ownerAddress
+        collection {
+          id
+          collectionId
+          description
+          image {
+            id
+            url
+          }
+          isVerified
+          name
+          numAssets
+          markets(currencies: [USD]) {
+            id
+            floorPrice {
+              value
+            }
+            owners
+            totalVolume {
+              value
+            }
+          }
+          nftContracts {
+            id
+            address
+          }
+        }
+        description
+        image {
+          id
+          url
+          dimensions {
+            width
+            height
+          }
+        }
+        name
+        nftContract {
+          id
+          address
+          chain
+          standard
+        }
+        tokenId
+        creator {
+          id
+          address
+          username
+        }
+        traits {
+          id
+          name
+          rarity
+          value
+        }
+        listings(first: 1) {
+          edges {
+            node {
+              id
+              price {
+                currency
+                value
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+  nftActivity(filter: $activityFilter) {
+    edges {
+      node {
+        id
+        quantity
+        price {
+          currency
+          value
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useNftItemScreenQuery__
+ *
+ * To run a query within a React component, call `useNftItemScreenQuery` and pass it any options that fit your needs.
+ * When your component renders, `useNftItemScreenQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useNftItemScreenQuery({
+ *   variables: {
+ *      contractAddress: // value for 'contractAddress'
+ *      filter: // value for 'filter'
+ *      activityFilter: // value for 'activityFilter'
+ *   },
+ * });
+ */
+export function useNftItemScreenQuery(baseOptions: Apollo.QueryHookOptions<NftItemScreenQuery, NftItemScreenQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<NftItemScreenQuery, NftItemScreenQueryVariables>(NftItemScreenDocument, options);
+      }
+export function useNftItemScreenLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<NftItemScreenQuery, NftItemScreenQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<NftItemScreenQuery, NftItemScreenQueryVariables>(NftItemScreenDocument, options);
+        }
+export type NftItemScreenQueryHookResult = ReturnType<typeof useNftItemScreenQuery>;
+export type NftItemScreenLazyQueryHookResult = ReturnType<typeof useNftItemScreenLazyQuery>;
+export type NftItemScreenQueryResult = Apollo.QueryResult<NftItemScreenQuery, NftItemScreenQueryVariables>;
+export const NftCollectionScreenDocument = gql`
+    query NftCollectionScreen($contractAddress: String!, $first: Int, $after: String) {
+  nftCollections(filter: {addresses: [$contractAddress]}) {
+    edges {
+      node {
+        id
+        bannerImage {
+          id
+          url
+        }
+        isVerified
+        numAssets
+        description
+        homepageUrl
+        twitterName
+        image {
+          id
+          url
+        }
+        name
+        markets(currencies: [USD]) {
+          id
+          floorPrice {
+            value
+          }
+          owners
+          volume24h {
+            value
+          }
+          totalVolume {
+            value
+          }
+        }
+      }
+    }
+  }
+  nftAssets(
+    address: $contractAddress
+    first: $first
+    after: $after
+    orderBy: PRICE
+    asc: true
+  ) {
+    edges {
+      node {
+        ownerAddress
+        id
+        name
+        tokenId
+        nftContract {
+          id
+          address
+        }
+        collection {
+          id
+          collectionId
+          name
+        }
+        image {
+          id
+          url
+          dimensions {
+            width
+            height
+          }
+        }
+        listings(first: 1) {
+          edges {
+            node {
+              id
+              price {
+                currency
+                value
+              }
+            }
+          }
+        }
+      }
+    }
+    pageInfo {
+      endCursor
+      hasNextPage
+      hasPreviousPage
+      startCursor
+    }
+  }
+}
+    `;
+
+/**
+ * __useNftCollectionScreenQuery__
+ *
+ * To run a query within a React component, call `useNftCollectionScreenQuery` and pass it any options that fit your needs.
+ * When your component renders, `useNftCollectionScreenQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useNftCollectionScreenQuery({
+ *   variables: {
+ *      contractAddress: // value for 'contractAddress'
+ *      first: // value for 'first'
+ *      after: // value for 'after'
+ *   },
+ * });
+ */
+export function useNftCollectionScreenQuery(baseOptions: Apollo.QueryHookOptions<NftCollectionScreenQuery, NftCollectionScreenQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<NftCollectionScreenQuery, NftCollectionScreenQueryVariables>(NftCollectionScreenDocument, options);
+      }
+export function useNftCollectionScreenLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<NftCollectionScreenQuery, NftCollectionScreenQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<NftCollectionScreenQuery, NftCollectionScreenQueryVariables>(NftCollectionScreenDocument, options);
+        }
+export type NftCollectionScreenQueryHookResult = ReturnType<typeof useNftCollectionScreenQuery>;
+export type NftCollectionScreenLazyQueryHookResult = ReturnType<typeof useNftCollectionScreenLazyQuery>;
+export type NftCollectionScreenQueryResult = Apollo.QueryResult<NftCollectionScreenQuery, NftCollectionScreenQueryVariables>;
+export const NftsTabDocument = gql`
+    query NftsTab($ownerAddress: String!, $first: Int, $after: String, $filter: NftBalancesFilterInput) {
+  nftBalances(
+    ownerAddress: $ownerAddress
+    first: $first
+    after: $after
+    filter: $filter
+  ) {
+    edges {
+      node {
+        ownedAsset {
+          id
+          collection {
+            id
+            name
+            isVerified
+            markets(currencies: [ETH]) {
+              id
+              floorPrice {
+                value
+              }
+            }
+          }
+          image {
+            id
+            url
+            dimensions {
+              width
+              height
+            }
+          }
+          name
+          tokenId
+          description
+          nftContract {
+            id
+            address
+          }
+          isSpam
+        }
+      }
+    }
+    pageInfo {
+      endCursor
+      hasNextPage
+      hasPreviousPage
+      startCursor
+    }
+  }
+}
+    `;
+
+/**
+ * __useNftsTabQuery__
+ *
+ * To run a query within a React component, call `useNftsTabQuery` and pass it any options that fit your needs.
+ * When your component renders, `useNftsTabQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useNftsTabQuery({
+ *   variables: {
+ *      ownerAddress: // value for 'ownerAddress'
+ *      first: // value for 'first'
+ *      after: // value for 'after'
+ *      filter: // value for 'filter'
+ *   },
+ * });
+ */
+export function useNftsTabQuery(baseOptions: Apollo.QueryHookOptions<NftsTabQuery, NftsTabQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<NftsTabQuery, NftsTabQueryVariables>(NftsTabDocument, options);
+      }
+export function useNftsTabLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<NftsTabQuery, NftsTabQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<NftsTabQuery, NftsTabQueryVariables>(NftsTabDocument, options);
+        }
+export type NftsTabQueryHookResult = ReturnType<typeof useNftsTabQuery>;
+export type NftsTabLazyQueryHookResult = ReturnType<typeof useNftsTabLazyQuery>;
+export type NftsTabQueryResult = Apollo.QueryResult<NftsTabQuery, NftsTabQueryVariables>;
+export const PortfolioBalancesDocument = gql`
+    query PortfolioBalances($ownerAddress: String!, $valueModifiers: [PortfolioValueModifier!]) {
+  portfolios(
+    ownerAddresses: [$ownerAddress]
+    chains: [ETHEREUM, POLYGON, ARBITRUM, OPTIMISM, BASE, BNB]
+    valueModifiers: $valueModifiers
+  ) {
+    id
+    tokensTotalDenominatedValue {
+      value
+    }
+    tokensTotalDenominatedValueChange(duration: DAY) {
+      absolute {
+        value
+      }
+      percentage {
+        value
+      }
+    }
+    tokenBalances {
+      id
+      quantity
+      isHidden
+      denominatedValue {
+        currency
+        value
+      }
+      token {
+        chain
+        address
+        symbol
+        decimals
+        project {
+          id
+          name
+          logoUrl
+          safetyLevel
+          isSpam
+        }
+      }
+      tokenProjectMarket {
+        relativeChange24: pricePercentChange(duration: DAY) {
+          value
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __usePortfolioBalancesQuery__
+ *
+ * To run a query within a React component, call `usePortfolioBalancesQuery` and pass it any options that fit your needs.
+ * When your component renders, `usePortfolioBalancesQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = usePortfolioBalancesQuery({
+ *   variables: {
+ *      ownerAddress: // value for 'ownerAddress'
+ *      valueModifiers: // value for 'valueModifiers'
+ *   },
+ * });
+ */
+export function usePortfolioBalancesQuery(baseOptions: Apollo.QueryHookOptions<PortfolioBalancesQuery, PortfolioBalancesQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<PortfolioBalancesQuery, PortfolioBalancesQueryVariables>(PortfolioBalancesDocument, options);
+      }
+export function usePortfolioBalancesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<PortfolioBalancesQuery, PortfolioBalancesQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<PortfolioBalancesQuery, PortfolioBalancesQueryVariables>(PortfolioBalancesDocument, options);
+        }
+export type PortfolioBalancesQueryHookResult = ReturnType<typeof usePortfolioBalancesQuery>;
+export type PortfolioBalancesLazyQueryHookResult = ReturnType<typeof usePortfolioBalancesLazyQuery>;
+export type PortfolioBalancesQueryResult = Apollo.QueryResult<PortfolioBalancesQuery, PortfolioBalancesQueryVariables>;
+export const MultiplePortfolioBalancesDocument = gql`
+    query MultiplePortfolioBalances($ownerAddresses: [String!]!, $valueModifiers: [PortfolioValueModifier!]) {
+  portfolios(
+    ownerAddresses: $ownerAddresses
+    chains: [ETHEREUM, POLYGON, ARBITRUM, OPTIMISM, BASE, BNB]
+    valueModifiers: $valueModifiers
+  ) {
+    id
+    tokensTotalDenominatedValue {
+      value
+    }
+    tokensTotalDenominatedValueChange(duration: DAY) {
+      absolute {
+        value
+      }
+      percentage {
+        value
+      }
+    }
+    tokenBalances {
+      id
+      quantity
+      isHidden
+      denominatedValue {
+        currency
+        value
+      }
+      token {
+        chain
+        address
+        symbol
+        decimals
+        project {
+          id
+          name
+          logoUrl
+          safetyLevel
+          isSpam
+        }
+      }
+      tokenProjectMarket {
+        relativeChange24: pricePercentChange(duration: DAY) {
+          value
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useMultiplePortfolioBalancesQuery__
+ *
+ * To run a query within a React component, call `useMultiplePortfolioBalancesQuery` and pass it any options that fit your needs.
+ * When your component renders, `useMultiplePortfolioBalancesQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useMultiplePortfolioBalancesQuery({
+ *   variables: {
+ *      ownerAddresses: // value for 'ownerAddresses'
+ *      valueModifiers: // value for 'valueModifiers'
+ *   },
+ * });
+ */
+export function useMultiplePortfolioBalancesQuery(baseOptions: Apollo.QueryHookOptions<MultiplePortfolioBalancesQuery, MultiplePortfolioBalancesQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<MultiplePortfolioBalancesQuery, MultiplePortfolioBalancesQueryVariables>(MultiplePortfolioBalancesDocument, options);
+      }
+export function useMultiplePortfolioBalancesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<MultiplePortfolioBalancesQuery, MultiplePortfolioBalancesQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<MultiplePortfolioBalancesQuery, MultiplePortfolioBalancesQueryVariables>(MultiplePortfolioBalancesDocument, options);
+        }
+export type MultiplePortfolioBalancesQueryHookResult = ReturnType<typeof useMultiplePortfolioBalancesQuery>;
+export type MultiplePortfolioBalancesLazyQueryHookResult = ReturnType<typeof useMultiplePortfolioBalancesLazyQuery>;
+export type MultiplePortfolioBalancesQueryResult = Apollo.QueryResult<MultiplePortfolioBalancesQuery, MultiplePortfolioBalancesQueryVariables>;
+export const SelectWalletScreenDocument = gql`
+    query SelectWalletScreen($ownerAddresses: [String!]!) {
+  portfolios(
+    ownerAddresses: $ownerAddresses
+    chains: [ETHEREUM, POLYGON, ARBITRUM, OPTIMISM, BASE, BNB]
+  ) {
+    id
+    ownerAddress
+    tokensTotalDenominatedValue {
+      value
+    }
+  }
+}
+    `;
+
+/**
+ * __useSelectWalletScreenQuery__
+ *
+ * To run a query within a React component, call `useSelectWalletScreenQuery` and pass it any options that fit your needs.
+ * When your component renders, `useSelectWalletScreenQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useSelectWalletScreenQuery({
+ *   variables: {
+ *      ownerAddresses: // value for 'ownerAddresses'
+ *   },
+ * });
+ */
+export function useSelectWalletScreenQuery(baseOptions: Apollo.QueryHookOptions<SelectWalletScreenQuery, SelectWalletScreenQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<SelectWalletScreenQuery, SelectWalletScreenQueryVariables>(SelectWalletScreenDocument, options);
+      }
+export function useSelectWalletScreenLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<SelectWalletScreenQuery, SelectWalletScreenQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<SelectWalletScreenQuery, SelectWalletScreenQueryVariables>(SelectWalletScreenDocument, options);
+        }
+export type SelectWalletScreenQueryHookResult = ReturnType<typeof useSelectWalletScreenQuery>;
+export type SelectWalletScreenLazyQueryHookResult = ReturnType<typeof useSelectWalletScreenLazyQuery>;
+export type SelectWalletScreenQueryResult = Apollo.QueryResult<SelectWalletScreenQuery, SelectWalletScreenQueryVariables>;
+export const TransactionHistoryUpdaterDocument = gql`
+    query TransactionHistoryUpdater($addresses: [String!]!) {
+  portfolios(
+    ownerAddresses: $addresses
+    chains: [ETHEREUM, POLYGON, ARBITRUM, OPTIMISM, BASE, BNB]
+  ) {
+    id
+    ownerAddress
+    assetActivities(pageSize: 1, page: 1) {
+      id
+      timestamp
+      details {
+        ... on TransactionDetails {
+          id
+          hash
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useTransactionHistoryUpdaterQuery__
+ *
+ * To run a query within a React component, call `useTransactionHistoryUpdaterQuery` and pass it any options that fit your needs.
+ * When your component renders, `useTransactionHistoryUpdaterQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useTransactionHistoryUpdaterQuery({
+ *   variables: {
+ *      addresses: // value for 'addresses'
+ *   },
+ * });
+ */
+export function useTransactionHistoryUpdaterQuery(baseOptions: Apollo.QueryHookOptions<TransactionHistoryUpdaterQuery, TransactionHistoryUpdaterQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<TransactionHistoryUpdaterQuery, TransactionHistoryUpdaterQueryVariables>(TransactionHistoryUpdaterDocument, options);
+      }
+export function useTransactionHistoryUpdaterLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<TransactionHistoryUpdaterQuery, TransactionHistoryUpdaterQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<TransactionHistoryUpdaterQuery, TransactionHistoryUpdaterQueryVariables>(TransactionHistoryUpdaterDocument, options);
+        }
+export type TransactionHistoryUpdaterQueryHookResult = ReturnType<typeof useTransactionHistoryUpdaterQuery>;
+export type TransactionHistoryUpdaterLazyQueryHookResult = ReturnType<typeof useTransactionHistoryUpdaterLazyQuery>;
+export type TransactionHistoryUpdaterQueryResult = Apollo.QueryResult<TransactionHistoryUpdaterQuery, TransactionHistoryUpdaterQueryVariables>;
+export const TokenDocument = gql`
+    query Token($chain: Chain!, $address: String) {
+  token(chain: $chain, address: $address) {
+    symbol
+    decimals
+    chain
+    address
+    project {
+      id
+      name
+      logoUrl
+      safetyLevel
+      isSpam
+    }
+  }
+}
+    `;
+
+/**
+ * __useTokenQuery__
+ *
+ * To run a query within a React component, call `useTokenQuery` and pass it any options that fit your needs.
+ * When your component renders, `useTokenQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useTokenQuery({
+ *   variables: {
+ *      chain: // value for 'chain'
+ *      address: // value for 'address'
+ *   },
+ * });
+ */
+export function useTokenQuery(baseOptions: Apollo.QueryHookOptions<TokenQuery, TokenQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<TokenQuery, TokenQueryVariables>(TokenDocument, options);
+      }
+export function useTokenLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<TokenQuery, TokenQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<TokenQuery, TokenQueryVariables>(TokenDocument, options);
+        }
+export type TokenQueryHookResult = ReturnType<typeof useTokenQuery>;
+export type TokenLazyQueryHookResult = ReturnType<typeof useTokenLazyQuery>;
+export type TokenQueryResult = Apollo.QueryResult<TokenQuery, TokenQueryVariables>;
+export const TokenDetailsScreenDocument = gql`
+    query TokenDetailsScreen($chain: Chain!, $address: String, $includeSpanish: Boolean = false, $includeFrench: Boolean = false, $includeJapanese: Boolean = false, $includePortuguese: Boolean = false, $includeChineseSimplified: Boolean = false, $includeChineseTraditional: Boolean = false) {
+  token(chain: $chain, address: $address) {
+    address
+    chain
+    symbol
+    name
+    market(currency: USD) {
+      id
+      volume(duration: DAY) {
+        value
+      }
+      price {
+        value
+      }
+      priceHigh52W: priceHighLow(duration: YEAR, highLow: HIGH) {
+        value
+      }
+      priceLow52W: priceHighLow(duration: YEAR, highLow: LOW) {
+        value
+      }
+    }
+    project {
+      id
+      name
+      description
+      descriptionTranslations {
+        descriptionEsEs @include(if: $includeSpanish)
+        descriptionFrFr @include(if: $includeFrench)
+        descriptionJaJp @include(if: $includeJapanese)
+        descriptionPtPt @include(if: $includePortuguese)
+        descriptionZhHans @include(if: $includeChineseSimplified)
+        descriptionZhHant @include(if: $includeChineseTraditional)
+      }
+      homepageUrl
+      twitterName
+      safetyLevel
+      logoUrl
+      markets(currencies: [USD]) {
+        id
+        price {
+          value
+        }
+        marketCap {
+          value
+        }
+        fullyDilutedValuation {
+          value
+        }
+        priceHigh52W: priceHighLow(duration: YEAR, highLow: HIGH) {
+          value
+        }
+        priceLow52W: priceHighLow(duration: YEAR, highLow: LOW) {
+          value
+        }
+      }
+      tokens {
+        chain
+        address
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useTokenDetailsScreenQuery__
+ *
+ * To run a query within a React component, call `useTokenDetailsScreenQuery` and pass it any options that fit your needs.
+ * When your component renders, `useTokenDetailsScreenQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useTokenDetailsScreenQuery({
+ *   variables: {
+ *      chain: // value for 'chain'
+ *      address: // value for 'address'
+ *      includeSpanish: // value for 'includeSpanish'
+ *      includeFrench: // value for 'includeFrench'
+ *      includeJapanese: // value for 'includeJapanese'
+ *      includePortuguese: // value for 'includePortuguese'
+ *      includeChineseSimplified: // value for 'includeChineseSimplified'
+ *      includeChineseTraditional: // value for 'includeChineseTraditional'
+ *   },
+ * });
+ */
+export function useTokenDetailsScreenQuery(baseOptions: Apollo.QueryHookOptions<TokenDetailsScreenQuery, TokenDetailsScreenQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<TokenDetailsScreenQuery, TokenDetailsScreenQueryVariables>(TokenDetailsScreenDocument, options);
+      }
+export function useTokenDetailsScreenLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<TokenDetailsScreenQuery, TokenDetailsScreenQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<TokenDetailsScreenQuery, TokenDetailsScreenQueryVariables>(TokenDetailsScreenDocument, options);
+        }
+export type TokenDetailsScreenQueryHookResult = ReturnType<typeof useTokenDetailsScreenQuery>;
+export type TokenDetailsScreenLazyQueryHookResult = ReturnType<typeof useTokenDetailsScreenLazyQuery>;
+export type TokenDetailsScreenQueryResult = Apollo.QueryResult<TokenDetailsScreenQuery, TokenDetailsScreenQueryVariables>;
+export const TokenProjectsDocument = gql`
+    query TokenProjects($contracts: [ContractInput!]!) {
+  tokenProjects(contracts: $contracts) {
+    id
+    name
+    logoUrl
+    safetyLevel
+    tokens {
+      chain
+      address
+      decimals
+      symbol
+    }
+  }
+}
+    `;
+
+/**
+ * __useTokenProjectsQuery__
+ *
+ * To run a query within a React component, call `useTokenProjectsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useTokenProjectsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useTokenProjectsQuery({
+ *   variables: {
+ *      contracts: // value for 'contracts'
+ *   },
+ * });
+ */
+export function useTokenProjectsQuery(baseOptions: Apollo.QueryHookOptions<TokenProjectsQuery, TokenProjectsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<TokenProjectsQuery, TokenProjectsQueryVariables>(TokenProjectsDocument, options);
+      }
+export function useTokenProjectsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<TokenProjectsQuery, TokenProjectsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<TokenProjectsQuery, TokenProjectsQueryVariables>(TokenProjectsDocument, options);
+        }
+export type TokenProjectsQueryHookResult = ReturnType<typeof useTokenProjectsQuery>;
+export type TokenProjectsLazyQueryHookResult = ReturnType<typeof useTokenProjectsLazyQuery>;
+export type TokenProjectsQueryResult = Apollo.QueryResult<TokenProjectsQuery, TokenProjectsQueryVariables>;
+export const TransactionListDocument = gql`
+    query TransactionList($address: String!) {
+  portfolios(
+    ownerAddresses: [$address]
+    chains: [ETHEREUM, POLYGON, ARBITRUM, OPTIMISM, BASE, BNB]
+  ) {
+    id
+    assetActivities(
+      pageSize: 100
+      page: 1
+      chains: [ETHEREUM, POLYGON, ARBITRUM, OPTIMISM, BASE, BNB]
+    ) {
+      id
+      timestamp
+      chain
+      details {
+        ... on TransactionDetails {
+          id
+          to
+          type
+          hash
+          from
+          status
+          assetChanges {
+            __typename
+            ... on TokenTransfer {
+              id
+              asset {
+                id
+                symbol
+                address
+                decimals
+                chain
+                project {
+                  id
+                  isSpam
+                  spamCode
+                }
+              }
+              tokenStandard
+              quantity
+              sender
+              recipient
+              direction
+              transactedValue {
+                id
+                currency
+                value
+              }
+            }
+            ... on NftTransfer {
+              id
+              asset {
+                id
+                name
+                isSpam
+                nftContract {
+                  id
+                  chain
+                  address
+                }
+                tokenId
+                image {
+                  id
+                  url
+                }
+                collection {
+                  id
+                  name
+                }
+              }
+              nftStandard
+              sender
+              recipient
+              direction
+            }
+            ... on TokenApproval {
+              id
+              asset {
+                id
+                symbol
+                decimals
+                address
+                chain
+              }
+              tokenStandard
+              approvedAddress
+              quantity
+            }
+          }
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useTransactionListQuery__
+ *
+ * To run a query within a React component, call `useTransactionListQuery` and pass it any options that fit your needs.
+ * When your component renders, `useTransactionListQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useTransactionListQuery({
+ *   variables: {
+ *      address: // value for 'address'
+ *   },
+ * });
+ */
+export function useTransactionListQuery(baseOptions: Apollo.QueryHookOptions<TransactionListQuery, TransactionListQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<TransactionListQuery, TransactionListQueryVariables>(TransactionListDocument, options);
+      }
+export function useTransactionListLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<TransactionListQuery, TransactionListQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<TransactionListQuery, TransactionListQueryVariables>(TransactionListDocument, options);
+        }
+export type TransactionListQueryHookResult = ReturnType<typeof useTransactionListQuery>;
+export type TransactionListLazyQueryHookResult = ReturnType<typeof useTransactionListLazyQuery>;
+export type TransactionListQueryResult = Apollo.QueryResult<TransactionListQuery, TransactionListQueryVariables>;
+export const FeedTransactionListDocument = gql`
+    query FeedTransactionList($addresses: [String!]!) {
+  portfolios(
+    ownerAddresses: $addresses
+    chains: [ETHEREUM, POLYGON, ARBITRUM, OPTIMISM, BASE, BNB]
+  ) {
+    id
+    ownerAddress
+    assetActivities(
+      pageSize: 30
+      page: 1
+      chains: [ETHEREUM, POLYGON, ARBITRUM, OPTIMISM, BASE, BNB]
+    ) {
+      id
+      timestamp
+      chain
+      details {
+        ... on TransactionDetails {
+          id
+          to
+          type
+          hash
+          from
+          status
+          assetChanges {
+            __typename
+            ... on TokenTransfer {
+              id
+              asset {
+                id
+                symbol
+                address
+                decimals
+                chain
+                project {
+                  id
+                  isSpam
+                  spamCode
+                }
+              }
+              tokenStandard
+              quantity
+              sender
+              recipient
+              direction
+              transactedValue {
+                currency
+                value
+              }
+            }
+            ... on NftTransfer {
+              id
+              asset {
+                id
+                name
+                isSpam
+                nftContract {
+                  id
+                  chain
+                  address
+                }
+                tokenId
+                image {
+                  id
+                  url
+                }
+                collection {
+                  id
+                  name
+                }
+              }
+              nftStandard
+              sender
+              recipient
+              direction
+            }
+            ... on TokenApproval {
+              id
+              asset {
+                id
+                symbol
+                decimals
+                address
+                chain
+              }
+              tokenStandard
+              approvedAddress
+              quantity
+            }
+          }
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useFeedTransactionListQuery__
+ *
+ * To run a query within a React component, call `useFeedTransactionListQuery` and pass it any options that fit your needs.
+ * When your component renders, `useFeedTransactionListQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useFeedTransactionListQuery({
+ *   variables: {
+ *      addresses: // value for 'addresses'
+ *   },
+ * });
+ */
+export function useFeedTransactionListQuery(baseOptions: Apollo.QueryHookOptions<FeedTransactionListQuery, FeedTransactionListQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<FeedTransactionListQuery, FeedTransactionListQueryVariables>(FeedTransactionListDocument, options);
+      }
+export function useFeedTransactionListLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<FeedTransactionListQuery, FeedTransactionListQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<FeedTransactionListQuery, FeedTransactionListQueryVariables>(FeedTransactionListDocument, options);
+        }
+export type FeedTransactionListQueryHookResult = ReturnType<typeof useFeedTransactionListQuery>;
+export type FeedTransactionListLazyQueryHookResult = ReturnType<typeof useFeedTransactionListLazyQuery>;
+export type FeedTransactionListQueryResult = Apollo.QueryResult<FeedTransactionListQuery, FeedTransactionListQueryVariables>;
+export const TopTokensDocument = gql`
+    query TopTokens($chain: Chain, $page: Int = 1, $pageSize: Int = 100, $orderBy: TokenSortableField = POPULARITY) {
+  topTokens(chain: $chain, page: $page, pageSize: $pageSize, orderBy: $orderBy) {
+    address
+    chain
+    decimals
+    symbol
+    project {
+      id
+      name
+      isSpam
+      logoUrl
+      safetyLevel
+    }
+  }
+}
+    `;
+
+/**
+ * __useTopTokensQuery__
+ *
+ * To run a query within a React component, call `useTopTokensQuery` and pass it any options that fit your needs.
+ * When your component renders, `useTopTokensQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useTopTokensQuery({
+ *   variables: {
+ *      chain: // value for 'chain'
+ *      page: // value for 'page'
+ *      pageSize: // value for 'pageSize'
+ *      orderBy: // value for 'orderBy'
+ *   },
+ * });
+ */
+export function useTopTokensQuery(baseOptions?: Apollo.QueryHookOptions<TopTokensQuery, TopTokensQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<TopTokensQuery, TopTokensQueryVariables>(TopTokensDocument, options);
+      }
+export function useTopTokensLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<TopTokensQuery, TopTokensQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<TopTokensQuery, TopTokensQueryVariables>(TopTokensDocument, options);
+        }
+export type TopTokensQueryHookResult = ReturnType<typeof useTopTokensQuery>;
+export type TopTokensLazyQueryHookResult = ReturnType<typeof useTopTokensLazyQuery>;
+export type TopTokensQueryResult = Apollo.QueryResult<TopTokensQuery, TopTokensQueryVariables>;
+export const SearchTokensDocument = gql`
+    query SearchTokens($searchQuery: String!, $chains: [Chain!]) {
+  searchTokens(searchQuery: $searchQuery, chains: $chains) {
+    id
+    chain
+    address
+    decimals
+    symbol
+    project {
+      id
+      name
+      logoUrl
+      safetyLevel
+    }
+  }
+}
+    `;
+
+/**
+ * __useSearchTokensQuery__
+ *
+ * To run a query within a React component, call `useSearchTokensQuery` and pass it any options that fit your needs.
+ * When your component renders, `useSearchTokensQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useSearchTokensQuery({
+ *   variables: {
+ *      searchQuery: // value for 'searchQuery'
+ *      chains: // value for 'chains'
+ *   },
+ * });
+ */
+export function useSearchTokensQuery(baseOptions: Apollo.QueryHookOptions<SearchTokensQuery, SearchTokensQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<SearchTokensQuery, SearchTokensQueryVariables>(SearchTokensDocument, options);
+      }
+export function useSearchTokensLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<SearchTokensQuery, SearchTokensQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<SearchTokensQuery, SearchTokensQueryVariables>(SearchTokensDocument, options);
+        }
+export type SearchTokensQueryHookResult = ReturnType<typeof useSearchTokensQuery>;
+export type SearchTokensLazyQueryHookResult = ReturnType<typeof useSearchTokensLazyQuery>;
+export type SearchTokensQueryResult = Apollo.QueryResult<SearchTokensQuery, SearchTokensQueryVariables>;
+export const ExploreSearchDocument = gql`
+    query ExploreSearch($searchQuery: String!, $nftCollectionsFilter: NftCollectionsFilterInput!) {
+  searchTokens(searchQuery: $searchQuery) {
+    chain
+    address
+    decimals
+    symbol
+    market {
+      volume(duration: DAY) {
+        value
+      }
+    }
+    project {
+      id
+      name
+      logoUrl
+      safetyLevel
+    }
+  }
+  nftCollections(filter: $nftCollectionsFilter, first: 4) {
+    edges {
+      node {
+        id
+        name
+        collectionId
+        isVerified
+        nftContracts {
+          id
+          chain
+          address
+        }
+        image {
+          id
+          url
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useExploreSearchQuery__
+ *
+ * To run a query within a React component, call `useExploreSearchQuery` and pass it any options that fit your needs.
+ * When your component renders, `useExploreSearchQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useExploreSearchQuery({
+ *   variables: {
+ *      searchQuery: // value for 'searchQuery'
+ *      nftCollectionsFilter: // value for 'nftCollectionsFilter'
+ *   },
+ * });
+ */
+export function useExploreSearchQuery(baseOptions: Apollo.QueryHookOptions<ExploreSearchQuery, ExploreSearchQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<ExploreSearchQuery, ExploreSearchQueryVariables>(ExploreSearchDocument, options);
+      }
+export function useExploreSearchLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExploreSearchQuery, ExploreSearchQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<ExploreSearchQuery, ExploreSearchQueryVariables>(ExploreSearchDocument, options);
+        }
+export type ExploreSearchQueryHookResult = ReturnType<typeof useExploreSearchQuery>;
+export type ExploreSearchLazyQueryHookResult = ReturnType<typeof useExploreSearchLazyQuery>;
+export type ExploreSearchQueryResult = Apollo.QueryResult<ExploreSearchQuery, ExploreSearchQueryVariables>;
+export const ExploreTokensTabDocument = gql`
+    query ExploreTokensTab($topTokensOrderBy: TokenSortableField!) {
+  topTokens(chain: ETHEREUM, page: 1, pageSize: 100, orderBy: $topTokensOrderBy) {
+    ...TopTokenParts
+  }
+  eth: token(address: null, chain: ETHEREUM) {
+    ...TopTokenParts
+  }
+}
+    ${TopTokenPartsFragmentDoc}`;
+
+/**
+ * __useExploreTokensTabQuery__
+ *
+ * To run a query within a React component, call `useExploreTokensTabQuery` and pass it any options that fit your needs.
+ * When your component renders, `useExploreTokensTabQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useExploreTokensTabQuery({
+ *   variables: {
+ *      topTokensOrderBy: // value for 'topTokensOrderBy'
+ *   },
+ * });
+ */
+export function useExploreTokensTabQuery(baseOptions: Apollo.QueryHookOptions<ExploreTokensTabQuery, ExploreTokensTabQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<ExploreTokensTabQuery, ExploreTokensTabQueryVariables>(ExploreTokensTabDocument, options);
+      }
+export function useExploreTokensTabLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExploreTokensTabQuery, ExploreTokensTabQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<ExploreTokensTabQuery, ExploreTokensTabQueryVariables>(ExploreTokensTabDocument, options);
+        }
+export type ExploreTokensTabQueryHookResult = ReturnType<typeof useExploreTokensTabQuery>;
+export type ExploreTokensTabLazyQueryHookResult = ReturnType<typeof useExploreTokensTabLazyQuery>;
+export type ExploreTokensTabQueryResult = Apollo.QueryResult<ExploreTokensTabQuery, ExploreTokensTabQueryVariables>;
+export const FavoriteTokenCardDocument = gql`
+    query FavoriteTokenCard($chain: Chain!, $address: String) {
+  token(chain: $chain, address: $address) {
+    symbol
+    chain
+    address
+    project {
+      id
+      name
+      logoUrl
+      markets(currencies: [USD]) {
+        id
+        price {
+          value
+        }
+        pricePercentChange24h {
+          value
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useFavoriteTokenCardQuery__
+ *
+ * To run a query within a React component, call `useFavoriteTokenCardQuery` and pass it any options that fit your needs.
+ * When your component renders, `useFavoriteTokenCardQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useFavoriteTokenCardQuery({
+ *   variables: {
+ *      chain: // value for 'chain'
+ *      address: // value for 'address'
+ *   },
+ * });
+ */
+export function useFavoriteTokenCardQuery(baseOptions: Apollo.QueryHookOptions<FavoriteTokenCardQuery, FavoriteTokenCardQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<FavoriteTokenCardQuery, FavoriteTokenCardQueryVariables>(FavoriteTokenCardDocument, options);
+      }
+export function useFavoriteTokenCardLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<FavoriteTokenCardQuery, FavoriteTokenCardQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<FavoriteTokenCardQuery, FavoriteTokenCardQueryVariables>(FavoriteTokenCardDocument, options);
+        }
+export type FavoriteTokenCardQueryHookResult = ReturnType<typeof useFavoriteTokenCardQuery>;
+export type FavoriteTokenCardLazyQueryHookResult = ReturnType<typeof useFavoriteTokenCardLazyQuery>;
+export type FavoriteTokenCardQueryResult = Apollo.QueryResult<FavoriteTokenCardQuery, FavoriteTokenCardQueryVariables>;
+export const TokensDocument = gql`
+    query Tokens($contracts: [ContractInput!]!) {
+  tokens(contracts: $contracts) {
+    symbol
+    chain
+    address
+    project {
+      name
+    }
+  }
+}
+    `;
+
+/**
+ * __useTokensQuery__
+ *
+ * To run a query within a React component, call `useTokensQuery` and pass it any options that fit your needs.
+ * When your component renders, `useTokensQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useTokensQuery({
+ *   variables: {
+ *      contracts: // value for 'contracts'
+ *   },
+ * });
+ */
+export function useTokensQuery(baseOptions: Apollo.QueryHookOptions<TokensQuery, TokensQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<TokensQuery, TokensQueryVariables>(TokensDocument, options);
+      }
+export function useTokensLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<TokensQuery, TokensQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<TokensQuery, TokensQueryVariables>(TokensDocument, options);
+        }
+export type TokensQueryHookResult = ReturnType<typeof useTokensQuery>;
+export type TokensLazyQueryHookResult = ReturnType<typeof useTokensLazyQuery>;
+export type TokensQueryResult = Apollo.QueryResult<TokensQuery, TokensQueryVariables>;
+export const ConvertDocument = gql`
+    query Convert($fromCurrency: Currency!, $toCurrency: Currency!) {
+  convert(
+    fromAmount: {currency: $fromCurrency, value: 1.0}
+    toCurrency: $toCurrency
+  ) {
+    value
+    currency
+  }
+}
+    `;
+
+/**
+ * __useConvertQuery__
+ *
+ * To run a query within a React component, call `useConvertQuery` and pass it any options that fit your needs.
+ * When your component renders, `useConvertQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useConvertQuery({
+ *   variables: {
+ *      fromCurrency: // value for 'fromCurrency'
+ *      toCurrency: // value for 'toCurrency'
+ *   },
+ * });
+ */
+export function useConvertQuery(baseOptions: Apollo.QueryHookOptions<ConvertQuery, ConvertQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<ConvertQuery, ConvertQueryVariables>(ConvertDocument, options);
+      }
+export function useConvertLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ConvertQuery, ConvertQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<ConvertQuery, ConvertQueryVariables>(ConvertDocument, options);
+        }
+export type ConvertQueryHookResult = ReturnType<typeof useConvertQuery>;
+export type ConvertLazyQueryHookResult = ReturnType<typeof useConvertLazyQuery>;
+export type ConvertQueryResult = Apollo.QueryResult<ConvertQuery, ConvertQueryVariables>;
+export const PortfolioBalanceDocument = gql`
+    query PortfolioBalance($owner: String!, $valueModifiers: [PortfolioValueModifier!]) {
+  portfolios(
+    ownerAddresses: [$owner]
+    chains: [ETHEREUM, POLYGON, ARBITRUM, OPTIMISM, BASE, BNB]
+    valueModifiers: $valueModifiers
+  ) {
+    id
+    tokensTotalDenominatedValue {
+      value
+    }
+    tokensTotalDenominatedValueChange(duration: DAY) {
+      absolute {
+        value
+      }
+      percentage {
+        value
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __usePortfolioBalanceQuery__
+ *
+ * To run a query within a React component, call `usePortfolioBalanceQuery` and pass it any options that fit your needs.
+ * When your component renders, `usePortfolioBalanceQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = usePortfolioBalanceQuery({
+ *   variables: {
+ *      owner: // value for 'owner'
+ *      valueModifiers: // value for 'valueModifiers'
+ *   },
+ * });
+ */
+export function usePortfolioBalanceQuery(baseOptions: Apollo.QueryHookOptions<PortfolioBalanceQuery, PortfolioBalanceQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<PortfolioBalanceQuery, PortfolioBalanceQueryVariables>(PortfolioBalanceDocument, options);
+      }
+export function usePortfolioBalanceLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<PortfolioBalanceQuery, PortfolioBalanceQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<PortfolioBalanceQuery, PortfolioBalanceQueryVariables>(PortfolioBalanceDocument, options);
+        }
+export type PortfolioBalanceQueryHookResult = ReturnType<typeof usePortfolioBalanceQuery>;
+export type PortfolioBalanceLazyQueryHookResult = ReturnType<typeof usePortfolioBalanceLazyQuery>;
+export type PortfolioBalanceQueryResult = Apollo.QueryResult<PortfolioBalanceQuery, PortfolioBalanceQueryVariables>;
+export const PortfolioTokenBalancesDocument = gql`
+    query PortfolioTokenBalances($ownerAddress: String!) {
+  portfolios(
+    ownerAddresses: [$ownerAddress]
+    chains: [ETHEREUM, POLYGON, ARBITRUM, OPTIMISM, BASE, BNB]
+  ) {
+    id
+    tokenBalances {
+      id
+      quantity
+      denominatedValue {
+        currency
+        value
+      }
+      token {
+        id
+        chain
+        address
+        symbol
+        decimals
+        project {
+          id
+          name
+          logoUrl
+          safetyLevel
+          isSpam
+        }
+      }
+      tokenProjectMarket {
+        relativeChange24: pricePercentChange(duration: DAY) {
+          value
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __usePortfolioTokenBalancesQuery__
+ *
+ * To run a query within a React component, call `usePortfolioTokenBalancesQuery` and pass it any options that fit your needs.
+ * When your component renders, `usePortfolioTokenBalancesQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = usePortfolioTokenBalancesQuery({
+ *   variables: {
+ *      ownerAddress: // value for 'ownerAddress'
+ *   },
+ * });
+ */
+export function usePortfolioTokenBalancesQuery(baseOptions: Apollo.QueryHookOptions<PortfolioTokenBalancesQuery, PortfolioTokenBalancesQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<PortfolioTokenBalancesQuery, PortfolioTokenBalancesQueryVariables>(PortfolioTokenBalancesDocument, options);
+      }
+export function usePortfolioTokenBalancesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<PortfolioTokenBalancesQuery, PortfolioTokenBalancesQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<PortfolioTokenBalancesQuery, PortfolioTokenBalancesQueryVariables>(PortfolioTokenBalancesDocument, options);
+        }
+export type PortfolioTokenBalancesQueryHookResult = ReturnType<typeof usePortfolioTokenBalancesQuery>;
+export type PortfolioTokenBalancesLazyQueryHookResult = ReturnType<typeof usePortfolioTokenBalancesLazyQuery>;
+export type PortfolioTokenBalancesQueryResult = Apollo.QueryResult<PortfolioTokenBalancesQuery, PortfolioTokenBalancesQueryVariables>;
+
+
+export type ResolverTypeWrapper<T> = Promise<T> | T;
+
+
+export type ResolverWithResolve<TResult, TParent, TContext, TArgs> = {
+  resolve: ResolverFn<TResult, TParent, TContext, TArgs>;
+};
+export type Resolver<TResult, TParent = {}, TContext = {}, TArgs = {}> = ResolverFn<TResult, TParent, TContext, TArgs> | ResolverWithResolve<TResult, TParent, TContext, TArgs>;
+
+export type ResolverFn<TResult, TParent, TContext, TArgs> = (
+  parent: TParent,
+  args: TArgs,
+  context: TContext,
+  info: GraphQLResolveInfo
+) => Promise<TResult> | TResult;
+
+export type SubscriptionSubscribeFn<TResult, TParent, TContext, TArgs> = (
+  parent: TParent,
+  args: TArgs,
+  context: TContext,
+  info: GraphQLResolveInfo
+) => AsyncIterable<TResult> | Promise<AsyncIterable<TResult>>;
+
+export type SubscriptionResolveFn<TResult, TParent, TContext, TArgs> = (
+  parent: TParent,
+  args: TArgs,
+  context: TContext,
+  info: GraphQLResolveInfo
+) => TResult | Promise<TResult>;
+
+export interface SubscriptionSubscriberObject<TResult, TKey extends string, TParent, TContext, TArgs> {
+  subscribe: SubscriptionSubscribeFn<{ [key in TKey]: TResult }, TParent, TContext, TArgs>;
+  resolve?: SubscriptionResolveFn<TResult, { [key in TKey]: TResult }, TContext, TArgs>;
+}
+
+export interface SubscriptionResolverObject<TResult, TParent, TContext, TArgs> {
+  subscribe: SubscriptionSubscribeFn<any, TParent, TContext, TArgs>;
+  resolve: SubscriptionResolveFn<TResult, any, TContext, TArgs>;
+}
+
+export type SubscriptionObject<TResult, TKey extends string, TParent, TContext, TArgs> =
+  | SubscriptionSubscriberObject<TResult, TKey, TParent, TContext, TArgs>
+  | SubscriptionResolverObject<TResult, TParent, TContext, TArgs>;
+
+export type SubscriptionResolver<TResult, TKey extends string, TParent = {}, TContext = {}, TArgs = {}> =
+  | ((...args: any[]) => SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>)
+  | SubscriptionObject<TResult, TKey, TParent, TContext, TArgs>;
+
+export type TypeResolveFn<TTypes, TParent = {}, TContext = {}> = (
+  parent: TParent,
+  context: TContext,
+  info: GraphQLResolveInfo
+) => Maybe<TTypes> | Promise<Maybe<TTypes>>;
+
+export type IsTypeOfResolverFn<T = {}, TContext = {}> = (obj: T, context: TContext, info: GraphQLResolveInfo) => boolean | Promise<boolean>;
+
+export type NextResolverFn<T> = () => Promise<T>;
+
+export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs = {}> = (
+  next: NextResolverFn<TResult>,
+  parent: TParent,
+  args: TArgs,
+  context: TContext,
+  info: GraphQLResolveInfo
+) => TResult | Promise<TResult>;
+
+/** Mapping of union types */
+export type ResolversUnionTypes = {
+  ActivityDetails: ( SwapOrderDetails ) | ( Omit<TransactionDetails, 'assetChanges'> & { assetChanges: Array<Maybe<ResolversTypes['AssetChange']>> } );
+  AssetChange: ( NftApproval ) | ( NftApproveForAll ) | ( NftTransfer ) | ( TokenApproval ) | ( TokenTransfer );
+};
+
+/** Mapping of union parent types */
+export type ResolversUnionParentTypes = {
+  ActivityDetails: ( SwapOrderDetails ) | ( Omit<TransactionDetails, 'assetChanges'> & { assetChanges: Array<Maybe<ResolversParentTypes['AssetChange']>> } );
+  AssetChange: ( NftApproval ) | ( NftApproveForAll ) | ( NftTransfer ) | ( TokenApproval ) | ( TokenTransfer );
+};
+
+/** Mapping between all available schema types and the resolvers types */
+export type ResolversTypes = {
+  AWSJSON: ResolverTypeWrapper<Scalars['AWSJSON']>;
+  ActivityDetails: ResolverTypeWrapper<ResolversUnionTypes['ActivityDetails']>;
+  ActivityDetailsInput: ActivityDetailsInput;
+  ActivityType: ActivityType;
+  Amount: ResolverTypeWrapper<Amount>;
+  AmountChange: ResolverTypeWrapper<AmountChange>;
+  AmountInput: AmountInput;
+  ApplicationContract: ResolverTypeWrapper<ApplicationContract>;
+  ApplicationContractInput: ApplicationContractInput;
+  AssetActivity: ResolverTypeWrapper<Omit<AssetActivity, 'assetChanges' | 'details'> & { assetChanges: Array<Maybe<ResolversTypes['AssetChange']>>, details: ResolversTypes['ActivityDetails'] }>;
+  AssetActivityInput: AssetActivityInput;
+  AssetActivitySwitch: AssetActivitySwitch;
+  AssetChange: ResolverTypeWrapper<ResolversUnionTypes['AssetChange']>;
+  AssetChangeInput: AssetChangeInput;
+  Boolean: ResolverTypeWrapper<Scalars['Boolean']>;
+  Chain: Chain;
+  CollectionSortableField: CollectionSortableField;
+  ContractInput: ContractInput;
+  Currency: Currency;
+  CurrencyAmountInput: CurrencyAmountInput;
+  DescriptionTranslations: ResolverTypeWrapper<DescriptionTranslations>;
+  Dimensions: ResolverTypeWrapper<Dimensions>;
+  DimensionsInput: DimensionsInput;
+  Float: ResolverTypeWrapper<Scalars['Float']>;
+  HighLow: HighLow;
+  HistoryDuration: HistoryDuration;
+  IAmount: ResolversTypes['Amount'] | ResolversTypes['TimestampedAmount'];
+  IContract: ResolversTypes['ApplicationContract'] | ResolversTypes['NftContract'] | ResolversTypes['Token'];
+  ID: ResolverTypeWrapper<Scalars['ID']>;
+  Image: ResolverTypeWrapper<Image>;
+  ImageInput: ImageInput;
+  Int: ResolverTypeWrapper<Scalars['Int']>;
+  MediaType: MediaType;
+  Mutation: ResolverTypeWrapper<{}>;
+  NftActivity: ResolverTypeWrapper<NftActivity>;
+  NftActivityConnection: ResolverTypeWrapper<NftActivityConnection>;
+  NftActivityEdge: ResolverTypeWrapper<NftActivityEdge>;
+  NftActivityFilterInput: NftActivityFilterInput;
+  NftActivityType: NftActivityType;
+  NftApproval: ResolverTypeWrapper<NftApproval>;
+  NftApprovalInput: NftApprovalInput;
+  NftApproveForAll: ResolverTypeWrapper<NftApproveForAll>;
+  NftApproveForAllInput: NftApproveForAllInput;
+  NftAsset: ResolverTypeWrapper<NftAsset>;
+  NftAssetConnection: ResolverTypeWrapper<NftAssetConnection>;
+  NftAssetEdge: ResolverTypeWrapper<NftAssetEdge>;
+  NftAssetInput: NftAssetInput;
+  NftAssetRarity: ResolverTypeWrapper<NftAssetRarity>;
+  NftAssetSortableField: NftAssetSortableField;
+  NftAssetTrait: ResolverTypeWrapper<NftAssetTrait>;
+  NftAssetTraitInput: NftAssetTraitInput;
+  NftAssetsFilterInput: NftAssetsFilterInput;
+  NftBalance: ResolverTypeWrapper<NftBalance>;
+  NftBalanceAssetInput: NftBalanceAssetInput;
+  NftBalanceConnection: ResolverTypeWrapper<NftBalanceConnection>;
+  NftBalanceEdge: ResolverTypeWrapper<NftBalanceEdge>;
+  NftBalancesFilterInput: NftBalancesFilterInput;
+  NftCollection: ResolverTypeWrapper<NftCollection>;
+  NftCollectionBalance: ResolverTypeWrapper<NftCollectionBalance>;
+  NftCollectionBalanceConnection: ResolverTypeWrapper<NftCollectionBalanceConnection>;
+  NftCollectionBalanceEdge: ResolverTypeWrapper<NftCollectionBalanceEdge>;
+  NftCollectionConnection: ResolverTypeWrapper<NftCollectionConnection>;
+  NftCollectionEdge: ResolverTypeWrapper<NftCollectionEdge>;
+  NftCollectionInput: NftCollectionInput;
+  NftCollectionMarket: ResolverTypeWrapper<NftCollectionMarket>;
+  NftCollectionMarketplace: ResolverTypeWrapper<NftCollectionMarketplace>;
+  NftCollectionTrait: ResolverTypeWrapper<NftCollectionTrait>;
+  NftCollectionTraitStats: ResolverTypeWrapper<NftCollectionTraitStats>;
+  NftCollectionsFilterInput: NftCollectionsFilterInput;
+  NftContract: ResolverTypeWrapper<NftContract>;
+  NftContractInput: NftContractInput;
+  NftFee: ResolverTypeWrapper<NftFee>;
+  NftMarketplace: NftMarketplace;
+  NftOrder: ResolverTypeWrapper<NftOrder>;
+  NftOrderConnection: ResolverTypeWrapper<NftOrderConnection>;
+  NftOrderEdge: ResolverTypeWrapper<NftOrderEdge>;
+  NftProfile: ResolverTypeWrapper<NftProfile>;
+  NftRarityProvider: NftRarityProvider;
+  NftRouteResponse: ResolverTypeWrapper<NftRouteResponse>;
+  NftStandard: NftStandard;
+  NftTrade: ResolverTypeWrapper<NftTrade>;
+  NftTradeInput: NftTradeInput;
+  NftTransfer: ResolverTypeWrapper<NftTransfer>;
+  NftTransferInput: NftTransferInput;
+  OrderStatus: OrderStatus;
+  OrderType: OrderType;
+  PageInfo: ResolverTypeWrapper<PageInfo>;
+  PairInput: PairInput;
+  PermitDetailsInput: PermitDetailsInput;
+  PermitInput: PermitInput;
+  PoolInput: PoolInput;
+  Portfolio: ResolverTypeWrapper<Portfolio>;
+  PortfolioValueModifier: PortfolioValueModifier;
+  PriceSource: PriceSource;
+  ProtocolVersion: ProtocolVersion;
+  PushNotification: ResolverTypeWrapper<PushNotification>;
+  Query: ResolverTypeWrapper<{}>;
+  SafetyLevel: SafetyLevel;
+  Status: ResolverTypeWrapper<Status>;
+  String: ResolverTypeWrapper<Scalars['String']>;
+  Subscription: ResolverTypeWrapper<{}>;
+  SubscriptionType: SubscriptionType;
+  SwapOrderDetails: ResolverTypeWrapper<SwapOrderDetails>;
+  SwapOrderStatus: SwapOrderStatus;
+  TimestampedAmount: ResolverTypeWrapper<TimestampedAmount>;
+  Token: ResolverTypeWrapper<Token>;
+  TokenAmount: ResolverTypeWrapper<TokenAmount>;
+  TokenAmountInput: TokenAmountInput;
+  TokenApproval: ResolverTypeWrapper<TokenApproval>;
+  TokenApprovalInput: TokenApprovalInput;
+  TokenAssetInput: TokenAssetInput;
+  TokenBalance: ResolverTypeWrapper<TokenBalance>;
+  TokenInput: TokenInput;
+  TokenMarket: ResolverTypeWrapper<TokenMarket>;
+  TokenProject: ResolverTypeWrapper<TokenProject>;
+  TokenProjectMarket: ResolverTypeWrapper<TokenProjectMarket>;
+  TokenSortableField: TokenSortableField;
+  TokenStandard: TokenStandard;
+  TokenTradeInput: TokenTradeInput;
+  TokenTradeRouteInput: TokenTradeRouteInput;
+  TokenTradeRoutesInput: TokenTradeRoutesInput;
+  TokenTradeType: TokenTradeType;
+  TokenTransfer: ResolverTypeWrapper<TokenTransfer>;
+  TokenTransferInput: TokenTransferInput;
+  TradePoolInput: TradePoolInput;
+  Transaction: ResolverTypeWrapper<Transaction>;
+  TransactionDetails: ResolverTypeWrapper<Omit<TransactionDetails, 'assetChanges'> & { assetChanges: Array<Maybe<ResolversTypes['AssetChange']>> }>;
+  TransactionDetailsInput: TransactionDetailsInput;
+  TransactionDirection: TransactionDirection;
+  TransactionNotification: ResolverTypeWrapper<TransactionNotification>;
+  TransactionStatus: TransactionStatus;
+  TransactionType: TransactionType;
+  V2Pair: ResolverTypeWrapper<V2Pair>;
+  V3Pool: ResolverTypeWrapper<V3Pool>;
+};
+
+/** Mapping between all available schema types and the resolvers parents */
+export type ResolversParentTypes = {
+  AWSJSON: Scalars['AWSJSON'];
+  ActivityDetails: ResolversUnionParentTypes['ActivityDetails'];
+  ActivityDetailsInput: ActivityDetailsInput;
+  Amount: Amount;
+  AmountChange: AmountChange;
+  AmountInput: AmountInput;
+  ApplicationContract: ApplicationContract;
+  ApplicationContractInput: ApplicationContractInput;
+  AssetActivity: Omit<AssetActivity, 'assetChanges' | 'details'> & { assetChanges: Array<Maybe<ResolversParentTypes['AssetChange']>>, details: ResolversParentTypes['ActivityDetails'] };
+  AssetActivityInput: AssetActivityInput;
+  AssetChange: ResolversUnionParentTypes['AssetChange'];
+  AssetChangeInput: AssetChangeInput;
+  Boolean: Scalars['Boolean'];
+  ContractInput: ContractInput;
+  CurrencyAmountInput: CurrencyAmountInput;
+  DescriptionTranslations: DescriptionTranslations;
+  Dimensions: Dimensions;
+  DimensionsInput: DimensionsInput;
+  Float: Scalars['Float'];
+  IAmount: ResolversParentTypes['Amount'] | ResolversParentTypes['TimestampedAmount'];
+  IContract: ResolversParentTypes['ApplicationContract'] | ResolversParentTypes['NftContract'] | ResolversParentTypes['Token'];
+  ID: Scalars['ID'];
+  Image: Image;
+  ImageInput: ImageInput;
+  Int: Scalars['Int'];
+  Mutation: {};
+  NftActivity: NftActivity;
+  NftActivityConnection: NftActivityConnection;
+  NftActivityEdge: NftActivityEdge;
+  NftActivityFilterInput: NftActivityFilterInput;
+  NftApproval: NftApproval;
+  NftApprovalInput: NftApprovalInput;
+  NftApproveForAll: NftApproveForAll;
+  NftApproveForAllInput: NftApproveForAllInput;
+  NftAsset: NftAsset;
+  NftAssetConnection: NftAssetConnection;
+  NftAssetEdge: NftAssetEdge;
+  NftAssetInput: NftAssetInput;
+  NftAssetRarity: NftAssetRarity;
+  NftAssetTrait: NftAssetTrait;
+  NftAssetTraitInput: NftAssetTraitInput;
+  NftAssetsFilterInput: NftAssetsFilterInput;
+  NftBalance: NftBalance;
+  NftBalanceAssetInput: NftBalanceAssetInput;
+  NftBalanceConnection: NftBalanceConnection;
+  NftBalanceEdge: NftBalanceEdge;
+  NftBalancesFilterInput: NftBalancesFilterInput;
+  NftCollection: NftCollection;
+  NftCollectionBalance: NftCollectionBalance;
+  NftCollectionBalanceConnection: NftCollectionBalanceConnection;
+  NftCollectionBalanceEdge: NftCollectionBalanceEdge;
+  NftCollectionConnection: NftCollectionConnection;
+  NftCollectionEdge: NftCollectionEdge;
+  NftCollectionInput: NftCollectionInput;
+  NftCollectionMarket: NftCollectionMarket;
+  NftCollectionMarketplace: NftCollectionMarketplace;
+  NftCollectionTrait: NftCollectionTrait;
+  NftCollectionTraitStats: NftCollectionTraitStats;
+  NftCollectionsFilterInput: NftCollectionsFilterInput;
+  NftContract: NftContract;
+  NftContractInput: NftContractInput;
+  NftFee: NftFee;
+  NftOrder: NftOrder;
+  NftOrderConnection: NftOrderConnection;
+  NftOrderEdge: NftOrderEdge;
+  NftProfile: NftProfile;
+  NftRouteResponse: NftRouteResponse;
+  NftTrade: NftTrade;
+  NftTradeInput: NftTradeInput;
+  NftTransfer: NftTransfer;
+  NftTransferInput: NftTransferInput;
+  PageInfo: PageInfo;
+  PairInput: PairInput;
+  PermitDetailsInput: PermitDetailsInput;
+  PermitInput: PermitInput;
+  PoolInput: PoolInput;
+  Portfolio: Portfolio;
+  PortfolioValueModifier: PortfolioValueModifier;
+  PushNotification: PushNotification;
+  Query: {};
+  Status: Status;
+  String: Scalars['String'];
+  Subscription: {};
+  SwapOrderDetails: SwapOrderDetails;
+  TimestampedAmount: TimestampedAmount;
+  Token: Token;
+  TokenAmount: TokenAmount;
+  TokenAmountInput: TokenAmountInput;
+  TokenApproval: TokenApproval;
+  TokenApprovalInput: TokenApprovalInput;
+  TokenAssetInput: TokenAssetInput;
+  TokenBalance: TokenBalance;
+  TokenInput: TokenInput;
+  TokenMarket: TokenMarket;
+  TokenProject: TokenProject;
+  TokenProjectMarket: TokenProjectMarket;
+  TokenTradeInput: TokenTradeInput;
+  TokenTradeRouteInput: TokenTradeRouteInput;
+  TokenTradeRoutesInput: TokenTradeRoutesInput;
+  TokenTransfer: TokenTransfer;
+  TokenTransferInput: TokenTransferInput;
+  TradePoolInput: TradePoolInput;
+  Transaction: Transaction;
+  TransactionDetails: Omit<TransactionDetails, 'assetChanges'> & { assetChanges: Array<Maybe<ResolversParentTypes['AssetChange']>> };
+  TransactionDetailsInput: TransactionDetailsInput;
+  TransactionNotification: TransactionNotification;
+  V2Pair: V2Pair;
+  V3Pool: V3Pool;
+};
+
+export type Aws_Api_KeyDirectiveArgs = { };
+
+export type Aws_Api_KeyDirectiveResolver<Result, Parent, ContextType = any, Args = Aws_Api_KeyDirectiveArgs> = DirectiveResolverFn<Result, Parent, ContextType, Args>;
+
+export type Aws_AuthDirectiveArgs = {
+  cognito_groups?: Maybe<Array<Maybe<Scalars['String']>>>;
+};
+
+export type Aws_AuthDirectiveResolver<Result, Parent, ContextType = any, Args = Aws_AuthDirectiveArgs> = DirectiveResolverFn<Result, Parent, ContextType, Args>;
+
+export type Aws_Cognito_User_PoolsDirectiveArgs = {
+  cognito_groups?: Maybe<Array<Maybe<Scalars['String']>>>;
+};
+
+export type Aws_Cognito_User_PoolsDirectiveResolver<Result, Parent, ContextType = any, Args = Aws_Cognito_User_PoolsDirectiveArgs> = DirectiveResolverFn<Result, Parent, ContextType, Args>;
+
+export type Aws_IamDirectiveArgs = { };
+
+export type Aws_IamDirectiveResolver<Result, Parent, ContextType = any, Args = Aws_IamDirectiveArgs> = DirectiveResolverFn<Result, Parent, ContextType, Args>;
+
+export type Aws_LambdaDirectiveArgs = { };
+
+export type Aws_LambdaDirectiveResolver<Result, Parent, ContextType = any, Args = Aws_LambdaDirectiveArgs> = DirectiveResolverFn<Result, Parent, ContextType, Args>;
+
+export type Aws_OidcDirectiveArgs = { };
+
+export type Aws_OidcDirectiveResolver<Result, Parent, ContextType = any, Args = Aws_OidcDirectiveArgs> = DirectiveResolverFn<Result, Parent, ContextType, Args>;
+
+export type Aws_PublishDirectiveArgs = {
+  subscriptions?: Maybe<Array<Maybe<Scalars['String']>>>;
+};
+
+export type Aws_PublishDirectiveResolver<Result, Parent, ContextType = any, Args = Aws_PublishDirectiveArgs> = DirectiveResolverFn<Result, Parent, ContextType, Args>;
+
+export type Aws_SubscribeDirectiveArgs = {
+  mutations?: Maybe<Array<Maybe<Scalars['String']>>>;
+};
+
+export type Aws_SubscribeDirectiveResolver<Result, Parent, ContextType = any, Args = Aws_SubscribeDirectiveArgs> = DirectiveResolverFn<Result, Parent, ContextType, Args>;
+
+export type DeferDirectiveArgs = { };
+
+export type DeferDirectiveResolver<Result, Parent, ContextType = any, Args = DeferDirectiveArgs> = DirectiveResolverFn<Result, Parent, ContextType, Args>;
+
+export interface AwsjsonScalarConfig extends GraphQLScalarTypeConfig<ResolversTypes['AWSJSON'], any> {
+  name: 'AWSJSON';
+}
+
+export type ActivityDetailsResolvers<ContextType = any, ParentType extends ResolversParentTypes['ActivityDetails'] = ResolversParentTypes['ActivityDetails']> = {
+  __resolveType: TypeResolveFn<'SwapOrderDetails' | 'TransactionDetails', ParentType, ContextType>;
+};
+
+export type AmountResolvers<ContextType = any, ParentType extends ResolversParentTypes['Amount'] = ResolversParentTypes['Amount']> = {
+  currency?: Resolver<Maybe<ResolversTypes['Currency']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  value?: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type AmountChangeResolvers<ContextType = any, ParentType extends ResolversParentTypes['AmountChange'] = ResolversParentTypes['AmountChange']> = {
+  absolute?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  percentage?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type ApplicationContractResolvers<ContextType = any, ParentType extends ResolversParentTypes['ApplicationContract'] = ResolversParentTypes['ApplicationContract']> = {
+  address?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  chain?: Resolver<ResolversTypes['Chain'], ParentType, ContextType>;
+  icon?: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type AssetActivityResolvers<ContextType = any, ParentType extends ResolversParentTypes['AssetActivity'] = ResolversParentTypes['AssetActivity']> = {
+  addresses?: Resolver<Maybe<Array<ResolversTypes['String']>>, ParentType, ContextType>;
+  assetChanges?: Resolver<Array<Maybe<ResolversTypes['AssetChange']>>, ParentType, ContextType>;
+  chain?: Resolver<ResolversTypes['Chain'], ParentType, ContextType>;
+  details?: Resolver<ResolversTypes['ActivityDetails'], ParentType, ContextType>;
+  gasUsed?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  timestamp?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  transaction?: Resolver<ResolversTypes['Transaction'], ParentType, ContextType>;
+  type?: Resolver<ResolversTypes['ActivityType'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type AssetChangeResolvers<ContextType = any, ParentType extends ResolversParentTypes['AssetChange'] = ResolversParentTypes['AssetChange']> = {
+  __resolveType: TypeResolveFn<'NftApproval' | 'NftApproveForAll' | 'NftTransfer' | 'TokenApproval' | 'TokenTransfer', ParentType, ContextType>;
+};
+
+export type DescriptionTranslationsResolvers<ContextType = any, ParentType extends ResolversParentTypes['DescriptionTranslations'] = ResolversParentTypes['DescriptionTranslations']> = {
+  descriptionEnUs?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionEs419?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionEsEs?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionEsUs?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionFrFr?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionHiIn?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionIdId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionJaJp?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionMsMy?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionNlNl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionPtPt?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionRuRu?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionThTh?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionTrTr?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionUkUa?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionUrPk?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionViVn?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionZhHans?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionZhHant?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type DimensionsResolvers<ContextType = any, ParentType extends ResolversParentTypes['Dimensions'] = ResolversParentTypes['Dimensions']> = {
+  height?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  width?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type IAmountResolvers<ContextType = any, ParentType extends ResolversParentTypes['IAmount'] = ResolversParentTypes['IAmount']> = {
+  __resolveType: TypeResolveFn<'Amount' | 'TimestampedAmount', ParentType, ContextType>;
+  currency?: Resolver<Maybe<ResolversTypes['Currency']>, ParentType, ContextType>;
+  value?: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+};
+
+export type IContractResolvers<ContextType = any, ParentType extends ResolversParentTypes['IContract'] = ResolversParentTypes['IContract']> = {
+  __resolveType: TypeResolveFn<'ApplicationContract' | 'NftContract' | 'Token', ParentType, ContextType>;
+  address?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  chain?: Resolver<ResolversTypes['Chain'], ParentType, ContextType>;
+};
+
+export type ImageResolvers<ContextType = any, ParentType extends ResolversParentTypes['Image'] = ResolversParentTypes['Image']> = {
+  dimensions?: Resolver<Maybe<ResolversTypes['Dimensions']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  url?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type MutationResolvers<ContextType = any, ParentType extends ResolversParentTypes['Mutation'] = ResolversParentTypes['Mutation']> = {
+  assetActivity?: Resolver<ResolversTypes['AssetActivity'], ParentType, ContextType, RequireFields<MutationAssetActivityArgs, 'input'>>;
+  heartbeat?: Resolver<ResolversTypes['Status'], ParentType, ContextType, RequireFields<MutationHeartbeatArgs, 'subscriptionId' | 'type'>>;
+  unsubscribe?: Resolver<ResolversTypes['Status'], ParentType, ContextType, RequireFields<MutationUnsubscribeArgs, 'subscriptionId' | 'type'>>;
+};
+
+export type NftActivityResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftActivity'] = ResolversParentTypes['NftActivity']> = {
+  address?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  asset?: Resolver<Maybe<ResolversTypes['NftAsset']>, ParentType, ContextType>;
+  fromAddress?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  marketplace?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  orderStatus?: Resolver<Maybe<ResolversTypes['OrderStatus']>, ParentType, ContextType>;
+  price?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  quantity?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  timestamp?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  toAddress?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  tokenId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  transactionHash?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  type?: Resolver<ResolversTypes['NftActivityType'], ParentType, ContextType>;
+  url?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftActivityConnectionResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftActivityConnection'] = ResolversParentTypes['NftActivityConnection']> = {
+  edges?: Resolver<Array<ResolversTypes['NftActivityEdge']>, ParentType, ContextType>;
+  pageInfo?: Resolver<ResolversTypes['PageInfo'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftActivityEdgeResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftActivityEdge'] = ResolversParentTypes['NftActivityEdge']> = {
+  cursor?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  node?: Resolver<ResolversTypes['NftActivity'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftApprovalResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftApproval'] = ResolversParentTypes['NftApproval']> = {
+  approvedAddress?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  asset?: Resolver<ResolversTypes['NftAsset'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  nftStandard?: Resolver<ResolversTypes['NftStandard'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftApproveForAllResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftApproveForAll'] = ResolversParentTypes['NftApproveForAll']> = {
+  approved?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
+  asset?: Resolver<ResolversTypes['NftAsset'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  nftStandard?: Resolver<ResolversTypes['NftStandard'], ParentType, ContextType>;
+  operatorAddress?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftAssetResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftAsset'] = ResolversParentTypes['NftAsset']> = {
+  animationUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  collection?: Resolver<Maybe<ResolversTypes['NftCollection']>, ParentType, ContextType>;
+  creator?: Resolver<Maybe<ResolversTypes['NftProfile']>, ParentType, ContextType>;
+  description?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  flaggedBy?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  image?: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
+  imageUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  isSpam?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
+  listings?: Resolver<Maybe<ResolversTypes['NftOrderConnection']>, ParentType, ContextType, Partial<NftAssetListingsArgs>>;
+  mediaType?: Resolver<Maybe<ResolversTypes['MediaType']>, ParentType, ContextType>;
+  metadataUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  nftContract?: Resolver<Maybe<ResolversTypes['NftContract']>, ParentType, ContextType>;
+  originalImage?: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
+  ownerAddress?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  rarities?: Resolver<Maybe<Array<ResolversTypes['NftAssetRarity']>>, ParentType, ContextType>;
+  smallImage?: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
+  smallImageUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  suspiciousFlag?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
+  thumbnail?: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
+  thumbnailUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  tokenId?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  traits?: Resolver<Maybe<Array<ResolversTypes['NftAssetTrait']>>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftAssetConnectionResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftAssetConnection'] = ResolversParentTypes['NftAssetConnection']> = {
+  edges?: Resolver<Array<ResolversTypes['NftAssetEdge']>, ParentType, ContextType>;
+  pageInfo?: Resolver<ResolversTypes['PageInfo'], ParentType, ContextType>;
+  totalCount?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftAssetEdgeResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftAssetEdge'] = ResolversParentTypes['NftAssetEdge']> = {
+  cursor?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  node?: Resolver<ResolversTypes['NftAsset'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftAssetRarityResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftAssetRarity'] = ResolversParentTypes['NftAssetRarity']> = {
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  provider?: Resolver<Maybe<ResolversTypes['NftRarityProvider']>, ParentType, ContextType>;
+  rank?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  score?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftAssetTraitResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftAssetTrait'] = ResolversParentTypes['NftAssetTrait']> = {
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  rarity?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  value?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftBalanceResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftBalance'] = ResolversParentTypes['NftBalance']> = {
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  lastPrice?: Resolver<Maybe<ResolversTypes['TimestampedAmount']>, ParentType, ContextType>;
+  listedMarketplaces?: Resolver<Maybe<Array<ResolversTypes['NftMarketplace']>>, ParentType, ContextType>;
+  listingFees?: Resolver<Maybe<Array<Maybe<ResolversTypes['NftFee']>>>, ParentType, ContextType>;
+  ownedAsset?: Resolver<Maybe<ResolversTypes['NftAsset']>, ParentType, ContextType>;
+  quantity?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftBalanceConnectionResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftBalanceConnection'] = ResolversParentTypes['NftBalanceConnection']> = {
+  edges?: Resolver<Array<ResolversTypes['NftBalanceEdge']>, ParentType, ContextType>;
+  pageInfo?: Resolver<ResolversTypes['PageInfo'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftBalanceEdgeResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftBalanceEdge'] = ResolversParentTypes['NftBalanceEdge']> = {
+  cursor?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  node?: Resolver<ResolversTypes['NftBalance'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftCollectionResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftCollection'] = ResolversParentTypes['NftCollection']> = {
+  bannerImage?: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
+  bannerImageUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  collectionId?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  creator?: Resolver<Maybe<ResolversTypes['NftProfile']>, ParentType, ContextType>;
+  description?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  discordUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  homepageUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  image?: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
+  imageUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  instagramName?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  isVerified?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
+  markets?: Resolver<Maybe<Array<ResolversTypes['NftCollectionMarket']>>, ParentType, ContextType, RequireFields<NftCollectionMarketsArgs, 'currencies'>>;
+  name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  nftContracts?: Resolver<Maybe<Array<ResolversTypes['NftContract']>>, ParentType, ContextType>;
+  numAssets?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  openseaUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  traits?: Resolver<Maybe<Array<ResolversTypes['NftCollectionTrait']>>, ParentType, ContextType>;
+  twitterName?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftCollectionBalanceResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftCollectionBalance'] = ResolversParentTypes['NftCollectionBalance']> = {
+  address?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  balance?: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  logoImage?: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
+  name?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftCollectionBalanceConnectionResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftCollectionBalanceConnection'] = ResolversParentTypes['NftCollectionBalanceConnection']> = {
+  edges?: Resolver<Array<ResolversTypes['NftCollectionBalanceEdge']>, ParentType, ContextType>;
+  pageInfo?: Resolver<ResolversTypes['PageInfo'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftCollectionBalanceEdgeResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftCollectionBalanceEdge'] = ResolversParentTypes['NftCollectionBalanceEdge']> = {
+  cursor?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  node?: Resolver<ResolversTypes['NftCollectionBalance'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftCollectionConnectionResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftCollectionConnection'] = ResolversParentTypes['NftCollectionConnection']> = {
+  edges?: Resolver<Array<ResolversTypes['NftCollectionEdge']>, ParentType, ContextType>;
+  pageInfo?: Resolver<ResolversTypes['PageInfo'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftCollectionEdgeResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftCollectionEdge'] = ResolversParentTypes['NftCollectionEdge']> = {
+  cursor?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  node?: Resolver<ResolversTypes['NftCollection'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftCollectionMarketResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftCollectionMarket'] = ResolversParentTypes['NftCollectionMarket']> = {
+  floorPrice?: Resolver<Maybe<ResolversTypes['TimestampedAmount']>, ParentType, ContextType>;
+  floorPricePercentChange?: Resolver<Maybe<ResolversTypes['TimestampedAmount']>, ParentType, ContextType, Partial<NftCollectionMarketFloorPricePercentChangeArgs>>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  listings?: Resolver<Maybe<ResolversTypes['TimestampedAmount']>, ParentType, ContextType>;
+  marketplaces?: Resolver<Maybe<Array<ResolversTypes['NftCollectionMarketplace']>>, ParentType, ContextType, Partial<NftCollectionMarketMarketplacesArgs>>;
+  nftContracts?: Resolver<Maybe<Array<ResolversTypes['NftContract']>>, ParentType, ContextType>;
+  owners?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  percentListed?: Resolver<Maybe<ResolversTypes['TimestampedAmount']>, ParentType, ContextType>;
+  percentUniqueOwners?: Resolver<Maybe<ResolversTypes['TimestampedAmount']>, ParentType, ContextType>;
+  sales?: Resolver<Maybe<ResolversTypes['TimestampedAmount']>, ParentType, ContextType, Partial<NftCollectionMarketSalesArgs>>;
+  totalVolume?: Resolver<Maybe<ResolversTypes['TimestampedAmount']>, ParentType, ContextType>;
+  volume?: Resolver<Maybe<ResolversTypes['TimestampedAmount']>, ParentType, ContextType, Partial<NftCollectionMarketVolumeArgs>>;
+  volume24h?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  volumePercentChange?: Resolver<Maybe<ResolversTypes['TimestampedAmount']>, ParentType, ContextType, Partial<NftCollectionMarketVolumePercentChangeArgs>>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftCollectionMarketplaceResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftCollectionMarketplace'] = ResolversParentTypes['NftCollectionMarketplace']> = {
+  floorPrice?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  listings?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  marketplace?: Resolver<Maybe<ResolversTypes['NftMarketplace']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftCollectionTraitResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftCollectionTrait'] = ResolversParentTypes['NftCollectionTrait']> = {
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  stats?: Resolver<Maybe<Array<ResolversTypes['NftCollectionTraitStats']>>, ParentType, ContextType>;
+  values?: Resolver<Maybe<Array<ResolversTypes['String']>>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftCollectionTraitStatsResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftCollectionTraitStats'] = ResolversParentTypes['NftCollectionTraitStats']> = {
+  assets?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  listings?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  value?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftContractResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftContract'] = ResolversParentTypes['NftContract']> = {
+  address?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  chain?: Resolver<ResolversTypes['Chain'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  standard?: Resolver<Maybe<ResolversTypes['NftStandard']>, ParentType, ContextType>;
+  symbol?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  totalSupply?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftFeeResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftFee'] = ResolversParentTypes['NftFee']> = {
+  basisPoints?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  payoutAddress?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftOrderResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftOrder'] = ResolversParentTypes['NftOrder']> = {
+  address?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  auctionType?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  createdAt?: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  endAt?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  maker?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  marketplace?: Resolver<ResolversTypes['NftMarketplace'], ParentType, ContextType>;
+  marketplaceUrl?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  orderHash?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  poolPrices?: Resolver<Maybe<Array<ResolversTypes['String']>>, ParentType, ContextType>;
+  price?: Resolver<ResolversTypes['Amount'], ParentType, ContextType>;
+  protocolParameters?: Resolver<Maybe<ResolversTypes['AWSJSON']>, ParentType, ContextType>;
+  quantity?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  startAt?: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  status?: Resolver<ResolversTypes['OrderStatus'], ParentType, ContextType>;
+  taker?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  tokenId?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  type?: Resolver<ResolversTypes['OrderType'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftOrderConnectionResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftOrderConnection'] = ResolversParentTypes['NftOrderConnection']> = {
+  edges?: Resolver<Array<ResolversTypes['NftOrderEdge']>, ParentType, ContextType>;
+  pageInfo?: Resolver<ResolversTypes['PageInfo'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftOrderEdgeResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftOrderEdge'] = ResolversParentTypes['NftOrderEdge']> = {
+  cursor?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  node?: Resolver<ResolversTypes['NftOrder'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftProfileResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftProfile'] = ResolversParentTypes['NftProfile']> = {
+  address?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  isVerified?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
+  profileImage?: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
+  username?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftRouteResponseResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftRouteResponse'] = ResolversParentTypes['NftRouteResponse']> = {
+  calldata?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  route?: Resolver<Maybe<Array<ResolversTypes['NftTrade']>>, ParentType, ContextType>;
+  sendAmount?: Resolver<ResolversTypes['TokenAmount'], ParentType, ContextType>;
+  toAddress?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftTradeResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftTrade'] = ResolversParentTypes['NftTrade']> = {
+  amount?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  contractAddress?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  marketplace?: Resolver<ResolversTypes['NftMarketplace'], ParentType, ContextType>;
+  price?: Resolver<ResolversTypes['TokenAmount'], ParentType, ContextType>;
+  quotePrice?: Resolver<Maybe<ResolversTypes['TokenAmount']>, ParentType, ContextType>;
+  tokenId?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  tokenType?: Resolver<Maybe<ResolversTypes['NftStandard']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type NftTransferResolvers<ContextType = any, ParentType extends ResolversParentTypes['NftTransfer'] = ResolversParentTypes['NftTransfer']> = {
+  asset?: Resolver<ResolversTypes['NftAsset'], ParentType, ContextType>;
+  direction?: Resolver<ResolversTypes['TransactionDirection'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  nftStandard?: Resolver<ResolversTypes['NftStandard'], ParentType, ContextType>;
+  recipient?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  sender?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type PageInfoResolvers<ContextType = any, ParentType extends ResolversParentTypes['PageInfo'] = ResolversParentTypes['PageInfo']> = {
+  endCursor?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  hasNextPage?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
+  hasPreviousPage?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
+  startCursor?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type PortfolioResolvers<ContextType = any, ParentType extends ResolversParentTypes['Portfolio'] = ResolversParentTypes['Portfolio']> = {
+  assetActivities?: Resolver<Maybe<Array<Maybe<ResolversTypes['AssetActivity']>>>, ParentType, ContextType, Partial<PortfolioAssetActivitiesArgs>>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  nftBalances?: Resolver<Maybe<Array<Maybe<ResolversTypes['NftBalance']>>>, ParentType, ContextType>;
+  ownerAddress?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  tokenBalances?: Resolver<Maybe<Array<Maybe<ResolversTypes['TokenBalance']>>>, ParentType, ContextType>;
+  tokensTotalDenominatedValue?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  tokensTotalDenominatedValueChange?: Resolver<Maybe<ResolversTypes['AmountChange']>, ParentType, ContextType, Partial<PortfolioTokensTotalDenominatedValueChangeArgs>>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type PushNotificationResolvers<ContextType = any, ParentType extends ResolversParentTypes['PushNotification'] = ResolversParentTypes['PushNotification']> = {
+  contents?: Resolver<ResolversTypes['AWSJSON'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  notifyAddress?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  signerHeader?: Resolver<ResolversTypes['AWSJSON'], ParentType, ContextType>;
+  viewerHeader?: Resolver<ResolversTypes['AWSJSON'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type QueryResolvers<ContextType = any, ParentType extends ResolversParentTypes['Query'] = ResolversParentTypes['Query']> = {
+  convert?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType, RequireFields<QueryConvertArgs, 'fromAmount' | 'toCurrency'>>;
+  nftActivity?: Resolver<Maybe<ResolversTypes['NftActivityConnection']>, ParentType, ContextType, Partial<QueryNftActivityArgs>>;
+  nftAssets?: Resolver<Maybe<ResolversTypes['NftAssetConnection']>, ParentType, ContextType, RequireFields<QueryNftAssetsArgs, 'address'>>;
+  nftBalances?: Resolver<Maybe<ResolversTypes['NftBalanceConnection']>, ParentType, ContextType, RequireFields<QueryNftBalancesArgs, 'ownerAddress'>>;
+  nftCollectionBalances?: Resolver<Maybe<ResolversTypes['NftCollectionBalanceConnection']>, ParentType, ContextType, RequireFields<QueryNftCollectionBalancesArgs, 'ownerAddress'>>;
+  nftCollections?: Resolver<Maybe<ResolversTypes['NftCollectionConnection']>, ParentType, ContextType, Partial<QueryNftCollectionsArgs>>;
+  nftRoute?: Resolver<Maybe<ResolversTypes['NftRouteResponse']>, ParentType, ContextType, RequireFields<QueryNftRouteArgs, 'nftTrades' | 'senderAddress'>>;
+  portfolios?: Resolver<Maybe<Array<Maybe<ResolversTypes['Portfolio']>>>, ParentType, ContextType, RequireFields<QueryPortfoliosArgs, 'ownerAddresses'>>;
+  searchTokens?: Resolver<Maybe<Array<Maybe<ResolversTypes['Token']>>>, ParentType, ContextType, RequireFields<QuerySearchTokensArgs, 'searchQuery'>>;
+  token?: Resolver<Maybe<ResolversTypes['Token']>, ParentType, ContextType, RequireFields<QueryTokenArgs, 'chain'>>;
+  tokenProjects?: Resolver<Maybe<Array<Maybe<ResolversTypes['TokenProject']>>>, ParentType, ContextType, RequireFields<QueryTokenProjectsArgs, 'contracts'>>;
+  tokens?: Resolver<Maybe<Array<Maybe<ResolversTypes['Token']>>>, ParentType, ContextType, RequireFields<QueryTokensArgs, 'contracts'>>;
+  topCollections?: Resolver<Maybe<ResolversTypes['NftCollectionConnection']>, ParentType, ContextType, Partial<QueryTopCollectionsArgs>>;
+  topTokens?: Resolver<Maybe<Array<Maybe<ResolversTypes['Token']>>>, ParentType, ContextType, Partial<QueryTopTokensArgs>>;
+  topV2Pairs?: Resolver<Maybe<Array<ResolversTypes['V2Pair']>>, ParentType, ContextType, RequireFields<QueryTopV2PairsArgs, 'chain' | 'first'>>;
+  topV3Pools?: Resolver<Maybe<Array<ResolversTypes['V3Pool']>>, ParentType, ContextType, RequireFields<QueryTopV3PoolsArgs, 'chain' | 'first'>>;
+  transactionNotification?: Resolver<Maybe<ResolversTypes['TransactionNotification']>, ParentType, ContextType, RequireFields<QueryTransactionNotificationArgs, 'address' | 'chain' | 'transactionHash'>>;
+};
+
+export type StatusResolvers<ContextType = any, ParentType extends ResolversParentTypes['Status'] = ResolversParentTypes['Status']> = {
+  success?: Resolver<ResolversTypes['Boolean'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type SubscriptionResolvers<ContextType = any, ParentType extends ResolversParentTypes['Subscription'] = ResolversParentTypes['Subscription']> = {
+  onAssetActivity?: SubscriptionResolver<Maybe<ResolversTypes['AssetActivity']>, "onAssetActivity", ParentType, ContextType, RequireFields<SubscriptionOnAssetActivityArgs, 'addresses' | 'subscriptionId'>>;
+};
+
+export type SwapOrderDetailsResolvers<ContextType = any, ParentType extends ResolversParentTypes['SwapOrderDetails'] = ResolversParentTypes['SwapOrderDetails']> = {
+  expiry?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  hash?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  inputToken?: Resolver<ResolversTypes['Token'], ParentType, ContextType>;
+  inputTokenQuantity?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  offerer?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  outputToken?: Resolver<ResolversTypes['Token'], ParentType, ContextType>;
+  outputTokenQuantity?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  status?: Resolver<ResolversTypes['SwapOrderStatus'], ParentType, ContextType>;
+  swapOrderStatus?: Resolver<ResolversTypes['SwapOrderStatus'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type TimestampedAmountResolvers<ContextType = any, ParentType extends ResolversParentTypes['TimestampedAmount'] = ResolversParentTypes['TimestampedAmount']> = {
+  currency?: Resolver<Maybe<ResolversTypes['Currency']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  timestamp?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  value?: Resolver<ResolversTypes['Float'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type TokenResolvers<ContextType = any, ParentType extends ResolversParentTypes['Token'] = ResolversParentTypes['Token']> = {
+  address?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  chain?: Resolver<ResolversTypes['Chain'], ParentType, ContextType>;
+  decimals?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  market?: Resolver<Maybe<ResolversTypes['TokenMarket']>, ParentType, ContextType, Partial<TokenMarketArgs>>;
+  name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  project?: Resolver<Maybe<ResolversTypes['TokenProject']>, ParentType, ContextType>;
+  standard?: Resolver<Maybe<ResolversTypes['TokenStandard']>, ParentType, ContextType>;
+  symbol?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type TokenAmountResolvers<ContextType = any, ParentType extends ResolversParentTypes['TokenAmount'] = ResolversParentTypes['TokenAmount']> = {
+  currency?: Resolver<ResolversTypes['Currency'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  value?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type TokenApprovalResolvers<ContextType = any, ParentType extends ResolversParentTypes['TokenApproval'] = ResolversParentTypes['TokenApproval']> = {
+  approvedAddress?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  asset?: Resolver<ResolversTypes['Token'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  quantity?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  tokenStandard?: Resolver<ResolversTypes['TokenStandard'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type TokenBalanceResolvers<ContextType = any, ParentType extends ResolversParentTypes['TokenBalance'] = ResolversParentTypes['TokenBalance']> = {
+  blockNumber?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  blockTimestamp?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  denominatedValue?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  isHidden?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
+  ownerAddress?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  quantity?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  token?: Resolver<Maybe<ResolversTypes['Token']>, ParentType, ContextType>;
+  tokenProjectMarket?: Resolver<Maybe<ResolversTypes['TokenProjectMarket']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type TokenMarketResolvers<ContextType = any, ParentType extends ResolversParentTypes['TokenMarket'] = ResolversParentTypes['TokenMarket']> = {
+  fullyDilutedValuation?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  price?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  priceHighLow?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType, RequireFields<TokenMarketPriceHighLowArgs, 'duration' | 'highLow'>>;
+  priceHistory?: Resolver<Maybe<Array<Maybe<ResolversTypes['TimestampedAmount']>>>, ParentType, ContextType, RequireFields<TokenMarketPriceHistoryArgs, 'duration'>>;
+  pricePercentChange?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType, RequireFields<TokenMarketPricePercentChangeArgs, 'duration'>>;
+  priceSource?: Resolver<ResolversTypes['PriceSource'], ParentType, ContextType>;
+  token?: Resolver<ResolversTypes['Token'], ParentType, ContextType>;
+  totalValueLocked?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  volume?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType, RequireFields<TokenMarketVolumeArgs, 'duration'>>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type TokenProjectResolvers<ContextType = any, ParentType extends ResolversParentTypes['TokenProject'] = ResolversParentTypes['TokenProject']> = {
+  description?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  descriptionTranslations?: Resolver<Maybe<ResolversTypes['DescriptionTranslations']>, ParentType, ContextType>;
+  homepageUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  isSpam?: Resolver<Maybe<ResolversTypes['Boolean']>, ParentType, ContextType>;
+  logo?: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
+  logoUrl?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  markets?: Resolver<Maybe<Array<Maybe<ResolversTypes['TokenProjectMarket']>>>, ParentType, ContextType, RequireFields<TokenProjectMarketsArgs, 'currencies'>>;
+  name?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  safetyLevel?: Resolver<Maybe<ResolversTypes['SafetyLevel']>, ParentType, ContextType>;
+  smallLogo?: Resolver<Maybe<ResolversTypes['Image']>, ParentType, ContextType>;
+  spamCode?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  tokens?: Resolver<Array<ResolversTypes['Token']>, ParentType, ContextType>;
+  twitterName?: Resolver<Maybe<ResolversTypes['String']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type TokenProjectMarketResolvers<ContextType = any, ParentType extends ResolversParentTypes['TokenProjectMarket'] = ResolversParentTypes['TokenProjectMarket']> = {
+  currency?: Resolver<ResolversTypes['Currency'], ParentType, ContextType>;
+  fullyDilutedValuation?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  marketCap?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  price?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  priceHigh52w?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  priceHighLow?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType, RequireFields<TokenProjectMarketPriceHighLowArgs, 'duration' | 'highLow'>>;
+  priceHistory?: Resolver<Maybe<Array<Maybe<ResolversTypes['TimestampedAmount']>>>, ParentType, ContextType, RequireFields<TokenProjectMarketPriceHistoryArgs, 'duration'>>;
+  priceLow52w?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  pricePercentChange?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType, RequireFields<TokenProjectMarketPricePercentChangeArgs, 'duration'>>;
+  pricePercentChange24h?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  tokenProject?: Resolver<ResolversTypes['TokenProject'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type TokenTransferResolvers<ContextType = any, ParentType extends ResolversParentTypes['TokenTransfer'] = ResolversParentTypes['TokenTransfer']> = {
+  asset?: Resolver<ResolversTypes['Token'], ParentType, ContextType>;
+  direction?: Resolver<ResolversTypes['TransactionDirection'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  quantity?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  recipient?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  sender?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  tokenStandard?: Resolver<ResolversTypes['TokenStandard'], ParentType, ContextType>;
+  transactedValue?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type TransactionResolvers<ContextType = any, ParentType extends ResolversParentTypes['Transaction'] = ResolversParentTypes['Transaction']> = {
+  blockNumber?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  from?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  gasLimit?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  hash?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  maxFeePerGas?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  nonce?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  status?: Resolver<ResolversTypes['TransactionStatus'], ParentType, ContextType>;
+  to?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type TransactionDetailsResolvers<ContextType = any, ParentType extends ResolversParentTypes['TransactionDetails'] = ResolversParentTypes['TransactionDetails']> = {
+  application?: Resolver<Maybe<ResolversTypes['ApplicationContract']>, ParentType, ContextType>;
+  assetChanges?: Resolver<Array<Maybe<ResolversTypes['AssetChange']>>, ParentType, ContextType>;
+  from?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  hash?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  nonce?: Resolver<ResolversTypes['Int'], ParentType, ContextType>;
+  status?: Resolver<ResolversTypes['TransactionStatus'], ParentType, ContextType>;
+  to?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  transactionStatus?: Resolver<ResolversTypes['TransactionStatus'], ParentType, ContextType>;
+  type?: Resolver<ResolversTypes['TransactionType'], ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type TransactionNotificationResolvers<ContextType = any, ParentType extends ResolversParentTypes['TransactionNotification'] = ResolversParentTypes['TransactionNotification']> = {
+  hash?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  push?: Resolver<Array<ResolversTypes['PushNotification']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type V2PairResolvers<ContextType = any, ParentType extends ResolversParentTypes['V2Pair'] = ResolversParentTypes['V2Pair']> = {
+  address?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  chain?: Resolver<ResolversTypes['Chain'], ParentType, ContextType>;
+  createdAtTimestamp?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  cumulativeVolume?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType, Partial<V2PairCumulativeVolumeArgs>>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  protocolVersion?: Resolver<ResolversTypes['ProtocolVersion'], ParentType, ContextType>;
+  token0?: Resolver<Maybe<ResolversTypes['Token']>, ParentType, ContextType>;
+  token0Supply?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  token1?: Resolver<Maybe<ResolversTypes['Token']>, ParentType, ContextType>;
+  token1Supply?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  totalLiquidity?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  txCount?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type V3PoolResolvers<ContextType = any, ParentType extends ResolversParentTypes['V3Pool'] = ResolversParentTypes['V3Pool']> = {
+  address?: Resolver<ResolversTypes['String'], ParentType, ContextType>;
+  chain?: Resolver<ResolversTypes['Chain'], ParentType, ContextType>;
+  createdAtTimestamp?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  cumulativeVolume?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType, Partial<V3PoolCumulativeVolumeArgs>>;
+  feeTier?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  id?: Resolver<ResolversTypes['ID'], ParentType, ContextType>;
+  protocolVersion?: Resolver<ResolversTypes['ProtocolVersion'], ParentType, ContextType>;
+  token0?: Resolver<Maybe<ResolversTypes['Token']>, ParentType, ContextType>;
+  token0Supply?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  token1?: Resolver<Maybe<ResolversTypes['Token']>, ParentType, ContextType>;
+  token1Supply?: Resolver<Maybe<ResolversTypes['Float']>, ParentType, ContextType>;
+  totalLiquidity?: Resolver<Maybe<ResolversTypes['Amount']>, ParentType, ContextType>;
+  txCount?: Resolver<Maybe<ResolversTypes['Int']>, ParentType, ContextType>;
+  __isTypeOf?: IsTypeOfResolverFn<ParentType, ContextType>;
+};
+
+export type Resolvers<ContextType = any> = {
+  AWSJSON?: GraphQLScalarType;
+  ActivityDetails?: ActivityDetailsResolvers<ContextType>;
+  Amount?: AmountResolvers<ContextType>;
+  AmountChange?: AmountChangeResolvers<ContextType>;
+  ApplicationContract?: ApplicationContractResolvers<ContextType>;
+  AssetActivity?: AssetActivityResolvers<ContextType>;
+  AssetChange?: AssetChangeResolvers<ContextType>;
+  DescriptionTranslations?: DescriptionTranslationsResolvers<ContextType>;
+  Dimensions?: DimensionsResolvers<ContextType>;
+  IAmount?: IAmountResolvers<ContextType>;
+  IContract?: IContractResolvers<ContextType>;
+  Image?: ImageResolvers<ContextType>;
+  Mutation?: MutationResolvers<ContextType>;
+  NftActivity?: NftActivityResolvers<ContextType>;
+  NftActivityConnection?: NftActivityConnectionResolvers<ContextType>;
+  NftActivityEdge?: NftActivityEdgeResolvers<ContextType>;
+  NftApproval?: NftApprovalResolvers<ContextType>;
+  NftApproveForAll?: NftApproveForAllResolvers<ContextType>;
+  NftAsset?: NftAssetResolvers<ContextType>;
+  NftAssetConnection?: NftAssetConnectionResolvers<ContextType>;
+  NftAssetEdge?: NftAssetEdgeResolvers<ContextType>;
+  NftAssetRarity?: NftAssetRarityResolvers<ContextType>;
+  NftAssetTrait?: NftAssetTraitResolvers<ContextType>;
+  NftBalance?: NftBalanceResolvers<ContextType>;
+  NftBalanceConnection?: NftBalanceConnectionResolvers<ContextType>;
+  NftBalanceEdge?: NftBalanceEdgeResolvers<ContextType>;
+  NftCollection?: NftCollectionResolvers<ContextType>;
+  NftCollectionBalance?: NftCollectionBalanceResolvers<ContextType>;
+  NftCollectionBalanceConnection?: NftCollectionBalanceConnectionResolvers<ContextType>;
+  NftCollectionBalanceEdge?: NftCollectionBalanceEdgeResolvers<ContextType>;
+  NftCollectionConnection?: NftCollectionConnectionResolvers<ContextType>;
+  NftCollectionEdge?: NftCollectionEdgeResolvers<ContextType>;
+  NftCollectionMarket?: NftCollectionMarketResolvers<ContextType>;
+  NftCollectionMarketplace?: NftCollectionMarketplaceResolvers<ContextType>;
+  NftCollectionTrait?: NftCollectionTraitResolvers<ContextType>;
+  NftCollectionTraitStats?: NftCollectionTraitStatsResolvers<ContextType>;
+  NftContract?: NftContractResolvers<ContextType>;
+  NftFee?: NftFeeResolvers<ContextType>;
+  NftOrder?: NftOrderResolvers<ContextType>;
+  NftOrderConnection?: NftOrderConnectionResolvers<ContextType>;
+  NftOrderEdge?: NftOrderEdgeResolvers<ContextType>;
+  NftProfile?: NftProfileResolvers<ContextType>;
+  NftRouteResponse?: NftRouteResponseResolvers<ContextType>;
+  NftTrade?: NftTradeResolvers<ContextType>;
+  NftTransfer?: NftTransferResolvers<ContextType>;
+  PageInfo?: PageInfoResolvers<ContextType>;
+  Portfolio?: PortfolioResolvers<ContextType>;
+  PushNotification?: PushNotificationResolvers<ContextType>;
+  Query?: QueryResolvers<ContextType>;
+  Status?: StatusResolvers<ContextType>;
+  Subscription?: SubscriptionResolvers<ContextType>;
+  SwapOrderDetails?: SwapOrderDetailsResolvers<ContextType>;
+  TimestampedAmount?: TimestampedAmountResolvers<ContextType>;
+  Token?: TokenResolvers<ContextType>;
+  TokenAmount?: TokenAmountResolvers<ContextType>;
+  TokenApproval?: TokenApprovalResolvers<ContextType>;
+  TokenBalance?: TokenBalanceResolvers<ContextType>;
+  TokenMarket?: TokenMarketResolvers<ContextType>;
+  TokenProject?: TokenProjectResolvers<ContextType>;
+  TokenProjectMarket?: TokenProjectMarketResolvers<ContextType>;
+  TokenTransfer?: TokenTransferResolvers<ContextType>;
+  Transaction?: TransactionResolvers<ContextType>;
+  TransactionDetails?: TransactionDetailsResolvers<ContextType>;
+  TransactionNotification?: TransactionNotificationResolvers<ContextType>;
+  V2Pair?: V2PairResolvers<ContextType>;
+  V3Pool?: V3PoolResolvers<ContextType>;
+};
+
+export type DirectiveResolvers<ContextType = any> = {
+  aws_api_key?: Aws_Api_KeyDirectiveResolver<any, any, ContextType>;
+  aws_auth?: Aws_AuthDirectiveResolver<any, any, ContextType>;
+  aws_cognito_user_pools?: Aws_Cognito_User_PoolsDirectiveResolver<any, any, ContextType>;
+  aws_iam?: Aws_IamDirectiveResolver<any, any, ContextType>;
+  aws_lambda?: Aws_LambdaDirectiveResolver<any, any, ContextType>;
+  aws_oidc?: Aws_OidcDirectiveResolver<any, any, ContextType>;
+  aws_publish?: Aws_PublishDirectiveResolver<any, any, ContextType>;
+  aws_subscribe?: Aws_SubscribeDirectiveResolver<any, any, ContextType>;
+  defer?: DeferDirectiveResolver<any, any, ContextType>;
+};
diff --git a/packages/wallet/src/data/cache.ts b/packages/wallet/src/data/cache.ts
index b20c51c5cbb..869d999e570 100644
--- a/packages/wallet/src/data/cache.ts
+++ b/packages/wallet/src/data/cache.ts
@@ -1,27 +1,18 @@
-import { InMemoryCache, InMemoryCacheConfig } from '@apollo/client'
+import { InMemoryCache } from '@apollo/client'
 import { Reference, relayStylePagination } from '@apollo/client/utilities'
 
-const injectTimestampForRestQueries = (config: InMemoryCacheConfig = {}): InMemoryCacheConfig => {
-  if (
-    config.typePolicies?.Query?.fields?.data &&
-    'merge' in (config.typePolicies?.Query?.fields?.data ?? {})
-  ) {
-    throw new Error(
-      'Invalid cache config: `data` field already has a `merge` function that conflicts with the injected `merge` function'
-    )
-  }
-
-  return {
-    ...config,
+/**
+ * @returns Apollo#InMemoryCache with custom type policies
+ * NOTE: persistence is managed by consumers
+ */
+export function setupCache(): InMemoryCache {
+  return new InMemoryCache({
     typePolicies: {
-      ...config.typePolicies,
       Query: {
-        ...config.typePolicies?.Query,
         fields: {
-          ...config.typePolicies?.Query?.fields,
           data: {
-            ...config.typePolicies?.Query?.fields?.data,
-            merge(_, incoming): unknown {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            merge(_, incoming): any {
               return {
                 ...incoming,
                 // add a timestamp because there is no cache-ttl in Apollo and in some cases (i.e. routing API quotes) we cannot show stale quotes
@@ -29,22 +20,6 @@ const injectTimestampForRestQueries = (config: InMemoryCacheConfig = {}): InMemo
               }
             },
           },
-        },
-      },
-    },
-  }
-}
-
-export function createNewInMemoryCache(config: InMemoryCacheConfig = {}): InMemoryCache {
-  // eslint-disable-next-line no-restricted-syntax
-  return new InMemoryCache(injectTimestampForRestQueries(config))
-}
-
-export function setupWalletCache(): InMemoryCache {
-  return createNewInMemoryCache({
-    typePolicies: {
-      Query: {
-        fields: {
           // relayStylePagination function unfortunately generates a field policy that ignores args
           // Note: all non-pagination related query args should be added for cache to work properly.
           // ^ This ensures that cache doesnt get overwritten by similar queries with different args (e.g. different filter on NFT Items)
diff --git a/packages/wallet/src/data/links.ts b/packages/wallet/src/data/links.ts
index 5abefefe9fc..33322ea660f 100644
--- a/packages/wallet/src/data/links.ts
+++ b/packages/wallet/src/data/links.ts
@@ -6,13 +6,13 @@ import { config } from 'wallet/src/config'
 import { uniswapUrls } from 'wallet/src/constants/urls'
 import {
   EnsLookupParams,
-  STUB_ONCHAIN_ENS_ENDPOINT,
   getOnChainEnsFetch,
+  STUB_ONCHAIN_ENS_ENDPOINT,
 } from 'wallet/src/features/ens/api'
 import {
   BalanceLookupParams,
-  STUB_ONCHAIN_BALANCES_ENDPOINT,
   getOnChainBalancesFetch,
+  STUB_ONCHAIN_BALANCES_ENDPOINT,
 } from 'wallet/src/features/portfolio/api'
 import { isAndroid, isIOS } from 'wallet/src/utils/platform'
 
diff --git a/packages/wallet/src/data/tradingApi/api.json b/packages/wallet/src/data/tradingApi/api.json
deleted file mode 100644
index 925e9062746..00000000000
--- a/packages/wallet/src/data/tradingApi/api.json
+++ /dev/null
@@ -1,1282 +0,0 @@
-{
-  "openapi": "3.0.0",
-  "servers": [
-    {
-      "description": "Uniswap trading APIs Beta",
-      "url": "https://beta.api.uniswap.org/v2/trade"
-    },
-    {
-      "description": "Uniswap trading APIs",
-      "url": "https://api.uniswap.org/v2/trade"
-    }
-  ],
-  "info": {
-    "version": "1.0.0",
-    "title": "Token Trading",
-    "description": "Uniswap trading APIs for fungible tokens."
-  },
-  "paths": {
-    "/check_approval": {
-      "post": {
-        "tags": [
-          "Approval"
-        ],
-        "summary": "Check if token approval is required",
-        "description": "Checks if the swapper has the required approval. If the swapper does not have the required approval, then the response will include the transaction to approve the token. If the swapper has the required approval, then the response will be empty. If the parameter `includeGasInfo` is set to `true`, then the response will include the gas fee for the approval transaction.",
-        "operationId": "check_approval",
-        "security": [
-          {
-            "apiKey": []
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/ApprovalRequest"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/200ApprovalSuccess"
-          }
-        }
-      }
-    },
-    "/quote": {
-      "post": {
-        "tags": [
-          "Quote"
-        ],
-        "summary": "Get a quote",
-        "description": "Get a quote according to the provided configuration. Optionally adds a fee to the quote according to the API key being used. The fee is **ALWAYS** taken from the output token. If there is a fee and the trade is `EXACT_INPUT`, then the output amount will **NOT** include the fee subtraction. For `EXACT_INPUT` swaps, use `portionBips` to calculate the fee from the quoted amount. If there is a fee and the trade is `EXACT_OUTPUT`, then the input amount will **NOT** include the fee addition to account for the fee. For `EXACT_OUTPUT` swaps, use `portionAmount` to get the fee.",
-        "operationId": "aggregator_quote",
-        "security": [
-          {
-            "apiKey": []
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/QuoteRequest"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/200QuoteSuccess"
-          }
-        }
-      }
-    },
-    "/order": {
-      "post": {
-        "tags": [
-          "Order"
-        ],
-        "summary": "Create a gasless order",
-        "description": "Submits a new gasless encoded order. The order will be validated and if valid, will be submitted to the filler network. The network will try to fill the order at the quoted `startAmount`, and if not, the amount will start decaying until the `endAmount` is reached. While the order is within `decayEndTime`, the `orderStatus` is `open`. If the order does not get filled after the `decayEndTime` has passed, that is reflected in the `expired` `orderStatus`. then  The order will be filled at the best price possible. Once the order is filled, `orderStatus` becomes `filled`.",
-        "operationId": "post_dutch_order",
-        "security": [
-          {
-            "apiKey": []
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/OrderRequest"
-              }
-            }
-          }
-        },
-        "responses": {
-          "201": {
-            "$ref": "#/components/responses/201OrderSuccess"
-          },
-          "400": {
-            "$ref": "#/components/responses/400InvalidOrder"
-          }
-        }
-      }
-    },
-    "/orders": {
-      "get": {
-        "tags": [
-          "Order"
-        ],
-        "summary": "Get gasless orders",
-        "description": "Retrieve gasless orders filtered by query param(s). Some fields on the order can be used as query param.",
-        "operationId": "get_dutch_order",
-        "security": [
-          {
-            "apiKey": []
-          }
-        ],
-        "parameters": [
-          {
-            "$ref": "#/components/parameters/orderIdParam"
-          },
-          {
-            "$ref": "#/components/parameters/limitParam"
-          },
-          {
-            "$ref": "#/components/parameters/orderStatusParam"
-          },
-          {
-            "$ref": "#/components/parameters/swapperParam"
-          },
-          {
-            "$ref": "#/components/parameters/sortKeyParam"
-          },
-          {
-            "$ref": "#/components/parameters/sortParam"
-          },
-          {
-            "$ref": "#/components/parameters/fillerParam"
-          },
-          {
-            "$ref": "#/components/parameters/cursorParam"
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/200OrdersSuccess"
-          },
-          "404": {
-            "$ref": "#/components/responses/404OrderNotFound"
-          }
-        }
-      }
-    },
-    "/swap": {
-      "post": {
-        "tags": [
-          "Swap"
-        ],
-        "summary": "Create swap calldata",
-        "description": "Create the calldata for a swap transaction against the Uniswap Protocols. If the `quote` parameter includes the fee parameters, then the calldata will include the fee disbursement. The gas estimates will be **more precise** when the the response calldata would be valid if submitted on-chain. ",
-        "operationId": "create_swap_transaction",
-        "security": [
-          {
-            "apiKey": []
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/CreateSwapRequest"
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/200CreateSwapSuccess"
-          }
-        }
-      }
-    },
-    "/swap/{txHash}": {
-      "get": {
-        "tags": [
-          "Swap"
-        ],
-        "summary": "Get swap status",
-        "description": "Get the status of a swap transaction.",
-        "operationId": "get_swap_transaction",
-        "security": [
-          {
-            "apiKey": []
-          }
-        ],
-        "parameters": [
-          {
-            "$ref": "#/components/parameters/transactionHashParam"
-          }
-        ],
-        "responses": {
-          "200": {
-            "$ref": "#/components/responses/200GetSwapSuccess"
-          },
-          "404": {
-            "$ref": "#/components/responses/404SwapNotFound"
-          }
-        }
-      }
-    }
-  },
-  "components": {
-    "responses": {
-      "404OrderNotFound": {
-        "description": "The order was not found."
-      },
-      "404SwapNotFound": {
-        "description": "The order was not found."
-      },
-      "400InvalidOrder": {
-        "description": "Invalid Order."
-      },
-      "200OrdersSuccess": {
-        "description": "Order submitted.",
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "#/components/schemas/GetOrdersResponse"
-            }
-          }
-        }
-      },
-      "201OrderSuccess": {
-        "description": "Encoded order submitted.",
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "#/components/schemas/OrderResponse"
-            }
-          }
-        }
-      },
-      "200QuoteSuccess": {
-        "description": "Quote request successful.",
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "#/components/schemas/QuoteResponse"
-            }
-          }
-        }
-      },
-      "200ApprovalSuccess": {
-        "description": "Check approval successful.",
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "#/components/schemas/ApprovalResponse"
-            }
-          }
-        }
-      },
-      "200CreateSwapSuccess": {
-        "description": "Create swap successful.",
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "#/components/schemas/CreateSwapResponse"
-            }
-          }
-        }
-      },
-      "200GetSwapSuccess": {
-        "description": "Get swap successful.",
-        "content": {
-          "application/json": {
-            "schema": {
-              "$ref": "#/components/schemas/GetSwapResponse"
-            }
-          }
-        }
-      }
-    },
-    "schemas": {
-      "NullablePermit": {
-        "allOf": [
-          {
-            "$ref": "#/components/schemas/Permit"
-          },
-          {
-            "type": "object",
-            "nullable": true
-          }
-        ]
-      },
-      "TokenAmount": {
-        "type": "string"
-      },
-      "SwapStatus": {
-        "type": "string",
-        "enum": [
-          "pending",
-          "success",
-          "error"
-        ]
-      },
-      "GetSwapResponse": {
-        "type": "object",
-        "properties": {
-          "requestId": {
-            "$ref": "#/components/schemas/RequestId"
-          },
-          "status": {
-            "$ref": "#/components/schemas/SwapStatus"
-          }
-        }
-      },
-      "CreateSwapRequest": {
-        "type": "object",
-        "description": "The parameters **signature** and **permitData** should only be included if *permitData* was returned from **/quote**.",
-        "properties": {
-          "quote": {
-            "$ref": "#/components/schemas/ClassicQuote"
-          },
-          "signature": {
-            "type": "string",
-            "description": "The signed permit."
-          },
-          "includeGasInfo": {
-            "type": "boolean",
-            "default": false
-          },
-          "permitData": {
-            "allOf": [
-              {
-                "$ref": "#/components/schemas/Permit"
-              }
-            ]
-          }
-        },
-        "required": [
-          "quote"
-        ]
-      },
-      "Address": {
-        "type": "string",
-        "pattern": "^(0x)?[0-9a-fA-F]{40}$"
-      },
-      "CreateSwapResponse": {
-        "type": "object",
-        "properties": {
-          "requestId": {
-            "$ref": "#/components/schemas/RequestId"
-          },
-          "swap": {
-            "$ref": "#/components/schemas/TransactionRequest"
-          },
-          "gasFee": {
-            "type": "string"
-          },
-          "txFailureReasons": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/TransactionFailureReason"
-            }
-          }
-        }
-      },
-      "QuoteResponse": {
-        "type": "object",
-        "properties": {
-          "requestId": {
-            "$ref": "#/components/schemas/RequestId"
-          },
-          "quote": {
-            "$ref": "#/components/schemas/Quote"
-          },
-          "routing": {
-            "$ref": "#/components/schemas/Routing"
-          },
-          "permitData": {
-            "$ref": "#/components/schemas/NullablePermit"
-          }
-        },
-        "required": [
-          "routing",
-          "quote",
-          "permitData"
-        ]
-      },
-      "QuoteRequest": {
-        "type": "object",
-        "properties": {
-          "type": {
-            "$ref": "#/components/schemas/TradeType"
-          },
-          "amount": {
-            "type": "string"
-          },
-          "tokenInChainId": {
-            "$ref": "#/components/schemas/ChainId"
-          },
-          "tokenOutChainId": {
-            "$ref": "#/components/schemas/ChainId"
-          },
-          "tokenIn": {
-            "type": "string"
-          },
-          "tokenOut": {
-            "type": "string"
-          },
-          "swapper": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "slippageTolerance": {
-            "description": "The slippage tolerance is a percentage represented as a percentage. For **Classic** swaps, the slippage tolerance is the maximum amount the price can change between the time the transaction is submitted and the time it is executed. For **DutchLimit** swaps, the slippage tolerance determines how much the `endAmount` can decay from the `startAmount`.",
-            "type": "number"
-          },
-          "routingPreference": {
-            "$ref": "#/components/schemas/RoutingPreference"
-          }
-        },
-        "required": [
-          "type",
-          "amount",
-          "tokenInChainId",
-          "tokenOutChainId",
-          "tokenIn",
-          "tokenOut",
-          "swapper"
-        ]
-      },
-      "GetOrdersResponse": {
-        "type": "object",
-        "properties": {
-          "requestId": {
-            "$ref": "#/components/schemas/RequestId"
-          },
-          "orders": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/OrderEntity"
-            }
-          },
-          "cursor": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "order"
-        ]
-      },
-      "OrderResponse": {
-        "type": "object",
-        "properties": {
-          "requestId": {
-            "$ref": "#/components/schemas/RequestId"
-          },
-          "orderId": {
-            "type": "string"
-          },
-          "orderStatus": {
-            "$ref": "#/components/schemas/OrderStatus"
-          }
-        },
-        "required": [
-          "requestId",
-          "orderId",
-          "orderStatus"
-        ]
-      },
-      "OrderRequest": {
-        "type": "object",
-        "properties": {
-          "signature": {
-            "type": "string",
-            "description": "The signed permit."
-          },
-          "quote": {
-            "$ref": "#/components/schemas/DutchQuote"
-          }
-        },
-        "required": [
-          "signature",
-          "chainId",
-          "quote"
-        ]
-      },
-      "ChainId": {
-        "type": "number",
-        "enum": [
-          1,
-          10,
-          56,
-          137,
-          8453,
-          42161
-        ],
-        "default": 1
-      },
-      "Chain": {
-        "type": "string",
-        "enum": [
-          "ETHEREUM"
-        ],
-        "default": "ETHEREUM"
-      },
-      "OrderInput": {
-        "type": "object",
-        "properties": {
-          "token": {
-            "type": "string"
-          },
-          "startAmount": {
-            "type": "string"
-          },
-          "endAmount": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "token"
-        ]
-      },
-      "OrderOutput": {
-        "type": "object",
-        "properties": {
-          "token": {
-            "type": "string"
-          },
-          "startAmount": {
-            "type": "string"
-          },
-          "endAmount": {
-            "type": "string"
-          },
-          "isFeeOutput": {
-            "type": "boolean"
-          },
-          "recipient": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "token"
-        ]
-      },
-      "SettledAmount": {
-        "type": "object",
-        "properties": {
-          "tokenOut": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "amountOut": {
-            "type": "string"
-          },
-          "tokenIn": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "amountIn": {
-            "type": "string"
-          }
-        }
-      },
-      "OrderType": {
-        "type": "string",
-        "enum": [
-          "DutchLimit"
-        ]
-      },
-      "OrderEntity": {
-        "type": "object",
-        "properties": {
-          "type": {
-            "$ref": "#/components/schemas/OrderType"
-          },
-          "signature": {
-            "type": "string"
-          },
-          "nonce": {
-            "type": "string"
-          },
-          "orderId": {
-            "type": "string"
-          },
-          "orderStatus": {
-            "$ref": "#/components/schemas/OrderStatus"
-          },
-          "chainId": {
-            "$ref": "#/components/schemas/ChainId"
-          },
-          "swapper": {
-            "type": "string"
-          },
-          "reactor": {
-            "type": "string"
-          },
-          "startTime": {
-            "type": "number"
-          },
-          "endTime": {
-            "type": "number"
-          },
-          "deadline": {
-            "type": "number"
-          },
-          "filler": {
-            "type": "string"
-          },
-          "txHash": {
-            "type": "string"
-          },
-          "input": {
-            "$ref": "#/components/schemas/OrderInput"
-          },
-          "outputs": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/OrderOutput"
-            }
-          },
-          "settledAmounts": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/SettledAmount"
-            }
-          }
-        },
-        "required": [
-          "encodedOrder",
-          "signature",
-          "nonce",
-          "orderId",
-          "orderStatus",
-          "chainId",
-          "swapper",
-          "type"
-        ]
-      },
-      "SortKey": {
-        "type": "string",
-        "enum": [
-          "createdAt"
-        ]
-      },
-      "OrderId": {
-        "type": "string"
-      },
-      "OrderStatus": {
-        "type": "string",
-        "enum": [
-          "open",
-          "expired",
-          "error",
-          "cancelled",
-          "filled",
-          "unverified",
-          "insufficient-funds"
-        ]
-      },
-      "Permit": {
-        "type": "object",
-        "properties": {
-          "domain": {
-            "type": "object"
-          },
-          "values": {
-            "type": "object"
-          },
-          "types": {
-            "type": "object"
-          }
-        }
-      },
-      "DutchInput": {
-        "type": "object",
-        "properties": {
-          "startAmount": {
-            "type": "string"
-          },
-          "endAmount": {
-            "type": "string"
-          },
-          "token": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "startAmount",
-          "endAmount",
-          "type"
-        ]
-      },
-      "DutchOutput": {
-        "type": "object",
-        "properties": {
-          "startAmount": {
-            "type": "string"
-          },
-          "endAmount": {
-            "type": "string"
-          },
-          "token": {
-            "type": "string"
-          },
-          "recipient": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "startAmount",
-          "endAmount",
-          "token",
-          "recipient"
-        ]
-      },
-      "DutchOrderInfo": {
-        "type": "object",
-        "properties": {
-          "chainId": {
-            "$ref": "#/components/schemas/ChainId"
-          },
-          "nonce": {
-            "type": "string"
-          },
-          "reactor": {
-            "type": "string"
-          },
-          "swapper": {
-            "type": "string"
-          },
-          "deadline": {
-            "type": "number"
-          },
-          "additionalValidationContract": {
-            "type": "string"
-          },
-          "additionalValidationData": {
-            "type": "string"
-          },
-          "decayStartTime": {
-            "type": "number"
-          },
-          "decayEndTime": {
-            "type": "number"
-          },
-          "exclusiveFiller": {
-            "type": "string"
-          },
-          "exclusivityOverrideBps": {
-            "type": "string"
-          },
-          "input": {
-            "$ref": "#/components/schemas/DutchInput"
-          },
-          "outputs": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/DutchOutput"
-            }
-          }
-        },
-        "required": [
-          "chainId",
-          "nonce",
-          "reactor",
-          "swapper",
-          "deadline",
-          "validationContract",
-          "validationData",
-          "startTime",
-          "endTime",
-          "exclusiveFiller",
-          "exclusivityOverrideBps",
-          "input",
-          "outputs"
-        ]
-      },
-      "DutchQuote": {
-        "type": "object",
-        "properties": {
-          "encodedOrder": {
-            "type": "string"
-          },
-          "orderId": {
-            "type": "string"
-          },
-          "orderInfo": {
-            "$ref": "#/components/schemas/DutchOrderInfo"
-          },
-          "portionBips": {
-            "type": "number"
-          },
-          "portionAmount": {
-            "type": "string"
-          },
-          "portionRecipient": {
-            "$ref": "#/components/schemas/Address"
-          }
-        },
-        "required": [
-          "encodedOrder",
-          "orderInfo",
-          "orderId"
-        ]
-      },
-      "TradeType": {
-        "type": "string",
-        "enum": [
-          "EXACT_INPUT",
-          "EXACT_OUTPUT"
-        ]
-      },
-      "Routing": {
-        "type": "string",
-        "enum": [
-          "DUTCH_LIMIT",
-          "CLASSIC"
-        ]
-      },
-      "Quote": {
-        "oneOf": [
-          {
-            "$ref": "#/components/schemas/DutchQuote"
-          },
-          {
-            "$ref": "#/components/schemas/ClassicQuote"
-          }
-        ]
-      },
-      "ApprovalRequest": {
-        "type": "object",
-        "properties": {
-          "walletAddress": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "token": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "amount": {
-            "$ref": "#/components/schemas/TokenAmount"
-          },
-          "chainId": {
-            "$ref": "#/components/schemas/ChainId"
-          },
-          "includeGasInfo": {
-            "type": "boolean",
-            "default": false
-          }
-        },
-        "required": [
-          "walletAddress",
-          "token",
-          "amount",
-          "chainId"
-        ]
-      },
-      "ApprovalResponse": {
-        "type": "object",
-        "properties": {
-          "requestId": {
-            "$ref": "#/components/schemas/RequestId"
-          },
-          "approval": {
-            "$ref": "#/components/schemas/TransactionRequest"
-          },
-          "gasFee": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "requestId",
-          "approval"
-        ]
-      },
-      "ClassicQuote": {
-        "type": "object",
-        "properties": {
-          "input": {
-            "$ref": "#/components/schemas/ClassicInput"
-          },
-          "output": {
-            "$ref": "#/components/schemas/ClassicOutput"
-          },
-          "swapper": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "chainId": {
-            "$ref": "#/components/schemas/ChainId"
-          },
-          "slippage": {
-            "type": "number"
-          },
-          "tradeType": {
-            "$ref": "#/components/schemas/TradeType"
-          },
-          "gasFee": {
-            "type": "string",
-            "description": "The gas fee in terms of wei."
-          },
-          "gasFeeUSD": {
-            "type": "string",
-            "description": "The gas fee in terms of USD."
-          },
-          "gasFeeQuote": {
-            "type": "string",
-            "description": "The gas fee in terms of the quoted currency."
-          },
-          "route": {
-            "type": "array",
-            "items": {
-              "type": "array",
-              "items": {
-                "oneOf": [
-                  {
-                    "$ref": "#/components/schemas/V3PoolInRoute"
-                  },
-                  {
-                    "$ref": "#/components/schemas/V2PoolInRoute"
-                  }
-                ]
-              }
-            }
-          },
-          "portionBips": {
-            "type": "number",
-            "description": "The portion of the swap that will be taken as a fee. The fee will be taken from the output token."
-          },
-          "portionAmount": {
-            "type": "string",
-            "description": "The amount of the swap that will be taken as a fee. The fee will be taken from the output token."
-          },
-          "portionRecipient": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "routeString": {
-            "type": "string",
-            "description": "The route in string format."
-          },
-          "quoteId": {
-            "type": "string",
-            "description": "The quote id. Used for analytics purposes."
-          },
-          "gasUseEstimate": {
-            "type": "string",
-            "description": "The estimated gas use."
-          },
-          "blockNumber": {
-            "type": "number",
-            "description": "The current block number."
-          }
-        }
-      },
-      "TokenInRoute": {
-        "type": "object",
-        "properties": {
-          "address": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "chainId": {
-            "$ref": "#/components/schemas/ChainId"
-          },
-          "symbol": {
-            "type": "string"
-          },
-          "decimals": {
-            "type": "string"
-          },
-          "buyFeeBps": {
-            "type": "string"
-          },
-          "sellFeeBps": {
-            "type": "string"
-          }
-        }
-      },
-      "V2Reserve": {
-        "type": "object",
-        "properties": {
-          "token": {
-            "$ref": "#/components/schemas/TokenInRoute"
-          },
-          "quotient": {
-            "type": "string"
-          }
-        }
-      },
-      "V2PoolInRoute": {
-        "type": "object",
-        "properties": {
-          "type": {
-            "type": "string",
-            "default": "v2-pool"
-          },
-          "address": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "tokenIn": {
-            "$ref": "#/components/schemas/TokenInRoute"
-          },
-          "tokenOut": {
-            "$ref": "#/components/schemas/TokenInRoute"
-          },
-          "reserve0": {
-            "$ref": "#/components/schemas/V2Reserve"
-          },
-          "reserve1": {
-            "$ref": "#/components/schemas/V2Reserve"
-          },
-          "amountIn": {
-            "type": "string"
-          },
-          "amountOut": {
-            "type": "string"
-          }
-        }
-      },
-      "V3PoolInRoute": {
-        "type": "object",
-        "properties": {
-          "type": {
-            "type": "string",
-            "default": "v3-pool"
-          },
-          "address": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "tokenIn": {
-            "$ref": "#/components/schemas/TokenInRoute"
-          },
-          "tokenOut": {
-            "$ref": "#/components/schemas/TokenInRoute"
-          },
-          "sqrtRatioX96": {
-            "type": "string"
-          },
-          "liquidity": {
-            "type": "string"
-          },
-          "tickCurrent": {
-            "type": "string"
-          },
-          "fee": {
-            "type": "string"
-          },
-          "amountIn": {
-            "type": "string"
-          },
-          "amountOut": {
-            "type": "string"
-          }
-        }
-      },
-      "TransactionHash": {
-        "type": "string",
-        "pattern": "^(0x)?[0-9a-fA-F]{64}$"
-      },
-      "ClassicInput": {
-        "type": "object",
-        "properties": {
-          "token": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "amount": {
-            "type": "string"
-          }
-        }
-      },
-      "ClassicOutput": {
-        "type": "object",
-        "properties": {
-          "token": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "amount": {
-            "type": "string"
-          },
-          "recipient": {
-            "$ref": "#/components/schemas/Address"
-          }
-        }
-      },
-      "RequestId": {
-        "type": "string"
-      },
-      "RoutingPreference": {
-        "type": "string",
-        "description": "The routing preference determines which protocol to use for the swap. If the routing preference is `DUTCH_LIMIT`, then the swap will be routed through the Dutch Auction Protocol. If the routing preference is `CLASSIC`, then the swap will be routed through the Classic Protocol. If the routing preference is `BEST_PRICE`, then the swap will be routed through the protocol that provides the best price.",
-        "enum": [
-          "CLASSIC",
-          "UNISWAPX",
-          "BEST_PRICE"
-        ],
-        "default": "BEST_PRICE"
-      },
-      "TransactionRequest": {
-        "type": "object",
-        "properties": {
-          "to": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "from": {
-            "$ref": "#/components/schemas/Address"
-          },
-          "data": {
-            "type": "string",
-            "description": "The calldata for the transaction."
-          },
-          "value": {
-            "type": "string",
-            "description": "The value of the transaction in terms of wei in hex format."
-          },
-          "gasLimit": {
-            "type": "string"
-          },
-          "chainId": {
-            "type": "integer"
-          },
-          "maxFeePerGas": {
-            "type": "string"
-          },
-          "maxPriorityFeePerGas": {
-            "type": "string"
-          },
-          "gasPrice": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "to",
-          "from",
-          "data",
-          "value",
-          "chainId"
-        ]
-      },
-      "TransactionFailureReason": {
-        "type": "string",
-        "enum": [
-          "SIMULATION_ERROR"
-        ]
-      }
-    },
-    "parameters": {
-      "addressParam": {
-        "name": "address",
-        "in": "path",
-        "schema": {
-          "$ref": "#/components/schemas/Address"
-        },
-        "required": true
-      },
-      "tokenIdParam": {
-        "name": "tokenId",
-        "in": "path",
-        "schema": {
-          "type": "string"
-        },
-        "required": true
-      },
-      "cursorParam": {
-        "name": "cursor",
-        "in": "query",
-        "schema": {
-          "type": "string"
-        },
-        "required": false
-      },
-      "limitParam": {
-        "name": "limit",
-        "in": "query",
-        "schema": {
-          "type": "number"
-        },
-        "required": false
-      },
-      "chainParam": {
-        "name": "chain",
-        "in": "query",
-        "schema": {
-          "$ref": "#/components/schemas/Chain"
-        },
-        "required": false
-      },
-      "addressPathParam": {
-        "name": "address",
-        "in": "query",
-        "schema": {
-          "$ref": "#/components/schemas/Chain"
-        },
-        "required": false
-      },
-      "orderStatusParam": {
-        "name": "orderStatus",
-        "in": "query",
-        "description": "Filter by order status.",
-        "required": false,
-        "schema": {
-          "$ref": "#/components/schemas/OrderStatus"
-        }
-      },
-      "orderIdParam": {
-        "name": "orderId",
-        "in": "query",
-        "required": false,
-        "schema": {
-          "$ref": "#/components/schemas/OrderId"
-        }
-      },
-      "swapperParam": {
-        "name": "swapper",
-        "in": "query",
-        "description": "Filter by swapper address.",
-        "required": false,
-        "schema": {
-          "$ref": "#/components/schemas/Address"
-        }
-      },
-      "fillerParam": {
-        "name": "filler",
-        "in": "query",
-        "description": "Filter by filler address.",
-        "required": false,
-        "schema": {
-          "$ref": "#/components/schemas/Address"
-        }
-      },
-      "sortKeyParam": {
-        "name": "sortKey",
-        "in": "query",
-        "description": "Order the query results by the sort key.",
-        "required": false,
-        "schema": {
-          "$ref": "#/components/schemas/SortKey"
-        }
-      },
-      "sortParam": {
-        "name": "sort",
-        "in": "query",
-        "description": "Sort query. For example: `sort=gt(UNIX_TIMESTAMP)`, `sort=between(1675872827, 1675872930)`, or `lt(1675872930)`.",
-        "required": false,
-        "schema": {
-          "type": "string"
-        }
-      },
-      "descParam": {
-        "description": "Sort query results by sortKey in descending order.",
-        "name": "desc",
-        "in": "query",
-        "required": false,
-        "schema": {
-          "type": "string"
-        }
-      },
-      "transactionHashParam": {
-        "description": "The transaction has.",
-        "name": "txHash",
-        "in": "path",
-        "required": true,
-        "schema": {
-          "$ref": "#/components/schemas/TransactionHash"
-        }
-      }
-    },
-    "securitySchemes": {
-      "apiKey": {
-        "type": "apiKey",
-        "in": "header",
-        "name": "x-api-key"
-      }
-    }
-  },
-  "security": [
-    {
-      "apiKey": []
-    }
-  ]
-}
diff --git a/packages/wallet/src/features/activity/hooks.ts b/packages/wallet/src/features/activity/hooks.ts
index 042f7441d2c..12aab2907d1 100644
--- a/packages/wallet/src/features/activity/hooks.ts
+++ b/packages/wallet/src/features/activity/hooks.ts
@@ -1,11 +1,11 @@
 import { ApolloError, NetworkStatus } from '@apollo/client'
 import { useCallback, useMemo } from 'react'
 import { PollingInterval } from 'wallet/src/constants/misc'
+import { isNonPollingRequestInFlight } from 'wallet/src/data/utils'
 import {
   useFeedTransactionListQuery,
   useTransactionListQuery,
 } from 'wallet/src/data/__generated__/types-and-hooks'
-import { isNonPollingRequestInFlight } from 'wallet/src/data/utils'
 import { usePersistedError } from 'wallet/src/features/dataApi/utils'
 import { useLocalizedDayjs } from 'wallet/src/features/language/localizedDayjs'
 import {
@@ -14,7 +14,7 @@ import {
   parseDataResponseToTransactionDetails,
 } from 'wallet/src/features/transactions/history/utils'
 import { TransactionDetails } from 'wallet/src/features/transactions/types'
-import { LoadingItem, SectionHeader, isLoadingItem, isSectionHeader } from './utils'
+import { isLoadingItem, isSectionHeader, LoadingItem, SectionHeader } from './utils'
 
 const LOADING_ITEM = (index: number): LoadingItem => ({ itemType: 'LOADING', id: index })
 const LOADING_DATA = [LOADING_ITEM(1), LOADING_ITEM(2), LOADING_ITEM(3), LOADING_ITEM(4)]
diff --git a/packages/wallet/src/features/appearance/hooks.tsx b/packages/wallet/src/features/appearance/hooks.tsx
index 1dcfa09de3e..3fd5d970cbc 100644
--- a/packages/wallet/src/features/appearance/hooks.tsx
+++ b/packages/wallet/src/features/appearance/hooks.tsx
@@ -17,3 +17,8 @@ export function useSelectedColorScheme(): 'light' | 'dark' {
   const systemTheme = isDarkMode ? 'dark' : 'light'
   return systemTheme
 }
+
+export function useIsDarkMode(): boolean {
+  const selectedColorScheme = useSelectedColorScheme()
+  return selectedColorScheme === 'dark'
+}
diff --git a/packages/wallet/src/features/auth/types.ts b/packages/wallet/src/features/auth/types.ts
index 2dba010b526..abf395a6192 100644
--- a/packages/wallet/src/features/auth/types.ts
+++ b/packages/wallet/src/features/auth/types.ts
@@ -19,8 +19,3 @@ export interface UnlockParams extends AuthBaseParams {
 export interface LockParams extends AuthBaseParams {
   type: AuthActionType.Lock
 }
-
-export type AuthTrigger = (args: {
-  successCallback: () => void
-  failureCallback: () => void
-}) => Promise<void>
diff --git a/packages/wallet/src/features/behaviorHistory/selectors.ts b/packages/wallet/src/features/behaviorHistory/selectors.ts
deleted file mode 100644
index d2b3326bf8e..00000000000
--- a/packages/wallet/src/features/behaviorHistory/selectors.ts
+++ /dev/null
@@ -1,7 +0,0 @@
-import { SharedState } from 'wallet/src/state/reducer'
-
-export const selectHasViewedReviewScreen = (state: SharedState): boolean =>
-  state.behaviorHistory.hasViewedReviewScreen
-
-export const selectHasSubmittedHoldToSwap = (state: SharedState): boolean =>
-  state.behaviorHistory.hasSubmittedHoldToSwap
diff --git a/packages/wallet/src/features/dataApi/balances.test.ts b/packages/wallet/src/features/dataApi/balances.test.ts
deleted file mode 100644
index ed35bac378c..00000000000
--- a/packages/wallet/src/features/dataApi/balances.test.ts
+++ /dev/null
@@ -1,623 +0,0 @@
-/* eslint-disable max-lines */
-import { ApolloError, NetworkStatus } from '@apollo/client'
-import {
-  Chain,
-  PortfolioBalanceDocument,
-  Portfolio as PortfolioType,
-  Resolvers,
-} from 'wallet/src/data/__generated__/types-and-hooks'
-import { setupWalletCache } from 'wallet/src/data/cache'
-import { PortfolioBalance as PortfolioBalanceType } from 'wallet/src/features/dataApi/types'
-import { FavoritesState, initialFavoritesState } from 'wallet/src/features/favorites/slice'
-import { WalletState, initialWalletState } from 'wallet/src/features/wallet/slice'
-import {
-  PortfolioBalance,
-  PortfolioBalanceWithoutUSD,
-  PortfolioBalancesWithUSD,
-  SAMPLE_CURRENCY_ID_1,
-  SAMPLE_CURRENCY_ID_2,
-  SAMPLE_SEED_ADDRESS_1,
-  SAMPLE_SEED_ADDRESS_2,
-} from 'wallet/src/test/fixtures'
-import { Portfolio, PortfolioBalancesById, Portfolios } from 'wallet/src/test/gqlFixtures'
-import { act, renderHook, waitFor } from 'wallet/src/test/test-utils'
-import {
-  sortPortfolioBalances,
-  useHighestBalanceNativeCurrencyId,
-  usePortfolioBalances,
-  usePortfolioCacheUpdater,
-  usePortfolioTotalValue,
-  usePortfolioValueModifiers,
-  useSortedPortfolioBalances,
-  useTokenBalancesGroupedByVisibility,
-} from './balances'
-
-const currencyId1 = '1-0x6b175474e89094c44da98b954eedeac495271d0f'
-const currencyId2 = '1-0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee'
-
-const BalancesById = {
-  [currencyId1]: PortfolioBalancesById[currencyId1],
-  [currencyId2]: PortfolioBalancesById[currencyId2],
-}
-
-const portfolioResolvers: Resolvers = {
-  Query: {
-    portfolios: () => [Portfolio as PortfolioType],
-  },
-}
-
-describe(usePortfolioValueModifiers, () => {
-  const sharedModifier = {
-    tokenIncludeOverrides: [],
-    tokenExcludeOverrides: [],
-    includeSmallBalances: false,
-    includeSpamTokens: false,
-  }
-
-  const mockWalletState = (overrideSettings?: Partial<WalletState['settings']>): WalletState => ({
-    ...initialWalletState,
-    settings: {
-      ...initialWalletState.settings,
-      ...overrideSettings,
-    },
-  })
-
-  const mockFavoritesState = (
-    overrideTokensVisibility?: FavoritesState['tokensVisibility']
-  ): FavoritesState => ({
-    ...initialFavoritesState,
-    tokensVisibility: {
-      ...initialFavoritesState.tokensVisibility,
-      ...overrideTokensVisibility,
-    },
-  })
-
-  it('returns undefined if no address is passed', () => {
-    const { result } = renderHook(() => usePortfolioValueModifiers())
-
-    expect(result.current).toEqual(undefined)
-  })
-
-  it('returns a single modifier if a single address is passed', () => {
-    const { result } = renderHook(() => usePortfolioValueModifiers(SAMPLE_SEED_ADDRESS_1))
-
-    expect(result.current).toEqual([{ ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_1 }])
-  })
-
-  it('returns multiple modifiers if multiple addresses are passed', () => {
-    const { result } = renderHook(() =>
-      usePortfolioValueModifiers([SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2])
-    )
-
-    expect(result.current).toEqual([
-      { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_1 },
-      { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_2 },
-    ])
-  })
-
-  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 }) } }
-      )
-
-      expect(result.current).toEqual([
-        { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_1, includeSmallBalances: true },
-        { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_2, includeSmallBalances: true },
-      ])
-    })
-
-    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 }) } }
-      )
-
-      expect(result.current).toEqual([
-        { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_1, includeSmallBalances: false },
-        { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_2, includeSmallBalances: false },
-      ])
-    })
-  })
-
-  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 }) } }
-      )
-
-      expect(result.current).toEqual([
-        { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_1, includeSpamTokens: true },
-        { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_2, includeSpamTokens: true },
-      ])
-    })
-
-    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 }) } }
-      )
-
-      expect(result.current).toEqual([
-        { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_1, includeSpamTokens: false },
-        { ...sharedModifier, ownerAddress: SAMPLE_SEED_ADDRESS_2, includeSpamTokens: false },
-      ])
-    })
-  })
-
-  describe('token overrides', () => {
-    it('does not include token overrides in the result if tokensVisibility does not contain addresses visibility settings', () => {
-      const { result } = renderHook(() => usePortfolioValueModifiers(SAMPLE_SEED_ADDRESS_1), {
-        preloadedState: { favorites: mockFavoritesState() },
-      })
-
-      expect(result.current).toEqual([
-        {
-          ...sharedModifier,
-          ownerAddress: SAMPLE_SEED_ADDRESS_1,
-          tokenIncludeOverrides: [],
-          tokenExcludeOverrides: [],
-        },
-      ])
-    })
-
-    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: {
-            favorites: mockFavoritesState({
-              [SAMPLE_SEED_ADDRESS_1]: {
-                [SAMPLE_CURRENCY_ID_1]: { isVisible: false },
-                [SAMPLE_CURRENCY_ID_2]: { isVisible: true },
-              },
-              [SAMPLE_SEED_ADDRESS_2]: {
-                [SAMPLE_CURRENCY_ID_1]: { isVisible: true },
-              },
-            }),
-          },
-        }
-      )
-
-      expect(result.current).toEqual([
-        {
-          ...sharedModifier,
-          ownerAddress: SAMPLE_SEED_ADDRESS_1,
-          tokenIncludeOverrides: [
-            {
-              chain: Chain.Ethereum,
-              address: SAMPLE_CURRENCY_ID_2.replace('1-', '').toLocaleLowerCase(),
-            },
-          ],
-          tokenExcludeOverrides: [
-            {
-              chain: Chain.Ethereum,
-              address: SAMPLE_CURRENCY_ID_1.replace('1-', '').toLocaleLowerCase(),
-            },
-          ],
-        },
-        {
-          ...sharedModifier,
-          ownerAddress: SAMPLE_SEED_ADDRESS_2,
-          tokenIncludeOverrides: [
-            {
-              chain: Chain.Ethereum,
-              address: SAMPLE_CURRENCY_ID_1.replace('1-', '').toLocaleLowerCase(),
-            },
-          ],
-          tokenExcludeOverrides: [],
-        },
-      ])
-    })
-  })
-})
-
-describe(usePortfolioBalances, () => {
-  it('returns empty results if no address was specified', () => {
-    const { result } = renderHook(() => usePortfolioBalances({}))
-
-    expect(result.current).toEqual({
-      data: undefined,
-      loading: false,
-      networkStatus: NetworkStatus.ready,
-      refetch: expect.any(Function),
-      error: undefined,
-    })
-  })
-
-  it('returns loading set to true when data is being fetched', async () => {
-    const { result } = renderHook(() => usePortfolioBalances({ address: SAMPLE_SEED_ADDRESS_1 }), {
-      resolvers: portfolioResolvers,
-    })
-
-    expect(result.current).toEqual({
-      data: undefined,
-      loading: true,
-      networkStatus: NetworkStatus.loading,
-      refetch: expect.any(Function),
-      error: undefined,
-    })
-
-    await act(() => undefined)
-  })
-
-  it('returns error when query fails', async () => {
-    jest.spyOn(console, 'error').mockImplementation(() => undefined)
-
-    const { result } = renderHook(() => usePortfolioBalances({ address: SAMPLE_SEED_ADDRESS_1 }), {
-      resolvers: {
-        Query: {
-          portfolios: () => {
-            throw new Error('test')
-          },
-        },
-      },
-    })
-
-    await waitFor(() => {
-      expect(result.current).toEqual({
-        data: undefined,
-        loading: false,
-        networkStatus: NetworkStatus.error,
-        refetch: expect.any(Function),
-        error: new ApolloError({ errorMessage: 'test' }),
-      })
-    })
-  })
-
-  it('returns undefined when no balances for the specified address are found', async () => {
-    const { result } = renderHook(() => usePortfolioBalances({ address: SAMPLE_SEED_ADDRESS_1 }), {
-      resolvers: {
-        Query: {
-          portfolios: () => [],
-        },
-      },
-    })
-
-    expect(result.current.loading).toEqual(true)
-
-    await waitFor(() => {
-      expect(result.current).toEqual({
-        data: undefined,
-        loading: false,
-        networkStatus: NetworkStatus.ready,
-        refetch: expect.any(Function),
-        error: undefined,
-      })
-    })
-  })
-
-  it('returns balances grouped by currencyId', async () => {
-    const { result } = renderHook(() => usePortfolioBalances({ address: Portfolio.ownerAddress }), {
-      resolvers: portfolioResolvers,
-    })
-
-    await waitFor(() => {
-      expect(result.current).toEqual({
-        data: BalancesById,
-        loading: false,
-        networkStatus: NetworkStatus.ready,
-        refetch: expect.any(Function),
-        error: undefined,
-      })
-    })
-  })
-
-  it('calls onCompleted callback when query completes', async () => {
-    const onCompleted = jest.fn()
-    const { result } = renderHook(
-      () => usePortfolioBalances({ address: SAMPLE_SEED_ADDRESS_1, onCompleted }),
-      { resolvers: portfolioResolvers }
-    )
-
-    expect(result.current.loading).toEqual(true)
-    expect(onCompleted).not.toHaveBeenCalled()
-
-    await waitFor(() => {
-      expect(result.current.loading).toEqual(false)
-      expect(onCompleted).toHaveBeenCalledTimes(1)
-    })
-  })
-})
-
-describe(usePortfolioTotalValue, () => {
-  it('returns empty results if no address was specified', () => {
-    const { result } = renderHook(() => usePortfolioTotalValue({}))
-
-    expect(result.current).toEqual({
-      data: undefined,
-      loading: false,
-      networkStatus: NetworkStatus.ready,
-      refetch: expect.any(Function),
-      error: undefined,
-    })
-  })
-
-  it('returns loading set to true when data is being fetched', async () => {
-    const { result } = renderHook(
-      () => usePortfolioTotalValue({ address: SAMPLE_SEED_ADDRESS_1 }),
-      {
-        resolvers: portfolioResolvers,
-      }
-    )
-
-    expect(result.current).toEqual({
-      data: undefined,
-      loading: true,
-      networkStatus: NetworkStatus.loading,
-      refetch: expect.any(Function),
-      error: undefined,
-    })
-
-    await act(() => undefined)
-  })
-
-  it('returns error when query fails', async () => {
-    jest.spyOn(console, 'error').mockImplementation(() => undefined)
-
-    const { result } = renderHook(
-      () => usePortfolioTotalValue({ address: SAMPLE_SEED_ADDRESS_1 }),
-      {
-        resolvers: {
-          Query: {
-            portfolios: () => {
-              throw new Error('test')
-            },
-          },
-        },
-      }
-    )
-
-    await waitFor(() => {
-      expect(result.current).toEqual({
-        data: undefined,
-        loading: false,
-        networkStatus: NetworkStatus.error,
-        refetch: expect.any(Function),
-        error: new ApolloError({ errorMessage: 'test' }),
-      })
-    })
-  })
-
-  it('retruns undefined when no balances for the specified address are found', async () => {
-    const { result } = renderHook(
-      () => usePortfolioTotalValue({ address: SAMPLE_SEED_ADDRESS_1 }),
-      {
-        resolvers: {
-          Query: {
-            portfolios: () => [],
-          },
-        },
-      }
-    )
-
-    expect(result.current.loading).toEqual(true)
-
-    await waitFor(() => {
-      expect(result.current).toEqual({
-        data: undefined,
-        loading: false,
-        networkStatus: NetworkStatus.ready,
-        refetch: expect.any(Function),
-        error: undefined,
-      })
-    })
-  })
-
-  it('returns total value of all balances for the specified address', async () => {
-    const { result } = renderHook(
-      () => usePortfolioTotalValue({ address: Portfolio.ownerAddress }),
-      {
-        resolvers: portfolioResolvers,
-      }
-    )
-
-    await waitFor(() => {
-      expect(result.current).toEqual({
-        data: {
-          balanceUSD: Portfolio.tokensTotalDenominatedValue?.value,
-          percentChange: Portfolio.tokensTotalDenominatedValueChange?.percentage?.value,
-          absoluteChangeUSD: Portfolio.tokensTotalDenominatedValueChange?.absolute?.value,
-        },
-        loading: false,
-        networkStatus: NetworkStatus.ready,
-        refetch: expect.any(Function),
-        error: undefined,
-      })
-    })
-  })
-})
-
-describe(useHighestBalanceNativeCurrencyId, () => {
-  it('returns undefined if there is no native currency', async () => {
-    const { result } = renderHook(() => useHighestBalanceNativeCurrencyId(SAMPLE_SEED_ADDRESS_1), {
-      resolvers: {
-        Query: {
-          portfolios: () => [
-            {
-              ...Portfolio,
-              tokenBalances: [Portfolio?.tokenBalances?.[0]], // the first balance is not native
-            } as PortfolioType,
-          ],
-        },
-      },
-    })
-
-    await act(() => undefined) // wait for query to complete
-
-    expect(result.current).toEqual(undefined)
-  })
-
-  it('returns native currency id with the highest balance', async () => {
-    const { result } = renderHook(
-      () => useHighestBalanceNativeCurrencyId(SAMPLE_SEED_ADDRESS_1.toLocaleLowerCase()),
-      {
-        resolvers: portfolioResolvers,
-      }
-    )
-
-    await act(() => undefined) // wait for query to complete
-
-    await waitFor(() => {
-      expect(result.current).toEqual('1-0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee')
-    })
-  })
-})
-
-describe(useTokenBalancesGroupedByVisibility, () => {
-  const hiddenBalances = [{ ...PortfolioBalancesWithUSD[0], isHidden: true }] as [
-    PortfolioBalanceType
-  ]
-  const visibleBalances = [{ ...PortfolioBalancesWithUSD[1], isHidden: false }] as [
-    PortfolioBalanceType
-  ]
-
-  it('shownTokens and hiddenTokens are undefined when no balances are passed', () => {
-    const { result } = renderHook(() => useTokenBalancesGroupedByVisibility({}))
-
-    expect(result.current).toEqual({
-      shownTokens: undefined,
-      hiddenTokens: undefined,
-    })
-  })
-
-  it('groups balances by visibility when balances are passed', () => {
-    const { result } = renderHook(() =>
-      useTokenBalancesGroupedByVisibility({
-        balancesById: {
-          [visibleBalances[0].cacheId]: visibleBalances[0],
-          [hiddenBalances[0].cacheId]: hiddenBalances[0],
-        },
-      })
-    )
-
-    expect(result.current).toEqual({
-      shownTokens: visibleBalances,
-      hiddenTokens: hiddenBalances,
-    })
-  })
-})
-
-describe(useSortedPortfolioBalances, () => {
-  it('returns loading set to true when data is being fetched', () => {
-    const { result } = renderHook(() =>
-      useSortedPortfolioBalances({ address: SAMPLE_SEED_ADDRESS_1 })
-    )
-
-    expect(result.current).toEqual({
-      data: {
-        balances: [],
-        hiddenBalances: [],
-      },
-      loading: true,
-      networkStatus: NetworkStatus.loading,
-      refetch: expect.any(Function),
-    })
-  })
-
-  it('returns balances grouped by visibility when data is fetched', async () => {
-    const { result } = renderHook(
-      () => useSortedPortfolioBalances({ address: 'SAMPLE_SEED_ADDRESS_1' }),
-      {
-        resolvers: portfolioResolvers,
-      }
-    )
-
-    await waitFor(() => {
-      expect(result.current).toEqual({
-        data: {
-          balances: [PortfolioBalancesById['1-0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee']],
-          hiddenBalances: [PortfolioBalancesById['1-0x6b175474e89094c44da98b954eedeac495271d0f']],
-        },
-        loading: false,
-        networkStatus: NetworkStatus.ready,
-        refetch: expect.any(Function),
-      })
-    })
-  })
-})
-
-describe(sortPortfolioBalances, () => {
-  it('returns balances with USD value before balances without USD value', () => {
-    const result = sortPortfolioBalances([
-      ...PortfolioBalanceWithoutUSD,
-      ...PortfolioBalancesWithUSD,
-    ])
-
-    expect(result).toEqual([
-      expect.objectContaining({ balanceUSD: expect.any(Number) }),
-      expect.objectContaining({ balanceUSD: expect.any(Number) }),
-      expect.objectContaining({ balanceUSD: expect.any(Number) }),
-      expect.objectContaining({ balanceUSD: null }),
-      expect.objectContaining({ balanceUSD: null }),
-      expect.objectContaining({ balanceUSD: null }),
-    ])
-  })
-
-  it('sorts balances with USD value by USD value in descending order', () => {
-    const result = sortPortfolioBalances(PortfolioBalancesWithUSD)
-
-    expect(result).toEqual(PortfolioBalancesWithUSD.sort((a, b) => b.balanceUSD! - a.balanceUSD!))
-  })
-
-  it('sorts balances without USD value by name', () => {
-    const result = sortPortfolioBalances(PortfolioBalanceWithoutUSD)
-
-    expect(result).toEqual([
-      PortfolioBalanceWithoutUSD[2],
-      PortfolioBalanceWithoutUSD[0],
-      PortfolioBalanceWithoutUSD[1],
-    ])
-  })
-})
-
-describe(usePortfolioCacheUpdater, () => {
-  const cache = setupWalletCache()
-  const modifyMock = jest.spyOn(cache, 'modify')
-
-  beforeEach(async () => {
-    await cache.reset()
-    modifyMock.mockClear()
-
-    cache.writeQuery({
-      query: PortfolioBalanceDocument,
-      data: { portfolios: Portfolios },
-      variables: { owner: SAMPLE_SEED_ADDRESS_1 },
-    })
-  })
-
-  it('updates the isHidden field in the cache', () => {
-    const { result } = renderHook(() => usePortfolioCacheUpdater(SAMPLE_SEED_ADDRESS_1), {
-      cache,
-      resolvers: portfolioResolvers,
-    })
-
-    result.current(true, PortfolioBalance)
-
-    expect(modifyMock).toHaveBeenCalledWith({
-      id: PortfolioBalance.cacheId,
-      fields: {
-        isHidden: expect.any(Function),
-      },
-    })
-  })
-
-  it('updates the tokensTotalDenominatedValue field in the cache', () => {
-    const { result } = renderHook(() => usePortfolioCacheUpdater(SAMPLE_SEED_ADDRESS_1), {
-      cache,
-      resolvers: portfolioResolvers,
-    })
-
-    result.current(true, PortfolioBalance)
-
-    expect(modifyMock).toHaveBeenCalledWith(
-      expect.objectContaining({
-        fields: {
-          tokensTotalDenominatedValue: expect.any(Function),
-        },
-      })
-    )
-  })
-})
diff --git a/packages/wallet/src/features/dataApi/topTokens.test.ts b/packages/wallet/src/features/dataApi/topTokens.test.ts
deleted file mode 100644
index 64bbbf681f8..00000000000
--- a/packages/wallet/src/features/dataApi/topTokens.test.ts
+++ /dev/null
@@ -1,65 +0,0 @@
-import { ChainId } from 'wallet/src/constants/chains'
-import { gqlTokenToCurrencyInfo } from 'wallet/src/features/dataApi/utils'
-import { TopTokens } from 'wallet/src/test/gqlFixtures'
-import { act, renderHook, waitFor } from 'wallet/src/test/test-utils'
-import { usePopularTokens } from './topTokens'
-
-describe(usePopularTokens, () => {
-  it('returns loading true when data is being fetched', async () => {
-    const { result } = renderHook(() => usePopularTokens(ChainId.Mainnet))
-
-    expect(result.current).toEqual({
-      data: undefined,
-      loading: true,
-      error: undefined,
-      refetch: expect.any(Function),
-    })
-
-    await act(() => undefined)
-  })
-
-  it('returns error when data fetching fails', async () => {
-    jest.spyOn(console, 'error').mockImplementation(() => undefined)
-
-    const { result } = renderHook(() => usePopularTokens(ChainId.Mainnet), {
-      resolvers: {
-        Query: {
-          topTokens: () => {
-            throw new Error('test error')
-          },
-        },
-      },
-    })
-
-    await waitFor(() => {
-      expect(result.current).toEqual({
-        data: undefined,
-        loading: false,
-        error: new Error('test error'),
-        refetch: expect.any(Function),
-      })
-    })
-  })
-
-  it('returns data when data fetching succeeds', async () => {
-    const { result } = renderHook(() => usePopularTokens(ChainId.Mainnet), {
-      resolvers: {
-        Query: {
-          topTokens: () => TopTokens,
-        },
-      },
-    })
-
-    await waitFor(() => {
-      expect(result.current).toEqual({
-        data: TopTokens.map((token) => {
-          token.address = token?.address?.toLowerCase()
-          return gqlTokenToCurrencyInfo(token)
-        }),
-        loading: false,
-        error: undefined,
-        refetch: expect.any(Function),
-      })
-    })
-  })
-})
diff --git a/packages/wallet/src/features/dataApi/utils.test.ts b/packages/wallet/src/features/dataApi/utils.test.ts
index b9e6c14e16f..a1eb2a9c808 100644
--- a/packages/wallet/src/features/dataApi/utils.test.ts
+++ b/packages/wallet/src/features/dataApi/utils.test.ts
@@ -1,84 +1,7 @@
-import { ApolloError } from '@apollo/client'
 import { Token } from '@uniswap/sdk-core'
 import { ChainId } from 'wallet/src/constants/chains'
-import { Token as GQLToken, TokenProject } from 'wallet/src/data/__generated__/types-and-hooks'
-import { fromGraphQLChain } from 'wallet/src/features/chains/utils'
-import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
 import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
-import { SAMPLE_CURRENCY_ID_1, SAMPLE_CURRENCY_ID_2 } from 'wallet/src/test/fixtures'
-import { EthToken, TokenProjectDay } from 'wallet/src/test/gqlFixtures'
-import { renderHook } from 'wallet/src/test/test-utils'
-import {
-  buildCurrency,
-  currencyIdToContractInput,
-  gqlTokenToCurrencyInfo,
-  tokenProjectToCurrencyInfos,
-  usePersistedError,
-} from './utils'
-
-describe(currencyIdToContractInput, () => {
-  it('converts currencyId to ContractInput', () => {
-    expect(currencyIdToContractInput(SAMPLE_CURRENCY_ID_1)).toEqual({
-      address: SAMPLE_CURRENCY_ID_1.replace('1-', '').toLocaleLowerCase(),
-      chain: 'ETHEREUM',
-    })
-    expect(currencyIdToContractInput(SAMPLE_CURRENCY_ID_2)).toEqual({
-      address: SAMPLE_CURRENCY_ID_2.replace('1-', '').toLocaleLowerCase(),
-      chain: 'ETHEREUM',
-    })
-  })
-})
-
-describe(tokenProjectToCurrencyInfos, () => {
-  const project = TokenProjectDay
-
-  const getExpectedResult = (proj: TokenProject, token: GQLToken): CurrencyInfo =>
-    ({
-      logoUrl: project.logoUrl,
-      safetyLevel: project.safetyLevel,
-      currencyId: `${fromGraphQLChain(token.chain)}-${token.address}`,
-      currency: buildCurrency({
-        chainId: fromGraphQLChain(token.chain),
-        address: token.address,
-        decimals: token.decimals,
-        symbol: token.symbol,
-        name: project.name,
-      }),
-    } as CurrencyInfo)
-
-  it('converts tokenProject to CurrencyInfo', () => {
-    const result = tokenProjectToCurrencyInfos([project])
-
-    expect(result).toEqual(project.tokens.map((token) => getExpectedResult(project, token)))
-  })
-
-  it('filters by chainId if chainFilter is provided', () => {
-    const result = tokenProjectToCurrencyInfos([project], ChainId.Polygon)
-
-    expect(result).toEqual(
-      project.tokens
-        .filter((token) => token.chain === 'POLYGON')
-        .map((token) => getExpectedResult(project, token))
-    )
-  })
-
-  it('filters out values for which currency is invalid', () => {
-    const projectWithInvalidTokens = {
-      ...project,
-      tokens: [
-        project.tokens[0],
-        {
-          ...project.tokens[1],
-          chain: 'INVALID',
-        },
-      ],
-    } as TokenProject
-
-    const result = tokenProjectToCurrencyInfos([projectWithInvalidTokens], ChainId.Mainnet)
-
-    expect(result).toEqual([getExpectedResult(project, project.tokens[0] as GQLToken)])
-  })
-})
+import { buildCurrency } from './utils'
 
 describe(buildCurrency, () => {
   it('should return a new Token instance when all parameters are provided', () => {
@@ -124,109 +47,3 @@ describe(buildCurrency, () => {
     ).toBeUndefined()
   })
 })
-
-describe(gqlTokenToCurrencyInfo, () => {
-  it('returns formatted CurrencyInfo for a given token', () => {
-    const result = gqlTokenToCurrencyInfo(EthToken)
-
-    expect(result).toEqual({
-      currency: buildCurrency({
-        chainId: fromGraphQLChain(EthToken.chain),
-        address: EthToken.address,
-        decimals: EthToken.decimals,
-        symbol: EthToken.symbol,
-        name: EthToken.project?.name,
-      }),
-      currencyId: `${fromGraphQLChain(EthToken.chain)}-${EthToken.address}`,
-      logoUrl: EthToken.project?.logoUrl,
-      safetyLevel: EthToken.project?.safetyLevel,
-      isSpam: false,
-    })
-  })
-
-  it('returns null if currency is invalid', () => {
-    const result = gqlTokenToCurrencyInfo({
-      ...EthToken,
-      chain: 'INVALID',
-    } as unknown as GQLToken)
-
-    expect(result).toBeNull()
-  })
-})
-
-describe(usePersistedError, () => {
-  it('returns undefined when no error is passed', () => {
-    const { result } = renderHook(() => usePersistedError(false))
-
-    expect(result.current).toBeUndefined()
-  })
-
-  it('returns error when error is passed', () => {
-    const error = new ApolloError({})
-    const { result } = renderHook(() => usePersistedError(false, error))
-
-    expect(result.current).toBe(error)
-  })
-
-  describe('when is not loading', () => {
-    it('returns undefined if error was previously passed and undefined is passed later', () => {
-      const error = new ApolloError({})
-      const { result, rerender } = renderHook(usePersistedError, {
-        initialProps: [false, error],
-      })
-
-      expect(result.current).toBe(error)
-
-      rerender([false])
-
-      expect(result.current).toBeUndefined()
-    })
-
-    it('returns new error if error was previously passed and new error is passed later', () => {
-      const error1 = new ApolloError({})
-      const error2 = new ApolloError({})
-      const { result, rerender } = renderHook(usePersistedError, {
-        initialProps: [false, error1],
-      })
-
-      expect(result.current).toBe(error1)
-
-      rerender([false, error2])
-
-      expect(result.current).toBe(error2)
-    })
-  })
-
-  describe('when is loading', () => {
-    it('returns undefined if error was previously passed and undefined is passed later when loading is finished', () => {
-      const error = new ApolloError({})
-      const { result, rerender } = renderHook(usePersistedError, {
-        initialProps: [false, error],
-      })
-
-      expect(result.current).toBe(error)
-
-      rerender([true])
-
-      expect(result.current).toBe(error) // still retruns error as loading is not finished
-
-      rerender([false])
-
-      expect(result.current).toBeUndefined() // returns undefined as loading is finished
-    })
-
-    it('returns error if error was previously passed and new error is passed later', () => {
-      const error1 = new ApolloError({})
-      const error2 = new ApolloError({})
-      const { result, rerender } = renderHook(usePersistedError, {
-        initialProps: [false, error1],
-      })
-
-      expect(result.current).toBe(error1)
-
-      rerender([true, error2])
-
-      expect(result.current).toBe(error2) // returns the new error because it is passed
-    })
-  })
-})
diff --git a/packages/wallet/src/features/dataApi/utils.ts b/packages/wallet/src/features/dataApi/utils.ts
index d7817517714..b7da6ebc6da 100644
--- a/packages/wallet/src/features/dataApi/utils.ts
+++ b/packages/wallet/src/features/dataApi/utils.ts
@@ -1,6 +1,6 @@
 import { ApolloError } from '@apollo/client'
 import { Token } from '@uniswap/sdk-core'
-import { useRef } from 'react'
+import { useEffect, useState } from 'react'
 import { ChainId } from 'wallet/src/constants/chains'
 import {
   Chain,
@@ -12,8 +12,8 @@ import {
 import { fromGraphQLChain, toGraphQLChain } from 'wallet/src/features/chains/utils'
 import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import {
-  CurrencyId,
   currencyId,
+  CurrencyId,
   currencyIdToChain,
   currencyIdToGraphQLAddress,
   isNativeCurrencyAddress,
@@ -38,10 +38,10 @@ export function currencyIdToContractInput(id: CurrencyId): ContractInput {
 }
 
 export function tokenProjectToCurrencyInfos(
-  tokenProjects: TokenProjectsQuery['tokenProjects'],
+  tokenProject: TokenProjectsQuery['tokenProjects'],
   chainFilter?: ChainId | null
 ): CurrencyInfo[] {
-  return tokenProjects
+  return tokenProject
     ?.flatMap((project) =>
       project?.tokens.map((token) => {
         const { logoUrl, safetyLevel, name } = project ?? {}
@@ -150,11 +150,14 @@ until the network request returns.
 Feature request to enable persisted errors: https://github.com/apollographql/apollo-feature-requests/issues/348
 */
 export function usePersistedError(loading: boolean, error?: ApolloError): ApolloError | undefined {
-  const persistedErrorRef = useRef<ApolloError>()
+  const [persistedError, setPersistedError] = useState<ApolloError>()
 
-  if (error || !loading) {
-    persistedErrorRef.current = error
-  }
+  useEffect(() => {
+    if (error || !loading) {
+      setPersistedError(error)
+      return
+    }
+  }, [error, loading, setPersistedError])
 
-  return persistedErrorRef.current
+  return persistedError
 }
diff --git a/packages/wallet/src/features/ens/api.ts b/packages/wallet/src/features/ens/api.ts
index aea43cbd167..fbe5a24b5d0 100644
--- a/packages/wallet/src/features/ens/api.ts
+++ b/packages/wallet/src/features/ens/api.ts
@@ -15,8 +15,6 @@ export enum EnsLookupType {
   Name = 'name',
   Address = 'address',
   Avatar = 'avatar',
-  Description = 'description',
-  TwitterUsername = 'com.twitter',
 }
 
 export type EnsLookupParams = {
@@ -48,12 +46,6 @@ async function getAvatarFetch(address: string, provider: providers.JsonRpcProvid
   return checkedName ? await provider.getAvatar(checkedName) : null
 }
 
-async function getTextFetch(key: string, name: string, provider: providers.JsonRpcProvider) {
-  const resolver = await provider.getResolver(name)
-  const text = resolver?.getText(key)
-  return text ?? null
-}
-
 export const getOnChainEnsFetch = async (params: EnsLookupParams): Promise<Response> => {
   const { type, nameOrAddress } = params
   const provider = createEthersProvider(ChainId.Mainnet)
@@ -73,12 +65,6 @@ export const getOnChainEnsFetch = async (params: EnsLookupParams): Promise<Respo
     case EnsLookupType.Avatar:
       response = await getAvatarFetch(nameOrAddress, provider)
       break
-    case EnsLookupType.Description:
-      response = await getTextFetch('description', nameOrAddress, provider)
-      break
-    case EnsLookupType.TwitterUsername:
-      response = await getTextFetch('com.twitter', nameOrAddress, provider)
-      break
     default:
       throw new Error(`Invalid ENS lookup type: ${type}`)
   }
@@ -121,9 +107,3 @@ export function useAddressFromEns(maybeName: string | null, chainId: ChainId = C
 export function useENSAvatar(address?: string | null, chainId: ChainId = ChainId.Mainnet) {
   return useEnsQuery(EnsLookupType.Avatar, address, chainId)
 }
-export function useENSDescription(name?: string | null, chainId: ChainId = ChainId.Mainnet) {
-  return useEnsQuery(EnsLookupType.Description, name, chainId)
-}
-export function useENSTwitterUsername(name?: string | null, chainId: ChainId = ChainId.Mainnet) {
-  return useEnsQuery(EnsLookupType.TwitterUsername, name, chainId)
-}
diff --git a/packages/wallet/src/features/experiments/constants.ts b/packages/wallet/src/features/experiments/constants.ts
index 13eb5a91a13..bc595cff287 100644
--- a/packages/wallet/src/features/experiments/constants.ts
+++ b/packages/wallet/src/features/experiments/constants.ts
@@ -12,11 +12,9 @@ export enum FEATURE_FLAGS {
   MevBlocker = 'mev-blocker',
   PortionFields = 'portion-fields',
   RestoreWallet = 'restore-wallet',
-  Scantastic = 'scantastic',
   SeedPhraseRefactorNative = 'refactor-seed-phrase-native',
   SendRewrite = 'send-rewrite',
   Unitags = 'unitags',
-  TradingApi = 'trading-api',
 }
 
 /**
diff --git a/packages/wallet/src/features/experiments/hooks.ts b/packages/wallet/src/features/experiments/hooks.ts
index f140bb87266..1528e84a5b9 100644
--- a/packages/wallet/src/features/experiments/hooks.ts
+++ b/packages/wallet/src/features/experiments/hooks.ts
@@ -8,8 +8,8 @@ import {
   EXPERIMENT_NAMES,
   EXPERIMENT_PARAMS,
   FEATURE_FLAGS,
-  SWAP_VARIANT_TYPE_PARAMETER_NAME,
   SwapRewriteVariant,
+  SWAP_VARIANT_TYPE_PARAMETER_NAME,
 } from './constants'
 
 export function useFeatureFlag(flagName: FEATURE_FLAGS): boolean {
diff --git a/packages/wallet/src/features/fiatOnRamp/api.ts b/packages/wallet/src/features/fiatOnRamp/api.ts
index 9dc446e389d..2428ae2ef02 100644
--- a/packages/wallet/src/features/fiatOnRamp/api.ts
+++ b/packages/wallet/src/features/fiatOnRamp/api.ts
@@ -4,14 +4,16 @@ import dayjs from 'dayjs'
 import { logger } from 'utilities/src/logger/logger'
 import { ONE_MINUTE_MS } from 'utilities/src/time/time'
 import { config } from 'wallet/src/config'
-import { MeldWidgetResponse } from 'wallet/src/features/fiatOnRamp/meld'
 import {
-  FORQuoteRequest,
-  FORQuoteResponse,
-  FORServiceProvidersResponse,
-  FORSupportedCountriesResponse,
-  FORSupportedTokensRequest,
-  FORSupportedTokensResponse,
+  MeldCountryPaymentMethodsResponse,
+  MeldCryptoCurrency,
+  MeldCryptoQuoteResponse,
+  MeldQuote,
+  MeldServiceProvidersResponse,
+  MeldSupportedTokensResponse,
+  MeldWidgetResponse,
+} from 'wallet/src/features/fiatOnRamp/meld'
+import {
   FiatOnRampWidgetUrlQueryParameters,
   FiatOnRampWidgetUrlQueryResponse,
   MoonpayBuyQuoteResponse,
@@ -25,6 +27,7 @@ import { extractFiatOnRampTransactionDetails } from 'wallet/src/features/transac
 import { serializeQueryParams } from 'wallet/src/features/transactions/swap/utils'
 import { TransactionDetails, TransactionStatus } from 'wallet/src/features/transactions/types'
 import { sendWalletAnalyticsEvent } from 'wallet/src/telemetry'
+import { buildCurrencyId } from 'wallet/src/utils/currencyId'
 
 const COMMON_QUERY_PARAMS = serializeQueryParams({ apiKey: config.moonpayApiKey })
 const TRANSACTION_NOT_FOUND = 404
@@ -200,28 +203,66 @@ export const {
 export const fiatOnRampAggregatorApi = createApi({
   reducerPath: 'fiatOnRampAggregatorApi',
   baseQuery: fetchBaseQuery({
-    baseUrl: config.fiatOnRampApiUrl,
+    baseUrl: config.meldApiUrl,
+    prepareHeaders: (headers) => {
+      headers.set('Authorization', `BASIC ${config.meldApiKey}`)
+      headers.set('Meld-Version', `${config.meldApiVersion}`)
+      return headers
+    },
   }),
   endpoints: (builder) => ({
-    fiatOnRampAggregatorCountryList: builder.query<FORSupportedCountriesResponse, void>({
-      query: () => `/supported-countries`,
+    fiatOnRampAggregatorCountryList: builder.query<MeldCountryPaymentMethodsResponse, void>({
+      query: () =>
+        `/service-providers/properties/country-payment-methods?category=CRYPTO_ONRAMP&accountServiceProviders=true`,
     }),
-    fiatOnRampAggregatorCryptoQuote: builder.query<FORQuoteResponse, FORQuoteRequest>({
-      query: (request) => ({
-        url: '/quote',
-        body: request,
+    fiatOnRampAggregatorCryptoQuote: builder.query<
+      MeldCryptoQuoteResponse['quotes'],
+      {
+        amount: number
+        destinationCurrencyCode: string
+        countryCode: string
+      }
+    >({
+      query: ({ amount, destinationCurrencyCode, countryCode }) => ({
+        url: '/payments/crypto/quote',
+        body: {
+          sourceAmount: amount,
+          sourceCurrencyCode: 'USD',
+          destinationCurrencyCode,
+          countryCode,
+        },
         method: 'POST',
       }),
+      transformResponse: (response: MeldCryptoQuoteResponse): Maybe<MeldQuote[]> =>
+        response?.quotes,
       keepUnusedDataFor: 0,
     }),
-    fiatOnRampAggregatorServiceProviders: builder.query<FORServiceProvidersResponse, void>({
-      query: () => '/service-providers',
+    fiatOnRampAggregatorServiceProviders: builder.query<MeldServiceProvidersResponse, void>({
+      query: () => '/service-providers/details?statuses=LIVE%2CRECENTLY_ADDED',
     }),
     fiatOnRampAggregatorSupportedTokens: builder.query<
-      FORSupportedTokensResponse,
-      FORSupportedTokensRequest
+      MeldCryptoCurrency[],
+      { fiatCurrency: string; countryCode: string }
     >({
-      query: (request) => `/supported-tokens?${new URLSearchParams(request).toString()}`,
+      query: ({ fiatCurrency }) =>
+        `/service-providers/properties?categories=CRYPTO_ONRAMP&accountServiceProviders=true&fiatCurrencies=${fiatCurrency}`,
+      transformResponse: (response: MeldSupportedTokensResponse, _, { countryCode }) =>
+        // get all crypto currencies from all service providers that support the given fiat currency in the given country
+        Object.values(
+          response.reduce((acc: Record<string, MeldCryptoCurrency>, serviceProvider) => {
+            if (!serviceProvider.crypto?.onRamp) {
+              return acc
+            }
+            const { countries, cryptoCurrencies } = serviceProvider.crypto.onRamp
+            if (countries.find((c) => c.countryCode === countryCode)) {
+              cryptoCurrencies.forEach((cryptoCurrency) => {
+                acc[buildCurrencyId(parseInt(cryptoCurrency.chainId, 10), cryptoCurrency.address)] =
+                  cryptoCurrency
+              })
+            }
+            return acc
+          }, {})
+        ),
     }),
     fiatOnRampAggregatorWidget: builder.query<
       MeldWidgetResponse,
@@ -232,8 +273,6 @@ export const fiatOnRampAggregatorApi = createApi({
         serviceProvider: string
         sourceCurrencyCode: string
         walletAddress: string
-        externalCustomerId: string
-        externalSessionId: string
       }
     >({
       query: ({
@@ -243,8 +282,6 @@ export const fiatOnRampAggregatorApi = createApi({
         serviceProvider,
         sourceCurrencyCode,
         walletAddress,
-        externalCustomerId,
-        externalSessionId,
       }) => ({
         url: 'crypto/session/widget',
         body: {
@@ -255,10 +292,7 @@ export const fiatOnRampAggregatorApi = createApi({
             serviceProvider,
             sourceCurrencyCode,
             walletAddress,
-            lockFields: ['destinationCurrencyCode'],
           },
-          externalCustomerId,
-          externalSessionId,
         },
         method: 'POST',
       }),
diff --git a/packages/wallet/src/features/fiatOnRamp/hooks.ts b/packages/wallet/src/features/fiatOnRamp/hooks.ts
deleted file mode 100644
index a3a341ea620..00000000000
--- a/packages/wallet/src/features/fiatOnRamp/hooks.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-import { FiatCurrency } from 'wallet/src/features/fiatCurrency/constants'
-import {
-  FiatCurrencyInfo,
-  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/meld.test.ts b/packages/wallet/src/features/fiatOnRamp/meld.test.ts
index ebfce1662a7..23f1f69394f 100644
--- a/packages/wallet/src/features/fiatOnRamp/meld.test.ts
+++ b/packages/wallet/src/features/fiatOnRamp/meld.test.ts
@@ -1,5 +1,4 @@
-import { mockLocalizedFormatter } from 'wallet/src/test/utils'
-import { extractCurrencyAmountFromError, getCountryFlagSvgUrl, isMeldApiError } from './meld'
+import { getCountryFlagSvgUrl, isMeldApiError } from './meld'
 
 describe('getCountryFlagSvgUrl', () => {
   test('should return the correct SVG URL for a given country code', () => {
@@ -10,53 +9,6 @@ describe('getCountryFlagSvgUrl', () => {
   })
 })
 
-describe('extractCurrencyAmountFromError', () => {
-  test('extracts amount too low error', () => {
-    // USD currency
-    const errorStringUsd = 'Source amount is below the minimum allowed, which is 50.00 USD'
-    const resultUsd = extractCurrencyAmountFromError(
-      errorStringUsd,
-      mockLocalizedFormatter.formatNumberOrString
-    )
-    expect(resultUsd).toEqual('$50.00')
-
-    // Not USD currency
-    const errorStringEur = 'Source amount is below the minimum allowed, which is 50.00 EUR'
-    const resultEur = extractCurrencyAmountFromError(
-      errorStringEur,
-      mockLocalizedFormatter.formatNumberOrString
-    )
-    expect(resultEur).toEqual('€50.00')
-  })
-
-  test('extracts amount too high error', () => {
-    // USD currency
-    const errorStringUsd = 'Source amount is above the maximum allowed, which is 50.00 USD'
-    const resultUsd = extractCurrencyAmountFromError(
-      errorStringUsd,
-      mockLocalizedFormatter.formatNumberOrString
-    )
-    expect(resultUsd).toEqual('$50.00')
-
-    // Not USD currency
-    const errorStringEur = 'Source amount is above the maximum allowed, which is 50.00 EUR'
-    const resultEur = extractCurrencyAmountFromError(
-      errorStringEur,
-      mockLocalizedFormatter.formatNumberOrString
-    )
-    expect(resultEur).toEqual('€50.00')
-  })
-
-  test('extracts nothing', () => {
-    const errorString = 'Test'
-    const result = extractCurrencyAmountFromError(
-      errorString,
-      mockLocalizedFormatter.formatNumberOrString
-    )
-    expect(result).toEqual(undefined)
-  })
-})
-
 describe('isMeldApiError', () => {
   test('returns true', () => {
     const error = {
diff --git a/packages/wallet/src/features/fiatOnRamp/meld.ts b/packages/wallet/src/features/fiatOnRamp/meld.ts
index a3734e96453..ab2f5bea052 100644
--- a/packages/wallet/src/features/fiatOnRamp/meld.ts
+++ b/packages/wallet/src/features/fiatOnRamp/meld.ts
@@ -1,12 +1,90 @@
-import { NumberType } from 'utilities/src/format/types'
-import { FORSupportedCountry } from 'wallet/src/features/fiatOnRamp/types'
-import { LocalizationContextState } from 'wallet/src/features/language/LocalizationContext'
+export type MeldCountryPaymentMethodsResponse = Array<{
+  country: BaseCountry
+  paymentMethods: MeldPaymentMethod[]
+}>
+
+export type MeldCryptoQuoteResponse = {
+  quotes: Maybe<MeldQuote[]>
+  message: string | null
+  error: string | null
+}
+
+export type MeldServiceProvidersResponse = Array<MeldServiceProvider>
+
+type BaseCountry = {
+  countryCode: string
+  displayName: string
+}
+
+export type MeldPaymentMethod = {
+  type: string
+  subtype: string
+  displayName: string
+  logos: MeldLogos
+}
+
+export type MeldQuote = {
+  transactionType: string
+  sourceAmount: number
+  sourceAmountWithoutFees: number
+  fiatAmountWithoutFees: number
+  destinationAmountWithoutFees: number | null
+  sourceCurrencyCode: string
+  countryCode: string | null
+  totalFee: number
+  networkFee: number
+  transactionFee: number
+  destinationAmount: number
+  destinationCurrencyCode: string
+  exchangeRate: number
+  paymentMethodType: string
+  customerScore: number
+  serviceProvider: string
+}
+
+export interface MeldServiceProvider {
+  serviceProvider: string
+  name: string
+  status: string
+  categories: Category[]
+  categoryStatuses: CategoryStatuses
+  authSettingsFields: SettingsField[]
+  configSettingsFields: SettingsField[]
+  url: string
+  logos: MeldLogos
+  providerSpecificConfigs?: ProviderSpecificConfigs
+}
+
+interface SettingsField {
+  fieldName: string
+  fieldType: string
+  required: boolean
+}
+
+enum Category {
+  BankLinking = 'BANK_LINKING',
+  CryptoOfframp = 'CRYPTO_OFFRAMP',
+  CryptoOnramp = 'CRYPTO_ONRAMP',
+  FiatPayments = 'FIAT_PAYMENTS',
+}
+
+export interface CategoryStatuses {
+  FIAT_PAYMENTS?: string
+  CRYPTO_ONRAMP?: string
+  BANK_LINKING?: string
+  CRYPTO_OFFRAMP?: string
+}
 
 export interface MeldLogos {
   darkLogo: string
   lightLogo: string
 }
 
+interface ProviderSpecificConfigs {
+  sdkForm: string
+  sdk: string
+}
+
 export interface MeldWidgetResponse {
   id: string
   externalSessionId: null | string
@@ -29,112 +107,13 @@ export type MeldSupportedToken = {
   crypto: {
     onRamp: {
       cryptoCurrencies: MeldCryptoCurrency[]
-      countries: FORSupportedCountry[]
+      countries: BaseCountry[]
     }
   }
 }
 
 export type MeldSupportedTokensResponse = MeldSupportedToken[]
 
-export interface MeldSearchTransactionsResponse {
-  transactions: MeldTransaction[]
-  count: number
-  remaining: number
-  totalCount: number
-  message: string | null
-  error: string | null
-}
-
-export interface MeldTransaction {
-  key: string
-  id: string
-  parentPaymentTransactionId: string | null
-  accountId: string
-  isPassthrough: boolean
-  passthroughReference: string | null
-  isImported: boolean
-  customer: Customer
-  paymentMethod: string | null
-  transactionType: string
-  status:
-    | 'PENDING_CREATED'
-    | 'PENDING'
-    | 'PROCESSING'
-    | 'AUTHORIZED'
-    | 'AUTHORIZATION_EXPIRED'
-    | 'SETTLING'
-    | 'SETTLED'
-    | 'REFUNDED'
-    | 'DECLINED'
-    | 'CANCELLED'
-    | 'FAILED'
-    | 'ERROR'
-    | 'VOIDED'
-    | 'TWO_FA_REQUIRED'
-    | 'TWO_FA_PROVIDED'
-  sourceAmount: number
-  authAmount: number | null
-  captureAmount: number | null
-  sourceCurrencyCode: string
-  destinationAmount: number
-  destinationCurrencyCode: string
-  paymentMethodType: string
-  serviceProvider: string
-  serviceTransactionId: string
-  orderId: string | null
-  description: string | null
-  externalReferenceId: string | null
-  serviceProviderDetails: ServiceProviderDetails
-  wallet: string
-  cryptoPurchaseDetails: CryptoPurchaseDetails
-  multiFactorAuthorizationStatus: string | null
-  createdAt: string
-  updatedAt: string
-  countryCode: string
-  sessionId: string
-  externalSessionId: string | null
-  externalCustomerId: string
-  sourceAmountInUsd: number
-  apiAccessProfileId: string
-}
-
-interface Customer {
-  id: string
-  accountId: string
-  externalId: string
-  name: {
-    firstName: string | null
-    lastName: string | null
-  }
-  addresses: unknown[] // Replace 'any' with a more specific type if you have the structure for addresses
-}
-
-interface ServiceProviderDetails {
-  feeAmount: number
-  serviceProviderCustomerId: string
-  cardId: string
-  networkFeeAmount: number
-  cryptoCurrencyAmount: number
-  customerId: string
-  extraFeeAmount: number
-  cryptoTransactionId: string | null
-  type: string
-  walletAddress: string
-  email: string | null
-  cryptoCurrency: string
-}
-
-interface CryptoPurchaseDetails {
-  destinationCurrencyCode: string
-  destinationAmount: number
-  walletAddress: string
-  networkFee: number
-  transactionFee: number
-  partnerFee: number | null
-  totalFee: number
-  blockchainTransactionId: string | null
-}
-
 export interface MeldApiError {
   data: {
     code: string
@@ -148,22 +127,6 @@ export function getCountryFlagSvgUrl(countryCode: string): string {
   return `https://images-country.meld.io/${countryCode}/flag.svg`
 }
 
-export function extractCurrencyAmountFromError(
-  errorString: string,
-  formatter: LocalizationContextState['formatNumberOrString']
-): string | undefined {
-  const regex = /(\d+\.\d{2})\s([A-Z]{3})/ // parse string like "50.00 USD"
-  const match = errorString.match(regex)
-  if (match && match[1] && match[2]) {
-    return formatter({
-      value: match[1],
-      type: NumberType.FiatStandard,
-      currencyCode: match[2],
-    })
-  }
-  return
-}
-
 export function isMeldApiError(error: unknown): error is MeldApiError {
   return (
     typeof error === 'object' &&
diff --git a/packages/wallet/src/features/fiatOnRamp/types.ts b/packages/wallet/src/features/fiatOnRamp/types.ts
index 9a85a399e1c..33180762247 100644
--- a/packages/wallet/src/features/fiatOnRamp/types.ts
+++ b/packages/wallet/src/features/fiatOnRamp/types.ts
@@ -160,76 +160,3 @@ export type MoonpayTransactionResponseItem = MoonpayQuote & {
     actions: 'complete_bank_transfer' | 'retry_kyc' | 'verify_card_by_code' | 'verify_card_by_file'
   }>
 }
-
-// /supported-countries
-
-export type FORSupportedCountry = {
-  countryCode: string
-  displayName: string
-}
-
-export type FORSupportedCountriesResponse = {
-  supportedCountries: FORSupportedCountry[]
-}
-
-// /quote
-
-export type FORQuoteRequest = {
-  countryCode: string
-  destinationCurrencyCode: string
-  sourceAmount: number
-  sourceCurrencyCode: string
-}
-
-export type FORQuote = {
-  countryCode: string | null
-  sourceAmount: number
-  sourceCurrencyCode: string
-  destinationAmount: number
-  destinationCurrencyCode: string
-  serviceProvider: string
-}
-
-export type FORQuoteResponse = {
-  quotes: Maybe<FORQuote[]>
-  message: string | null
-  error: string | null
-}
-
-// /service-providers
-
-export type FORLogo = {
-  darkLogo: string
-  lightLogo: string
-}
-
-export type FORServiceProvider = {
-  serviceProvider: string
-  name: string
-  url: string
-  logos: FORLogo
-}
-
-export type FORServiceProvidersResponse = {
-  serviceProviders: FORServiceProvider[]
-}
-
-// /supported-tokens
-
-export type FORSupportedTokensRequest = {
-  fiatCurrency: string
-  countryCode: string
-}
-
-export type FORSupportedToken = {
-  cryptoCurrencyCode: string
-  displayName: string
-  address: string
-  cryptoCurrencyChain: string
-  chainId: string
-  symbol: string
-}
-
-export type FORSupportedTokensResponse = {
-  supportedTokens: FORSupportedToken[]
-}
diff --git a/packages/wallet/src/features/gas/hooks.ts b/packages/wallet/src/features/gas/hooks.ts
index 1c75f66d89d..03608b8df90 100644
--- a/packages/wallet/src/features/gas/hooks.ts
+++ b/packages/wallet/src/features/gas/hooks.ts
@@ -1,19 +1,11 @@
-import { BigNumber, providers } from 'ethers'
+import { providers } from 'ethers'
 import { useMemo } from 'react'
 import { ChainId } from 'wallet/src/constants/chains'
-import { TRANSACTION_CANCELLATION_GAS_FACTOR } from 'wallet/src/constants/transactions'
-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 { useUSDCValue } from 'wallet/src/features/routing/useUSDCPrice'
 import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
-import { TransactionDetails } from 'wallet/src/features/transactions/types'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
-
-type CancelationGasFeeDetails = {
-  cancelRequest: providers.TransactionRequest
-  cancelationGasFee: string
-}
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
 export function useTransactionGasFee(
   tx: Maybe<providers.TransactionRequest>,
@@ -56,53 +48,3 @@ export function useUSDValue(chainId?: ChainId, ethValueInWei?: string): string |
 
   return useUSDCValue(currencyAmount)?.toExact()
 }
-
-/**
- * Construct cancelation transaction with increased gas (based on current network conditions),
- * then use it to compute new gas info.
- */
-export function useCancelationGasFeeInfo(
-  transaction: TransactionDetails
-): CancelationGasFeeDetails | undefined {
-  const cancelationRequest = useMemo(() => {
-    return {
-      chainId: transaction.chainId,
-      from: transaction.from,
-      to: transaction.from,
-      value: '0x0',
-    }
-  }, [transaction])
-
-  const baseTxGasFee = useTransactionGasFee(cancelationRequest, GasSpeed.Urgent)
-  return useMemo(() => {
-    if (!baseTxGasFee.params) {
-      return
-    }
-
-    const adjustedFeeDetails = getAdjustedGasFeeDetails(
-      transaction.options.request,
-      baseTxGasFee.params,
-      TRANSACTION_CANCELLATION_GAS_FACTOR
-    )
-
-    const cancelRequest = {
-      ...cancelationRequest,
-      ...adjustedFeeDetails.params,
-      gasLimit: baseTxGasFee.params.gasLimit,
-    }
-
-    return {
-      cancelRequest,
-      cancelationGasFee: getCancelationGasFee(adjustedFeeDetails, baseTxGasFee.params.gasLimit),
-    }
-  }, [baseTxGasFee, cancelationRequest, transaction.options.request])
-}
-
-function getCancelationGasFee(adjustedFeeDetails: FeeDetails, gasLimit: string): string {
-  // doing object destructuring here loses ts checks based on FeeDetails.type >:(
-  if (adjustedFeeDetails.type === FeeType.Legacy) {
-    return BigNumber.from(gasLimit).mul(adjustedFeeDetails.params.gasPrice).toString()
-  }
-
-  return BigNumber.from(adjustedFeeDetails.params.maxFeePerGas).mul(gasLimit).toString()
-}
diff --git a/packages/wallet/src/features/images/ImageUri.native.tsx b/packages/wallet/src/features/images/ImageUri.native.tsx
index 97f20ca2aae..485d4ab45d4 100644
--- a/packages/wallet/src/features/images/ImageUri.native.tsx
+++ b/packages/wallet/src/features/images/ImageUri.native.tsx
@@ -4,9 +4,6 @@ import FastImage, { OnLoadEvent } from 'react-native-fast-image'
 import Animated, { useAnimatedStyle, useSharedValue } from 'react-native-reanimated'
 import { Flex, Loader } from 'ui/src'
 import { ImageUriProps } from 'wallet/src/features/images/ImageUri'
-import { UNITAG_BUCKET_NAME } from 'wallet/src/features/unitags/constants'
-
-const AWS_DOMAIN = 'amazonaws.com'
 
 export function ImageUri({
   maxHeight,
@@ -59,17 +56,12 @@ export function ImageUri({
     }
     return <Loader.Image />
   }
+
   return (
     <Animated.View style={[styles.fullWidth, animatedImageContainerStyle]}>
       <FastImage
         resizeMode={resizeMode ?? FastImage.resizeMode.contain}
-        source={{
-          uri,
-          cache:
-            uri.includes(UNITAG_BUCKET_NAME) && uri.includes(AWS_DOMAIN)
-              ? FastImage.cacheControl.web
-              : FastImage.cacheControl.immutable,
-        }}
+        source={{ uri }}
         style={[
           styles.image,
           imageStyle ?? [styles.fullWidth, { maxHeight: maxHeight ?? '100%' }],
diff --git a/packages/wallet/src/features/images/RemoteImage.tsx b/packages/wallet/src/features/images/RemoteImage.tsx
index f1265ac3092..5cc6fc0b27f 100644
--- a/packages/wallet/src/features/images/RemoteImage.tsx
+++ b/packages/wallet/src/features/images/RemoteImage.tsx
@@ -10,7 +10,6 @@ type Props = {
   uri: string
   height: number
   width: number
-  resizeMode?: ImageResizeMode
   fallback?: JSX.Element
 }
 
@@ -23,7 +22,6 @@ export function RemoteImage({
   uri,
   height,
   width,
-  resizeMode = RESIZE_MODE_CONTAIN,
   fallback,
 }: Props): JSX.Element | null {
   const imageHttpUrl = uriToHttp(uri)[0]
@@ -50,7 +48,7 @@ export function RemoteImage({
     flex: aspectRatio ? 1 : undefined,
     backgroundColor,
     borderRadius,
-    resizeMode,
+    resizeMode: RESIZE_MODE_CONTAIN,
     width: !aspectRatio ? width : undefined,
     height: !aspectRatio ? height : undefined,
   }
diff --git a/packages/wallet/src/features/images/hooks.ts b/packages/wallet/src/features/images/hooks.ts
index b685d365755..2ff4d52d1dd 100644
--- a/packages/wallet/src/features/images/hooks.ts
+++ b/packages/wallet/src/features/images/hooks.ts
@@ -1,4 +1,4 @@
-import { ApolloClient, from } from '@apollo/client'
+import { ApolloClient, from, InMemoryCache } from '@apollo/client'
 import { RetryLink } from '@apollo/client/link/retry'
 import { RestLink } from 'apollo-link-rest'
 import { useMemo } from 'react'
@@ -6,10 +6,9 @@ import { logger } from 'utilities/src/logger/logger'
 import { useAsyncData } from 'utilities/src/react/hooks'
 import { ONE_MINUTE_MS } from 'utilities/src/time/time'
 import { config } from 'wallet/src/config'
-import { createNewInMemoryCache } from 'wallet/src/data/cache'
 import { useRestQuery } from 'wallet/src/data/rest'
 import { GqlResult } from 'wallet/src/features/dataApi/types'
-import { SvgData, fetchSVG } from 'wallet/src/features/images/utils'
+import { fetchSVG, SvgData } from 'wallet/src/features/images/utils'
 
 const restLink = new RestLink({
   uri: `${config.simpleHashApiUrl}/api/v0`,
@@ -22,7 +21,7 @@ const retryLink = new RetryLink()
 
 const apolloClient = new ApolloClient({
   link: from([retryLink, restLink]),
-  cache: createNewInMemoryCache(),
+  cache: new InMemoryCache(),
   defaultOptions: {
     watchQuery: {
       // ensures query is returning data even if some fields errored out
diff --git a/packages/wallet/src/features/language/saga.ts b/packages/wallet/src/features/language/saga.ts
index adfc2c4cf4f..ce921972130 100644
--- a/packages/wallet/src/features/language/saga.ts
+++ b/packages/wallet/src/features/language/saga.ts
@@ -1,16 +1,16 @@
+import { getLocales, Locale as DeviceLocale } from 'expo-localization'
 import { I18nManager } from 'react-native'
 import RNRestart from 'react-native-restart'
 import { Statsig } from 'statsig-react-native'
 import { call, put, select, takeLatest } from 'typed-redux-saga'
-import { getDeviceLocales } from 'utilities/src/device/locales'
 import { logger } from 'utilities/src/logger/logger'
 import { FEATURE_FLAGS } from 'wallet/src/features/experiments/constants'
 import {
   Language,
   Locale,
-  SUPPORTED_LANGUAGES,
   mapDeviceLanguageToLanguage,
   mapLocaleToLanguage,
+  SUPPORTED_LANGUAGES,
 } from 'wallet/src/features/language/constants'
 import { getLocale } from 'wallet/src/features/language/hooks'
 import {
@@ -77,6 +77,27 @@ function getDeviceLanguage(): Language {
   return Language.English
 }
 
+function getDeviceLocales(): DeviceLocale[] {
+  try {
+    return getLocales()
+  } catch (e) {
+    logger.error(e, { level: 'warning', tags: { file: 'saga.ts', function: 'getDeviceLocales' } })
+  }
+  return [
+    {
+      languageCode: 'en',
+      languageTag: 'en-US',
+      regionCode: null,
+      currencyCode: null,
+      currencySymbol: null,
+      decimalSeparator: null,
+      digitGroupingSeparator: null,
+      textDirection: null,
+      measurementSystem: null,
+    },
+  ]
+}
+
 function restartAppIfRTL(currentLocale: Locale) {
   const isRtl = i18n.dir(currentLocale) === 'rtl'
   if (isRtl !== I18nManager.isRTL) {
diff --git a/packages/wallet/src/features/nfts/hooks.ts b/packages/wallet/src/features/nfts/hooks.ts
index 6c926b989cb..d300ebcd130 100644
--- a/packages/wallet/src/features/nfts/hooks.ts
+++ b/packages/wallet/src/features/nfts/hooks.ts
@@ -9,7 +9,7 @@ import {
   HIDDEN_NFTS_ROW_LEFT_ITEM,
   HIDDEN_NFTS_ROW_RIGHT_ITEM,
 } from 'wallet/src/features/nfts/constants'
-import { NFTItem, NftData } from 'wallet/src/features/nfts/types'
+import { NftData, NFTItem } from 'wallet/src/features/nfts/types'
 import { getNFTAssetKey } from 'wallet/src/features/nfts/utils'
 import { useAppSelector } from 'wallet/src/state'
 
diff --git a/packages/wallet/src/features/notifications/components/ApproveNotification.tsx b/packages/wallet/src/features/notifications/components/ApproveNotification.tsx
deleted file mode 100644
index 2d1f7aedfb2..00000000000
--- a/packages/wallet/src/features/notifications/components/ApproveNotification.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-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'
-import { formApproveNotificationTitle } from 'wallet/src/features/notifications/utils'
-import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
-import { buildCurrencyId } from 'wallet/src/utils/currencyId'
-
-export function ApproveNotification({
-  notification: { address, chainId, tokenAddress, spender, txStatus, txType, hideDelay },
-}: {
-  notification: ApproveTxNotification
-}): JSX.Element {
-  const { navigateToAccountActivityList } = useWalletNavigation()
-
-  const currencyInfo = useCurrencyInfo(buildCurrencyId(chainId, tokenAddress))
-
-  const title = formApproveNotificationTitle(
-    txStatus,
-    currencyInfo?.currency,
-    tokenAddress,
-    spender
-  )
-
-  const icon = (
-    <LogoWithTxStatus
-      assetType={AssetType.Currency}
-      chainId={chainId}
-      currencyInfo={currencyInfo}
-      size={NOTIFICATION_ICON_SIZE}
-      txStatus={txStatus}
-      txType={txType}
-    />
-  )
-
-  return (
-    <NotificationToast
-      address={address}
-      hideDelay={hideDelay}
-      icon={icon}
-      title={title}
-      onPress={navigateToAccountActivityList}
-    />
-  )
-}
diff --git a/packages/wallet/src/features/notifications/components/ChangeAssetVisibilityNotification.tsx b/packages/wallet/src/features/notifications/components/ChangeAssetVisibilityNotification.tsx
deleted file mode 100644
index 0286dca4942..00000000000
--- a/packages/wallet/src/features/notifications/components/ChangeAssetVisibilityNotification.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-import { useTranslation } from 'react-i18next'
-import { useSporeColors } from 'ui/src'
-import EyeOffIcon from 'ui/src/assets/icons/eye-off.svg'
-import EyeIcon from 'ui/src/assets/icons/eye.svg'
-import { iconSizes } from 'ui/src/theme'
-import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
-import { ChangeAssetVisibilityNotification as ChangeAssetVisibilityNotificationType } from 'wallet/src/features/notifications/types'
-
-export function ChangeAssetVisibilityNotification({
-  notification: { visible, hideDelay, assetName },
-}: {
-  notification: ChangeAssetVisibilityNotificationType
-}): JSX.Element {
-  const { t } = useTranslation()
-  const colors = useSporeColors()
-
-  return (
-    <NotificationToast
-      smallToast
-      hideDelay={hideDelay}
-      icon={
-        visible ? (
-          <EyeOffIcon
-            color={colors.neutral1.get()}
-            height={iconSizes.icon24}
-            width={iconSizes.icon24}
-          />
-        ) : (
-          <EyeIcon
-            color={colors.neutral1.get()}
-            height={iconSizes.icon24}
-            width={iconSizes.icon24}
-          />
-        )
-      }
-      title={
-        visible
-          ? t('{{assetName}} hidden', { assetName })
-          : t('{{assetName}} unhidden', { assetName })
-      }
-    />
-  )
-}
diff --git a/packages/wallet/src/features/notifications/components/ChooseCountryNotification.tsx b/packages/wallet/src/features/notifications/components/ChooseCountryNotification.tsx
deleted file mode 100644
index 260700be074..00000000000
--- a/packages/wallet/src/features/notifications/components/ChooseCountryNotification.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useTranslation } from 'react-i18next'
-import { SvgUri } from 'react-native-svg'
-import { Flex } from 'ui/src'
-import { iconSizes } from 'ui/src/theme'
-import { getCountryFlagSvgUrl } from 'wallet/src/features/fiatOnRamp/meld'
-import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
-import { ChooseCountryNotification as ChooseCountryNotificationType } from 'wallet/src/features/notifications/types'
-
-export function ChooseCountryNotification({
-  notification: { countryName, countryCode, hideDelay },
-}: {
-  notification: ChooseCountryNotificationType
-}): JSX.Element {
-  const { t } = useTranslation()
-  const countryFlagUrl = getCountryFlagSvgUrl(countryCode)
-  return (
-    <NotificationToast
-      smallToast
-      hideDelay={hideDelay}
-      icon={
-        <Flex borderRadius="$roundedFull" overflow="hidden">
-          <SvgUri height={iconSizes.icon20} uri={countryFlagUrl} width={iconSizes.icon20} />
-        </Flex>
-      }
-      title={t('Switched to {{name}}', { name: countryName })}
-    />
-  )
-}
diff --git a/packages/wallet/src/features/notifications/components/CopiedNotification.tsx b/packages/wallet/src/features/notifications/components/CopiedNotification.tsx
deleted file mode 100644
index 1c5abc2ce4b..00000000000
--- a/packages/wallet/src/features/notifications/components/CopiedNotification.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useTranslation } from 'react-i18next'
-import { SuccessNotification } from 'wallet/src/features/notifications/components/SuccessNotification'
-import { CopyNotification, CopyNotificationType } from 'wallet/src/features/notifications/types'
-
-export function CopiedNotification({
-  notification: { hideDelay = 2000, copyType },
-}: {
-  notification: CopyNotification
-}): JSX.Element | null {
-  const { t } = useTranslation()
-
-  let title
-  switch (copyType) {
-    case CopyNotificationType.Address:
-      title = t('Address copied')
-      break
-    case CopyNotificationType.ContractAddress:
-      title = t('Contract address copied')
-      break
-    case CopyNotificationType.TransactionId:
-      title = t('Transaction ID copied')
-      break
-    case CopyNotificationType.Image:
-      title = t('Image copied')
-      break
-  }
-
-  return <SuccessNotification notification={{ title, hideDelay }} />
-}
diff --git a/packages/wallet/src/features/notifications/components/DefaultNotification.tsx b/packages/wallet/src/features/notifications/components/DefaultNotification.tsx
deleted file mode 100644
index c6c22350a62..00000000000
--- a/packages/wallet/src/features/notifications/components/DefaultNotification.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
-import { AppNotificationDefault } from 'wallet/src/features/notifications/types'
-
-export function DefaultNotification({
-  notification: { address, title, hideDelay },
-}: {
-  notification: AppNotificationDefault
-}): JSX.Element {
-  return <NotificationToast address={address} hideDelay={hideDelay} title={title} />
-}
diff --git a/packages/wallet/src/features/notifications/components/ErrorNotification.tsx b/packages/wallet/src/features/notifications/components/ErrorNotification.tsx
deleted file mode 100644
index 3298fe146d9..00000000000
--- a/packages/wallet/src/features/notifications/components/ErrorNotification.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
-import { AppErrorNotification } from 'wallet/src/features/notifications/types'
-
-export function ErrorNotification({
-  notification: { address, errorMessage, hideDelay },
-}: {
-  notification: AppErrorNotification
-}): JSX.Element {
-  return <NotificationToast address={address} hideDelay={hideDelay} title={errorMessage} />
-}
diff --git a/packages/wallet/src/features/notifications/components/SharedNotificationToastRouter.tsx b/packages/wallet/src/features/notifications/components/SharedNotificationToastRouter.tsx
deleted file mode 100644
index d1ce401be45..00000000000
--- a/packages/wallet/src/features/notifications/components/SharedNotificationToastRouter.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-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'
-import { CopiedNotification } from 'wallet/src/features/notifications/components/CopiedNotification'
-import { DefaultNotification } from 'wallet/src/features/notifications/components/DefaultNotification'
-import { ErrorNotification } from 'wallet/src/features/notifications/components/ErrorNotification'
-import { SuccessNotification } from 'wallet/src/features/notifications/components/SuccessNotification'
-import { SwapNetworkNotification } from 'wallet/src/features/notifications/components/SwapNetworkNotification'
-import { SwapNotification } from 'wallet/src/features/notifications/components/SwapNotification'
-import { SwapPendingNotification } from 'wallet/src/features/notifications/components/SwapPendingNotification'
-import { TransferCurrencyNotification } from 'wallet/src/features/notifications/components/TransferCurrencyNotification'
-import { TransferCurrencyPendingNotification } from 'wallet/src/features/notifications/components/TransferCurrencyPendingNotification'
-import { TransferNFTNotification } from 'wallet/src/features/notifications/components/TransferNFTNotification'
-import { UnknownTxNotification } from 'wallet/src/features/notifications/components/UnknownNotification'
-import { WrapNotification } from 'wallet/src/features/notifications/components/WrapNotification'
-import { AppNotification, AppNotificationType } from 'wallet/src/features/notifications/types'
-import { TransactionType } from 'wallet/src/features/transactions/types'
-
-export function SharedNotificationToastRouter({
-  notification,
-}: {
-  notification: AppNotification
-}): JSX.Element | null {
-  switch (notification.type) {
-    case AppNotificationType.Default:
-      return <DefaultNotification notification={notification} />
-    case AppNotificationType.AssetVisibility:
-      return <ChangeAssetVisibilityNotification notification={notification} />
-    case AppNotificationType.Copied:
-      return <CopiedNotification notification={notification} />
-    case AppNotificationType.Success:
-      return <SuccessNotification notification={notification} />
-    case AppNotificationType.Error:
-      return <ErrorNotification notification={notification} />
-    case AppNotificationType.ChooseCountry:
-      return <ChooseCountryNotification notification={notification} />
-    case AppNotificationType.SwapNetwork:
-      return <SwapNetworkNotification notification={notification} />
-    case AppNotificationType.SwapPending:
-      return <SwapPendingNotification notification={notification} />
-    case AppNotificationType.TransferCurrencyPending:
-      return <TransferCurrencyPendingNotification notification={notification} />
-    case AppNotificationType.Transaction:
-      switch (notification.txType) {
-        case TransactionType.Approve:
-          return <ApproveNotification notification={notification} />
-        case TransactionType.Swap:
-          return <SwapNotification notification={notification} />
-        case TransactionType.Wrap:
-          return <WrapNotification notification={notification} />
-        case TransactionType.Unknown:
-          return <UnknownTxNotification notification={notification} />
-        case TransactionType.Send:
-        case TransactionType.Receive:
-          if (notification.assetType === AssetType.Currency) {
-            return <TransferCurrencyNotification notification={notification} />
-          } else {
-            return <TransferNFTNotification notification={notification} />
-          }
-      }
-  }
-
-  return null
-}
diff --git a/packages/wallet/src/features/notifications/components/SuccessNotification.tsx b/packages/wallet/src/features/notifications/components/SuccessNotification.tsx
deleted file mode 100644
index 9b9bbf10aec..00000000000
--- a/packages/wallet/src/features/notifications/components/SuccessNotification.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { useSporeColors } from 'ui/src'
-import { iconSizes } from 'ui/src/theme'
-import { CheckmarkCircle } from 'wallet/src/components/icons/CheckmarkCircle'
-import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
-import { AppNotificationDefault } from 'wallet/src/features/notifications/types'
-
-export function SuccessNotification({
-  notification: { hideDelay = 2000, title },
-}: {
-  notification: Pick<AppNotificationDefault, 'title' | 'hideDelay'>
-}): JSX.Element | null {
-  const colors = useSporeColors()
-
-  return (
-    <NotificationToast
-      smallToast
-      hideDelay={hideDelay}
-      icon={
-        <CheckmarkCircle
-          backgroundColor={colors.statusSuccess.val}
-          checkmarkStrokeWidth={2}
-          color={colors.sporeWhite.val}
-          size={iconSizes.icon16}
-        />
-      }
-      title={title}
-    />
-  )
-}
diff --git a/packages/wallet/src/features/notifications/components/SwapNetworkNotification.tsx b/packages/wallet/src/features/notifications/components/SwapNetworkNotification.tsx
deleted file mode 100644
index 723531492d7..00000000000
--- a/packages/wallet/src/features/notifications/components/SwapNetworkNotification.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useTranslation } from 'react-i18next'
-import { iconSizes } from 'ui/src/theme'
-import { NetworkLogo } from 'wallet/src/components/CurrencyLogo/NetworkLogo'
-import { CHAIN_INFO } from 'wallet/src/constants/chains'
-import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
-import { SwapNetworkNotification as SwapNetworkNotificationType } from 'wallet/src/features/notifications/types'
-
-export function SwapNetworkNotification({
-  notification: { chainId, hideDelay },
-}: {
-  notification: SwapNetworkNotificationType
-}): JSX.Element {
-  const { t } = useTranslation()
-  const network = CHAIN_INFO[chainId].label
-
-  return (
-    <NotificationToast
-      smallToast
-      hideDelay={hideDelay}
-      icon={<NetworkLogo chainId={chainId} size={iconSizes.icon24} />}
-      title={t('Swapping on {{ network }}', { network })}
-    />
-  )
-}
diff --git a/packages/wallet/src/features/notifications/components/SwapNotification.tsx b/packages/wallet/src/features/notifications/components/SwapNotification.tsx
deleted file mode 100644
index b80f0eba667..00000000000
--- a/packages/wallet/src/features/notifications/components/SwapNotification.tsx
+++ /dev/null
@@ -1,82 +0,0 @@
-import { useTranslation } from 'react-i18next'
-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'
-import { NOTIFICATION_ICON_SIZE } from 'wallet/src/features/notifications/constants'
-import { SwapTxNotification } from 'wallet/src/features/notifications/types'
-import { formSwapNotificationTitle } from 'wallet/src/features/notifications/utils'
-import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
-import { useCreateSwapFormState } from 'wallet/src/features/transactions/hooks'
-import { TransactionStatus } from 'wallet/src/features/transactions/types'
-
-export function SwapNotification({
-  notification: {
-    chainId,
-    txId,
-    txStatus,
-    inputCurrencyId,
-    inputCurrencyAmountRaw,
-    outputCurrencyId,
-    outputCurrencyAmountRaw,
-    tradeType,
-    address,
-    hideDelay,
-  },
-}: {
-  notification: SwapTxNotification
-}): JSX.Element {
-  const formatter = useLocalizationContext()
-  const inputCurrencyInfo = useCurrencyInfo(inputCurrencyId)
-  const outputCurrencyInfo = useCurrencyInfo(outputCurrencyId)
-
-  const title = formSwapNotificationTitle(
-    formatter,
-    txStatus,
-    inputCurrencyInfo?.currency,
-    outputCurrencyInfo?.currency,
-    inputCurrencyId,
-    outputCurrencyId,
-    inputCurrencyAmountRaw,
-    outputCurrencyAmountRaw,
-    tradeType
-  )
-
-  const { t } = useTranslation()
-
-  const { navigateToAccountActivityList, navigateToSwapFlow } = useWalletNavigation()
-
-  const swapFormState = useCreateSwapFormState(address, chainId, txId)
-
-  const onRetry = (): void => {
-    navigateToSwapFlow(swapFormState ? { initialState: swapFormState } : undefined)
-  }
-
-  const retryButton =
-    txStatus === TransactionStatus.Failed
-      ? {
-          title: t('Retry'),
-          onPress: onRetry,
-        }
-      : undefined
-
-  const icon = (
-    <SplitLogo
-      chainId={chainId}
-      inputCurrencyInfo={inputCurrencyInfo}
-      outputCurrencyInfo={outputCurrencyInfo}
-      size={NOTIFICATION_ICON_SIZE}
-    />
-  )
-
-  return (
-    <NotificationToast
-      actionButton={retryButton}
-      address={address}
-      hideDelay={hideDelay}
-      icon={icon}
-      title={title}
-      onPress={navigateToAccountActivityList}
-    />
-  )
-}
diff --git a/packages/wallet/src/features/notifications/components/SwapPendingNotification.tsx b/packages/wallet/src/features/notifications/components/SwapPendingNotification.tsx
deleted file mode 100644
index 2ced0616a97..00000000000
--- a/packages/wallet/src/features/notifications/components/SwapPendingNotification.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import { TFunction, useTranslation } from 'react-i18next'
-import { ONE_SECOND_MS } from 'utilities/src/time/time'
-import { SpinningLoader } from 'wallet/src/components/loading/SpinningLoader'
-import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
-import { SwapPendingNotification as SwapPendingNotificationType } from 'wallet/src/features/notifications/types'
-import { WrapType } from 'wallet/src/features/transactions/types'
-
-// We roughly track the L1 block time, accuracy isnt crucial because we have other pending states,
-// and when a txn confirms it ll replace this toast.
-export const TRANSACTION_PENDING_NOTIFICATION_DELAY = 12 * ONE_SECOND_MS
-
-export function SwapPendingNotification({
-  notification,
-}: {
-  notification: SwapPendingNotificationType
-}): JSX.Element {
-  const { t } = useTranslation()
-
-  const notificationText = getNotificationText(notification.wrapType, t)
-
-  return (
-    <NotificationToast
-      smallToast
-      hideDelay={TRANSACTION_PENDING_NOTIFICATION_DELAY}
-      icon={<SpinningLoader color="$accent1" />}
-      title={notificationText}
-    />
-  )
-}
-
-function getNotificationText(wrapType: WrapType, t: TFunction): string {
-  switch (wrapType) {
-    case WrapType.NotApplicable:
-      return t('Swap pending')
-    case WrapType.Unwrap:
-      return t('Unwrap pending')
-    case WrapType.Wrap:
-      return t('Wrap pending')
-  }
-}
diff --git a/packages/wallet/src/features/notifications/components/TransferCurrencyNotification.tsx b/packages/wallet/src/features/notifications/components/TransferCurrencyNotification.tsx
deleted file mode 100644
index 7378ffa5166..00000000000
--- a/packages/wallet/src/features/notifications/components/TransferCurrencyNotification.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-import { LogoWithTxStatus } from 'wallet/src/components/CurrencyLogo/LogoWithTxStatus'
-import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
-import { useENS } from 'wallet/src/features/ens/useENS'
-import { useLocalizationContext } from 'wallet/src/features/language/LocalizationContext'
-import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
-import { NOTIFICATION_ICON_SIZE } from 'wallet/src/features/notifications/constants'
-import { TransferCurrencyTxNotification } from 'wallet/src/features/notifications/types'
-import { formTransferCurrencyNotificationTitle } from 'wallet/src/features/notifications/utils'
-import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
-import { TransactionType } from 'wallet/src/features/transactions/types'
-import { buildCurrencyId } from 'wallet/src/utils/currencyId'
-
-export function TransferCurrencyNotification({
-  notification,
-}: {
-  notification: TransferCurrencyTxNotification
-}): JSX.Element {
-  const formatter = useLocalizationContext()
-  const {
-    address,
-    assetType,
-    chainId,
-    tokenAddress,
-    currencyAmountRaw,
-    txType,
-    txStatus,
-    hideDelay,
-  } = notification
-  const senderOrRecipient =
-    txType === TransactionType.Send ? notification.recipient : notification.sender
-  const { name: ensName } = useENS(chainId, senderOrRecipient)
-  const currencyInfo = useCurrencyInfo(buildCurrencyId(chainId, tokenAddress))
-
-  const title = formTransferCurrencyNotificationTitle(
-    formatter,
-    txType,
-    txStatus,
-    currencyInfo?.currency,
-    tokenAddress,
-    currencyAmountRaw,
-    ensName ?? senderOrRecipient
-  )
-
-  const { navigateToAccountActivityList } = useWalletNavigation()
-
-  const icon = (
-    <LogoWithTxStatus
-      assetType={assetType}
-      chainId={chainId}
-      currencyInfo={currencyInfo}
-      size={NOTIFICATION_ICON_SIZE}
-      txStatus={txStatus}
-      txType={txType}
-    />
-  )
-
-  return (
-    <NotificationToast
-      address={address}
-      hideDelay={hideDelay}
-      icon={icon}
-      title={title}
-      onPress={navigateToAccountActivityList}
-    />
-  )
-}
diff --git a/packages/wallet/src/features/notifications/components/TransferCurrencyPendingNotification.tsx b/packages/wallet/src/features/notifications/components/TransferCurrencyPendingNotification.tsx
deleted file mode 100644
index b5579cfaf66..00000000000
--- a/packages/wallet/src/features/notifications/components/TransferCurrencyPendingNotification.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useTranslation } from 'react-i18next'
-import { SpinningLoader } from 'wallet/src/components/loading/SpinningLoader'
-import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
-import { TRANSACTION_PENDING_NOTIFICATION_DELAY } from 'wallet/src/features/notifications/components/SwapPendingNotification'
-import { TransferCurrencyPendingNotification as TransferPendingNotificationType } from 'wallet/src/features/notifications/types'
-
-export function TransferCurrencyPendingNotification({
-  notification,
-}: {
-  notification: TransferPendingNotificationType
-}): JSX.Element {
-  const { t } = useTranslation()
-
-  const { currencyInfo } = notification
-
-  return (
-    <NotificationToast
-      smallToast
-      hideDelay={TRANSACTION_PENDING_NOTIFICATION_DELAY}
-      icon={<SpinningLoader color="$accent1" />}
-      title={t(`{{symbol}} transfer pending`, { symbol: currencyInfo.currency.symbol })}
-    />
-  )
-}
diff --git a/packages/wallet/src/features/notifications/components/TransferNFTNotification.tsx b/packages/wallet/src/features/notifications/components/TransferNFTNotification.tsx
deleted file mode 100644
index 1d90a0e935b..00000000000
--- a/packages/wallet/src/features/notifications/components/TransferNFTNotification.tsx
+++ /dev/null
@@ -1,57 +0,0 @@
-import { LogoWithTxStatus } from 'wallet/src/components/CurrencyLogo/LogoWithTxStatus'
-import { useWalletNavigation } from 'wallet/src/contexts/WalletNavigationContext'
-import { useENS } from 'wallet/src/features/ens/useENS'
-import { useNFT } from 'wallet/src/features/nfts/hooks'
-import { NotificationToast } from 'wallet/src/features/notifications/components/NotificationToast'
-import { NOTIFICATION_ICON_SIZE } from 'wallet/src/features/notifications/constants'
-import { TransferNFTTxNotification } from 'wallet/src/features/notifications/types'
-import { formTransferNFTNotificationTitle } from 'wallet/src/features/notifications/utils'
-import { TransactionType } from 'wallet/src/features/transactions/types'
-import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
-
-export function TransferNFTNotification({
-  notification,
-}: {
-  notification: TransferNFTTxNotification
-}): JSX.Element {
-  const { address, assetType, chainId, tokenAddress, tokenId, txType, txStatus, hideDelay } =
-    notification
-  const userAddress = useActiveAccountAddressWithThrow()
-  const senderOrRecipient =
-    txType === TransactionType.Send ? notification.recipient : notification.sender
-  const nftOwner = txType === TransactionType.Send ? notification.recipient : userAddress
-  const { data: nft } = useNFT(nftOwner, tokenAddress, tokenId)
-  const { name: ensName } = useENS(chainId, senderOrRecipient)
-
-  const title = formTransferNFTNotificationTitle(
-    txType,
-    txStatus,
-    nft,
-    tokenAddress,
-    tokenId,
-    ensName ?? senderOrRecipient
-  )
-
-  const { navigateToAccountActivityList } = useWalletNavigation()
-
-  const icon = (
-    <LogoWithTxStatus
-      assetType={assetType}
-      chainId={chainId}
-      nftImageUrl={nft?.thumbnail?.url ?? undefined}
-      size={NOTIFICATION_ICON_SIZE}
-      txStatus={txStatus}
-      txType={txType}
-    />
-  )
-
-  return (
-    <NotificationToast
-      address={address}
-      hideDelay={hideDelay}
-      icon={icon}
-      title={title}
-      onPress={navigateToAccountActivityList}
-    />
-  )
-}
diff --git a/packages/wallet/src/features/notifications/components/UnknownNotification.tsx b/packages/wallet/src/features/notifications/components/UnknownNotification.tsx
deleted file mode 100644
index f2d7e4e54c4..00000000000
--- a/packages/wallet/src/features/notifications/components/UnknownNotification.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-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'
-import { TransactionNotificationBase } from 'wallet/src/features/notifications/types'
-import { formUnknownTxTitle } from 'wallet/src/features/notifications/utils'
-import { useCurrencyInfo } from 'wallet/src/features/tokens/useCurrencyInfo'
-import { buildCurrencyId } from 'wallet/src/utils/currencyId'
-
-export function UnknownTxNotification({
-  notification: { address, chainId, tokenAddress, txStatus, txType, hideDelay },
-}: {
-  notification: TransactionNotificationBase
-}): JSX.Element {
-  const { name: ensName } = useENS(chainId, tokenAddress)
-  const currencyInfo = useCurrencyInfo(
-    tokenAddress ? buildCurrencyId(chainId, tokenAddress) : undefined
-  )
-  const title = formUnknownTxTitle(txStatus, tokenAddress, ensName)
-  const icon = (
-    <LogoWithTxStatus
-      assetType={AssetType.Currency}
-      chainId={chainId}
-      currencyInfo={currencyInfo}
-      size={NOTIFICATION_ICON_SIZE}
-      txStatus={txStatus}
-      txType={txType}
-    />
-  )
-
-  const { navigateToAccountActivityList } = useWalletNavigation()
-
-  return (
-    <NotificationToast
-      address={address}
-      hideDelay={hideDelay}
-      icon={icon}
-      title={title}
-      onPress={navigateToAccountActivityList}
-    />
-  )
-}
diff --git a/packages/wallet/src/features/notifications/components/WrapNotification.tsx b/packages/wallet/src/features/notifications/components/WrapNotification.tsx
deleted file mode 100644
index 5c3a4f83ecc..00000000000
--- a/packages/wallet/src/features/notifications/components/WrapNotification.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { useTranslation } from 'react-i18next'
-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'
-import { NOTIFICATION_ICON_SIZE } from 'wallet/src/features/notifications/constants'
-import { WrapTxNotification } from 'wallet/src/features/notifications/types'
-import { formWrapNotificationTitle } from 'wallet/src/features/notifications/utils'
-import {
-  useNativeCurrencyInfo,
-  useWrappedNativeCurrencyInfo,
-} from 'wallet/src/features/tokens/useCurrencyInfo'
-import { useCreateWrapFormState } from 'wallet/src/features/transactions/hooks'
-import { TransactionStatus } from 'wallet/src/features/transactions/types'
-
-export function WrapNotification({
-  notification: { txId, txStatus, currencyAmountRaw, address, hideDelay, unwrapped, chainId },
-}: {
-  notification: WrapTxNotification
-}): JSX.Element {
-  const { t } = useTranslation()
-  const formatter = useLocalizationContext()
-
-  const nativeCurrencyInfo = useNativeCurrencyInfo(chainId)
-  const wrappedCurrencyInfo = useWrappedNativeCurrencyInfo(chainId)
-  const inputCurrencyInfo = unwrapped ? wrappedCurrencyInfo : nativeCurrencyInfo
-  const outputCurrencyInfo = unwrapped ? nativeCurrencyInfo : wrappedCurrencyInfo
-
-  const title = formWrapNotificationTitle(
-    formatter,
-    txStatus,
-    inputCurrencyInfo?.currency,
-    outputCurrencyInfo?.currency,
-    currencyAmountRaw,
-    unwrapped
-  )
-
-  const wrapFormState = useCreateWrapFormState(
-    address,
-    chainId,
-    txId,
-    inputCurrencyInfo?.currency,
-    outputCurrencyInfo?.currency
-  )
-
-  const { navigateToAccountActivityList, navigateToSwapFlow } = useWalletNavigation()
-
-  const onRetry = (): void => {
-    navigateToSwapFlow(wrapFormState ? { initialState: wrapFormState } : undefined)
-  }
-
-  const retryButton =
-    txStatus === TransactionStatus.Failed
-      ? {
-          title: t('Retry'),
-          onPress: onRetry,
-        }
-      : undefined
-
-  const icon = (
-    <SplitLogo
-      chainId={chainId}
-      inputCurrencyInfo={inputCurrencyInfo}
-      outputCurrencyInfo={outputCurrencyInfo}
-      size={NOTIFICATION_ICON_SIZE}
-    />
-  )
-
-  return (
-    <NotificationToast
-      actionButton={retryButton}
-      address={address}
-      hideDelay={hideDelay}
-      icon={icon}
-      title={title}
-      onPress={navigateToAccountActivityList}
-    />
-  )
-}
diff --git a/packages/wallet/src/features/notifications/constants.ts b/packages/wallet/src/features/notifications/constants.ts
deleted file mode 100644
index f325eb6f0c3..00000000000
--- a/packages/wallet/src/features/notifications/constants.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { iconSizes } from 'ui/src/theme'
-
-export const NOTIFICATION_ICON_SIZE = iconSizes.icon36
diff --git a/packages/wallet/src/features/notifications/hooks.ts b/packages/wallet/src/features/notifications/hooks.ts
deleted file mode 100644
index 6ee32dda0c2..00000000000
--- a/packages/wallet/src/features/notifications/hooks.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { useMemo } from 'react'
-import { makeSelectHasNotifications } from 'wallet/src/features/notifications/selectors'
-import { useAppSelector } from 'wallet/src/state'
-
-export function useSelectAddressHasNotifications(address: Address | null): boolean | undefined {
-  const selectHasNotifications = useMemo(makeSelectHasNotifications, [])
-  return useAppSelector((state) => selectHasNotifications(state, address))
-}
diff --git a/packages/wallet/src/features/notifications/types.ts b/packages/wallet/src/features/notifications/types.ts
index cb693d87623..0e064ac48a6 100644
--- a/packages/wallet/src/features/notifications/types.ts
+++ b/packages/wallet/src/features/notifications/types.ts
@@ -1,7 +1,6 @@
 import { TradeType } from '@uniswap/sdk-core'
 import { ChainId } from 'wallet/src/constants/chains'
 import { AssetType } from 'wallet/src/entities/assets'
-import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
 import {
   FinalizedTransactionStatus,
   TransactionType,
@@ -21,8 +20,6 @@ export enum AppNotificationType {
   ChooseCountry,
   AssetVisibility, // could be token or NFT
   SwapPending,
-  TransferCurrencyPending,
-  ScantasticComplete,
 }
 
 interface AppNotificationBase {
@@ -133,7 +130,6 @@ export type TransactionNotification =
 
 export enum CopyNotificationType {
   Address = 'address',
-  ContractAddress = 'contractAddress',
   TransactionId = 'transactionId',
   Image = 'image',
 }
@@ -170,20 +166,10 @@ export interface SwapPendingNotification extends AppNotificationBase {
   wrapType: WrapType
 }
 
-export interface TransferCurrencyPendingNotification extends AppNotificationBase {
-  type: AppNotificationType.TransferCurrencyPending
-  currencyInfo: CurrencyInfo
-}
-
-export interface ScantasticCompleteNotification extends AppNotificationBase {
-  type: AppNotificationType.ScantasticComplete
-}
-
 export type AppNotification =
   | AppNotificationDefault
   | AppErrorNotification
   | SwapPendingNotification
-  | TransferCurrencyPendingNotification
   | CopyNotification
   | WalletConnectNotification
   | TransactionNotification
@@ -191,4 +177,3 @@ export type AppNotification =
   | ChooseCountryNotification
   | ChangeAssetVisibilityNotification
   | SuccessNotification
-  | ScantasticCompleteNotification
diff --git a/packages/wallet/src/features/notifications/utils.test.ts b/packages/wallet/src/features/notifications/utils.test.ts
deleted file mode 100644
index 46fd35ad19c..00000000000
--- a/packages/wallet/src/features/notifications/utils.test.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-import { TradeType } from '@uniswap/sdk-core'
-import { DAI, USDC } from 'wallet/src/constants/tokens'
-import { TransactionStatus } from 'wallet/src/features/transactions/types'
-import { initializeTranslation } from 'wallet/src/i18n/i18n'
-import { mockLocalizedFormatter } from 'wallet/src/test/utils'
-import { formSwapNotificationTitle } from './utils'
-
-describe(formSwapNotificationTitle, () => {
-  beforeAll(() => {
-    initializeTranslation()
-  })
-
-  it('formats successful local swap title', () => {
-    expect(
-      formSwapNotificationTitle(
-        mockLocalizedFormatter,
-        TransactionStatus.Success,
-        DAI,
-        USDC,
-        '1-DAI',
-        '1-USDC',
-        '1000000000000000000',
-        '1000000',
-        TradeType.EXACT_INPUT
-      )
-    ).toEqual('Swapped 1.00 DAI for ~1.00 USDC.')
-  })
-
-  it('formats successful remote swap title', () => {
-    expect(
-      formSwapNotificationTitle(
-        mockLocalizedFormatter,
-        TransactionStatus.Success,
-        DAI,
-        USDC,
-        '1-DAI',
-        '1-USDC',
-        '1000000000000000000',
-        '1200000'
-      )
-    ).toEqual('Swapped 1.00 DAI for 1.20 USDC.')
-  })
-
-  it('formats canceled swap title', () => {
-    expect(
-      formSwapNotificationTitle(
-        mockLocalizedFormatter,
-        TransactionStatus.Cancelled,
-        DAI,
-        USDC,
-        '1-DAI',
-        '1-USDC',
-        '1000000000000000000',
-        '1000000',
-        TradeType.EXACT_INPUT
-      )
-    ).toEqual('Canceled DAI-USDC swap.')
-  })
-
-  it('formats failed swap title', () => {
-    expect(
-      formSwapNotificationTitle(
-        mockLocalizedFormatter,
-        TransactionStatus.Failed,
-        DAI,
-        USDC,
-        '1-DAI',
-        '1-USDC',
-        '1000000000000000000',
-        '1000000',
-        TradeType.EXACT_INPUT
-      )
-    ).toEqual('Failed to swap 1.00 DAI for ~1.00 USDC.')
-  })
-})
diff --git a/packages/wallet/src/features/portfolio/TokenBalanceList.tsx b/packages/wallet/src/features/portfolio/TokenBalanceList.tsx
new file mode 100644
index 00000000000..76641c0e9f8
--- /dev/null
+++ b/packages/wallet/src/features/portfolio/TokenBalanceList.tsx
@@ -0,0 +1,75 @@
+// import { ReactNavigationPerformanceView } from '@shopify/react-native-performance-navigation'
+import { useMemo } from 'react'
+import { ScrollView } from 'tamagui'
+import { Flex, Text } from 'ui/src'
+import { PollingInterval } from 'wallet/src/constants/misc'
+import { useSortedPortfolioBalances } from 'wallet/src/features/dataApi/balances'
+import { PortfolioBalance } from 'wallet/src/features/dataApi/types'
+import { TokenBalanceItem } from './TokenBalanceItem'
+
+type TokenBalanceListProps = {
+  owner: Address
+}
+
+export function TokenBalanceList({ owner }: TokenBalanceListProps): JSX.Element {
+  const { data, loading } = useSortedPortfolioBalances({
+    address: owner,
+    pollInterval: PollingInterval.KindaFast,
+  })
+
+  const listItems = useMemo((): PortfolioBalance[] | undefined => {
+    if (!data) {
+      return
+    }
+
+    const { balances, hiddenBalances } = data
+
+    // No balances
+    if (!balances.length && !hiddenBalances.length) {
+      return
+    }
+
+    // No hidden tokens
+    if (balances.length > 0 && hiddenBalances.length === 0) {
+      return balances
+    }
+
+    // Show all tokens including hidden
+    return [...balances, ...hiddenBalances]
+  }, [data])
+
+  if (!data && loading) {
+    return (
+      <Flex centered minHeight={100} width="100%">
+        <Text color="$neutral3" variant="body1">
+          Loading token balances...
+        </Text>
+      </Flex>
+    )
+  }
+
+  if (!data || data?.balances?.length === 0) {
+    return (
+      <Flex centered minHeight={100} width="100%">
+        <Text color="$neutral3" variant="body1">
+          No tokens
+        </Text>
+      </Flex>
+    )
+  }
+
+  return (
+    <ScrollView pt="$spacing8" showsVerticalScrollIndicator={false} width="100%">
+      {listItems?.map((balance: PortfolioBalance) => {
+        return (
+          <TokenBalanceItem
+            key={balance.currencyInfo.currencyId}
+            // TODO: before passing down loading, add subtle animation on refresh of data, and make loaders take up same space as final objects
+            // loading={loading}
+            portfolioBalance={balance}
+          />
+        )
+      })}
+    </ScrollView>
+  )
+}
diff --git a/packages/wallet/src/features/portfolio/api.ts b/packages/wallet/src/features/portfolio/api.ts
index ed77f664724..5fedb848227 100644
--- a/packages/wallet/src/features/portfolio/api.ts
+++ b/packages/wallet/src/features/portfolio/api.ts
@@ -8,7 +8,7 @@ import { createEthersProvider } from 'wallet/src/features/providers/createEthers
 import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { walletContextValue } from 'wallet/src/features/wallet/context'
 import { currencyAddress as getCurrencyAddress } from 'wallet/src/utils/currencyId'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
 // stub endpoint to conform to REST endpoint styles
 // Rest link should intercept and use custom fetcher instead
diff --git a/packages/wallet/src/features/providers/ProviderManager.ts b/packages/wallet/src/features/providers/ProviderManager.ts
index 85e73d5dfec..455844f5eb8 100644
--- a/packages/wallet/src/features/providers/ProviderManager.ts
+++ b/packages/wallet/src/features/providers/ProviderManager.ts
@@ -2,7 +2,7 @@ import { providers as ethersProviders } from 'ethers'
 import { Task } from 'redux-saga'
 import { logger } from 'utilities/src/logger/logger'
 import { isStale } from 'utilities/src/time/time'
-import { CHAIN_INFO, ChainId, L1ChainInfo, L2ChainInfo, RPCType } from 'wallet/src/constants/chains'
+import { ChainId, CHAIN_INFO, L1ChainInfo, L2ChainInfo, RPCType } from 'wallet/src/constants/chains'
 import { createEthersProvider } from 'wallet/src/features/providers/createEthersProvider'
 import { getInfuraChainName } from 'wallet/src/features/providers/utils'
 
@@ -27,7 +27,7 @@ type ChainIdToProvider = Partial<Record<ChainId, ProviderInfo>>
 const getChainDetails = (chainId: ChainId): L1ChainInfo | L2ChainInfo => {
   const chainDetails = CHAIN_INFO[chainId]
   if (!chainDetails) {
-    logger.error(new Error('Cannot create provider for invalid chain details'), {
+    logger.error('Cannot create provider for invalid chain details', {
       tags: {
         file: 'ProviderManager',
         function: 'getChainDetails',
diff --git a/packages/wallet/src/features/providers/createEthersProvider.ts b/packages/wallet/src/features/providers/createEthersProvider.ts
index 9fd366478ac..1b26877189b 100644
--- a/packages/wallet/src/features/providers/createEthersProvider.ts
+++ b/packages/wallet/src/features/providers/createEthersProvider.ts
@@ -1,7 +1,7 @@
 import { providers as ethersProviders } from 'ethers'
 import { logger } from 'utilities/src/logger/logger'
 import { config } from 'wallet/src/config'
-import { CHAIN_INFO, ChainId, RPCType } from 'wallet/src/constants/chains'
+import { ChainId, CHAIN_INFO, RPCType } from 'wallet/src/constants/chains'
 import { getInfuraChainName } from 'wallet/src/features/providers/utils'
 
 // Should use ProviderManager for provider access unless being accessed outside of ProviderManagerContext (e.g., Apollo initialization)
diff --git a/packages/wallet/src/features/providers/utils.ts b/packages/wallet/src/features/providers/utils.ts
index fcb7079e857..d996d6674e0 100644
--- a/packages/wallet/src/features/providers/utils.ts
+++ b/packages/wallet/src/features/providers/utils.ts
@@ -1,4 +1,4 @@
-import { CHAIN_INFO, ChainId, RPCType } from 'wallet/src/constants/chains'
+import { ChainId, CHAIN_INFO, RPCType } from 'wallet/src/constants/chains'
 
 // Should match supported chains in `InfuraProvider` class within `getUrl` method
 export type InfuraChainName =
diff --git a/packages/wallet/src/features/routing/hooks.ts b/packages/wallet/src/features/routing/hooks.ts
index d77c4a54a55..f8ae441f009 100644
--- a/packages/wallet/src/features/routing/hooks.ts
+++ b/packages/wallet/src/features/routing/hooks.ts
@@ -8,7 +8,6 @@ import { RoutingIntent, TradeQuoteRequest, useQuoteQuery } from 'wallet/src/feat
 import { TradeQuoteResult } from 'wallet/src/features/routing/types'
 import { PermitSignatureInfo } from 'wallet/src/features/transactions/swap/usePermit2Signature'
 import { UseTradeArgs } from 'wallet/src/features/transactions/swap/useTrade'
-import { QuoteType } from 'wallet/src/features/transactions/utils'
 import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
 import {
   areCurrencyIdsEqual,
@@ -128,28 +127,14 @@ export function useSimulatedGasLimit(
     customSlippageTolerance,
   })
 
-  // Enforce routing api quote type
-  const quote =
-    data?.trade.quoteData?.quoteType === QuoteType.RoutingApi
-      ? data?.trade.quoteData.quote
-      : undefined
-
   return useMemo(
     () => ({
       loading: loading || isDebouncing,
       error: error || data?.simulationError,
-      quoteId: quote?.quoteId,
-      requestId: quote?.requestId,
+      quoteId: data?.trade.quote?.quoteId,
+      requestId: data?.trade.quote?.requestId,
       simulatedGasLimit: data?.gasUseEstimate,
     }),
-    [
-      loading,
-      isDebouncing,
-      error,
-      data?.simulationError,
-      data?.gasUseEstimate,
-      quote?.quoteId,
-      quote?.requestId,
-    ]
+    [loading, isDebouncing, error, data]
   )
 }
diff --git a/packages/wallet/src/features/search/selectSearchHistory.ts b/packages/wallet/src/features/search/selectSearchHistory.ts
deleted file mode 100644
index b324b1317c4..00000000000
--- a/packages/wallet/src/features/search/selectSearchHistory.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { SharedState } from 'wallet/src/state/reducer'
-import { SearchResult } from './SearchResult'
-
-export const selectSearchHistory = (state: SharedState): SearchResult[] => {
-  return state.searchHistory.results
-}
diff --git a/packages/wallet/src/features/tokens/NativeCurrency.ts b/packages/wallet/src/features/tokens/NativeCurrency.ts
index 948b0a1cf98..a3c524345fd 100644
--- a/packages/wallet/src/features/tokens/NativeCurrency.ts
+++ b/packages/wallet/src/features/tokens/NativeCurrency.ts
@@ -1,7 +1,7 @@
 // adapted from https://github.com/Uniswap/interface/src/constants/tokens.ts
 import { Currency, NativeCurrency as NativeCurrencyClass, Token } from '@uniswap/sdk-core'
 import { getNativeAddress } from 'wallet/src/constants/addresses'
-import { CHAIN_INFO, ChainId } from 'wallet/src/constants/chains'
+import { ChainId, CHAIN_INFO } from 'wallet/src/constants/chains'
 import { wrappedNativeCurrency } from 'wallet/src/constants/tokens'
 import { toSupportedChainId } from 'wallet/src/features/chains/utils'
 
diff --git a/packages/wallet/src/features/transactions/SummaryCards/types.ts b/packages/wallet/src/features/transactions/SummaryCards/types.ts
index 352b25e3a48..416a26da203 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/types.ts
+++ b/packages/wallet/src/features/transactions/SummaryCards/types.ts
@@ -1,10 +1,8 @@
 import { ChainId } from 'wallet/src/constants/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 {
-  authTrigger?: AuthTrigger
   transaction: TransactionDetails
   title?: string
   caption: string
@@ -13,7 +11,6 @@ export interface TransactionSummaryLayoutProps {
 }
 
 export interface SummaryItemProps {
-  authTrigger?: AuthTrigger
   transaction: TransactionDetails
   layoutElement: React.FunctionComponent<TransactionSummaryLayoutProps>
   swapCallbacks?: SwapSummaryCallbacks
diff --git a/packages/wallet/src/features/transactions/SummaryCards/utils.ts b/packages/wallet/src/features/transactions/SummaryCards/utils.ts
index bb1af11a556..901201265fd 100644
--- a/packages/wallet/src/features/transactions/SummaryCards/utils.ts
+++ b/packages/wallet/src/features/transactions/SummaryCards/utils.ts
@@ -5,10 +5,10 @@ import { iconSizes } from 'ui/src/theme'
 import { ONE_MINUTE_MS } from 'utilities/src/time/time'
 import { useInterval } from 'utilities/src/time/timing'
 import {
-  LoadingItem,
-  SectionHeader,
   isLoadingItem,
   isSectionHeader,
+  LoadingItem,
+  SectionHeader,
 } from 'wallet/src/features/activity/utils'
 import {
   FORMAT_DATE_MONTH_DAY,
@@ -44,10 +44,7 @@ export function generateActivityItemRenderer(
   layoutElement: React.FunctionComponent<TransactionSummaryLayoutProps>,
   loadingItem: JSX.Element,
   sectionHeaderElement: React.FunctionComponent<{ title: string }>,
-  swapCallbacks: SwapSummaryCallbacks | undefined,
-  authTrigger:
-    | ((args: { successCallback: () => void; failureCallback: () => void }) => Promise<void>)
-    | undefined
+  swapCallbacks?: SwapSummaryCallbacks
 ): ActivityItemRenderer {
   return function ActivityItemComponent({ item }: { item: ActivityItem }): JSX.Element {
     // if it's a loading item, render the loading placeholder
@@ -96,7 +93,6 @@ export function generateActivityItemRenderer(
     }
 
     return createElement(SummaryItem as React.FunctionComponent<SummaryItemProps>, {
-      authTrigger,
       transaction: item,
       layoutElement,
       swapCallbacks,
diff --git a/packages/wallet/src/features/transactions/contexts/SwapTxContext.tsx b/packages/wallet/src/features/transactions/contexts/SwapTxContext.tsx
deleted file mode 100644
index 46ebc3c84df..00000000000
--- a/packages/wallet/src/features/transactions/contexts/SwapTxContext.tsx
+++ /dev/null
@@ -1,85 +0,0 @@
-import { createContext, ReactNode, useContext, useMemo } from 'react'
-import { useSwapFormContext } from 'wallet/src/features/transactions/contexts/SwapFormContext'
-import { useSwapTxAndGasInfoLegacy } from 'wallet/src/features/transactions/swap/hooks'
-import { useSwapTxAndGasInfoTradingApi } from 'wallet/src/features/transactions/swap/tradingApiHooks/useSwapTxAndGasInfoTradingApi'
-import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-
-type SwapTxContextState = {
-  txRequest: ReturnType<typeof useSwapTxAndGasInfoTradingApi>['txRequest']
-  approveTxRequest: ReturnType<typeof useSwapTxAndGasInfoTradingApi>['approveTxRequest']
-  approvalError: ReturnType<typeof useSwapTxAndGasInfoTradingApi>['approvalError']
-  gasFee: ReturnType<typeof useSwapTxAndGasInfoTradingApi>['gasFee']
-}
-
-export const SwapTxContext = createContext<SwapTxContextState | undefined>(undefined)
-
-/**
- * TODO: https://linear.app/uniswap/issue/MOB-2440/remove-conditional-swap-context
- *
- * We create 2 versions of the swap contexts, 1 for each routing API (legacy and trading api).
- *
- * This helps us conditionally render based on the trading-api feature flag, without conditionally rendering hooks.
- */
-export function SwapTxContextProviderLegacyApi({ children }: { children: ReactNode }): JSX.Element {
-  const { derivedSwapInfo } = useSwapFormContext()
-
-  const currencyBalanceIn = derivedSwapInfo.currencyBalances[CurrencyField.INPUT]
-  const currencyAmountIn = derivedSwapInfo.currencyAmounts[CurrencyField.INPUT]
-
-  const isBalanceInsufficient = Boolean(
-    currencyAmountIn && currencyBalanceIn?.lessThan(currencyAmountIn)
-  )
-
-  const { txRequest, approveTxRequest, gasFee } = useSwapTxAndGasInfoLegacy({
-    derivedSwapInfo,
-    // When the balance is insufficient to swap, we want to skip the gas queries to avoid a 400 error.
-    skipGasFeeQuery: isBalanceInsufficient,
-  })
-
-  const state = useMemo<SwapTxContextState>(
-    (): SwapTxContextState => ({
-      txRequest,
-      approveTxRequest,
-      gasFee,
-      approvalError: undefined, // Legacy approval logic doesnt make api request for approval, so can ignore this.
-    }),
-    [approveTxRequest, gasFee, txRequest]
-  )
-
-  return <SwapTxContext.Provider value={state}>{children}</SwapTxContext.Provider>
-}
-
-// Same as above, with different hook for data fetching.
-export function SwapTxContextProviderTradingApi({
-  children,
-}: {
-  children: ReactNode
-}): JSX.Element {
-  const { derivedSwapInfo } = useSwapFormContext()
-
-  const { txRequest, approveTxRequest, gasFee, approvalError } = useSwapTxAndGasInfoTradingApi({
-    derivedSwapInfo,
-  })
-
-  const state = useMemo<SwapTxContextState>(
-    (): SwapTxContextState => ({
-      txRequest,
-      approveTxRequest,
-      gasFee,
-      approvalError,
-    }),
-    [approvalError, approveTxRequest, gasFee, txRequest]
-  )
-
-  return <SwapTxContext.Provider value={state}>{children}</SwapTxContext.Provider>
-}
-
-export const useSwapTxContext = (): SwapTxContextState => {
-  const swapContext = useContext(SwapTxContext)
-
-  if (swapContext === undefined) {
-    throw new Error('`useSwapTxContext` must be used inside of `SwapTxContextProvider`')
-  }
-
-  return swapContext
-}
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 88c7fde7074..5cfa5c96852 100644
--- a/packages/wallet/src/features/transactions/history/conversion/conversion.test.ts
+++ b/packages/wallet/src/features/transactions/history/conversion/conversion.test.ts
@@ -6,10 +6,10 @@ import {
   Chain,
   Currency,
   NftStandard,
-  TransactionType as RemoteTransactionType,
   TokenStandard,
   TransactionDirection,
   TransactionStatus,
+  TransactionType as RemoteTransactionType,
 } from 'wallet/src/data/__generated__/types-and-hooks'
 import {
   NFTTradeType,
diff --git a/packages/wallet/src/features/transactions/history/conversion/extractTransactionDetails.ts b/packages/wallet/src/features/transactions/history/conversion/extractTransactionDetails.ts
index 198b7eb0077..c72674e4e4c 100644
--- a/packages/wallet/src/features/transactions/history/conversion/extractTransactionDetails.ts
+++ b/packages/wallet/src/features/transactions/history/conversion/extractTransactionDetails.ts
@@ -1,9 +1,9 @@
 import { ChainId } from 'wallet/src/constants/chains'
+import { SpamCode } from 'wallet/src/data/types'
 import {
   TransactionStatus as RemoteTransactionStatus,
   TransactionType as RemoteTransactionType,
 } from 'wallet/src/data/__generated__/types-and-hooks'
-import { SpamCode } from 'wallet/src/data/types'
 import { fromGraphQLChain } from 'wallet/src/features/chains/utils'
 import {
   TransactionDetails,
diff --git a/packages/wallet/src/features/transactions/history/utils.ts b/packages/wallet/src/features/transactions/history/utils.ts
index 5c858be92d0..fb09ceda6a3 100644
--- a/packages/wallet/src/features/transactions/history/utils.ts
+++ b/packages/wallet/src/features/transactions/history/utils.ts
@@ -22,7 +22,7 @@ import {
   TransactionListQueryResponse,
   TransactionStatus,
 } from 'wallet/src/features/transactions/types'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
 export interface AllFormattedTransactions {
   last24hTransactionList: TransactionDetails[]
diff --git a/packages/wallet/src/features/transactions/hooks/useAllTransactionsBetweenAddresses.ts b/packages/wallet/src/features/transactions/hooks/useAllTransactionsBetweenAddresses.ts
deleted file mode 100644
index 537352a5464..00000000000
--- a/packages/wallet/src/features/transactions/hooks/useAllTransactionsBetweenAddresses.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { useMemo } from 'react'
-import { useSelectAddressTransactions } from 'wallet/src/features/transactions/selectors'
-import { TransactionDetails, TransactionType } from 'wallet/src/features/transactions/types'
-
-/**
- * Gets all transactions from a given sender and to a given recipient
- * @param sender Get all transactions sent by this sender
- * @param recipient Then filter so that we only keep txns to this recipient
- */
-export function useAllTransactionsBetweenAddresses(
-  sender: Address,
-  recipient: Maybe<Address>
-): TransactionDetails[] | undefined {
-  const txnsToSearch = useSelectAddressTransactions(sender)
-  return useMemo(() => {
-    if (!sender || !recipient || !txnsToSearch) {
-      return
-    }
-    return txnsToSearch.filter(
-      (tx: TransactionDetails) =>
-        tx.typeInfo.type === TransactionType.Send && tx.typeInfo.recipient === recipient
-    )
-  }, [recipient, sender, txnsToSearch])
-}
diff --git a/packages/wallet/src/features/transactions/hooks/useTokenFormActionHandlers.ts b/packages/wallet/src/features/transactions/hooks/useTokenFormActionHandlers.ts
deleted file mode 100644
index 4bcb5636e42..00000000000
--- a/packages/wallet/src/features/transactions/hooks/useTokenFormActionHandlers.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-import { AnyAction } from '@reduxjs/toolkit'
-import { useCallback } from 'react'
-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>): {
-  onCreateTxId: (txId: string) => void
-  onFocusInput: () => void
-  onFocusOutput: () => void
-  onSwitchCurrencies: () => void
-  onToggleFiatInput: (isFiatInput: boolean) => void
-  onSetExactAmount: (field: CurrencyField, value: string, isFiatInput?: boolean) => void
-  onSetMax: (amount: string) => void
-} {
-  const onUpdateExactTokenAmount = useCallback(
-    (field: CurrencyField, amount: string) =>
-      dispatch(transactionStateActions.updateExactAmountToken({ field, amount })),
-    [dispatch]
-  )
-
-  const onUpdateExactUSDAmount = useCallback(
-    (field: CurrencyField, amount: string) =>
-      dispatch(transactionStateActions.updateExactAmountFiat({ field, amount })),
-    [dispatch]
-  )
-
-  const onSetExactAmount = useCallback(
-    (field: CurrencyField, value: string, isFiatInput?: boolean) => {
-      const updater = isFiatInput ? onUpdateExactUSDAmount : onUpdateExactTokenAmount
-      updater(field, value)
-    },
-    [onUpdateExactUSDAmount, onUpdateExactTokenAmount]
-  )
-
-  const onSetMax = useCallback(
-    (amount: string) => {
-      // when setting max amount, always switch to token mode because
-      // our token/usd updater doesnt handle this case yet
-      dispatch(transactionStateActions.toggleFiatInput(false))
-      dispatch(
-        transactionStateActions.updateExactAmountToken({ field: CurrencyField.INPUT, amount })
-      )
-      // Unfocus the CurrencyInputField by setting focusOnCurrencyField to null
-      dispatch(transactionStateActions.onFocus(null))
-    },
-    [dispatch]
-  )
-
-  const onSwitchCurrencies = useCallback(() => {
-    dispatch(transactionStateActions.switchCurrencySides())
-  }, [dispatch])
-
-  const onToggleFiatInput = useCallback(
-    (isFiatInput: boolean) => dispatch(transactionStateActions.toggleFiatInput(isFiatInput)),
-    [dispatch]
-  )
-
-  const onCreateTxId = useCallback(
-    (txId: string) => dispatch(transactionStateActions.setTxId(txId)),
-    [dispatch]
-  )
-
-  const onFocusInput = useCallback(
-    () => dispatch(transactionStateActions.onFocus(CurrencyField.INPUT)),
-    [dispatch]
-  )
-  const onFocusOutput = useCallback(
-    () => dispatch(transactionStateActions.onFocus(CurrencyField.OUTPUT)),
-    [dispatch]
-  )
-  return {
-    onCreateTxId,
-    onFocusInput,
-    onFocusOutput,
-    onSwitchCurrencies,
-    onToggleFiatInput,
-    onSetExactAmount,
-    onSetMax,
-  }
-}
diff --git a/packages/wallet/src/features/transactions/hooks/useTokenSelectorActionHandlers.ts b/packages/wallet/src/features/transactions/hooks/useTokenSelectorActionHandlers.ts
deleted file mode 100644
index 5d506293fab..00000000000
--- a/packages/wallet/src/features/transactions/hooks/useTokenSelectorActionHandlers.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-import { AnyAction } from '@reduxjs/toolkit'
-import { Currency } from '@uniswap/sdk-core'
-import { useCallback } from 'react'
-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'
-import { sendWalletAnalyticsEvent } from 'wallet/src/telemetry'
-import { WalletEventName } from 'wallet/src/telemetry/constants'
-import { currencyAddress } from 'wallet/src/utils/currencyId'
-
-export function useTokenSelectorActionHandlers(
-  dispatch: React.Dispatch<AnyAction>,
-  flow: TokenSelectorFlow
-): {
-  onShowTokenSelector: (field: CurrencyField) => void
-  onHideTokenSelector: () => void
-  onSelectCurrency: (currency: Currency, field: CurrencyField, context: SearchContext) => void
-} {
-  const onShowTokenSelector = useCallback(
-    (field: CurrencyField) => dispatch(transactionStateActions.showTokenSelector(field)),
-    [dispatch]
-  )
-
-  const onHideTokenSelector = useCallback(
-    () => dispatch(transactionStateActions.showTokenSelector(undefined)),
-    [dispatch]
-  )
-
-  const onSelectCurrency = useCallback(
-    (currency: Currency, field: CurrencyField, context: SearchContext) => {
-      dispatch(
-        transactionStateActions.selectCurrency({
-          field,
-          tradeableAsset: {
-            address: currencyAddress(currency),
-            chainId: currency.chainId,
-            type: AssetType.Currency,
-          },
-        })
-      )
-
-      // log event that a currency was selected
-      sendWalletAnalyticsEvent(WalletEventName.TokenSelected, {
-        name: currency.name,
-        address: currencyAddress(currency),
-        chain: currency.chainId,
-        modal: flowToModalName(flow),
-        field,
-        category: context.category,
-        position: context.position,
-        suggestion_count: context.suggestionCount,
-        query: context.query,
-      })
-
-      // hide screen when done selecting
-      onHideTokenSelector()
-    },
-    [dispatch, flow, onHideTokenSelector]
-  )
-  return { onSelectCurrency, onShowTokenSelector, onHideTokenSelector }
-}
diff --git a/packages/wallet/src/features/transactions/refetchGQLQueriesSaga.ts b/packages/wallet/src/features/transactions/refetchGQLQueriesSaga.ts
index 8109e654245..13d730a6d88 100644
--- a/packages/wallet/src/features/transactions/refetchGQLQueriesSaga.ts
+++ b/packages/wallet/src/features/transactions/refetchGQLQueriesSaga.ts
@@ -3,20 +3,20 @@ import { call, delay } from 'typed-redux-saga'
 import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { getNativeAddress } from 'wallet/src/constants/addresses'
 import { PollingInterval } from 'wallet/src/constants/misc'
+import { GQLQueries } from 'wallet/src/data/queries'
 import {
   PortfolioBalancesDocument,
   PortfolioBalancesQuery,
 } from 'wallet/src/data/__generated__/types-and-hooks'
-import { GQLQueries } from 'wallet/src/data/queries'
 import { fromGraphQLChain } from 'wallet/src/features/chains/utils'
 import { TransactionDetails, TransactionType } from 'wallet/src/features/transactions/types'
 import { sendWalletAnalyticsEvent } from 'wallet/src/telemetry'
 import { WalletEventName } from 'wallet/src/telemetry/constants'
 import {
-  CurrencyId,
   buildCurrencyId,
   buildNativeCurrencyId,
   buildWrappedNativeCurrencyId,
+  CurrencyId,
 } from 'wallet/src/utils/currencyId'
 
 type CurrencyIdToBalance = Record<CurrencyId, number>
diff --git a/packages/wallet/src/features/transactions/sendTransactionSaga.ts b/packages/wallet/src/features/transactions/sendTransactionSaga.ts
index 7379c992c61..60f4cbde144 100644
--- a/packages/wallet/src/features/transactions/sendTransactionSaga.ts
+++ b/packages/wallet/src/features/transactions/sendTransactionSaga.ts
@@ -1,9 +1,10 @@
+import { Currency, TradeType } from '@uniswap/sdk-core'
 import { providers } from 'ethers'
 import { call, put } from 'typed-redux-saga'
 import { logger } from 'utilities/src/logger/logger'
-import { CHAIN_INFO, ChainId, RPCType } from 'wallet/src/constants/chains'
+import { ChainId, CHAIN_INFO, RPCType } from 'wallet/src/constants/chains'
 import { transactionActions } from 'wallet/src/features/transactions/slice'
-import { getBaseTradeAnalyticsProperties } from 'wallet/src/features/transactions/swap/analytics'
+import { Trade } from 'wallet/src/features/transactions/swap/useTrade'
 import {
   TransactionDetails,
   TransactionOptions,
@@ -20,6 +21,8 @@ import { getProvider, getSignerManager } from 'wallet/src/features/wallet/contex
 import { SignerManager } from 'wallet/src/features/wallet/signing/SignerManager'
 import { sendWalletAnalyticsEvent } from 'wallet/src/telemetry'
 import { WalletEventName } from 'wallet/src/telemetry/constants'
+import { getCurrencyAddressForAnalytics } from 'wallet/src/utils/currencyId'
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 import { hexlifyTransaction } from 'wallet/src/utils/transaction'
 
 export interface SendTransactionParams {
@@ -30,7 +33,7 @@ export interface SendTransactionParams {
   account: Account
   options: TransactionOptions
   typeInfo: TransactionTypeInfo
-  analytics?: ReturnType<typeof getBaseTradeAnalyticsProperties>
+  trade?: Trade<Currency, Currency, TradeType>
 }
 
 // A utility for sagas to send transactions
@@ -83,7 +86,7 @@ export async function signAndSendTransaction(
 }
 
 function* addTransaction(
-  { chainId, typeInfo, account, options, txId, analytics }: SendTransactionParams,
+  { chainId, typeInfo, account, options, txId, trade }: SendTransactionParams,
   hash: string,
   populatedRequest: providers.TransactionRequest
 ) {
@@ -104,18 +107,30 @@ function* addTransaction(
     },
   }
 
-  if (transaction.typeInfo.type === TransactionType.Swap) {
-    if (!analytics) {
-      logger.error(new Error('Missing `analytics` for swap when calling `addTransaction`'), {
-        tags: { file: 'sendTransaction', function: 'addTransaction' },
-        extra: { transaction },
-      })
-    } else {
-      yield* call(sendWalletAnalyticsEvent, WalletEventName.SwapSubmitted, {
-        transaction_hash: hash,
-        ...analytics,
-      })
-    }
+  if (transaction.typeInfo.type === TransactionType.Swap && trade) {
+    const feeCurrencyAmount = getCurrencyAmount({
+      value: trade.quote?.portionAmount,
+      valueType: ValueType.Raw,
+      currency: trade.outputAmount.currency,
+    })
+
+    const finalOutputAmount = feeCurrencyAmount
+      ? trade.outputAmount.subtract(feeCurrencyAmount)
+      : trade.outputAmount
+
+    yield* call(sendWalletAnalyticsEvent, WalletEventName.SwapSubmitted, {
+      transaction_hash: hash,
+      chain_id: chainId,
+      price_impact_basis_points: trade.priceImpact.multiply(100).toSignificant(),
+      token_in_amount: trade.inputAmount.toExact(),
+      token_out_amount: finalOutputAmount.toExact(),
+      token_in_symbol: trade.inputAmount.currency.symbol,
+      token_in_address: getCurrencyAddressForAnalytics(trade.inputAmount.currency),
+      token_out_symbol: trade.outputAmount.currency.symbol,
+      token_out_address: getCurrencyAddressForAnalytics(trade.outputAmount.currency),
+      trade_type: trade.tradeType,
+      fee_amount: trade.quote?.portionAmount,
+    })
   }
   yield* put(transactionActions.addTransaction(transaction))
   logger.debug('sendTransaction', 'addTransaction', 'Tx added:', { chainId, ...typeInfo })
diff --git a/packages/wallet/src/features/transactions/swap/TransactionModal.tsx b/packages/wallet/src/features/transactions/swap/TransactionModal.tsx
deleted file mode 100644
index dfc810a732c..00000000000
--- a/packages/wallet/src/features/transactions/swap/TransactionModal.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import {
-  TransactionModalFooterContainerProps,
-  TransactionModalInnerContainerProps,
-  TransactionModalProps,
-} from 'wallet/src/features/transactions/swap/TransactionModalProps'
-
-export function TransactionModal(_: TransactionModalProps): JSX.Element {
-  throw new Error('Implemented in `.native.tsx` and `.web.tsx` files')
-}
-
-export function TransactionModalInnerContainer(
-  _: TransactionModalInnerContainerProps
-): JSX.Element {
-  throw new Error('Implemented in `.native.tsx` and `.web.tsx` files')
-}
-
-export function TransactionModalFooterContainer(
-  _: TransactionModalFooterContainerProps
-): JSX.Element {
-  throw new Error('Implemented in `.native.tsx` and `.web.tsx` files')
-}
diff --git a/packages/wallet/src/features/transactions/swap/TransactionModal.web.tsx b/packages/wallet/src/features/transactions/swap/TransactionModal.web.tsx
deleted file mode 100644
index d49b0733edd..00000000000
--- a/packages/wallet/src/features/transactions/swap/TransactionModal.web.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-import { FadeIn } from 'react-native-reanimated'
-import { AnimatedFlex, Flex } from 'ui/src'
-import { TransactionModalContextProvider } from 'wallet/src/features/transactions/contexts/TransactionModalContext'
-import {
-  TransactionModalFooterContainerProps,
-  TransactionModalInnerContainerProps,
-  TransactionModalProps,
-} from 'wallet/src/features/transactions/swap/TransactionModalProps'
-
-export function TransactionModal({
-  children,
-  // fullscreen,
-  // modalName,
-  onClose,
-  openWalletRestoreModal,
-  walletNeedsRestore,
-}: TransactionModalProps): JSX.Element {
-  return (
-    <Flex fill justifyContent="flex-end">
-      <TransactionModalContextProvider
-        bottomSheetViewStyles={{}}
-        handleContentLayout={(): void => undefined}
-        openWalletRestoreModal={openWalletRestoreModal}
-        walletNeedsRestore={walletNeedsRestore}
-        onClose={onClose}>
-        {children}
-      </TransactionModalContextProvider>
-    </Flex>
-  )
-}
-
-export function TransactionModalInnerContainer({
-  // bottomSheetViewStyles,
-  onLayout,
-  fullscreen,
-  children,
-}: TransactionModalInnerContainerProps): JSX.Element {
-  return (
-    <Flex fill={fullscreen} onLayout={onLayout}>
-      {children}
-    </Flex>
-  )
-}
-
-export function TransactionModalFooterContainer({
-  children,
-}: TransactionModalFooterContainerProps): JSX.Element {
-  return (
-    <AnimatedFlex entering={FadeIn} position="relative" pt="$spacing24">
-      {children}
-    </AnimatedFlex>
-  )
-}
diff --git a/packages/wallet/src/features/transactions/swap/TransactionModalProps.tsx b/packages/wallet/src/features/transactions/swap/TransactionModalProps.tsx
deleted file mode 100644
index 6c4b1926853..00000000000
--- a/packages/wallet/src/features/transactions/swap/TransactionModalProps.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-import { PropsWithChildren } from 'react'
-import { LayoutChangeEvent, StyleProp, ViewStyle } from 'react-native'
-import { TransactionModalContextState } from 'wallet/src/features/transactions/contexts/TransactionModalContext'
-import { ModalNameType } from 'wallet/src/telemetry/constants'
-
-export type TransactionModalProps = PropsWithChildren<{
-  fullscreen: boolean
-  modalName: ModalNameType
-  onClose: () => void
-  openWalletRestoreModal?: TransactionModalContextState['openWalletRestoreModal']
-  walletNeedsRestore?: TransactionModalContextState['walletNeedsRestore']
-  BiometricsIcon?: TransactionModalContextState['BiometricsIcon']
-  authTrigger?: TransactionModalContextState['authTrigger']
-}>
-
-export type TransactionModalInnerContainerProps = PropsWithChildren<{
-  bottomSheetViewStyles: StyleProp<ViewStyle>
-  onLayout: (event: LayoutChangeEvent) => void
-  fullscreen: boolean
-}>
-
-export type TransactionModalFooterContainerProps = PropsWithChildren
diff --git a/packages/wallet/src/features/transactions/swap/routeUtils.ts b/packages/wallet/src/features/transactions/swap/routeUtils.ts
index 5ebb26bcf4b..e39d2ca7d1b 100644
--- a/packages/wallet/src/features/transactions/swap/routeUtils.ts
+++ b/packages/wallet/src/features/transactions/swap/routeUtils.ts
@@ -13,8 +13,7 @@ import {
 } from 'wallet/src/features/routing/types'
 import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { Trade } from 'wallet/src/features/transactions/swap/useTrade'
-import { QuoteType } from 'wallet/src/features/transactions/utils'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
 export function transformQuoteToTrade(
   tokenInIsNative: boolean,
@@ -40,7 +39,7 @@ export function transformQuoteToTrade(
       : undefined
 
   return new Trade({
-    quoteData: { quote: quoteResult, quoteType: QuoteType.RoutingApi },
+    quote: quoteResult,
     deadline,
     slippageTolerance: slippageTolerance ?? MAX_AUTO_SLIPPAGE_TOLERANCE,
     v2Routes:
diff --git a/packages/wallet/src/features/transactions/swap/tradingApi/client.ts b/packages/wallet/src/features/transactions/swap/tradingApi/client.ts
deleted file mode 100644
index 131c12ae5bc..00000000000
--- a/packages/wallet/src/features/transactions/swap/tradingApi/client.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import { ApolloClient, from } from '@apollo/client'
-import { RestLink } from 'apollo-link-rest'
-import { config } from 'wallet/src/config'
-import { createNewInMemoryCache } from 'wallet/src/data/cache'
-
-const restLink = new RestLink({
-  uri: config.uniswapApiBaseUrl,
-  headers: {
-    'Content-Type': 'application/json',
-    'X-API-KEY': config.tradingApiKey,
-    Origin: config.uniswapAppUrl,
-  },
-})
-
-export const TradingApiApolloClient = new ApolloClient({
-  link: from([restLink]),
-  cache: createNewInMemoryCache(),
-  defaultOptions: {
-    watchQuery: {
-      // ensures query is returning data even if some fields errored out
-      errorPolicy: 'all',
-      fetchPolicy: 'network-only',
-    },
-  },
-})
diff --git a/packages/wallet/src/features/transactions/swap/tradingApi/useTradingApiTrade.ts b/packages/wallet/src/features/transactions/swap/tradingApi/useTradingApiTrade.ts
deleted file mode 100644
index 3cfcc7b7352..00000000000
--- a/packages/wallet/src/features/transactions/swap/tradingApi/useTradingApiTrade.ts
+++ /dev/null
@@ -1,203 +0,0 @@
-import { ApolloError, NetworkStatus } from '@apollo/client'
-import { TradeType } from '@uniswap/sdk-core'
-import { useMemo } from 'react'
-import { logger } from 'utilities/src/logger/logger'
-import { ONE_MINUTE_MS } from 'utilities/src/time/time'
-import { useDebounceWithStatus } from 'utilities/src/time/timing'
-import { PollingInterval } from 'wallet/src/constants/misc'
-import { uniswapUrls } from 'wallet/src/constants/urls'
-import { useRestQuery } from 'wallet/src/data/rest'
-import {
-  RoutingPreference,
-  QuoteRequest as TradingApiQuoteRequest,
-  QuoteResponse as TradingApiQuoteResponse,
-  TradeType as TradingApiTradeType,
-} from 'wallet/src/data/tradingApi/__generated__/api'
-import { TradingApiApolloClient } from 'wallet/src/features/transactions/swap/tradingApi/client'
-import {
-  getTokenAddressForApiRequest,
-  toTradingApiSupportedChainId,
-  transformTradingApiResponseToTrade,
-} from 'wallet/src/features/transactions/swap/tradingApi/utils'
-import { TradeWithStatus, UseTradeArgs } from 'wallet/src/features/transactions/swap/useTrade'
-import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
-import { areCurrencyIdsEqual, currencyId } from 'wallet/src/utils/currencyId'
-
-// error strings hardcoded in @uniswap/unified-routing-api
-// https://github.com/Uniswap/unified-routing-api/blob/020ea371a00d4cc25ce9f9906479b00a43c65f2c/lib/util/errors.ts#L4
-export const SWAP_QUOTE_ERROR = 'QUOTE_ERROR'
-
-// client side error code for when the api returns an empty response
-export const NO_QUOTE_DATA = 'NO_QUOTE_DATA'
-
-const DEFAULT_DEADLINE_S = 60 * 30 // 30 minutes in seconds
-
-export function useTradingApiTrade(args: UseTradeArgs): TradeWithStatus {
-  const {
-    amountSpecified,
-    otherCurrency,
-    tradeType,
-    pollingInterval,
-    customSlippageTolerance,
-    isUSDQuote,
-    skip,
-  } = args
-  const activeAccountAddress = useActiveAccountAddressWithThrow()
-
-  /***** Format request arguments ******/
-
-  const [debouncedAmountSpecified, isDebouncing] = useDebounceWithStatus(amountSpecified)
-  const shouldDebounce =
-    amountSpecified && debouncedAmountSpecified?.currency.chainId === otherCurrency?.chainId
-  const amount = shouldDebounce ? debouncedAmountSpecified : amountSpecified
-
-  const currencyIn = tradeType === TradeType.EXACT_INPUT ? amount?.currency : otherCurrency
-  const currencyOut = tradeType === TradeType.EXACT_OUTPUT ? amount?.currency : otherCurrency
-  const currencyInEqualsCurrencyOut =
-    currencyIn &&
-    currencyOut &&
-    areCurrencyIdsEqual(currencyId(currencyIn), currencyId(currencyOut))
-
-  const tokenInChainId = toTradingApiSupportedChainId(currencyIn?.chainId)
-  const tokenOutChainId = toTradingApiSupportedChainId(currencyOut?.chainId)
-  const tokenInAddress = getTokenAddressForApiRequest(currencyIn)
-  const tokenOutAddress = getTokenAddressForApiRequest(currencyOut)
-
-  const requestTradeType =
-    tradeType === TradeType.EXACT_INPUT ? TradingApiTradeType.Input : TradingApiTradeType.Output
-
-  const skipQuery =
-    skip ||
-    !tokenInAddress ||
-    !tokenOutAddress ||
-    !tokenInChainId ||
-    !tokenOutChainId ||
-    !amount ||
-    currencyInEqualsCurrencyOut
-
-  const quoteRequestArgs: TradingApiQuoteRequest | undefined = useMemo(() => {
-    if (skipQuery) {
-      return undefined
-    }
-    return {
-      type: requestTradeType,
-      amount: amount.quotient.toString(),
-      swapper: activeAccountAddress,
-      tokenInChainId,
-      tokenOutChainId,
-      tokenIn: tokenInAddress,
-      tokenOut: tokenOutAddress,
-      slippageTolerance: customSlippageTolerance,
-      includeGasInfo: true,
-      routingPreference: RoutingPreference.Classic,
-    }
-  }, [
-    activeAccountAddress,
-    amount,
-    customSlippageTolerance,
-    requestTradeType,
-    skipQuery,
-    tokenInAddress,
-    tokenInChainId,
-    tokenOutAddress,
-    tokenOutChainId,
-  ])
-
-  /***** Fetch quote from trading API  ******/
-
-  const response = useRestQuery<
-    TradingApiQuoteResponse,
-    TradingApiQuoteRequest | Record<string, never>
-  >(
-    uniswapUrls.tradingApiPaths.quote,
-    quoteRequestArgs ?? {},
-    ['quote', 'permitData'],
-    {
-      pollInterval: pollingInterval ?? PollingInterval.Fast,
-      ttlMs: ONE_MINUTE_MS,
-      skip: !quoteRequestArgs,
-      notifyOnNetworkStatusChange: true,
-    },
-    'POST',
-    TradingApiApolloClient
-  )
-
-  const { error, data, loading, networkStatus } = response
-
-  /***** Format `trade` type, add errors if needed.  ******/
-
-  return useMemo(() => {
-    // Error logging
-    if (error && !isUSDQuote) {
-      logger.error(error, { tags: { file: 'useTradingApiTrade', function: 'quote' } })
-    }
-    if (data && !data.quote) {
-      logger.error(new Error('Unexpected empty Trading API response'), {
-        tags: { file: 'useTradingApiTrade', function: 'quote' },
-        extra: {
-          quoteRequestArgs,
-        },
-      })
-    }
-
-    if (!data?.quote) {
-      // MOB(1193): Better handle Apollo 404s
-      // https://github.com/apollographql/apollo-link-rest/pull/142/files#diff-018e2012bf1dae58fa1e87509b038abf51ace54994e63239343d717fb9a2d037R995
-      // apollo-link-rest swallows 404 response errors, and instead just returns null data
-      // Until we can parse response errors correctly, just manually create error.
-      if (data === null && !error) {
-        return {
-          ...response,
-          trade: null,
-          error: new ApolloError({
-            errorMessage: NO_QUOTE_DATA,
-          }),
-        }
-      }
-
-      return { ...response, trade: null }
-    }
-
-    const trade = transformTradingApiResponseToTrade({
-      tokenInIsNative: Boolean(currencyIn?.isNative),
-      tokenOutIsNative: Boolean(currencyOut?.isNative),
-      tradeType,
-      deadline: DEFAULT_DEADLINE_S,
-      slippageTolerance: customSlippageTolerance,
-      data,
-    })
-
-    // If `transformTradingApiResponseToTrade` returns a `null` trade, it means we have a non-null quote, but no routes.
-    // Manually match the api quote error.
-    if (trade === null) {
-      return {
-        ...response,
-        trade: null,
-        error: new ApolloError({
-          errorMessage: SWAP_QUOTE_ERROR,
-        }),
-      }
-    }
-
-    return {
-      loading: (amountSpecified && isDebouncing) || loading,
-      error,
-      trade,
-      isFetching: networkStatus === NetworkStatus.poll,
-    }
-  }, [
-    amountSpecified,
-    currencyIn,
-    currencyOut,
-    customSlippageTolerance,
-    data,
-    error,
-    isDebouncing,
-    isUSDQuote,
-    loading,
-    networkStatus,
-    quoteRequestArgs,
-    response,
-    tradeType,
-  ])
-}
diff --git a/packages/wallet/src/features/transactions/swap/tradingApi/utils.ts b/packages/wallet/src/features/transactions/swap/tradingApi/utils.ts
deleted file mode 100644
index 813490f4b2c..00000000000
--- a/packages/wallet/src/features/transactions/swap/tradingApi/utils.ts
+++ /dev/null
@@ -1,254 +0,0 @@
-import { MixedRouteSDK } from '@uniswap/router-sdk'
-import { Currency, CurrencyAmount, Percent, Token, TradeType } from '@uniswap/sdk-core'
-import { Pair, Route as V2Route } from '@uniswap/v2-sdk'
-import { FeeAmount, Pool, Route as V3Route } from '@uniswap/v3-sdk'
-import { BigNumber } from 'ethers'
-import { MAX_AUTO_SLIPPAGE_TOLERANCE } from 'wallet/src/constants/transactions'
-import {
-  ClassicQuote,
-  Quote,
-  QuoteResponse,
-  ChainId as TradingApiChainId,
-  TokenInRoute as TradingApiTokenInRoute,
-  V2PoolInRoute as TradingApiV2PoolInRoute,
-  V3PoolInRoute as TradingApiV3PoolInRoute,
-} from 'wallet/src/data/tradingApi/__generated__/api'
-import { SwapFee } from 'wallet/src/features/routing/types'
-import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
-import { Trade } from 'wallet/src/features/transactions/swap/useTrade'
-import { QuoteType } from 'wallet/src/features/transactions/utils'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
-
-const NATIVE_ADDRESS_FOR_TRADING_API = '0x0000000000000000000000000000000000000000'
-
-interface TradingApiResponseToTradeArgs {
-  tokenInIsNative: boolean
-  tokenOutIsNative: boolean
-  tradeType: TradeType
-  deadline: number | undefined
-  slippageTolerance: number | undefined
-  data: QuoteResponse | undefined
-}
-
-export function transformTradingApiResponseToTrade(
-  params: TradingApiResponseToTradeArgs
-): Trade | null {
-  const { tokenInIsNative, tokenOutIsNative, tradeType, deadline, slippageTolerance, data } = params
-
-  const routes = computeRoutesTradingApi(tokenInIsNative, tokenOutIsNative, data)
-
-  if (!routes) {
-    return null
-  }
-
-  const swapFee: SwapFee | undefined =
-    data?.quote.portionAmount !== undefined && data?.quote?.portionBips !== undefined
-      ? {
-          recipient: data.quote.portionRecipient,
-          percent: new Percent(data.quote.portionBips, '10000'),
-          amount: data?.quote.portionAmount,
-        }
-      : undefined
-
-  return new Trade({
-    quoteData: { quote: data, quoteType: QuoteType.TradingApi },
-    deadline,
-    slippageTolerance: slippageTolerance ?? MAX_AUTO_SLIPPAGE_TOLERANCE,
-    v2Routes: routes?.flatMap((r) => (r?.routev2 ? { ...r, routev2: r.routev2 } : [])) ?? [],
-    v3Routes: routes?.flatMap((r) => (r?.routev3 ? { ...r, routev3: r.routev3 } : [])) ?? [],
-    mixedRoutes:
-      routes?.flatMap((r) => (r?.mixedRoute ? { ...r, mixedRoute: r.mixedRoute } : [])) ?? [],
-    tradeType,
-    swapFee,
-  })
-}
-
-/**
- * Transforms a Routing API quote into an array of routes that can be used to
- * create a `Trade`.
- */
-export function computeRoutesTradingApi(
-  tokenInIsNative: boolean,
-  tokenOutIsNative: boolean,
-  quoteResponse?: QuoteResponse
-):
-  | {
-      routev3: V3Route<Currency, Currency> | null
-      routev2: V2Route<Currency, Currency> | null
-      mixedRoute: MixedRouteSDK<Currency, Currency> | null
-      inputAmount: CurrencyAmount<Currency>
-      outputAmount: CurrencyAmount<Currency>
-    }[]
-  | undefined {
-  // TODO : remove quote type check for Uniswap X integration
-  if (!quoteResponse || !quoteResponse.quote || !isClassicQuote(quoteResponse.quote)) {
-    return
-  }
-
-  const { quote } = quoteResponse
-
-  if (!quote.route || quote.route?.length === 0) {
-    return
-  }
-
-  const tokenIn = quote.route[0]?.[0]?.tokenIn
-  const tokenOut = quote.route[0]?.[quote.route[0]?.length - 1]?.tokenOut
-
-  if (!tokenIn || !tokenOut) {
-    throw new Error('Expected both tokenIn and tokenOut to be present')
-  }
-  if (
-    !tokenIn.chainId ||
-    tokenOut.chainId === undefined ||
-    !tokenIn.address ||
-    !tokenOut.address ||
-    !tokenIn.decimals ||
-    !tokenOut.decimals
-  ) {
-    throw new Error('Expected all token properties to be present')
-  }
-
-  const parsedCurrencyIn = tokenInIsNative
-    ? NativeCurrency.onChain(tokenIn.chainId)
-    : parseTokenApi(tokenIn)
-
-  const parsedCurrencyOut = tokenOutIsNative
-    ? NativeCurrency.onChain(tokenOut.chainId)
-    : parseTokenApi(tokenOut)
-
-  try {
-    return quote.route.map((route) => {
-      if (route.length === 0) {
-        throw new Error('Expected route to have at least one pair or pool')
-      }
-
-      const inputAmount = getCurrencyAmount({
-        value: route[0]?.amountIn,
-        valueType: ValueType.Raw,
-        currency: parsedCurrencyIn,
-      })
-      const outputAmount = getCurrencyAmount({
-        value: route[route.length - 1]?.amountOut,
-        valueType: ValueType.Raw,
-        currency: parsedCurrencyOut,
-      })
-
-      if (!inputAmount || !outputAmount) {
-        throw new Error('Expected both amountIn and amountOut to be present')
-      }
-
-      const isOnlyV2 = isV2OnlyRouteApi(route)
-      const isOnlyV3 = isV3OnlyRouteApi(route)
-
-      return {
-        routev3: isOnlyV3
-          ? new V3Route(route.map(parseV3PoolApi), parsedCurrencyIn, parsedCurrencyOut)
-          : null,
-        routev2: isOnlyV2
-          ? new V2Route(route.map(parseV2PairApi), parsedCurrencyIn, parsedCurrencyOut)
-          : null,
-        mixedRoute:
-          !isOnlyV3 && !isOnlyV2
-            ? new MixedRouteSDK(route.map(parseMixedRouteApi), parsedCurrencyIn, parsedCurrencyOut)
-            : null,
-        inputAmount,
-        outputAmount,
-      }
-    })
-  } catch (e) {
-    return
-  }
-}
-
-function parseTokenApi(token: TradingApiTokenInRoute): Token {
-  const { address, chainId, decimals, symbol, buyFeeBps, sellFeeBps } = token
-  if (!chainId || !address || !decimals || !symbol) {
-    throw new Error('Expected token to have chainId, address, decimals, and symbol')
-  }
-  return new Token(
-    chainId,
-    address,
-    parseInt(decimals.toString(), 10),
-    symbol,
-    /**name=*/ undefined,
-    false,
-    buyFeeBps ? BigNumber.from(buyFeeBps) : undefined,
-    sellFeeBps ? BigNumber.from(sellFeeBps) : undefined
-  )
-}
-
-function parseV3PoolApi({
-  fee,
-  sqrtRatioX96,
-  liquidity,
-  tickCurrent,
-  tokenIn,
-  tokenOut,
-}: TradingApiV3PoolInRoute): Pool {
-  if (!tokenIn || !tokenOut || !fee || !sqrtRatioX96 || !liquidity || !tickCurrent) {
-    throw new Error('Expected pool values to be present')
-  }
-  return new Pool(
-    parseTokenApi(tokenIn),
-    parseTokenApi(tokenOut),
-    parseInt(fee, 10) as FeeAmount,
-    sqrtRatioX96,
-    liquidity,
-    parseInt(tickCurrent, 10)
-  )
-}
-
-function parseV2PairApi({ reserve0, reserve1 }: TradingApiV2PoolInRoute): Pair {
-  if (!reserve0?.token || !reserve1?.token || !reserve0.quotient || !reserve1.quotient) {
-    throw new Error('Expected pool values to be present')
-  }
-  return new Pair(
-    CurrencyAmount.fromRawAmount(parseTokenApi(reserve0.token), reserve0.quotient),
-    CurrencyAmount.fromRawAmount(parseTokenApi(reserve1.token), reserve1.quotient)
-  )
-}
-
-function parseMixedRouteApi(pool: TradingApiV2PoolInRoute | TradingApiV3PoolInRoute): Pair | Pool {
-  return pool.type === 'v2-pool' ? parseV2PairApi(pool) : parseV3PoolApi(pool)
-}
-
-function isV2OnlyRouteApi(route: (TradingApiV2PoolInRoute | TradingApiV3PoolInRoute)[]): boolean {
-  return route.every((pool) => pool.type === 'v2-pool')
-}
-
-function isV3OnlyRouteApi(route: (TradingApiV2PoolInRoute | TradingApiV3PoolInRoute)[]): boolean {
-  return route.every((pool) => pool.type === 'v3-pool')
-}
-
-export function getTokenAddressForApiRequest(currency: Maybe<Currency>): string | undefined {
-  if (!currency) {
-    return undefined
-  }
-  return currency.isNative ? NATIVE_ADDRESS_FOR_TRADING_API : currency.address
-}
-
-export function isClassicQuote(quote?: Quote): quote is ClassicQuote {
-  if (!quote) {
-    return false
-  }
-  return 'route' in quote
-}
-
-const SUPPORTED_TRADING_API_CHAIN_IDS: number[] = Object.values(TradingApiChainId).map((c) => c)
-
-// Parse any chain id to check if its supported by the API ChainId type
-function isTradingApiSupportedChainId(chainId?: number): chainId is TradingApiChainId {
-  if (!chainId) {
-    return false
-  }
-  return Object.values(SUPPORTED_TRADING_API_CHAIN_IDS).includes(chainId)
-}
-
-export function toTradingApiSupportedChainId(
-  chainId: Maybe<number>
-): TradingApiChainId | undefined {
-  if (!chainId || !isTradingApiSupportedChainId(chainId)) {
-    return undefined
-  }
-  return chainId
-}
diff --git a/packages/wallet/src/features/transactions/swap/tradingApiHooks/useSwapTxAndGasInfoTradingApi.ts b/packages/wallet/src/features/transactions/swap/tradingApiHooks/useSwapTxAndGasInfoTradingApi.ts
deleted file mode 100644
index db753b85685..00000000000
--- a/packages/wallet/src/features/transactions/swap/tradingApiHooks/useSwapTxAndGasInfoTradingApi.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { providers } from 'ethers'
-import { GasFeeResult } from 'wallet/src/features/gas/types'
-import { ApprovalAction } from 'wallet/src/features/transactions/swap/hooks'
-import { useTokenApprovalInfo } from 'wallet/src/features/transactions/swap/tradingApiHooks/useTokenApprovalInfo'
-import { useTransactionRequestInfo } from 'wallet/src/features/transactions/swap/tradingApiHooks/useTransactionRequestInfo'
-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'
-import { QuoteType } from 'wallet/src/features/transactions/utils'
-
-interface SwapTxAndGasInfo {
-  txRequest?: providers.TransactionRequest
-  approveTxRequest?: providers.TransactionRequest
-  approvalError?: boolean // block UI if unable to get approval status
-  gasFee: GasFeeResult
-}
-
-export function useSwapTxAndGasInfoTradingApi({
-  derivedSwapInfo,
-}: {
-  derivedSwapInfo: DerivedSwapInfo
-}): SwapTxAndGasInfo {
-  const { chainId, wrapType, currencyAmounts } = derivedSwapInfo
-
-  const tokenApprovalInfo = useTokenApprovalInfo({
-    chainId,
-    wrapType,
-    currencyInAmount: currencyAmounts[CurrencyField.INPUT],
-    skip: derivedSwapInfo?.trade.trade?.quoteData?.quoteType === QuoteType.RoutingApi,
-  })
-
-  const transactionRequestInfo = useTransactionRequestInfo({
-    derivedSwapInfo,
-    // Dont send transaction request if invalid or missing approval data
-    skip: !tokenApprovalInfo?.action || tokenApprovalInfo.action === ApprovalAction.Unknown,
-  })
-
-  const totalGasFee = sumGasFees(
-    tokenApprovalInfo?.gasFee,
-    transactionRequestInfo?.gasFeeResult.value
-  )
-
-  const approvalError = tokenApprovalInfo?.action === ApprovalAction.Unknown
-
-  const gasFeeResult = {
-    value: totalGasFee,
-    loading: !tokenApprovalInfo || transactionRequestInfo.gasFeeResult.loading,
-    error: transactionRequestInfo.gasFeeResult.error || approvalError,
-  }
-
-  return {
-    txRequest: transactionRequestInfo.transactionRequest,
-    approveTxRequest: tokenApprovalInfo?.txRequest || undefined,
-    approvalError,
-    gasFee: gasFeeResult,
-  }
-}
diff --git a/packages/wallet/src/features/transactions/swap/tradingApiHooks/useTokenApprovalInfo.ts b/packages/wallet/src/features/transactions/swap/tradingApiHooks/useTokenApprovalInfo.ts
deleted file mode 100644
index ef0c35c0511..00000000000
--- a/packages/wallet/src/features/transactions/swap/tradingApiHooks/useTokenApprovalInfo.ts
+++ /dev/null
@@ -1,105 +0,0 @@
-import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
-import { useMemo } from 'react'
-import { logger } from 'utilities/src/logger/logger'
-import { ONE_MINUTE_MS } from 'utilities/src/time/time'
-import { ChainId } from 'wallet/src/constants/chains'
-import { uniswapUrls } from 'wallet/src/constants/urls'
-import { useRestQuery } from 'wallet/src/data/rest'
-import { ApprovalRequest, ApprovalResponse } from 'wallet/src/data/tradingApi/__generated__/api'
-import { ApprovalAction, TokenApprovalInfo } from 'wallet/src/features/transactions/swap/hooks'
-import { TradingApiApolloClient } from 'wallet/src/features/transactions/swap/tradingApi/client'
-import {
-  getTokenAddressForApiRequest,
-  toTradingApiSupportedChainId,
-} from 'wallet/src/features/transactions/swap/tradingApi/utils'
-import { WrapType } from 'wallet/src/features/transactions/types'
-import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
-
-interface TokenApprovalInfoParams {
-  chainId: ChainId
-  wrapType: WrapType
-  currencyInAmount: Maybe<CurrencyAmount<Currency>>
-  skip?: boolean
-}
-
-export function useTokenApprovalInfo(
-  params: TokenApprovalInfoParams
-): (TokenApprovalInfo & { gasFee?: string }) | undefined {
-  const { chainId, wrapType, currencyInAmount, skip } = params
-
-  const isWrap = wrapType !== WrapType.NotApplicable
-
-  const address = useActiveAccountAddressWithThrow()
-  const currencyIn = currencyInAmount?.currency
-  const amount = currencyInAmount?.quotient.toString()
-
-  const tokenAddress = getTokenAddressForApiRequest(currencyIn)
-
-  const approvalRequestArgs: ApprovalRequest | undefined = useMemo(() => {
-    const supportedChainId = toTradingApiSupportedChainId(chainId)
-
-    if (!amount || !currencyIn || !tokenAddress || !supportedChainId) {
-      return undefined
-    }
-    return {
-      walletAddress: address,
-      token: tokenAddress,
-      amount,
-      chainId: supportedChainId,
-      includeGasInfo: true,
-    }
-  }, [address, amount, chainId, currencyIn, tokenAddress])
-
-  const { data, error } = useRestQuery<ApprovalResponse, ApprovalRequest | Record<string, never>>(
-    uniswapUrls.tradingApiPaths.approval,
-    approvalRequestArgs ?? {},
-    ['approval', 'gasFee'],
-    {
-      ttlMs: ONE_MINUTE_MS,
-      skip: skip || !approvalRequestArgs || isWrap,
-    },
-    'POST',
-    TradingApiApolloClient
-  )
-
-  return useMemo(() => {
-    if (error) {
-      logger.error(error, {
-        tags: { file: 'useTokenApprovalInfo', function: 'useTokenApprovalInfo' },
-        extra: {
-          approvalRequestArgs,
-        },
-      })
-    }
-
-    if (isWrap) {
-      return {
-        action: ApprovalAction.None,
-        txRequest: null,
-      }
-    }
-
-    if (data && !error) {
-      // API returns null if no approval is required
-      if (data.approval === null) {
-        return {
-          action: ApprovalAction.None,
-          txRequest: null,
-        }
-      }
-      if (data.approval) {
-        return {
-          action: ApprovalAction.Permit2Approve,
-          txRequest: data.approval,
-          gasFee: data.gasFee,
-        }
-      }
-    }
-
-    // No valid approval type found
-    return {
-      action: ApprovalAction.Unknown,
-      txRequest: null,
-    }
-  }, [approvalRequestArgs, data, error, isWrap])
-}
diff --git a/packages/wallet/src/features/transactions/swap/tradingApiHooks/useTransactionRequestInfo.ts b/packages/wallet/src/features/transactions/swap/tradingApiHooks/useTransactionRequestInfo.ts
deleted file mode 100644
index 57bad8b821d..00000000000
--- a/packages/wallet/src/features/transactions/swap/tradingApiHooks/useTransactionRequestInfo.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-import { SwapEventName } from '@uniswap/analytics-events'
-import { providers } from 'ethers'
-import { useMemo } from 'react'
-import { logger } from 'utilities/src/logger/logger'
-import { ONE_MINUTE_MS } from 'utilities/src/time/time'
-import { uniswapUrls } from 'wallet/src/constants/urls'
-import { useRestQuery } from 'wallet/src/data/rest'
-import {
-  CreateSwapRequest,
-  CreateSwapResponse,
-  TransactionFailureReason,
-} from 'wallet/src/data/tradingApi/__generated__/api'
-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 { useWrapTransactionRequest } from 'wallet/src/features/transactions/swap/hooks'
-import { TradingApiApolloClient } from 'wallet/src/features/transactions/swap/tradingApi/client'
-import { isClassicQuote } from 'wallet/src/features/transactions/swap/tradingApi/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'
-import { QuoteType } from 'wallet/src/features/transactions/utils'
-import { sendWalletAnalyticsEvent } from 'wallet/src/telemetry'
-
-interface TransactionRequestInfo {
-  transactionRequest: providers.TransactionRequest | undefined
-  gasFeeResult: GasFeeResult
-}
-
-export function useTransactionRequestInfo({
-  derivedSwapInfo,
-  skip,
-}: {
-  derivedSwapInfo: DerivedSwapInfo
-  skip: boolean
-}): TransactionRequestInfo {
-  const formatter = useLocalizationContext()
-
-  const { trade: tradeWithStatus, currencyAmounts } = derivedSwapInfo
-  const { trade } = tradeWithStatus || { trade: undefined }
-
-  const quote =
-    trade?.quoteData?.quoteType === QuoteType.TradingApi ? trade.quoteData.quote : undefined
-
-  // Quote indicates we need to include a signed permit message
-  const requiresPermit2Sig = quote && !!quote.permitData
-
-  const signatureInfo = usePermit2SignatureWithData(
-    currencyAmounts[CurrencyField.INPUT],
-    quote?.permitData,
-    /**skip=*/ !requiresPermit2Sig || skip
-  )
-
-  // Format request args
-  const swapRequestArgs: CreateSwapRequest | undefined = useMemo(() => {
-    if (!quote) {
-      return undefined
-    }
-    if (requiresPermit2Sig && !signatureInfo.signature) {
-      return undefined
-    }
-    // TODO: MOB(2438) https://linear.app/uniswap/issue/MOB-2438/uniswap-x-clean-old-trading-api-code
-    if (!isClassicQuote(quote.quote)) {
-      return undefined
-    }
-    // We cant get correct calldata from /swap if we dont have a valid slippage tolerance
-    if (tradeWithStatus.trade?.slippageTolerance === undefined) {
-      return undefined
-    }
-
-    // TODO: remove this when api does slippage calculation for us
-    // https://linear.app/uniswap/issue/MOB-2581/remove-slippage-adjustment-in-swap-request
-    quote.quote.slippage = tradeWithStatus.trade.slippageTolerance
-
-    return {
-      quote: quote.quote,
-      permitData: quote.permitData ?? undefined,
-      signature: signatureInfo.signature,
-      includeGasInfo: true,
-    }
-  }, [quote, requiresPermit2Sig, signatureInfo.signature, tradeWithStatus.trade?.slippageTolerance])
-
-  const isWrapApplicable = derivedSwapInfo.wrapType !== WrapType.NotApplicable
-  const wrapTxRequest = useWrapTransactionRequest(derivedSwapInfo)
-
-  const skipTransactionRequest = !swapRequestArgs || isWrapApplicable || skip
-
-  const { data, error, loading } = useRestQuery<
-    CreateSwapResponse,
-    CreateSwapRequest | Record<string, never>
-  >(
-    uniswapUrls.tradingApiPaths.swap,
-    swapRequestArgs ?? {},
-    ['swap', 'gasFee', 'requestId', 'txFailureReasons'],
-    {
-      ttlMs: ONE_MINUTE_MS,
-      skip: skipTransactionRequest,
-    },
-    'POST',
-    TradingApiApolloClient
-  )
-
-  // TODO: pull type from the api spec once its updated
-  // This is a case where simulation fails on backend, meaning txn is expected to fail
-  const simulationError = data?.txFailureReasons?.includes(TransactionFailureReason.SimulationError)
-
-  const gasEstimateError = simulationError || error
-
-  const wrapGasFee = useTransactionGasFee(wrapTxRequest, GasSpeed.Urgent, !isWrapApplicable)
-  const gasFeeValue = isWrapApplicable ? wrapGasFee.value : data?.gasFee
-  const gasFeeResult = {
-    value: gasFeeValue,
-    loading: (isWrapApplicable && wrapGasFee.loading) || loading,
-    error: gasEstimateError,
-  }
-
-  if (gasEstimateError) {
-    // Copy this exact error string that we use in other places in the app, so they can group.
-    const errorToLog = simulationError ? new Error('Unknown gas simulation error') : error
-
-    logger.error(errorToLog, {
-      tags: { file: 'useTransactionRequestInfo', function: 'useTransactionRequestInfo' },
-      extra: {
-        swapRequestArgs,
-      },
-    })
-
-    sendWalletAnalyticsEvent(SwapEventName.SWAP_ESTIMATE_GAS_CALL_FAILED, {
-      ...getBaseTradeAnalyticsPropertiesFromSwapInfo({ derivedSwapInfo, formatter }),
-      error: errorToLog,
-      txRequest: data?.swap,
-    })
-  }
-
-  return {
-    transactionRequest: isWrapApplicable ? wrapTxRequest : data?.swap,
-    gasFeeResult,
-  }
-}
diff --git a/packages/wallet/src/features/transactions/swap/usePermit2Signature.ts b/packages/wallet/src/features/transactions/swap/usePermit2Signature.ts
index e6c6f65fa9d..eb563d608ef 100644
--- a/packages/wallet/src/features/transactions/swap/usePermit2Signature.ts
+++ b/packages/wallet/src/features/transactions/swap/usePermit2Signature.ts
@@ -8,13 +8,12 @@ import {
 import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import { UNIVERSAL_ROUTER_ADDRESS } from '@uniswap/universal-router-sdk'
 import dayjs from 'dayjs'
-import { BigNumber, TypedDataField, providers } from 'ethers'
+import { BigNumber, providers } from 'ethers'
 import { useCallback } from 'react'
 import { logger } from 'utilities/src/logger/logger'
 import { useAsyncData } from 'utilities/src/react/hooks'
 import { currentTimeInSeconds, inXMinutesUnix } from 'utilities/src/time/time'
 import { ChainId } from 'wallet/src/constants/chains'
-import { Permit } from 'wallet/src/data/tradingApi/__generated__/api'
 import { Account, AccountType } from 'wallet/src/features/wallet/accounts/types'
 import { useProvider, useWalletSigners } from 'wallet/src/features/wallet/context'
 import { useActiveAccountWithThrow } from 'wallet/src/features/wallet/hooks'
@@ -108,10 +107,7 @@ async function getPermit2PermitSignature(
   }
 }
 
-export function usePermit2Signature(
-  currencyInAmount: Maybe<CurrencyAmount<Currency>>,
-  skip?: boolean
-): {
+export function usePermit2Signature(currencyInAmount: Maybe<CurrencyAmount<Currency>>): {
   isLoading: boolean
   data: PermitSignatureInfo | undefined
 } {
@@ -121,7 +117,7 @@ export function usePermit2Signature(
   const provider = useProvider(currencyIn?.chainId ?? ChainId.Mainnet)
 
   const permitSignatureFetcher = useCallback(() => {
-    if (!provider || !currencyIn || currencyIn.isNative || skip) {
+    if (!provider || !currencyIn || currencyIn.isNative) {
       return
     }
 
@@ -133,44 +129,7 @@ export function usePermit2Signature(
       currencyIn.chainId,
       currencyInAmount.quotient.toString()
     )
-  }, [account, currencyIn, currencyInAmount?.quotient, provider, signerManager, skip])
+  }, [account, currencyIn, currencyInAmount?.quotient, provider, signerManager])
 
   return useAsyncData(permitSignatureFetcher)
 }
-// Used to sign permit messages where we already have the domain, types, and values.
-export function usePermit2SignatureWithData(
-  currencyInAmount: Maybe<CurrencyAmount<Currency>>,
-  permitData: Maybe<Permit>,
-  skip?: boolean
-): {
-  isLoading: boolean
-  signature: string | undefined
-} {
-  const signerManager = useWalletSigners()
-  const account = useActiveAccountWithThrow()
-  const currencyIn = currencyInAmount?.currency
-  const provider = useProvider(currencyIn?.chainId ?? ChainId.Mainnet)
-
-  const { domain, types, values } = permitData || {}
-
-  const permitSignatureFetcher = useCallback(async () => {
-    if (!provider || !currencyIn || currencyIn.isNative || skip || !domain || !types || !values) {
-      return
-    }
-
-    return await signTypedData(
-      domain,
-      types as Record<string, TypedDataField[]>,
-      values as Record<string, unknown>,
-      account,
-      signerManager
-    )
-  }, [account, currencyIn, domain, provider, signerManager, skip, types, values])
-
-  const { data, isLoading } = useAsyncData(permitSignatureFetcher)
-
-  return {
-    isLoading,
-    signature: data,
-  }
-}
diff --git a/packages/wallet/src/features/transactions/swap/useTrade.ts b/packages/wallet/src/features/transactions/swap/useTrade.ts
index 527baec84f1..650daba9eb4 100644
--- a/packages/wallet/src/features/transactions/swap/useTrade.ts
+++ b/packages/wallet/src/features/transactions/swap/useTrade.ts
@@ -12,23 +12,12 @@ import {
   MAX_AUTO_SLIPPAGE_TOLERANCE,
   MIN_AUTO_SLIPPAGE_TOLERANCE,
 } from 'wallet/src/constants/transactions'
-import { QuoteResponse } from 'wallet/src/data/tradingApi/__generated__/api'
-import { isL2Chain, toSupportedChainId } from 'wallet/src/features/chains/utils'
+import { isL2Chain } from 'wallet/src/features/chains/utils'
 import { useRouterQuote } from 'wallet/src/features/routing/hooks'
 import { QuoteResult, SwapFee } from 'wallet/src/features/routing/types'
 import { useUSDCValue } from 'wallet/src/features/routing/useUSDCPrice'
 import { transformQuoteToTrade } from 'wallet/src/features/transactions/swap/routeUtils'
-import {
-  isClassicQuote,
-  transformTradingApiResponseToTrade,
-} from 'wallet/src/features/transactions/swap/tradingApi/utils'
 import { clearStaleTrades } from 'wallet/src/features/transactions/swap/utils'
-import { QuoteType } from 'wallet/src/features/transactions/utils'
-
-// Response data from either legacy for trading api quote request
-export type QuoteData =
-  | { quote?: QuoteResult; quoteType: QuoteType.RoutingApi }
-  | { quote?: QuoteResponse; quoteType: QuoteType.TradingApi }
 
 // TODO: [MOB-238] use composition instead of inheritance
 export class Trade<
@@ -36,19 +25,19 @@ export class Trade<
   TOutput extends Currency = Currency,
   TTradeType extends TradeType = TradeType
 > extends RouterSDKTrade<TInput, TOutput, TTradeType> {
-  readonly quoteData?: QuoteData
+  readonly quote?: QuoteResult
   readonly deadline?: number
   readonly slippageTolerance: number
   readonly swapFee?: SwapFee
 
   constructor({
-    quoteData,
+    quote,
     deadline,
     slippageTolerance,
     swapFee,
     ...routes
   }: {
-    readonly quoteData?: QuoteData
+    readonly quote?: QuoteResult
     readonly swapFee?: SwapFee
     readonly deadline?: number
     readonly slippageTolerance: number
@@ -70,14 +59,14 @@ export class Trade<
     readonly tradeType: TTradeType
   }) {
     super(routes)
-    this.quoteData = quoteData
+    this.quote = quote
     this.deadline = deadline
     this.slippageTolerance = slippageTolerance
     this.swapFee = swapFee
   }
 }
 
-export interface TradeWithStatus {
+interface TradeWithStatus {
   loading: boolean
   error?: FetchBaseQueryError | SerializedError
   trade: null | Trade<Currency, Currency, TradeType>
@@ -92,7 +81,6 @@ export interface UseTradeArgs {
   customSlippageTolerance?: number
   isUSDQuote?: boolean
   sendPortionEnabled?: boolean
-  skip?: boolean
 }
 
 export function useTrade(args: UseTradeArgs): TradeWithStatus {
@@ -104,7 +92,6 @@ export function useTrade(args: UseTradeArgs): TradeWithStatus {
     customSlippageTolerance,
     isUSDQuote,
     sendPortionEnabled,
-    skip,
   } = args
   const [debouncedAmountSpecified, isDebouncing] = useDebounceWithStatus(amountSpecified)
 
@@ -128,7 +115,6 @@ export function useTrade(args: UseTradeArgs): TradeWithStatus {
     customSlippageTolerance,
     isUSDQuote,
     sendPortionEnabled,
-    skip,
   })
 
   return useMemo(() => {
@@ -168,7 +154,6 @@ export function useSetTradeSlippage(
 ): { trade: TradeWithStatus; autoSlippageTolerance: number } {
   // Always calculate and return autoSlippageTolerance so the UI can warn user when custom slippage is set higher than auto slippage
   const autoSlippageTolerance = useCalculateAutoSlippage(trade?.trade)
-
   return useMemo(() => {
     // If the user has set a custom slippage, use that in the trade instead of the auto-slippage
     if (!trade.trade || userSetSlippage) {
@@ -176,33 +161,18 @@ export function useSetTradeSlippage(
     }
 
     const { loading, error, isFetching } = trade
-    const { tradeType, deadline, quoteData, inputAmount, outputAmount } = trade.trade
+    const { tradeType, deadline, quote, inputAmount, outputAmount } = trade.trade
     const tokenInIsNative = inputAmount.currency.isNative
     const tokenOutIsNative = outputAmount.currency.isNative
 
-    if (!quoteData) {
-      return { trade, autoSlippageTolerance }
-    }
-
-    // Based on the quote type, transform the quote data into a trade
-    const newTrade =
-      quoteData.quoteType === QuoteType.RoutingApi
-        ? transformQuoteToTrade(
-            tokenInIsNative,
-            tokenOutIsNative,
-            tradeType,
-            deadline,
-            autoSlippageTolerance,
-            quoteData?.quote
-          )
-        : transformTradingApiResponseToTrade({
-            tokenInIsNative,
-            tokenOutIsNative,
-            tradeType,
-            deadline,
-            slippageTolerance: autoSlippageTolerance,
-            data: quoteData?.quote,
-          })
+    const newTrade = transformQuoteToTrade(
+      tokenInIsNative,
+      tokenOutIsNative,
+      tradeType,
+      deadline,
+      autoSlippageTolerance,
+      quote
+    )
 
     return {
       trade: {
@@ -213,7 +183,7 @@ export function useSetTradeSlippage(
       },
       autoSlippageTolerance,
     }
-  }, [trade, userSetSlippage, autoSlippageTolerance])
+  }, [trade, autoSlippageTolerance, userSetSlippage])
 }
 
 /*
@@ -227,52 +197,26 @@ export function useSetTradeSlippage(
  */
 // TODO: move logic to `transformResponse` method of routingApi when endpoint returns output USD value
 function useCalculateAutoSlippage(trade: Maybe<Trade>): number {
-  // Enforce quote types
-  const isLegacyQuote = trade?.quoteData?.quoteType === QuoteType.RoutingApi
-
+  const chainId = trade?.quote?.route?.[0]?.[0]?.tokenIn.chainId
+  const gasCostUSD = trade?.quote?.gasUseEstimateUSD
   const outputAmountUSD = useUSDCValue(trade?.outputAmount)?.toExact()
 
   return useMemo<number>(() => {
-    if (isLegacyQuote) {
-      const chainId = trade.quoteData.quote?.route[0]?.[0]?.tokenIn?.chainId
-      const onL2 = isL2Chain(chainId)
-      const gasCostUSD = trade.quoteData.quote?.gasUseEstimateUSD
-      return calculateAutoSlippage({ onL2, gasCostUSD, outputAmountUSD })
-    } else {
-      // TODO:api remove this during Uniswap X integration
-      const quote = isClassicQuote(trade?.quoteData?.quote?.quote)
-        ? trade?.quoteData?.quote?.quote
-        : undefined
-      const chainId = toSupportedChainId(quote?.chainId) ?? undefined
-      const onL2 = isL2Chain(chainId)
-      const gasCostUSD = quote?.gasFeeUSD
-      return calculateAutoSlippage({ onL2, gasCostUSD, outputAmountUSD })
+    const onL2 = isL2Chain(chainId)
+    if (onL2 || !gasCostUSD || !outputAmountUSD) {
+      return MIN_AUTO_SLIPPAGE_TOLERANCE
     }
-  }, [isLegacyQuote, outputAmountUSD, trade])
-}
-
-function calculateAutoSlippage({
-  onL2,
-  gasCostUSD,
-  outputAmountUSD,
-}: {
-  onL2: boolean
-  gasCostUSD?: string
-  outputAmountUSD?: string
-}): number {
-  if (onL2 || !gasCostUSD || !outputAmountUSD) {
-    return MIN_AUTO_SLIPPAGE_TOLERANCE
-  }
 
-  const suggestedSlippageTolerance = (Number(gasCostUSD) / Number(outputAmountUSD)) * 100
+    const suggestedSlippageTolerance = (Number(gasCostUSD) / Number(outputAmountUSD)) * 100
 
-  if (suggestedSlippageTolerance > MAX_AUTO_SLIPPAGE_TOLERANCE) {
-    return MAX_AUTO_SLIPPAGE_TOLERANCE
-  }
+    if (suggestedSlippageTolerance > MAX_AUTO_SLIPPAGE_TOLERANCE) {
+      return MAX_AUTO_SLIPPAGE_TOLERANCE
+    }
 
-  if (suggestedSlippageTolerance < MIN_AUTO_SLIPPAGE_TOLERANCE) {
-    return MIN_AUTO_SLIPPAGE_TOLERANCE
-  }
+    if (suggestedSlippageTolerance < MIN_AUTO_SLIPPAGE_TOLERANCE) {
+      return MIN_AUTO_SLIPPAGE_TOLERANCE
+    }
 
-  return Number(suggestedSlippageTolerance.toFixed(2))
+    return Number(suggestedSlippageTolerance.toFixed(2))
+  }, [chainId, gasCostUSD, outputAmountUSD])
 }
diff --git a/packages/wallet/src/features/transactions/swap/utils.test.ts b/packages/wallet/src/features/transactions/swap/utils.test.ts
index 52f57901785..f66fe472ebf 100644
--- a/packages/wallet/src/features/transactions/swap/utils.test.ts
+++ b/packages/wallet/src/features/transactions/swap/utils.test.ts
@@ -1,12 +1,4 @@
-import { Currency, CurrencyAmount, TradeType } from '@uniswap/sdk-core'
-import { Route } from '@uniswap/v3-sdk'
-import { ChainId } from 'wallet/src/constants/chains'
-import { UNI, WBTC, wrappedNativeCurrency } from 'wallet/src/constants/tokens'
-import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
-import { Trade } from 'wallet/src/features/transactions/swap/useTrade'
-import { WrapType } from 'wallet/src/features/transactions/types'
-import { mockPool } from 'wallet/src/test/fixtures'
-import { getWrapType, requireAcceptNewTrade, serializeQueryParams } from './utils'
+import { serializeQueryParams } from './utils'
 
 describe(serializeQueryParams, () => {
   it('handles the correct types', () => {
@@ -19,102 +11,3 @@ describe(serializeQueryParams, () => {
     expect(serializeQueryParams({ space: ' ', bang: '!' })).toEqual('space=%20&bang=!')
   })
 })
-
-describe(getWrapType, () => {
-  const eth = NativeCurrency.onChain(ChainId.Mainnet)
-  const weth = wrappedNativeCurrency(ChainId.Mainnet)
-
-  const goerliEth = NativeCurrency.onChain(ChainId.Goerli)
-  const goerliWeth = wrappedNativeCurrency(ChainId.Goerli)
-
-  it('handles undefined args', () => {
-    expect(getWrapType(undefined, weth)).toEqual(WrapType.NotApplicable)
-    expect(getWrapType(weth, undefined)).toEqual(WrapType.NotApplicable)
-    expect(getWrapType(undefined, undefined)).toEqual(WrapType.NotApplicable)
-  })
-
-  it('handles wrap', () => {
-    expect(getWrapType(eth, weth)).toEqual(WrapType.Wrap)
-
-    // different chains
-    expect(getWrapType(goerliEth, weth)).toEqual(WrapType.NotApplicable)
-    expect(getWrapType(eth, goerliWeth)).toEqual(WrapType.NotApplicable)
-  })
-
-  it('handles unwrap', () => {
-    expect(getWrapType(weth, eth)).toEqual(WrapType.Unwrap)
-
-    // different chains
-    expect(getWrapType(weth, goerliEth)).toEqual(WrapType.NotApplicable)
-    expect(getWrapType(goerliWeth, eth)).toEqual(WrapType.NotApplicable)
-  })
-})
-
-describe(requireAcceptNewTrade, () => {
-  const oldTrade = new Trade({
-    v3Routes: [
-      {
-        routev3: new Route<Currency, Currency>([mockPool], UNI[ChainId.Mainnet], WBTC),
-        inputAmount: CurrencyAmount.fromRawAmount(UNI[ChainId.Mainnet], 1000),
-        outputAmount: CurrencyAmount.fromRawAmount(WBTC, 1000),
-      },
-    ],
-    v2Routes: [],
-    mixedRoutes: [],
-    tradeType: TradeType.EXACT_INPUT,
-    slippageTolerance: 0.5,
-  })
-
-  it('returns false when prices are within threshold', () => {
-    const newTrade = new Trade({
-      v3Routes: [
-        {
-          routev3: new Route<Currency, Currency>([mockPool], UNI[ChainId.Mainnet], WBTC),
-          inputAmount: CurrencyAmount.fromRawAmount(UNI[ChainId.Mainnet], 1000),
-          // Update this number if `ACCEPT_NEW_TRADE_THRESHOLD` changes
-          outputAmount: CurrencyAmount.fromRawAmount(WBTC, 990),
-        },
-      ],
-      v2Routes: [],
-      mixedRoutes: [],
-      tradeType: TradeType.EXACT_INPUT,
-      slippageTolerance: 0.5,
-    })
-    expect(requireAcceptNewTrade(oldTrade, newTrade)).toBe(false)
-  })
-
-  it('returns true when prices move above threshold', () => {
-    const newTrade = new Trade({
-      v3Routes: [
-        {
-          routev3: new Route<Currency, Currency>([mockPool], UNI[ChainId.Mainnet], WBTC),
-          inputAmount: CurrencyAmount.fromRawAmount(UNI[ChainId.Mainnet], 1000),
-          // Update this number if `ACCEPT_NEW_TRADE_THRESHOLD` changes
-          outputAmount: CurrencyAmount.fromRawAmount(WBTC, 979),
-        },
-      ],
-      v2Routes: [],
-      mixedRoutes: [],
-      tradeType: TradeType.EXACT_INPUT,
-      slippageTolerance: 0.5,
-    })
-    expect(requireAcceptNewTrade(oldTrade, newTrade)).toBe(true)
-  })
-
-  it('returns false when new price is better', () => {
-    const newTrade = new Trade({
-      v3Routes: [
-        {
-          routev3: new Route<Currency, Currency>([mockPool], UNI[ChainId.Mainnet], WBTC),
-          inputAmount: CurrencyAmount.fromRawAmount(UNI[ChainId.Mainnet], 1000),
-          outputAmount: CurrencyAmount.fromRawAmount(WBTC, 2000000),
-        },
-      ],
-      v2Routes: [],
-      mixedRoutes: [],
-      tradeType: TradeType.EXACT_INPUT,
-      slippageTolerance: 0.5,
-    })
-    expect(requireAcceptNewTrade(oldTrade, newTrade)).toBe(false)
-  })
-})
diff --git a/packages/wallet/src/features/transactions/swap/utils.ts b/packages/wallet/src/features/transactions/swap/utils.ts
index e9dc19a6c07..527a98bd0af 100644
--- a/packages/wallet/src/features/transactions/swap/utils.ts
+++ b/packages/wallet/src/features/transactions/swap/utils.ts
@@ -1,42 +1,6 @@
-import { Protocol } from '@uniswap/router-sdk'
-import { Currency, Percent, TradeType } from '@uniswap/sdk-core'
-import {
-  FlatFeeOptions,
-  SwapOptions as UniversalRouterSwapOptions,
-  SwapRouter as UniversalSwapRouter,
-} from '@uniswap/universal-router-sdk'
-import { FeeOptions } from '@uniswap/v3-sdk'
-import { BigNumber } from 'ethers'
-import { AppTFunction } from 'ui/src/i18n/types'
-import { NumberType } from 'utilities/src/format/types'
-import { ChainId } from 'wallet/src/constants/chains'
-import { AssetType } from 'wallet/src/entities/assets'
-import { LocalizationContextState } from 'wallet/src/features/language/LocalizationContext'
-import { isClassicQuote } from 'wallet/src/features/transactions/swap/tradingApi/utils'
-import { PermitSignatureInfo } from 'wallet/src/features/transactions/swap/usePermit2Signature'
-import { QuoteData, Trade } from 'wallet/src/features/transactions/swap/useTrade'
-import {
-  CurrencyField,
-  TransactionState,
-} from 'wallet/src/features/transactions/transactionState/types'
-import {
-  ExactInputSwapTransactionInfo,
-  ExactOutputSwapTransactionInfo,
-  TransactionType,
-  WrapType,
-} from 'wallet/src/features/transactions/types'
-import { QuoteType } from 'wallet/src/features/transactions/utils'
-import { ElementName, ElementNameType } from 'wallet/src/telemetry/constants'
+import { Currency } from '@uniswap/sdk-core'
+import { Trade } from 'wallet/src/features/transactions/swap/useTrade'
 import { areAddressesEqual } from 'wallet/src/utils/addresses'
-import { getSymbolDisplayText } from 'wallet/src/utils/currency'
-import {
-  CurrencyId,
-  areCurrencyIdsEqual,
-  buildWrappedNativeCurrencyId,
-  currencyId,
-  currencyIdToAddress,
-  currencyIdToChain,
-} from 'wallet/src/utils/currencyId'
 
 export function serializeQueryParams(
   params: Record<string, Parameters<typeof encodeURIComponent>[0]>
@@ -67,230 +31,3 @@ export const clearStaleTrades = (
   // then set `trade` to null
   return inputsMatch && outputsMatch ? trade : null
 }
-
-export function getWrapType(
-  inputCurrency: Currency | null | undefined,
-  outputCurrency: Currency | null | undefined
-): WrapType {
-  if (!inputCurrency || !outputCurrency || inputCurrency.chainId !== outputCurrency.chainId) {
-    return WrapType.NotApplicable
-  }
-
-  const inputChainId = inputCurrency.chainId as ChainId
-  const wrappedCurrencyId = buildWrappedNativeCurrencyId(inputChainId)
-
-  if (
-    inputCurrency.isNative &&
-    areCurrencyIdsEqual(currencyId(outputCurrency), wrappedCurrencyId)
-  ) {
-    return WrapType.Wrap
-  } else if (
-    outputCurrency.isNative &&
-    areCurrencyIdsEqual(currencyId(inputCurrency), wrappedCurrencyId)
-  ) {
-    return WrapType.Unwrap
-  }
-
-  return WrapType.NotApplicable
-}
-
-export function isWrapAction(wrapType: WrapType): wrapType is WrapType.Unwrap | WrapType.Wrap {
-  return wrapType === WrapType.Unwrap || wrapType === WrapType.Wrap
-}
-
-export function tradeToTransactionInfo(
-  trade: Trade
-): ExactInputSwapTransactionInfo | ExactOutputSwapTransactionInfo {
-  const slippageTolerancePercent = slippageToleranceToPercent(trade.slippageTolerance)
-  const { quoteData, slippageTolerance } = trade
-
-  const { quoteId, gasUseEstimate, routeString } = parseQuoteTypeSpecificParms(quoteData)
-
-  const baseTransactionInfo = {
-    inputCurrencyId: currencyId(trade.inputAmount.currency),
-    outputCurrencyId: currencyId(trade.outputAmount.currency),
-    slippageTolerance,
-    quoteId,
-    gasUseEstimate,
-    routeString,
-    protocol: getProtocolVersionFromTrade(trade),
-    quoteType: quoteData?.quoteType,
-  }
-
-  return trade.tradeType === TradeType.EXACT_INPUT
-    ? {
-        ...baseTransactionInfo,
-        type: TransactionType.Swap,
-        tradeType: TradeType.EXACT_INPUT,
-        inputCurrencyAmountRaw: trade.inputAmount.quotient.toString(),
-        expectedOutputCurrencyAmountRaw: trade.outputAmount.quotient.toString(),
-        minimumOutputCurrencyAmountRaw: trade
-          .minimumAmountOut(slippageTolerancePercent)
-          .quotient.toString(),
-      }
-    : {
-        ...baseTransactionInfo,
-        type: TransactionType.Swap,
-        tradeType: TradeType.EXACT_OUTPUT,
-        outputCurrencyAmountRaw: trade.outputAmount.quotient.toString(),
-        expectedInputCurrencyAmountRaw: trade.inputAmount.quotient.toString(),
-        maximumInputCurrencyAmountRaw: trade
-          .maximumAmountIn(slippageTolerancePercent)
-          .quotient.toString(),
-      }
-}
-
-function parseQuoteTypeSpecificParms(quoteData: QuoteData | undefined): {
-  gasUseEstimate: string | undefined
-  routeString: string | undefined
-  quoteId: string | undefined
-} {
-  const isLegacyQuote = quoteData?.quoteType === QuoteType.RoutingApi
-  const maybeTradingApiQuote = !isLegacyQuote
-    ? isClassicQuote(quoteData?.quote?.quote)
-      ? quoteData?.quote?.quote
-      : undefined
-    : undefined
-
-  const quoteId = isLegacyQuote ? quoteData?.quote?.quoteId : maybeTradingApiQuote?.quoteId
-  const gasUseEstimate = isLegacyQuote
-    ? quoteData.quote?.gasUseEstimate
-    : maybeTradingApiQuote?.gasFeeUSD
-  const routeString = isLegacyQuote
-    ? quoteData?.quote?.routeString
-    : maybeTradingApiQuote?.routeString
-
-  return { quoteId, gasUseEstimate, routeString }
-}
-
-// any price movement below ACCEPT_NEW_TRADE_THRESHOLD is auto-accepted for the user
-const ACCEPT_NEW_TRADE_THRESHOLD = new Percent(1, 100)
-export function requireAcceptNewTrade(oldTrade: Maybe<Trade>, newTrade: Maybe<Trade>): boolean {
-  if (!oldTrade || !newTrade) {
-    return false
-  }
-
-  return (
-    oldTrade.tradeType !== newTrade.tradeType ||
-    !oldTrade.inputAmount.currency.equals(newTrade.inputAmount.currency) ||
-    !oldTrade.outputAmount.currency.equals(newTrade.outputAmount.currency) ||
-    newTrade.executionPrice.lessThan(oldTrade.worstExecutionPrice(ACCEPT_NEW_TRADE_THRESHOLD))
-  )
-}
-
-export const getRateToDisplay = (
-  formatter: LocalizationContextState,
-  trade: Trade,
-  showInverseRate: boolean
-): string => {
-  const price = showInverseRate ? trade.executionPrice.invert() : trade.executionPrice
-  const formattedPrice = formatter.formatNumberOrString({
-    value: price.toSignificant(),
-    type: NumberType.SwapPrice,
-  })
-  const quoteCurrencySymbol = getSymbolDisplayText(trade.executionPrice.quoteCurrency.symbol)
-  const baseCurrencySymbol = getSymbolDisplayText(trade.executionPrice.baseCurrency.symbol)
-  const rate = `1 ${quoteCurrencySymbol} = ${formattedPrice} ${baseCurrencySymbol}`
-  const inverseRate = `1 ${baseCurrencySymbol} = ${formattedPrice} ${quoteCurrencySymbol}`
-  return showInverseRate ? rate : inverseRate
-}
-
-export const getActionName = (t: AppTFunction, wrapType: WrapType): string => {
-  switch (wrapType) {
-    case WrapType.Unwrap:
-      return t('Unwrap')
-    case WrapType.Wrap:
-      return t('Wrap')
-    default:
-      return t('Swap')
-  }
-}
-
-export const getActionElementName = (wrapType: WrapType): ElementNameType => {
-  switch (wrapType) {
-    case WrapType.Unwrap:
-      return ElementName.Unwrap
-    case WrapType.Wrap:
-      return ElementName.Wrap
-    default:
-      return ElementName.Swap
-  }
-}
-
-export function sumGasFees(gasFee1?: string | undefined, gasFee2?: string): string | undefined {
-  if (!gasFee1 || !gasFee2) {
-    return gasFee1 || gasFee2
-  }
-
-  return BigNumber.from(gasFee1).add(gasFee2).toString()
-}
-
-export const prepareSwapFormState = ({
-  inputCurrencyId,
-}: {
-  inputCurrencyId?: CurrencyId
-}): TransactionState | undefined => {
-  return inputCurrencyId
-    ? {
-        exactCurrencyField: CurrencyField.INPUT,
-        exactAmountToken: '',
-        [CurrencyField.INPUT]: {
-          address: currencyIdToAddress(inputCurrencyId),
-          chainId: currencyIdToChain(inputCurrencyId) ?? ChainId.Mainnet,
-          type: AssetType.Currency,
-        },
-        [CurrencyField.OUTPUT]: null,
-      }
-    : undefined
-}
-
-// rounds to nearest basis point
-export const slippageToleranceToPercent = (slippage: number): Percent => {
-  const basisPoints = Math.round(slippage * 100)
-  return new Percent(basisPoints, 10_000)
-}
-
-interface MethodParameterArgs {
-  permit2Signature?: PermitSignatureInfo
-  trade: Trade
-  address: string
-  feeOptions?: FeeOptions
-  flatFeeOptions?: FlatFeeOptions
-}
-
-export const getSwapMethodParameters = ({
-  permit2Signature,
-  trade,
-  address,
-  feeOptions,
-  flatFeeOptions,
-}: MethodParameterArgs): { calldata: string; value: string } => {
-  const slippageTolerancePercent = slippageToleranceToPercent(trade.slippageTolerance)
-  const baseOptions = {
-    slippageTolerance: slippageTolerancePercent,
-    recipient: address,
-    fee: feeOptions,
-    flatFee: flatFeeOptions,
-  }
-
-  const universalRouterSwapOptions: UniversalRouterSwapOptions = permit2Signature
-    ? {
-        ...baseOptions,
-        inputTokenPermit: {
-          signature: permit2Signature.signature,
-          ...permit2Signature.permitMessage,
-        },
-      }
-    : baseOptions
-  return UniversalSwapRouter.swapERC20CallParameters(trade, universalRouterSwapOptions)
-}
-
-export function getProtocolVersionFromTrade(trade: Trade): Protocol {
-  if (trade.routes.every((r) => r.protocol === Protocol.V2)) {
-    return Protocol.V2
-  }
-  if (trade.routes.every((r) => r.protocol === Protocol.V3)) {
-    return Protocol.V3
-  }
-  return Protocol.MIXED
-}
diff --git a/packages/wallet/src/features/transactions/transactionWatcherSaga.ts b/packages/wallet/src/features/transactions/transactionWatcherSaga.ts
index e86df896434..4991a75d828 100644
--- a/packages/wallet/src/features/transactions/transactionWatcherSaga.ts
+++ b/packages/wallet/src/features/transactions/transactionWatcherSaga.ts
@@ -297,7 +297,6 @@ export function logTransactionEvent(
       tradeType,
       protocol,
       transactedUSDValue,
-      quoteType,
     } = typeInfo as BaseSwapTransactionInfo
     const eventName =
       status === TransactionStatus.Success
@@ -321,7 +320,6 @@ export function logTransactionEvent(
       submitViaPrivateRpc,
       protocol,
       transactedUSDValue,
-      quoteType,
     })
   }
 
diff --git a/packages/wallet/src/features/transactions/transfer/hooks/useDerivedTransferInfo.ts b/packages/wallet/src/features/transactions/transfer/hooks/useDerivedTransferInfo.ts
deleted file mode 100644
index 8890ac189db..00000000000
--- a/packages/wallet/src/features/transactions/transfer/hooks/useDerivedTransferInfo.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import { useMemo } from 'react'
-import { ChainId } from 'wallet/src/constants/chains'
-import { AssetType } from 'wallet/src/entities/assets'
-import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import { DerivedTransferInfo } from 'wallet/src/features/transactions/transfer/types'
-
-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 { TransactionState } from 'wallet/src/features/transactions/transactionState/types'
-import { useActiveAccount } from 'wallet/src/features/wallet/hooks'
-import { buildCurrencyId } from 'wallet/src/utils/currencyId'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
-
-export function useDerivedTransferInfo(state: TransactionState): DerivedTransferInfo {
-  const {
-    [CurrencyField.INPUT]: tradeableAsset,
-    exactAmountToken,
-    exactAmountFiat,
-    recipient,
-    isFiatInput,
-    txId,
-  } = state
-
-  const activeAccount = useActiveAccount()
-  const chainId = tradeableAsset?.chainId ?? ChainId.Mainnet
-
-  const currencyInInfo = useCurrencyInfo(
-    tradeableAsset?.type === AssetType.Currency
-      ? buildCurrencyId(tradeableAsset?.chainId, tradeableAsset?.address)
-      : undefined
-  )
-
-  const currencyIn = currencyInInfo?.currency
-  const { data: nftIn } = useNFT(
-    activeAccount?.address,
-    tradeableAsset?.address,
-    tradeableAsset?.type === AssetType.ERC1155 || tradeableAsset?.type === AssetType.ERC721
-      ? tradeableAsset.tokenId
-      : undefined
-  )
-
-  const currencies = useMemo(
-    () => ({
-      [CurrencyField.INPUT]: currencyInInfo ?? nftIn,
-    }),
-    [currencyInInfo, nftIn]
-  )
-
-  const { balance: tokenInBalance } = useOnChainCurrencyBalance(
-    currencyIn?.isToken ? currencyIn : undefined,
-    activeAccount?.address
-  )
-
-  const { balance: nativeInBalance } = useOnChainNativeCurrencyBalance(
-    chainId ?? ChainId.Mainnet,
-    activeAccount?.address
-  )
-
-  const amountSpecified = useMemo(
-    () =>
-      getCurrencyAmount({
-        value: exactAmountToken,
-        valueType: ValueType.Exact,
-        currency: currencyIn,
-      }),
-    [currencyIn, exactAmountToken]
-  )
-  const currencyAmounts = useMemo(
-    () => ({
-      [CurrencyField.INPUT]: amountSpecified,
-    }),
-    [amountSpecified]
-  )
-
-  const currencyBalances = useMemo(
-    () => ({
-      [CurrencyField.INPUT]: currencyIn?.isNative ? nativeInBalance : tokenInBalance,
-    }),
-    [currencyIn, nativeInBalance, tokenInBalance]
-  )
-  return useMemo(
-    () => ({
-      chainId,
-      currencies,
-      currencyAmounts,
-      currencyBalances,
-      currencyTypes: { [CurrencyField.INPUT]: tradeableAsset?.type },
-      currencyInInfo,
-      exactAmountToken,
-      exactAmountFiat: exactAmountFiat ?? '',
-      exactCurrencyField: CurrencyField.INPUT,
-      isFiatInput,
-      nftIn: nftIn ?? undefined,
-      recipient,
-      txId,
-    }),
-    [
-      chainId,
-      currencies,
-      currencyAmounts,
-      currencyBalances,
-      currencyInInfo,
-      exactAmountToken,
-      exactAmountFiat,
-      isFiatInput,
-      nftIn,
-      recipient,
-      tradeableAsset?.type,
-      txId,
-    ]
-  )
-}
diff --git a/packages/wallet/src/features/transactions/transfer/hooks/useIsSmartContractAddress.ts b/packages/wallet/src/features/transactions/transfer/hooks/useIsSmartContractAddress.ts
deleted file mode 100644
index 73737ec86ee..00000000000
--- a/packages/wallet/src/features/transactions/transfer/hooks/useIsSmartContractAddress.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { useCallback } from 'react'
-import { useAsyncData } from 'utilities/src/react/hooks'
-import { ChainId } from 'wallet/src/constants/chains'
-import { useProvider } from 'wallet/src/features/wallet/context'
-
-export function useIsSmartContractAddress(
-  address: string | undefined,
-  chainId: ChainId
-): {
-  loading: boolean
-  isSmartContractAddress: boolean
-} {
-  const provider = useProvider(chainId)
-
-  const fetchIsSmartContractAddress = useCallback(async () => {
-    if (!address) {
-      return false
-    }
-    const code = await provider?.getCode(address)
-    // provider.getCode(address) will return a hex string if a smart contract is deployed at that address
-    // returning just 0x means there's no code and it's not a smart contract
-    return code !== '0x'
-  }, [provider, address])
-
-  const { data, isLoading } = useAsyncData(fetchIsSmartContractAddress)
-  return { isSmartContractAddress: !!data, loading: isLoading }
-}
diff --git a/packages/wallet/src/features/transactions/transfer/hooks/useOnSelectRecipient.ts b/packages/wallet/src/features/transactions/transfer/hooks/useOnSelectRecipient.ts
deleted file mode 100644
index 53bad441f87..00000000000
--- a/packages/wallet/src/features/transactions/transfer/hooks/useOnSelectRecipient.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { AnyAction } from '@reduxjs/toolkit'
-import { useCallback } from 'react'
-import { selectRecipient } from 'wallet/src/features/transactions/transactionState/transactionState'
-import { useOnToggleShowRecipientSelector } from 'wallet/src/features/transactions/transfer/hooks/useOnToggleShowRecipientSelector'
-
-export function useOnSelectRecipient(
-  dispatch: React.Dispatch<AnyAction>
-): (recipient: Address) => void {
-  const onToggleShowRecipientSelector = useOnToggleShowRecipientSelector(dispatch)
-  return useCallback(
-    (recipient: Address) => {
-      onToggleShowRecipientSelector()
-      dispatch(selectRecipient({ recipient }))
-    },
-    [dispatch, onToggleShowRecipientSelector]
-  )
-}
diff --git a/packages/wallet/src/features/transactions/transfer/hooks/useOnToggleShowRecipientSelector.ts b/packages/wallet/src/features/transactions/transfer/hooks/useOnToggleShowRecipientSelector.ts
deleted file mode 100644
index 670b46d5afa..00000000000
--- a/packages/wallet/src/features/transactions/transfer/hooks/useOnToggleShowRecipientSelector.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import { AnyAction } from '@reduxjs/toolkit'
-import { useCallback } from 'react'
-import { toggleShowRecipientSelector } from 'wallet/src/features/transactions/transactionState/transactionState'
-
-export function useOnToggleShowRecipientSelector(dispatch: React.Dispatch<AnyAction>): () => void {
-  return useCallback(() => {
-    dispatch(toggleShowRecipientSelector())
-  }, [dispatch])
-}
diff --git a/packages/wallet/src/features/transactions/transfer/hooks/useTransferCallback.ts b/packages/wallet/src/features/transactions/transfer/hooks/useTransferCallback.ts
deleted file mode 100644
index 9eaa1873aef..00000000000
--- a/packages/wallet/src/features/transactions/transfer/hooks/useTransferCallback.ts
+++ /dev/null
@@ -1,86 +0,0 @@
-import { providers } from 'ethers'
-import { useMemo } from 'react'
-import { ChainId } from 'wallet/src/constants/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(
-  txId?: string,
-  chainId?: ChainId,
-  toAddress?: Address,
-  tokenAddress?: Address,
-  amountInWei?: string,
-  transferTxWithGasSettings?: providers.TransactionRequest,
-  onSubmit?: () => void
-): (() => void) | null {
-  const account = useActiveAccount()
-
-  return useTransferCallback(
-    chainId && toAddress && tokenAddress && amountInWei && account
-      ? {
-          account,
-          chainId,
-          toAddress,
-          tokenAddress,
-          amountInWei,
-          type: AssetType.Currency,
-          txId,
-        }
-      : undefined,
-    transferTxWithGasSettings,
-    onSubmit
-  )
-}
-
-/** Helper transfer callback for NFTs */
-export function useTransferNFTCallback(
-  txId?: string,
-  chainId?: ChainId,
-  toAddress?: Address,
-  tokenAddress?: Address,
-  tokenId?: string,
-  txRequest?: providers.TransactionRequest,
-  onSubmit?: () => void
-): (() => void) | null {
-  const account = useActiveAccount()
-
-  return useTransferCallback(
-    account && chainId && toAddress && tokenAddress && tokenId
-      ? {
-          account,
-          chainId,
-          toAddress,
-          tokenAddress,
-          tokenId,
-          type: AssetType.ERC721,
-          txId,
-        }
-      : undefined,
-    txRequest,
-    onSubmit
-  )
-}
-
-/** General purpose transfer callback for ERC20s, NFTs, etc. */
-function useTransferCallback(
-  transferTokenParams?: TransferTokenParams,
-  txRequest?: providers.TransactionRequest,
-  onSubmit?: () => void
-): null | (() => void) {
-  const dispatch = useAppDispatch()
-
-  return useMemo(() => {
-    if (!transferTokenParams || !txRequest) {
-      return null
-    }
-
-    return () => {
-      dispatch(transferTokenActions.trigger({ transferTokenParams, txRequest }))
-      onSubmit?.()
-    }
-  }, [transferTokenParams, dispatch, txRequest, onSubmit])
-}
diff --git a/packages/wallet/src/features/transactions/transfer/types.ts b/packages/wallet/src/features/transactions/transfer/types.ts
index 5dac3b2e1b0..9e6df2595e8 100644
--- a/packages/wallet/src/features/transactions/transfer/types.ts
+++ b/packages/wallet/src/features/transactions/transfer/types.ts
@@ -1,9 +1,5 @@
-import { Currency, CurrencyAmount } from '@uniswap/sdk-core'
 import { ChainId } from 'wallet/src/constants/chains'
 import { AssetType, NFTAssetType } from 'wallet/src/entities/assets'
-import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
-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 {
@@ -26,40 +22,3 @@ export interface TransferNFTParams extends BaseTransferParams {
 }
 
 export type TransferTokenParams = TransferCurrencyParams | TransferNFTParams
-
-export type BaseDerivedInfo<TInput = CurrencyInfo> = {
-  currencies: {
-    [CurrencyField.INPUT]: Maybe<TInput>
-  }
-  currencyAmounts: {
-    [CurrencyField.INPUT]: Maybe<CurrencyAmount<Currency>>
-  }
-  currencyBalances: {
-    [CurrencyField.INPUT]: Maybe<CurrencyAmount<Currency>>
-  }
-  exactAmountFiat?: string
-  exactAmountToken: string
-  exactCurrencyField: CurrencyField
-}
-
-export type DerivedTransferInfo = BaseDerivedInfo<CurrencyInfo | GQLNftAsset> & {
-  currencyTypes: { [CurrencyField.INPUT]?: AssetType }
-  currencyInInfo?: CurrencyInfo | null
-  chainId: ChainId
-  exactAmountFiat: string
-  exactCurrencyField: CurrencyField.INPUT
-  isFiatInput?: boolean
-  nftIn: GQLNftAsset | undefined
-  recipient?: string
-  txId?: string
-}
-
-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 d80bded281e..5149884bdd8 100644
--- a/packages/wallet/src/features/transactions/types.ts
+++ b/packages/wallet/src/features/transactions/types.ts
@@ -1,17 +1,10 @@
-import { AnyAction } from '@reduxjs/toolkit'
 import { Protocol } from '@uniswap/router-sdk'
 import { TradeType } from '@uniswap/sdk-core'
 import { providers } from 'ethers'
-import { Dispatch } from 'react'
 import { ChainId } from 'wallet/src/constants/chains'
 import { TransactionListQuery } from 'wallet/src/data/__generated__/types-and-hooks'
 import { AssetType } from 'wallet/src/entities/assets'
 import { MoonpayCurrency } from 'wallet/src/features/fiatOnRamp/types'
-import { GasFeeResult } from 'wallet/src/features/gas/types'
-import { DerivedSwapInfo } from 'wallet/src/features/transactions/swap/types'
-import { DerivedTransferInfo } from 'wallet/src/features/transactions/transfer/types'
-import { QuoteType } from 'wallet/src/features/transactions/utils'
-import { Warning } from 'wallet/src/features/transactions/WarningModal/types'
 import { DappInfo } from 'wallet/src/features/walletConnect/types'
 
 export enum WrapType {
@@ -164,7 +157,6 @@ export interface BaseSwapTransactionInfo extends BaseTransactionInfo {
   routeString?: string
   gasUseEstimate?: string
   protocol?: Protocol
-  quoteType?: QuoteType
 }
 
 export interface ExactInputSwapTransactionInfo extends BaseSwapTransactionInfo {
@@ -293,27 +285,3 @@ export function isFinalizedTx(
     tx.status === TransactionStatus.FailedCancel
   )
 }
-
-export enum TransactionStep {
-  FORM,
-  REVIEW,
-  SUBMITTED,
-}
-
-export interface TransactionFlowProps {
-  dispatch: Dispatch<AnyAction>
-  showRecipientSelector?: boolean
-  recipientSelector?: JSX.Element
-  flowName: string
-  derivedInfo: DerivedTransferInfo | DerivedSwapInfo
-  onClose: () => void
-  approveTxRequest?: providers.TransactionRequest
-  txRequest?: providers.TransactionRequest
-  gasFee: GasFeeResult
-  step: TransactionStep
-  setStep: (newStep: TransactionStep) => void
-  warnings: Warning[]
-  exactValue: string
-  isFiatInput?: boolean
-  showFiatToggle?: boolean
-}
diff --git a/packages/wallet/src/features/transactions/utils.ts b/packages/wallet/src/features/transactions/utils.ts
index 256c1865b2c..834c1157569 100644
--- a/packages/wallet/src/features/transactions/utils.ts
+++ b/packages/wallet/src/features/transactions/utils.ts
@@ -7,12 +7,7 @@ import {
   FinalizedTransactionStatus,
   TransactionStatus,
 } from 'wallet/src/features/transactions/types'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
-
-export enum QuoteType {
-  RoutingApi = 'RoutingApi',
-  TradingApi = 'TradingApi',
-}
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
 export function getSerializableTransactionRequest(
   request: providers.TransactionRequest,
diff --git a/packages/wallet/src/features/unitags/api.ts b/packages/wallet/src/features/unitags/api.ts
index 33045f70d5a..923e74403bd 100644
--- a/packages/wallet/src/features/unitags/api.ts
+++ b/packages/wallet/src/features/unitags/api.ts
@@ -1,19 +1,14 @@
-import { ApolloClient, from } from '@apollo/client'
+import { ApolloClient, from, InMemoryCache } from '@apollo/client'
 import { RetryLink } from '@apollo/client/link/retry'
 import { RestLink } from 'apollo-link-rest'
-import axios from 'axios'
-import { ONE_SECOND_MS } from 'utilities/src/time/time'
 import { uniswapUrls } from 'wallet/src/constants/urls'
-import { createNewInMemoryCache } from 'wallet/src/data/cache'
 import { useRestMutation, useRestQuery } from 'wallet/src/data/rest'
 import {
   UnitagAddressResponse,
-  UnitagChangeUsernameRequestBody,
   UnitagClaimEligibilityParams,
   UnitagClaimEligibilityResponse,
+  UnitagClaimResponse,
   UnitagClaimUsernameRequestBody,
-  UnitagGetAvatarUploadUrlResponse,
-  UnitagResponse,
   UnitagUpdateMetadataRequestBody,
   UnitagUpdateMetadataResponse,
   UnitagUsernameResponse,
@@ -27,17 +22,18 @@ const retryLink = new RetryLink()
 
 const apolloClient = new ApolloClient({
   link: from([retryLink, restLink]),
-  cache: createNewInMemoryCache(),
+  cache: new InMemoryCache(),
   defaultOptions: {
     watchQuery: {
       // ensures query is returning data even if some fields errored out
       errorPolicy: 'all',
-      fetchPolicy: 'cache-and-network',
+      fetchPolicy: 'no-cache',
+      nextFetchPolicy: 'no-cache',
     },
   },
 })
 
-export function addQueryParamsToEndpoint(
+function addQueryParamsToEndpoint(
   endpoint: string,
   params: Record<string, string | number | boolean | undefined>
 ): string {
@@ -57,7 +53,7 @@ export function useUnitagQuery(
   return useRestQuery<UnitagUsernameResponse, Record<string, never>>(
     addQueryParamsToEndpoint('/username', { username }),
     {},
-    ['available', 'requiresEnsMatch', 'username', 'metadata', 'address'], // return all fields
+    ['available', 'requiresEnsMatch', 'metadata', 'address'], // return all fields
     {
       skip: !username, // skip if username is not provided
       fetchPolicy: 'no-cache',
@@ -84,9 +80,9 @@ export function useUnitagByAddressQuery(
 }
 
 export function useClaimUnitagMutation(): ReturnType<
-  typeof useRestMutation<UnitagResponse, UnitagClaimUsernameRequestBody>
+  typeof useRestMutation<UnitagClaimResponse, UnitagClaimUsernameRequestBody>
 > {
-  return useRestMutation<UnitagResponse, UnitagClaimUsernameRequestBody>(
+  return useRestMutation<UnitagClaimResponse, UnitagClaimUsernameRequestBody>(
     '/username',
     ['success', 'errorCode'], // return all fields
     {},
@@ -125,50 +121,3 @@ export function useUnitagClaimEligibilityQuery({
     apolloClient
   )
 }
-
-export function useUnitagGetAvatarUploadUrlQuery({
-  username,
-  skip,
-}: {
-  username?: string
-  skip?: boolean
-}): ReturnType<typeof useRestQuery<UnitagGetAvatarUploadUrlResponse>> {
-  return useRestQuery<UnitagGetAvatarUploadUrlResponse, Record<string, never>>(
-    addQueryParamsToEndpoint('/username/avatar-upload-url', { username }),
-    {},
-    ['success', 'avatarUrl', 'preSignedUrl', 's3UploadFields'], // return all fields
-    { skip: !username || skip, ttlMs: ONE_SECOND_MS * 110 },
-    'GET',
-    apolloClient
-  )
-}
-
-// TODO (MOB-1791): add signature authentication in headers
-export async function getUnitagAvatarUploadUrl(
-  username: string
-): ReturnType<typeof axios.get<UnitagGetAvatarUploadUrlResponse>> {
-  const avatarUploadUrl = `${uniswapUrls.unitagsApiUrl}/username/avatar-upload-url`
-  return await axios.get<UnitagGetAvatarUploadUrlResponse>(avatarUploadUrl, {
-    params: { username },
-  })
-}
-
-export async function deleteUnitag(
-  username: string,
-  address: Address
-): ReturnType<typeof axios.delete<UnitagResponse>> {
-  const avatarUploadUrl = `${uniswapUrls.unitagsApiUrl}/username`
-  return await axios.delete<UnitagResponse>(avatarUploadUrl, { data: { username, address } })
-}
-
-export function useUnitagChangeMutation(): ReturnType<
-  typeof useRestMutation<UnitagResponse, UnitagChangeUsernameRequestBody>
-> {
-  return useRestMutation<UnitagResponse, UnitagChangeUsernameRequestBody>(
-    '/username/change',
-    ['success', 'errorCode'], // return all fields
-    {},
-    'POST',
-    apolloClient
-  )
-}
diff --git a/packages/wallet/src/features/unitags/constants.ts b/packages/wallet/src/features/unitags/constants.ts
deleted file mode 100644
index 8738bb4fbfa..00000000000
--- a/packages/wallet/src/features/unitags/constants.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export const UNITAG_BUCKET_NAME = 'unitagavatars'
-export const UNITAG_VALID_REGEX = /^[a-z0-9]+$/
-export const UNITAG_SUFFIX = '.cantswim.eth'
diff --git a/packages/wallet/src/features/unitags/context.tsx b/packages/wallet/src/features/unitags/context.tsx
deleted file mode 100644
index 0845b1479be..00000000000
--- a/packages/wallet/src/features/unitags/context.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-import { PropsWithChildren, createContext, useContext, useState } from 'react'
-
-type UnitagUpdaterContextType = {
-  refetchUnitagsCounter: number
-  triggerRefetchUnitags: () => void
-}
-
-const UnitagUpdaterContext = createContext<UnitagUpdaterContextType | null>(null)
-
-export function UnitagUpdaterContextProvider({
-  children,
-}: PropsWithChildren<unknown>): JSX.Element {
-  const [refetchUnitagsCounter, setRefetchUnitagsCounter] = useState(0)
-
-  const triggerRefetchUnitags = (): void => {
-    setRefetchUnitagsCounter((prevCounter) => prevCounter + 1)
-  }
-  return (
-    <UnitagUpdaterContext.Provider value={{ refetchUnitagsCounter, triggerRefetchUnitags }}>
-      {children}
-    </UnitagUpdaterContext.Provider>
-  )
-}
-
-export const useUnitagUpdater = (): UnitagUpdaterContextType => {
-  const context = useContext(UnitagUpdaterContext)
-  if (!context) {
-    throw new Error('useUnitagUpdate must be used within a UnitagUpdateProvider')
-  }
-  return context
-}
diff --git a/packages/wallet/src/features/unitags/hooks.ts b/packages/wallet/src/features/unitags/hooks.ts
index 080613e4afe..95bb7d6fbf1 100644
--- a/packages/wallet/src/features/unitags/hooks.ts
+++ b/packages/wallet/src/features/unitags/hooks.ts
@@ -11,58 +11,40 @@ import {
   useUnitagClaimEligibilityQuery,
   useUnitagQuery,
 } from 'wallet/src/features/unitags/api'
-import { UNITAG_VALID_REGEX } from 'wallet/src/features/unitags/constants'
-import { UnitagAddressResponse, UnitagUsernameResponse } from 'wallet/src/features/unitags/types'
+import { UnitagAddressResponse } from 'wallet/src/features/unitags/types'
 import { useActiveAccountAddressWithThrow } from 'wallet/src/features/wallet/hooks'
 import { areAddressesEqual } from 'wallet/src/utils/addresses'
 
 const MIN_UNITAG_LENGTH = 3
 const MAX_UNITAG_LENGTH = 20
 
-export const useCanActiveAddressClaimUnitag = (): {
-  canClaimUnitag: boolean
-  refetch: (() => void) | undefined
-} => {
+export const useCanActiveAddressClaimUnitag = (): boolean => {
   const unitagsFeatureFlagEnabled = useFeatureFlag(FEATURE_FLAGS.Unitags)
   const activeAddress = useActiveAccountAddressWithThrow()
   const { data: deviceId } = useAsyncData(getUniqueId)
-  const { loading, data, refetch } = useUnitagClaimEligibilityQuery({
+  const { loading, data } = useUnitagClaimEligibilityQuery({
     address: activeAddress,
     deviceId: deviceId ?? '', // this is fine since we skip if deviceId is undefined
     skip: !unitagsFeatureFlagEnabled || !deviceId,
   })
-  return { canClaimUnitag: !loading && !!data?.canClaim, refetch }
+  return unitagsFeatureFlagEnabled && !loading && !!data?.canClaim
 }
 
-export const useCanAddressClaimUnitag = (
-  address?: Address
-): { canClaimUnitag: boolean; refetch: (() => void) | undefined } => {
+export const useCanAddressClaimUnitag = (address?: Address): boolean => {
   const unitagsFeatureFlagEnabled = useFeatureFlag(FEATURE_FLAGS.Unitags)
   const { data: deviceId } = useAsyncData(getUniqueId)
-  const { loading, data, refetch } = useUnitagClaimEligibilityQuery({
+  const { loading, data } = useUnitagClaimEligibilityQuery({
     address,
     deviceId: deviceId ?? '', // this is fine since we skip if deviceId is undefined
     skip: !unitagsFeatureFlagEnabled || !deviceId,
   })
-  return { canClaimUnitag: !loading && !!data?.canClaim, refetch }
+  return !loading && !!data?.canClaim
 }
 
-export const useUnitagByAddress = (
-  address?: Address
-): { unitag?: UnitagAddressResponse; loading: boolean; refetch: (() => void) | undefined } => {
+export const useUnitag = (address?: Address): UnitagAddressResponse | undefined => {
   const unitagsFeatureFlagEnabled = useFeatureFlag(FEATURE_FLAGS.Unitags)
-  const { data, loading, refetch } = useUnitagByAddressQuery(
-    unitagsFeatureFlagEnabled ? address : undefined
-  )
-  return { unitag: data, loading, refetch }
-}
-
-export const useUnitagByName = (
-  name?: string
-): { unitag?: UnitagUsernameResponse; loading: boolean } => {
-  const unitagsFeatureFlagEnabled = useFeatureFlag(FEATURE_FLAGS.Unitags)
-  const { data, loading } = useUnitagQuery(unitagsFeatureFlagEnabled ? name : undefined)
-  return { unitag: data, loading }
+  const { data } = useUnitagByAddressQuery(unitagsFeatureFlagEnabled ? address : undefined)
+  return data
 }
 
 // Helper function to enforce unitag length and alphanumeric characters
@@ -75,23 +57,23 @@ export const getUnitagFormatError = (unitag: string, t: TFunction): string | und
     return t(`Unitags cannot be more than {{ maxUnitagLength }} characters`, {
       maxUnitagLength: MAX_UNITAG_LENGTH,
     })
-  } else if (!UNITAG_VALID_REGEX.test(unitag)) {
-    return t('Unitags can only contain lowercase letters and numbers')
+  } else if (!/^[A-Za-z0-9]+$/.test(unitag)) {
+    return t('Unitags can only contain letters and numbers')
   }
   return undefined
 }
 
-export const useCanClaimUnitagName = (
+export const useUnitagError = (
   unitagAddress: Address | undefined,
   unitag: string | undefined
-): { error: string | undefined; loading: boolean } => {
+): { unitagError: string | undefined; loading: boolean } => {
   const { t } = useTranslation()
 
   // Check for length and alphanumeric characters
-  let error = unitag ? getUnitagFormatError(unitag, t) : undefined
+  let unitagError = unitag ? getUnitagFormatError(unitag, t) : undefined
 
   // Skip the backend calls if we found an error
-  const unitagToSearch = error ? undefined : unitag
+  const unitagToSearch = unitagError ? undefined : unitag
   const { loading: unitagLoading, data } = useUnitagQuery(unitagToSearch)
   const { loading: ensLoading, address: ensAddress } = useENS(ChainId.Mainnet, unitagToSearch, true)
   const loading = unitagLoading || ensLoading
@@ -100,10 +82,10 @@ export const useCanClaimUnitagName = (
   const dataLoaded = !loading && !!data
   const ensAddressMatchesUnitagAddress = areAddressesEqual(unitagAddress, ensAddress)
   if (dataLoaded && !data.available) {
-    error = t('This Unitag is not available')
+    unitagError = t('This Unitag is not available')
   }
   if (dataLoaded && data.requiresEnsMatch && !ensAddressMatchesUnitagAddress) {
-    error = t('To claim this Unitag you must own the {{ unitag }}.eth ENS', { unitag })
+    unitagError = t('To claim this Unitag you must own the {{ unitag }}.eth ENS', { unitag })
   }
-  return { error, loading }
+  return { unitagError, loading }
 }
diff --git a/packages/wallet/src/features/unitags/types.ts b/packages/wallet/src/features/unitags/types.ts
index 8d89c3f04e9..6fbcd2f0746 100644
--- a/packages/wallet/src/features/unitags/types.ts
+++ b/packages/wallet/src/features/unitags/types.ts
@@ -2,7 +2,6 @@ export type UnitagUsernameResponse = {
   available: boolean
   requiresEnsMatch: boolean
   metadata?: ProfileMetadata
-  username?: string
   address?: {
     address: Address
   }
@@ -13,7 +12,7 @@ export type UnitagAddressResponse = {
   metadata?: ProfileMetadata
 }
 
-export type UnitagResponse = {
+export type UnitagClaimResponse = {
   success: boolean
   errorCode?: UnitagErrorCodes
 }
@@ -26,6 +25,7 @@ export type UnitagClaimEligibilityResponse = {
 export type ProfileMetadata = {
   avatar?: string
   description?: string
+  url?: string
   twitter?: string
 }
 
@@ -44,7 +44,6 @@ export type UnitagClaimEligibilityParams = {
 export type UnitagUpdateMetadataRequestBody = {
   address: Address
   metadata: ProfileMetadata
-  clearAvatar?: boolean
 }
 
 export type UnitagUpdateMetadataResponse = {
@@ -52,29 +51,6 @@ export type UnitagUpdateMetadataResponse = {
   metadata?: ProfileMetadata
 }
 
-export type UnitagGetAvatarUploadUrlResponse = {
-  success: boolean
-  avatarUrl?: string
-  preSignedUrl?: string
-  s3UploadFields?: Record<string, string>
-}
-
-export type UnitagDeleteUsernameRequestBody = {
-  username: string
-  address: Address
-}
-
-export type UnitagAvatarUploadCredentials = {
-  preSignedUrl?: string
-  s3UploadFields?: Record<string, string>
-}
-
-export type UnitagChangeUsernameRequestBody = {
-  address: Address
-  username: string
-  deviceId: string
-}
-
 // Copied enum from unitags backend code -- needs to be up-to-date
 export enum UnitagErrorCodes {
   UnitagNotAvailable = 'unitags-1',
@@ -82,8 +58,6 @@ export enum UnitagErrorCodes {
   IPLimitReached = 'unitags-3',
   AddressLimitReached = 'unitags-4',
   DeviceLimitReached = 'unitags-5',
-  DeviceActiveLimitReached = 'unitags-6',
-  AddressActiveLimitReached = 'unitags-7',
-  NoUnitagForAddress = 'unitags-8',
-  UnitagNotActive = 'unitags-9',
+  ExistingUnitagForDevice = 'unitags-6',
+  ExistingUnitagForAddress = 'unitags-7',
 }
diff --git a/packages/wallet/src/features/unitags/utils.ts b/packages/wallet/src/features/unitags/utils.ts
index 2c4f25b78b4..20390ae011f 100644
--- a/packages/wallet/src/features/unitags/utils.ts
+++ b/packages/wallet/src/features/unitags/utils.ts
@@ -15,12 +15,10 @@ export function parseUnitagErrorCode(
     case UnitagErrorCodes.AddressLimitReached:
     case UnitagErrorCodes.DeviceLimitReached:
       return t('Unable to claim Unitag')
-    case UnitagErrorCodes.DeviceActiveLimitReached:
-      return t('You have hit the maximum number of unitags that can be active for this device')
-    case UnitagErrorCodes.AddressActiveLimitReached:
-      return t(
-        'You already have made the maximum number of changes to your unitags for this address'
-      )
+    case UnitagErrorCodes.ExistingUnitagForDevice:
+      return t('Existing unitag for this device')
+    case UnitagErrorCodes.ExistingUnitagForAddress:
+      return t('You already have a Unitag for this address')
     default:
       return t('Unknown error')
   }
diff --git a/packages/wallet/src/features/wallet/Keyring/Keyring.native.ts b/packages/wallet/src/features/wallet/Keyring/Keyring.native.ts
index bc3f9f08254..b458b1129d0 100644
--- a/packages/wallet/src/features/wallet/Keyring/Keyring.native.ts
+++ b/packages/wallet/src/features/wallet/Keyring/Keyring.native.ts
@@ -22,16 +22,6 @@ class NativeKeyring implements IKeyring {
     return Promise.resolve(true)
   }
 
-  // Not used on mobile
-  checkPassword(_password: string): Promise<boolean> {
-    throw new NotImplementedError('checkPassword')
-  }
-
-  // Not used on mobile
-  changePassword(_newPassword: string): Promise<boolean> {
-    throw new NotImplementedError('changePassword')
-  }
-
   getMnemonicIds(): Promise<string[]> {
     return RNEthersRS.getMnemonicIds()
   }
diff --git a/packages/wallet/src/features/wallet/Keyring/Keyring.ts b/packages/wallet/src/features/wallet/Keyring/Keyring.ts
index ab5eba501c2..2a21e644904 100644
--- a/packages/wallet/src/features/wallet/Keyring/Keyring.ts
+++ b/packages/wallet/src/features/wallet/Keyring/Keyring.ts
@@ -10,15 +10,6 @@ export interface IKeyring {
   /** Locks keyring */
   lock(): Promise<boolean>
 
-  /** @returns true if input password matches current password */
-  checkPassword(password: string): Promise<boolean>
-
-  /**
-   * Changes password and re-encrypts stored mnemonics
-   * @returns true if successful
-   */
-  changePassword(newPassword: string): Promise<boolean>
-
   /**
    * Fetches all mnemonic IDs, which are used as keys to access the actual mnemonics
    * in key-value store.
@@ -97,14 +88,6 @@ class NullKeyring implements IKeyring {
     return Promise.resolve(true)
   }
 
-  checkPassword(_password: string): Promise<boolean> {
-    throw new NotImplementedError('checkPassword')
-  }
-
-  changePassword(_newPassword: string): Promise<boolean> {
-    throw new NotImplementedError('changePassword')
-  }
-
   getMnemonicIds(): Promise<string[]> {
     throw new NotImplementedError('getMnemonicIds')
   }
diff --git a/packages/wallet/src/features/wallet/Keyring/__mocks__/Keyring.ts b/packages/wallet/src/features/wallet/Keyring/__mocks__/Keyring.ts
index f487359c475..f8879fea7c7 100644
--- a/packages/wallet/src/features/wallet/Keyring/__mocks__/Keyring.ts
+++ b/packages/wallet/src/features/wallet/Keyring/__mocks__/Keyring.ts
@@ -17,14 +17,6 @@ class MockKeyring implements IKeyring {
     return Promise.resolve(true)
   }
 
-  checkPassword(_password: string): Promise<boolean> {
-    return Promise.resolve(true)
-  }
-
-  changePassword(_newPassword: string): Promise<boolean> {
-    return Promise.resolve(true)
-  }
-
   getMnemonicIds(): Promise<string[]> {
     return Promise.resolve(Object.keys(mnemonics))
   }
diff --git a/packages/wallet/src/features/wallet/accounts/types.ts b/packages/wallet/src/features/wallet/accounts/types.ts
index 990ac9a537b..ceaac0b70a4 100644
--- a/packages/wallet/src/features/wallet/accounts/types.ts
+++ b/packages/wallet/src/features/wallet/accounts/types.ts
@@ -20,7 +20,6 @@ export interface AccountBase {
   pending?: boolean
   timeImportedMs: number
   pushNotificationsEnabled?: boolean
-  skippedUnitagPrompt?: boolean
 }
 
 export interface SignerMnemonicAccount extends AccountBase {
diff --git a/packages/wallet/src/features/wallet/hooks.ts b/packages/wallet/src/features/wallet/hooks.ts
index 03303e033d9..c2484df8151 100644
--- a/packages/wallet/src/features/wallet/hooks.ts
+++ b/packages/wallet/src/features/wallet/hooks.ts
@@ -1,13 +1,9 @@
-import { useEffect, useMemo, useRef } from 'react'
+import { useMemo, useRef } from 'react'
 import { trimToLength } from 'utilities/src/primitives/string'
-import { useENSAvatar, useENSName } from 'wallet/src/features/ens/api'
+import { useENSName } from 'wallet/src/features/ens/api'
 import useIsFocused from 'wallet/src/features/focus/useIsFocused'
-import { UNITAG_SUFFIX } from 'wallet/src/features/unitags/constants'
-import { useUnitagUpdater } from 'wallet/src/features/unitags/context'
-import { useUnitagByAddress } from 'wallet/src/features/unitags/hooks'
 import { Account, SignerMnemonicAccount } from 'wallet/src/features/wallet/accounts/types'
 import { SwapProtectionSetting } from 'wallet/src/features/wallet/slice'
-import { DisplayName, DisplayNameType } from 'wallet/src/features/wallet/types'
 import { useAppSelector } from 'wallet/src/state'
 import { getValidAddress, sanitizeAddressText, shortenAddress } from 'wallet/src/utils/addresses'
 import {
@@ -116,41 +112,18 @@ export function useHideSpamTokensSetting(): boolean {
 
 /**
  * Displays the ENS name if one is available otherwise displays the local name and if neither are available it shows the address.
- *
- * @param address - The address to display
- * @param options.showShortenedEns - Whether to shorten the ENS name to ENS_TRIM_LENGTH characters
- * @param options.includeUnitagSuffix - Whether to include the unitag suffix (.uni.eth) in returned unitag name
- * @param options.showLocalName - Whether to show the local wallet name
  */
-
-type DisplayNameOptions = {
-  showShortenedEns?: boolean
-  includeUnitagSuffix?: boolean
-  showLocalName?: boolean
-}
-
 export function useDisplayName(
   address: Maybe<string>,
-  options?: DisplayNameOptions
-): DisplayName | undefined {
-  const { refetchUnitagsCounter } = useUnitagUpdater()
-
-  const defaultOptions = {
-    showShortenedEns: false,
-    includeUnitagSuffix: false,
-    showLocalName: true,
-  }
-  const hookOptions = { ...defaultOptions, ...options }
-  const { showShortenedEns, includeUnitagSuffix, showLocalName } = hookOptions
-
+  showShortenedEns = false
+):
+  | {
+      name: string
+      type: 'local' | 'ens' | 'address'
+    }
+  | undefined {
   const validated = getValidAddress(address)
   const ens = useENSName(validated ?? undefined)
-  const { unitag, refetch: refetchUnitagByAddress } = useUnitagByAddress(validated ?? undefined)
-
-  // Force refetch of useUnitagByAddress if refetchUnitagsCounter changes
-  useEffect(() => {
-    refetchUnitagByAddress?.()
-  }, [refetchUnitagsCounter, refetchUnitagByAddress])
 
   // Need to account for pending accounts for use within onboarding
   const maybeLocalName = useAccounts()[address ?? '']?.name
@@ -161,51 +134,16 @@ export function useDisplayName(
     return
   }
 
-  if (unitag?.username) {
-    return {
-      name: includeUnitagSuffix ? unitag.username + UNITAG_SUFFIX : unitag.username,
-      type: DisplayNameType.Unitag,
-    }
-  }
-
   if (ens.data) {
     return {
       name: showShortenedEns ? trimToLength(ens.data, ENS_TRIM_LENGTH) : ens.data,
-      type: DisplayNameType.ENS,
+      type: 'ens',
     }
   }
 
-  if (showLocalName && localName) {
-    return { name: localName, type: DisplayNameType.Local }
-  }
-
-  return {
-    name: `${sanitizeAddressText(shortenAddress(address))}`,
-    type: DisplayNameType.Address,
-  }
-}
-
-/*
- * 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.
- */
-export function useAvatar(address: Maybe<string>): {
-  avatar: string | undefined
-  loading: boolean
-} {
-  const { data: avatar } = useENSAvatar(address)
-  const { unitag, loading } = useUnitagByAddress(address || undefined)
-
-  if (loading) {
-    return { avatar: undefined, loading }
-  }
-
-  if (unitag?.metadata?.avatar) {
-    return { avatar: unitag.metadata?.avatar, loading: false }
+  if (localName) {
+    return { name: localName, type: 'local' }
   }
 
-  return { avatar, loading: false }
+  return { name: `${sanitizeAddressText(shortenAddress(address))}`, type: 'address' }
 }
diff --git a/packages/wallet/src/features/wallet/signing/NativeSigner.native.ts b/packages/wallet/src/features/wallet/signing/NativeSigner.native.ts
index 1e067d9a49b..4970048688c 100644
--- a/packages/wallet/src/features/wallet/signing/NativeSigner.native.ts
+++ b/packages/wallet/src/features/wallet/signing/NativeSigner.native.ts
@@ -1,6 +1,6 @@
 import { TypedDataDomain, TypedDataField } from '@ethersproject/abstract-signer'
 import { _TypedDataEncoder } from '@ethersproject/hash'
-import { Bytes, Signer, UnsignedTransaction, providers, utils } from 'ethers'
+import { Bytes, providers, Signer, UnsignedTransaction, utils } from 'ethers'
 import { hexlify } from 'ethers/lib/utils'
 import { ChainId } from 'wallet/src/constants/chains'
 import { toSupportedChainId } from 'wallet/src/features/chains/utils'
diff --git a/packages/wallet/src/features/wallet/signing/NativeSigner.ts b/packages/wallet/src/features/wallet/signing/NativeSigner.ts
index 3e377b1d778..21702b68360 100644
--- a/packages/wallet/src/features/wallet/signing/NativeSigner.ts
+++ b/packages/wallet/src/features/wallet/signing/NativeSigner.ts
@@ -1,6 +1,6 @@
 import { TypedDataDomain, TypedDataField } from '@ethersproject/abstract-signer'
 import { _TypedDataEncoder } from '@ethersproject/hash'
-import { Bytes, Signer, UnsignedTransaction, providers, utils } from 'ethers'
+import { Bytes, providers, Signer, UnsignedTransaction, utils } from 'ethers'
 import { hexlify } from 'ethers/lib/utils'
 import { ChainId } from 'wallet/src/constants/chains'
 import { toSupportedChainId } from 'wallet/src/features/chains/utils'
diff --git a/packages/wallet/src/features/wallet/signing/SignerManager.ts b/packages/wallet/src/features/wallet/signing/SignerManager.ts
index 599ae55e94c..cf0b04bcb58 100644
--- a/packages/wallet/src/features/wallet/signing/SignerManager.ts
+++ b/packages/wallet/src/features/wallet/signing/SignerManager.ts
@@ -1,6 +1,6 @@
 import { Signer } from 'ethers'
-import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
 import { Account, AccountType } from 'wallet/src/features/wallet/accounts/types'
+import { Keyring } from 'wallet/src/features/wallet/Keyring/Keyring'
 import { NativeSigner } from './NativeSigner'
 
 /** Manages initialized ethers.Signers across the app */
diff --git a/packages/wallet/src/features/wallet/slice.ts b/packages/wallet/src/features/wallet/slice.ts
index fb83d15b302..4bb9a33cec9 100644
--- a/packages/wallet/src/features/wallet/slice.ts
+++ b/packages/wallet/src/features/wallet/slice.ts
@@ -134,18 +134,6 @@ const slice = createSlice({
       }
       state.activeAccountAddress = id
     },
-    markAccountDismissedUnitagPrompt: (state, action: PayloadAction<Address>) => {
-      const address = action.payload
-      const id = getValidAddress(address, true)
-      if (!id) {
-        throw new Error('Cannot operate on an invalid address')
-      }
-      const account = state.accounts[id]
-      if (!account) {
-        throw new Error(`Cannot mark prompt skipped for missing account ${id}`)
-      }
-      account.skippedUnitagPrompt = true
-    },
     unlockWallet: (state) => {
       state.isUnlocked = true
     },
@@ -209,7 +197,6 @@ export const {
   setAccountsNonPending,
   editAccount,
   setAccountAsActive,
-  markAccountDismissedUnitagPrompt,
   unlockWallet,
   lockWallet,
   resetWallet,
diff --git a/packages/wallet/src/features/wallet/types.ts b/packages/wallet/src/features/wallet/types.ts
index 21ee0ed2925..d5fc917f107 100644
--- a/packages/wallet/src/features/wallet/types.ts
+++ b/packages/wallet/src/features/wallet/types.ts
@@ -19,15 +19,3 @@ export enum TokenMetadataDisplayType {
   TVL,
   Symbol,
 }
-
-export type DisplayName = {
-  name: string
-  type: DisplayNameType
-}
-
-export enum DisplayNameType {
-  Address,
-  ENS,
-  Local,
-  Unitag,
-}
diff --git a/packages/wallet/src/i18n/locales/en-US.json b/packages/wallet/src/i18n/locales/en-US.json
index 0b6c16ec245..1e26698b8c9 100644
--- a/packages/wallet/src/i18n/locales/en-US.json
+++ b/packages/wallet/src/i18n/locales/en-US.json
@@ -1,13 +1,11 @@
 {
+  " and consent to the ": " and consent to the ",
   " with {{address}}": " with {{address}}",
   " with {{ensName}}": " with {{ensName}}",
   "{{ dappName }} wants to connect to your wallet": "{{ dappName }} wants to connect to your wallet",
-  "{{ numErrors }} word is invalid or misspelled": "{{ numErrors }} word is invalid or misspelled",
-  "{{ numErrors }} words are invalid or misspelled": "{{ numErrors }} words are invalid or misspelled",
   "{{ prevTxnsCount }} previous transfer": "{{ prevTxnsCount }} previous transfer",
   "{{ prevTxnsCount }} previous transfers": "{{ prevTxnsCount }} previous transfers",
   "{{ token }} fee": "{{ token }} fee",
-  "{{amount}} after fees": "{{amount}} after fees",
   "{{assetName}} hidden": "{{assetName}} hidden",
   "{{assetName}} unhidden": "{{assetName}} unhidden",
   "{{authTypeCapitalized}} is disabled": "{{authTypeCapitalized}} is disabled",
@@ -25,9 +23,6 @@
   "{{numConnections}} apps connected": "{{numConnections}} apps connected",
   "{{owner}}’s balance": "{{owner}}’s balance",
   "{{slippageTolerancePercent}} slippage": "{{slippageTolerancePercent}} slippage",
-  "{{step}}/{{totalSteps}} completed": "{{step}}/{{totalSteps}} completed",
-  "{{symbol}} transfer pending": "{{symbol}} transfer pending",
-  "{{totalSteps}}/{{totalSteps}} completed": "{{totalSteps}}/{{totalSteps}} completed",
   "{{unitag}}{{unitagSuffix}} is ready to send and receive crypto. Continue to build out your wallet by customizing your profile": "{{unitag}}{{unitagSuffix}} is ready to send and receive crypto. Continue to build out your wallet by customizing your profile",
   "{{what}} from {{sender}}": "{{what}} from {{sender}}",
   "{{what}} to {{recipient}}": "{{what}} to {{recipient}}",
@@ -47,7 +42,6 @@
   "52W Low": "52W Low",
   "A recovery phrase (or seed phrase) is a <2>set of words</2> required to access your wallet, <4>like a password.</4>": "A recovery phrase (or seed phrase) is a <2>set of words</2> required to access your wallet, <4>like a password.</4>",
   "A signature is required to prove that you own the wallet without exposing your private keys": "A signature is required to prove that you own the wallet without exposing your private keys",
-  "A simplified address": "A simplified address",
   "A word by itself is easy to guess": "A word by itself is easy to guess",
   "About": "About",
   "About {{ token }}": "About {{ token }}",
@@ -59,17 +53,16 @@
   "Add wallet": "Add wallet",
   "Add wallets you’ve backed up to your Google Drive account": "Add wallets you’ve backed up to your Google Drive account",
   "Add wallets you’ve backed up to your iCloud account": "Add wallets you’ve backed up to your iCloud account",
-  "Adding a view-only wallet allows you to try out the app or track a wallet. You will not be able to swap or send funds.": "Adding a view-only wallet allows you to try out the app or track a wallet. You will not be able to swap or send funds.",
   "Address copied": "Address copied",
+  "Address does not exist": "Address does not exist",
   "Address is a smart contract": "Address is a smart contract",
-  "Address not found": "Address not found",
   "All networks": "All networks",
   "Allow analytics": "Allow analytics",
   "Always use dark mode": "Always use dark mode",
   "Always use light mode": "Always use light mode",
+  "An easier way to receive": "An easier way to receive",
   "and": "and",
   "Anyone who gains access to your photos can access your wallet. We recommend that you write down your words instead.": "Anyone who gains access to your photos can access your wallet. We recommend that you write down your words instead.",
-  "Anyone who knows your recovery phrase can access your wallet and funds": "Anyone who knows your recovery phrase can access your wallet and funds",
   "Anyone who knows your recovery phrase can access your wallet and funds.": "Anyone who knows your recovery phrase can access your wallet and funds.",
   "App access": "App access",
   "App permissions": "App permissions",
@@ -98,14 +91,11 @@
   "Be careful: this {{ requestType }} may transfer assets": "Be careful: this {{ requestType }} may transfer assets",
   "Because these wallets share a recovery phrase, it will also delete the backups for:": "Because these wallets share a recovery phrase, it will also delete the backups for:",
   "Because you’re on a new device, you’ll need to restore your recovery phrase. This will allow you to swap and send tokens.": "Because you’re on a new device, you’ll need to restore your recovery phrase. This will allow you to swap and send tokens.",
-  "Before you continue": "Before you continue",
-  "Best overall": "Best overall",
   "Bio": "Bio",
   "Blocked address": "Blocked address",
   "Bought": "Bought",
   "Brazilian Real": "Brazilian Real",
   "British Pound": "British Pound",
-  "Browser": "Browser",
   "But, if you <2>lose your recovery phrase</2>, you’ll <5>lose access</5> to your wallet.": "But, if you <2>lose your recovery phrase</2>, you’ll <5>lose access</5> to your wallet.",
   "buy": "buy",
   "Buy": "Buy",
@@ -113,6 +103,7 @@
   "Buy crypto with a card or bank to send tokens.": "Buy crypto with a card or bank to send tokens.",
   "Buying": "Buying",
   "Buying {{amount}} worth of {{quoteCurrencyCode}}": "Buying {{amount}} worth of {{quoteCurrencyCode}}",
+  "By continuing, I agree to the ": "By continuing, I agree to the ",
   "By continuing, I agree to the <2>Terms of Service</2> and consent to the <6>Privacy Policy</6>.": "By continuing, I agree to the <2>Terms of Service</2> and consent to the <6>Privacy Policy</6>.",
   "By having your recovery phrase backed up to Google Drive, you can recover your wallet just by being logged into your Google account on any device.": "By having your recovery phrase backed up to Google Drive, you can recover your wallet just by being logged into your Google account on any device.",
   "By having your recovery phrase backed up to iCloud, you can recover your wallet just by being logged into your iCloud on any device.": "By having your recovery phrase backed up to iCloud, you can recover your wallet just by being logged into your iCloud on any device.",
@@ -129,24 +120,23 @@
   "Cancelled {{action}}": "Cancelled {{action}}",
   "Cancelling {{action}}": "Cancelling {{action}}",
   "Caution": "Caution",
-  "Change password": "Change password",
   "Change preferred language": "Change preferred language",
   "Check out your tokens and NFTs, follow crypto wallets, and stay up to date on the go.": "Check out your tokens and NFTs, follow crypto wallets, and stay up to date on the go.",
-  "Check your Uniswap mobile app for the 6-character code": "Check your Uniswap mobile app for the 6-character code",
   "Checkout": "Checkout",
-  "Checkout with": "Checkout with",
   "Chinese Yuan": "Chinese Yuan",
   "Chinese, Simplified": "Chinese, Simplified",
   "Chinese, Traditional": "Chinese, Traditional",
-  "Choose a backup method": "Choose a backup method",
+  "Choose a backup for your wallet": "Choose a backup for your wallet",
   "Choose a profile photo": "Choose a profile photo",
   "Choose a token": "Choose a token",
+  "Choose a wallet to map to": "Choose a wallet to map to",
   "Choose an NFT": "Choose an NFT",
   "Choose from camera roll": "Choose from camera roll",
-  "Choose how you want to add your wallet": "Choose how you want to add your wallet",
   "Choose token": "Choose token",
+  "Choose which wallet you want to assign your username to. You can only claim on 1 wallet, so choose wisely.": "Choose which wallet you want to assign your username to. You can only claim on 1 wallet, so choose wisely.",
   "Claim a username ": "Claim a username ",
   "Claim now": "Claim now",
+  "Claim one now": "Claim one now",
   "Claim your Uniswap username": "Claim your Uniswap username",
   "Claim your username": "Claim your username",
   "Clear all": "Clear all",
@@ -167,20 +157,14 @@
   "Connection Error": "Connection Error",
   "Content not available": "Content not available",
   "Continue": "Continue",
-  "Continue on Uniswap Extension": "Continue on Uniswap Extension",
   "Continue to checkout": "Continue to checkout",
-  "Contract": "Contract",
-  "Contract address copied": "Contract address copied",
   "Copied": "Copied",
   "Copy": "Copy",
   "Copy address": "Copy address",
+  "Copy contract address": "Copy contract address",
   "Copy MoonPay transaction ID": "Copy MoonPay transaction ID",
   "Copy transaction ID": "Copy transaction ID",
   "Copy wallet address": "Copy wallet address",
-  "Could not change username. Try again later.": "Could not change username. Try again later.",
-  "Could not claim username. Try again later.": "Could not claim username. Try again later.",
-  "Could not delete username. Try again later.": "Could not delete username. Try again later.",
-  "Could not set avatar. Try again later.": "Could not set avatar. Try again later.",
   "Couldn’t load activity": "Couldn’t load activity",
   "Couldn’t load addresses": "Couldn’t load addresses",
   "Couldn’t load NFT collection": "Couldn’t load NFT collection",
@@ -195,22 +179,20 @@
   "Create password": "Create password",
   "Create wallet": "Create wallet",
   "Create your backup password": "Create your backup password",
-  "Current password": "Current password",
+  "Create your unique username for free, no network fees involved.": "Create your unique username for free, no network fees involved.",
   "Current price": "Current price",
-  "Customizable profiles": "Customizable profiles",
+  "Customizable profile": "Customizable profile",
   "Customize profile": "Customize profile",
   "Dark mode": "Dark mode",
   "Dates are often easy to guess": "Dates are often easy to guess",
   "Default to your device’s appearance": "Default to your device’s appearance",
   "Delete": "Delete",
   "Delete backup": "Delete backup",
-  "Delete username": "Delete username",
   "Device": "Device",
   "Device settings": "Device settings",
   "Disconnect": "Disconnect",
   "Disconnected": "Disconnected",
   "Dismiss": "Dismiss",
-  "Do not share this with anyone": "Do not share this with anyone",
   "Do this step in a private place": "Do this step in a private place",
   "Done": "Done",
   "Due to the amount of {{ currencyOut }} liquidity currently available, the more {{ currencyIn }} you try to swap, the less {{ currencyOut }} you will receive.": "Due to the amount of {{ currencyOut }} liquidity currently available, the more {{ currencyIn }} you try to swap, the less {{ currencyOut }} you will receive.",
@@ -219,47 +201,37 @@
   "Edit favorite wallets": "Edit favorite wallets",
   "Edit favorites": "Edit favorites",
   "Edit label": "Edit label",
-  "Edit Label": "Edit Label",
   "Edit nickname": "Edit nickname",
   "Edit profile": "Edit profile",
-  "Edit username": "Edit username",
   "Enable": "Enable",
   "Encrypt your recovery phrase with a secure password": "Encrypt your recovery phrase with a secure password",
   "English": "English",
   "ENS": "ENS",
-  "ENS or address": "ENS or address",
   "Enter a value larger than 0": "Enter a value larger than 0",
   "Enter a value less than {{ maxSlippageTolerance }}": "Enter a value less than {{ maxSlippageTolerance }}",
   "Enter a wallet address": "Enter a wallet address",
-  "Enter backup password": "Enter backup password",
-  "Enter one-time code": "Enter one-time code",
+  "Enter address or ENS": "Enter address or ENS",
+  "Enter an Ethereum wallet address (starting with 0x) or ENS name (ending in .eth).": "Enter an Ethereum wallet address (starting with 0x) or ENS name (ending in .eth).",
   "Enter password": "Enter password",
   "Enter recovery phrase": "Enter recovery phrase",
   "Enter Recovery Phrase": "Enter Recovery Phrase",
-  "Enter this code in the Uniswap Extension. Your recovery phrase will be safely encrypted and transferred.": "Enter this code in the Uniswap Extension. Your recovery phrase will be safely encrypted and transferred.",
   "Enter this wallet’s recovery phrase to begin swapping and sending.": "Enter this wallet’s recovery phrase to begin swapping and sending.",
-  "Enter your current password": "Enter your current password",
-  "Enter your password to continue": "Enter your password to continue",
+  "Enter your Google Drive backup password": "Enter your Google Drive backup password",
+  "Enter your iCloud backup password": "Enter your iCloud backup password",
   "Enter your recovery phrase": "Enter your recovery phrase",
   "Enter your recovery phrase below, or try searching for backups again.": "Enter your recovery phrase below, or try searching for backups again.",
   "Enter your recovery phrase from another crypto wallet": "Enter your recovery phrase from another crypto wallet",
   "Enter your recovery phrase instead": "Enter your recovery phrase instead",
   "Error importing wallets": "Error importing wallets",
-  "Error loading accounts": "Error loading accounts",
-  "Error updating profile. Please try again.": "Error updating profile. Please try again.",
   "Error while checking transaction status": "Error while checking transaction status",
   "Error while importing backups": "Error while importing backups",
   "Euro": "Euro",
-  "Expired": "Expired",
-  "Expires in {{duration}}...": "Expires in {{duration}}...",
-  "Explore tokens & NFTs": "Explore tokens & NFTs",
-  "Failed attempts: {failedAttemptCount.toString()}": "Failed attempts: {failedAttemptCount.toString()}",
+  "Existing unitag for this device": "Existing unitag for this device",
   "Failed to {{action}}": "Failed to {{action}}",
   "Failed to approve {{currencySymbol}} for use with {{address}}.": "Failed to approve {{currencySymbol}} for use with {{address}}.",
   "Failed to fetch token balances": "Failed to fetch token balances",
   "Failed to import backups due to lack of permissions, interruption of authorization, or due to a cloud error": "Failed to import backups due to lack of permissions, interruption of authorization, or due to a cloud error",
   "Failed to send {{assetInfo}} to {{senderOrRecipient}}.": "Failed to send {{assetInfo}} to {{senderOrRecipient}}.",
-  "Failed to send.": "Failed to send.",
   "Failed to swap {{inputAssetInfo}} for {{outputAssetInfo}}.": "Failed to swap {{inputAssetInfo}} for {{outputAssetInfo}}.",
   "Failed to transact{{addressText}}.": "Failed to transact{{addressText}}.",
   "Failed to unwrap {{inputAssetInfo}}.": "Failed to unwrap {{inputAssetInfo}}.",
@@ -274,16 +246,15 @@
   "Fees are applied on a few select tokens to ensure the best experience with Uniswap, and have already been factored into this quote.": "Fees are applied on a few select tokens to ensure the best experience with Uniswap, and have already been factored into this quote.",
   "Fees are applied on a few select tokens to ensure the best experience with Uniswap. There is no fee associated with this swap.": "Fees are applied on a few select tokens to ensure the best experience with Uniswap. There is no fee associated with this swap.",
   "Fetching price...": "Fetching price...",
-  "Finding your wallets...": "Finding your wallets...",
-  "First, set a password": "First, set a password",
+  "Finish": "Finish",
   "Floor": "Floor",
-  "Follow the instructions on the browser web page to reset your password": "Follow the instructions on the browser web page to reset your password",
   "Forgot password?": "Forgot password?",
   "Free to claim": "Free to claim",
   "French": "French",
   "Fully Diluted Valuation": "Fully Diluted Valuation",
   "Function": "Function",
   "Generating your wallet...": "Generating your wallet...",
+  "Get a free username and personalized profile so people can find your across web3": "Get a free username and personalized profile so people can find your across web3",
   "Get help": "Get help",
   "Get max": "Get max",
   "Get notified when your transfers, swaps, and approvals complete.": "Get notified when your transfers, swaps, and approvals complete.",
@@ -293,8 +264,7 @@
   "Google Drive backup": "Google Drive backup",
   "Google Drive error": "Google Drive error",
   "Google Drive not available": "Google Drive not available",
-  "got it!": "got it!",
-  "Have the Uniswap app?": "Have the Uniswap app?",
+  "Got it": "Got it",
   "Help center": "Help center",
   "Hidden ({{numHidden}})": "Hidden ({{numHidden}})",
   "Hide": "Hide",
@@ -311,14 +281,13 @@
   "Hold to wrap": "Hold to wrap",
   "Hong Kong Dollar": "Hong Kong Dollar",
   "How do I find my recovery phrase?": "How do I find my recovery phrase?",
+  "How do you want to add your wallet?": "How do you want to add your wallet?",
+  "Human readable": "Human readable",
   "I already have a wallet": "I already have a wallet",
   "I backed up my recovery phrase and understand that Uniswap Labs can’t help me recover my wallets if I failed to do so.": "I backed up my recovery phrase and understand that Uniswap Labs can’t help me recover my wallets if I failed to do so.",
-  "I saved my recovery phrase": "I saved my recovery phrase",
   "I understand": "I understand",
+  "I understand that if I forget my password, Uniswap Labs cannot retrieve my recovery phrase.": "I understand that if I forget my password, Uniswap Labs cannot retrieve my recovery phrase.",
   "I understand that if I lose my recovery phrase, Uniswap Labs cannot help me restore it": "I understand that if I lose my recovery phrase, Uniswap Labs cannot help me restore it",
-  "I understand that Uniswap Labs can’t help me recover my wallet if I failed to do so": "I understand that Uniswap Labs can’t help me recover my wallet if I failed to do so",
-  "I will not share my recovery phrase with anyone, including Uniswap Labs": "I will not share my recovery phrase with anyone, including Uniswap Labs",
-  "I’m ready": "I’m ready",
   "iCloud backup": "iCloud backup",
   "iCloud Drive not available": "iCloud Drive not available",
   "iCloud error": "iCloud error",
@@ -343,12 +312,10 @@
   "Introducing Usernames": "Introducing Usernames",
   "Invalid password. Please try again.": "Invalid password. Please try again.",
   "Invalid phrase": "Invalid phrase",
-  "Invalid public key": "Invalid public key",
   "Invalid QR Code": "Invalid QR Code",
   "Invalid word: ": "Invalid word: ",
   "Invalid word: {{word}}": "Invalid word: {{word}}",
   "Is this a wallet address?": "Is this a wallet address?",
-  "Is this your device?": "Is this your device?",
   "It looks like you haven’t backed up any of your seed phrases to Google Drive.": "It looks like you haven’t backed up any of your seed phrases to Google Drive.",
   "It looks like you haven’t backed up any of your seed phrases to iCloud.": "It looks like you haven’t backed up any of your seed phrases to iCloud.",
   "It shares the same recovery phrase as <2>{{wallets}}</2>. Your recovery phrase will remain stored until you delete all remaining wallets.": "It shares the same recovery phrase as <2>{{wallets}}</2>. Your recovery phrase will remain stored until you delete all remaining wallets.",
@@ -359,14 +326,10 @@
   "Keep in mind that the network fee is still charged for failed transfers.": "Keep in mind that the network fee is still charged for failed transfers.",
   "Keep in mind that the network fee is still charged for failed unwraps.": "Keep in mind that the network fee is still charged for failed unwraps.",
   "Keep in mind that the network fee is still charged for failed wraps.": "Keep in mind that the network fee is still charged for failed wraps.",
-  "Labels are not public. They are stored locally and only visible to you.": "Labels are not public. They are stored locally and only visible to you.",
   "Language": "Language",
   "Last sale price": "Last sale price",
-  "Learn how to use the Uniswap Wallet": "Learn how to use the Uniswap Wallet",
   "Learn more": "Learn more",
-  "Learn more about wallet safety": "Learn more about wallet safety",
   "Let’s keep it safe": "Let’s keep it safe",
-  "Let’s make sure you’ve recorded it correctly": "Let’s make sure you’ve recorded it correctly",
   "Light mode": "Light mode",
   "Links": "Links",
   "Loading...": "Loading...",
@@ -375,7 +338,6 @@
   "Made with love, ": "Made with love, ",
   "Make sure that you’re scanning a valid Ethereum address QR code before trying again.": "Make sure that you’re scanning a valid Ethereum address QR code before trying again.",
   "Make sure that you’re scanning a valid WalletConnect or Ethereum address QR code before trying again.": "Make sure that you’re scanning a valid WalletConnect or Ethereum address QR code before trying again.",
-  "Make sure you’ve saved your recovery phrase. You will lose access to your funds otherwise": "Make sure you’ve saved your recovery phrase. You will lose access to your funds otherwise",
   "Make sure you’ve written down your recovery phrase or backed it up on Google Drive. <2>You will not be able to access your funds otherwise.</2>": "Make sure you’ve written down your recovery phrase or backed it up on Google Drive. <2>You will not be able to access your funds otherwise.</2>",
   "Make sure you’ve written down your recovery phrase or backed it up on iCloud. <2>You will not be able to access your funds otherwise.</2>": "Make sure you’ve written down your recovery phrase or backed it up on iCloud. <2>You will not be able to access your funds otherwise.</2>",
   "Malay": "Malay",
@@ -393,7 +355,6 @@
   "mint": "mint",
   "Minted": "Minted",
   "Minting": "Minting",
-  "My recovery phrase is 12 words": "My recovery phrase is 12 words",
   "My recovery phrase is longer than 12 words": "My recovery phrase is longer than 12 words",
   "N/A": "N/A",
   "Names and surnames by themselves are easy to guess": "Names and surnames by themselves are easy to guess",
@@ -401,18 +362,16 @@
   "Network cost": "Network cost",
   "Network fees are paid in the native token. Buy more {{ nativeCurrency }}.": "Network fees are paid in the native token. Buy more {{ nativeCurrency }}.",
   "Networks": "Networks",
-  "Never enter it to any websites or applications": "Never enter it to any websites or applications",
   "New address": "New address",
   "New input": "New input",
   "New output": "New output",
-  "New password": "New password",
   "New rate": "New rate",
   "NFT Collections": "NFT Collections",
   "NFTs": "NFTs",
   "Nickname": "Nickname",
+  "Nicknames are not public. They are stored locally and only visible to you.": "Nicknames are not public. They are stored locally and only visible to you.",
   "Nigerian Naira": "Nigerian Naira",
   "No activity yet": "No activity yet",
-  "No approvals pending": "No approvals pending",
   "No apps connected": "No apps connected",
   "No backups found": "No backups found",
   "No message found.": "No message found.",
@@ -435,22 +394,16 @@
   "OK": "OK",
   "One wallet found": "One wallet found",
   "Only available to purchase in USD": "Only available to purchase in USD",
-  "Only continue if you are syncing with the Uniswap Extension on a trusted device.": "Only continue if you are syncing with the Uniswap Extension on a trusted device.",
   "Oops! Something went wrong.": "Oops! Something went wrong.",
-  "Other options": "Other options",
-  "OTP unavailable": "OTP unavailable",
+  "or": "or",
   "Owned by": "Owned by",
   "Owned by {{owner}}": "Owned by {{owner}}",
   "Owners": "Owners",
   "Pakistani Rupee": "Pakistani Rupee",
-  "Password": "Password",
-  "Password reset": "Password reset",
   "Passwords do not match": "Passwords do not match",
-  "Passwords don’t match": "Passwords don’t match",
   "Paste": "Paste",
-  "Pin Uniswap Wallet to your browser toolbar by clicking on": "Pin Uniswap Wallet to your browser toolbar by clicking on",
+  "Pinned! It’s safe to close this tab now": "Pinned! It’s safe to close this tab now",
   "Please authenticate": "Please authenticate",
-  "Please choose a stronger password": "Please choose a stronger password",
   "Please confirm that the wallet below is the one you’d like to import.": "Please confirm that the wallet below is the one you’d like to import.",
   "Please try again in a few minutes.": "Please try again in a few minutes.",
   "Please verify that you are logged in to a Google account with Google Drive enabled on this device and try again.": "Please verify that you are logged in to a Google account with Google Drive enabled on this device and try again.",
@@ -458,7 +411,7 @@
   "Popular NFT collections": "Popular NFT collections",
   "Popular tokens": "Popular tokens",
   "Portuguese": "Portuguese",
-  "Powered by ENS subdomains": "Powered by ENS subdomains",
+  "Powered by ENS": "Powered by ENS",
   "Preferences": "Preferences",
   "Price decrease": "Price decrease",
   "Price decrease (24H)": "Price decrease (24H)",
@@ -466,10 +419,9 @@
   "Price increase (24H)": "Price increase (24H)",
   "Privacy": "Privacy",
   "Privacy policy": "Privacy policy",
-  "Profile updated": "Profile updated",
+  "Privacy Policy": "Privacy Policy",
   "Protect your wallet": "Protect your wallet",
   "purchase": "purchase",
-  "Purchase with a card, or transfer from an exchange": "Purchase with a card, or transfer from an exchange",
   "Purchased": "Purchased",
   "Purchasing": "Purchasing",
   "Rate": "Rate",
@@ -479,7 +431,6 @@
   "Read more": "Read more",
   "Read the following carefully before continuing": "Read the following carefully before continuing",
   "Receive": "Receive",
-  "Receive {{amount}}": "Receive {{amount}}",
   "Receive at least": "Receive at least",
   "Receive at least {{amount}} {{symbol}}": "Receive at least {{amount}} {{symbol}}",
   "Receive funds": "Receive funds",
@@ -491,22 +442,19 @@
   "Recent": "Recent",
   "Recent searches": "Recent searches",
   "Recent years are easy to guess": "Recent years are easy to guess",
-  "Recently used": "Recently used",
   "Recipient wallet is blocked": "Recipient wallet is blocked",
   "Recovery phrase": "Recovery phrase",
   "Recovery phrase must be 12-24 words": "Recovery phrase must be 12-24 words",
+  "Remember to record your words in the same order as they appear below.": "Remember to record your words in the same order as they appear below.",
   "Remove": "Remove",
   "Remove favorite": "Remove favorite",
   "Remove profile picture": "Remove profile picture",
-  "Remove recovery phrase": "Remove recovery phrase",
   "Remove wallet": "Remove wallet",
   "Repeats like \"aaa\" are easy to guess": "Repeats like \"aaa\" are easy to guess",
   "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"": "Repeats like \"abcabcabc\" are only slightly harder to guess than \"abc\"",
-  "Report profile": "Report profile",
   "Request from": "Request from",
   "Require {{authenticationTypeName}} to open app": "Require {{authenticationTypeName}} to open app",
   "Require {{authenticationTypeName}} to transact": "Require {{authenticationTypeName}} to transact",
-  "Reset your password": "Reset your password",
   "Restart app": "Restart app",
   "Restore": "Restore",
   "Restore a wallet": "Restore a wallet",
@@ -516,7 +464,11 @@
   "Restore your wallet to send": "Restore your wallet to send",
   "Restore your wallet to swap": "Restore your wallet to swap",
   "Retry": "Retry",
+  "Return home": "Return home",
+  "Reveal": "Reveal",
   "Review": "Review",
+  "Review send": "Review send",
+  "Review Send": "Review Send",
   "Review transfer": "Review transfer",
   "revoke": "revoke",
   "Revoked": "Revoked",
@@ -525,14 +477,12 @@
   "Russian Ruble": "Russian Ruble",
   "Save": "Save",
   "Save changes": "Save changes",
-  "Say goodbye to 0x addresses. Usernames are readable addresses that make it easier to receive crypto and connect with friends.": "Say goodbye to 0x addresses. Usernames are readable addresses that make it easier to receive crypto and connect with friends.",
+  "Save your recovery phrase in a safe location": "Save your recovery phrase in a safe location",
+  "Say goodbye to copying, pasting, and triple-checking 0x addresses.": "Say goodbye to copying, pasting, and triple-checking 0x addresses.",
   "Scan": "Scan",
   "Scan a QR code": "Scan a QR code",
-  "Scan the QR code on the Uniswap Extension again to continue syncing your wallet.": "Scan the QR code on the Uniswap Extension again to continue syncing your wallet.",
-  "Scan the QR code with the Uniswap Mobile App to import your wallets": "Scan the QR code with the Uniswap Mobile App to import your wallets",
   "Screenshots aren’t secure": "Screenshots aren’t secure",
   "Search": "Search",
-  "Search and browse trending tokens and NFTs": "Search and browse trending tokens and NFTs",
   "Search by country or region": "Search by country or region",
   "Search ENS or address": "Search ENS or address",
   "Search results": "Search results",
@@ -540,10 +490,9 @@
   "Search tokens and wallets": "Search tokens and wallets",
   "Searching for backups...": "Searching for backups...",
   "Searching for wallets": "Searching for wallets",
-  "Secret word": "Secret word",
   "Security": "Security",
-  "Select a backup to restore": "Select a backup to restore",
   "Select a token to buy": "Select a token to buy",
+  "Select backup to restore": "Select backup to restore",
   "Select the missing words in order.": "Select the missing words in order.",
   "Select wallets to import": "Select wallets to import",
   "Select your region": "Select your region",
@@ -564,7 +513,6 @@
   "Setting a password will encrypt your recovery phrase backup, adding an extra level of protection if your iCloud account is ever compromised.": "Setting a password will encrypt your recovery phrase backup, adding an extra level of protection if your iCloud account is ever compromised.",
   "Settings": "Settings",
   "Share": "Share",
-  "Sharing your address and connecting with friends has never been easier.": "Sharing your address and connecting with friends has never been easier.",
   "Short keyboard patterns are easy to guess": "Short keyboard patterns are easy to guess",
   "Show": "Show",
   "Show all {{numberOfWallets}} wallets": "Show all {{numberOfWallets}} wallets",
@@ -577,6 +525,7 @@
   "Signature request from": "Signature request from",
   "Singapore Dollar": "Singapore Dollar",
   "Skip": "Skip",
+  "Skip for now": "Skip for now",
   "slippage": "slippage",
   "Slippage may be higher than necessary": "Slippage may be higher than necessary",
   "Slippage Settings": "Slippage Settings",
@@ -591,11 +540,9 @@
   "Spanish (US)": "Spanish (US)",
   "Spend at most": "Spend at most",
   "Spend at most {{amount}} {{symbol}}": "Spend at most {{amount}} {{symbol}}",
-  "Start swapping": "Start swapping",
   "Stats": "Stats",
   "Straight rows of keys are easy to guess": "Straight rows of keys are easy to guess",
   "Submitted on": "Submitted on",
-  "Success": "Success",
   "Suggested": "Suggested",
   "Suggested wallets": "Suggested wallets",
   "Support": "Support",
@@ -617,13 +564,11 @@
   "Switch Network": "Switch Network",
   "Switched networks": "Switched networks",
   "Switched to {{name}}": "Switched to {{name}}",
-  "Sync from your phone": "Sync from your phone",
   "Terms of service": "Terms of service",
+  "Terms of Service": "Terms of Service",
   "Thai": "Thai",
   "Thai Baht": "Thai Baht",
   "The address you typed either does not exist or is spelled incorrectly.": "The address you typed either does not exist or is spelled incorrectly.",
-  "The code you submitted is incorrect, or there was an error submitting. Please try again.": "The code you submitted is incorrect, or there was an error submitting. Please try again.",
-  "The phrase you entered is invalid": "The phrase you entered is invalid",
   "The version of Uniswap Wallet you’re using is out of date and is missing critical upgrades. If you don’t update the app or you don’t have your recovery phrase written down, you won’t be able to access your assets.": "The version of Uniswap Wallet you’re using is out of date and is missing critical upgrades. If you don’t update the app or you don’t have your recovery phrase written down, you won’t be able to access your assets.",
   "There are multiple recovery phrases backed up to your Google Drive.": "There are multiple recovery phrases backed up to your Google Drive.",
   "There are multiple recovery phrases backed up to your iCloud.": "There are multiple recovery phrases backed up to your iCloud.",
@@ -631,16 +576,14 @@
   "There was an issue scanning this QR code.": "There was an issue scanning this QR code.",
   "There was an issue with WalletConnect. Please try again": "There was an issue with WalletConnect. Please try again",
   "This address is already imported": "This address is already imported",
-  "This address is blocked on Uniswap Wallet because it is associated with one or more blocked activities. If you believe this is an error, please email compliance@uniswap.org.": "This address is blocked on Uniswap Wallet because it is associated with one or more blocked activities. If you believe this is an error, please email compliance@uniswap.org.",
+  "This address is blocked on Uniswap Wallet because it is associated with one or more blocked activities. \n\nIf you believe this is an error, please email compliance@uniswap.org.": "This address is blocked on Uniswap Wallet because it is associated with one or more blocked activities. \n\nIf you believe this is an error, please email compliance@uniswap.org.",
   "This is a top-10 common password": "This is a top-10 common password",
   "This is a top-100 common password": "This is a top-100 common password",
   "This is a very common password": "This is a very common password",
   "This is a view-only wallet": "This is a view-only wallet",
-  "This is not your active wallet": "This is not your active wallet",
   "This is similar to a commonly used password": "This is similar to a commonly used password",
   "This is the cost to process your transaction on the blockchain. Uniswap does not receive any share of these fees.": "This is the cost to process your transaction on the blockchain. Uniswap does not receive any share of these fees.",
-  "This is your personal space for tokens, NFTs, and all of your trades. Finish setting it up to keep your funds safe.": "This is your personal space for tokens, NFTs, and all of your trades. Finish setting it up to keep your funds safe.",
-  "This is your personalized address that people can send crypto to.": "This is your personalized address that people can send crypto to.",
+  "This is your unique name that people can send funds to and use to find you across defi.": "This is your unique name that people can send funds to and use to find you across defi.",
   "This nickname is only visible to you": "This nickname is only visible to you",
   "This nickname is only visible to you.": "This nickname is only visible to you.",
   "This password is required to recover your recovery phrase backup from Google Drive.": "This password is required to recover your recovery phrase backup from Google Drive.",
@@ -652,6 +595,7 @@
   "This trade cannot be completed right now": "This trade cannot be completed right now",
   "This transaction is expected to fail": "This transaction is expected to fail",
   "This Unitag is not available": "This Unitag is not available",
+  "This username is a simple, user-friendly way to use your address in transactions. Your current address remains unchanged and secure.": "This username is a simple, user-friendly way to use your address in transactions. Your current address remains unchanged and secure.",
   "This wallet is blocked": "This wallet is blocked",
   "This wallet is in view only mode": "This wallet is in view only mode",
   "This wallet is view-only": "This wallet is view-only",
@@ -692,9 +636,8 @@
   "TVL": "TVL",
   "Twitter": "Twitter",
   "Type a bio for your profile": "Type a bio for your profile",
-  "Type or paste your 12 or 24-word recovery phrase": "Type or paste your 12 or 24-word recovery phrase",
   "Type your handle here": "Type your handle here",
-  "Type your recovery phrase": "Type your recovery phrase",
+  "Type your website url here": "Type your website url here",
   "Uh oh!": "Uh oh!",
   "Ukrainian": "Ukrainian",
   "Ukrainian Hryvnia": "Ukrainian Hryvnia",
@@ -704,19 +647,17 @@
   "Unable to claim Unitag": "Unable to claim Unitag",
   "Unable to delete backup": "Unable to delete backup",
   "Unable to replace transaction": "Unable to replace transaction",
-  "Unable to save new password": "Unable to save new password",
   "Unhide NFT": "Unhide NFT",
   "Unhide Token": "Unhide Token",
   "Uniswap defaults to your device‘s language settings. To change your preferred language, go to “Uniswap” in your device settings and tap on “Language”": "Uniswap defaults to your device‘s language settings. To change your preferred language, go to “Uniswap” in your device settings and tap on “Language”",
-  "Uniswap Labs does not store your password and can’t recover it, so it’s crucial you remember it.": "Uniswap Labs does not store your password and can’t recover it, so it’s crucial you remember it.",
-  "Uniswap one-time code": "Uniswap one-time code",
   "Uniswap Team 🦄": "Uniswap Team 🦄",
   "Uniswap TVL": "Uniswap TVL",
+  "Uniswap usernames are built on top of ENS subdomains.": "Uniswap usernames are built on top of ENS subdomains.",
   "Uniswap volume (24H)": "Uniswap volume (24H)",
   "Uniswap Wallet": "Uniswap Wallet",
   "Uniswap Wallet currently supports {{ chains }}. Please only use \"{{ dappName }}\" on these chains": "Uniswap Wallet currently supports {{ chains }}. Please only use \"{{ dappName }}\" on these chains",
   "Uniswap Wallet supports tokens on Ethereum, Polygon, Arbitrum, Optimism, Base, and BNB Chain. Right now, we only support NFTs on Ethereum.": "Uniswap Wallet supports tokens on Ethereum, Polygon, Arbitrum, Optimism, Base, and BNB Chain. Right now, we only support NFTs on Ethereum.",
-  "Unitags can only contain lowercase letters and numbers": "Unitags can only contain lowercase letters and numbers",
+  "Unitags can only contain letters and numbers": "Unitags can only contain letters and numbers",
   "Unitags cannot be more than {{ maxUnitagLength }} characters": "Unitags cannot be more than {{ maxUnitagLength }} characters",
   "Unitags must be at least {{ minUnitagLength }} characters": "Unitags must be at least {{ minUnitagLength }} characters",
   "United States Dollar": "United States Dollar",
@@ -736,13 +677,10 @@
   "Unwrapping": "Unwrapping",
   "Update app": "Update app",
   "Update the app to continue": "Update the app to continue",
+  "Upload an avatar, create a bio, and link your socials.": "Upload an avatar, create a bio, and link your socials.",
   "Upload your own or stick with your unique Unicon. You can always change this later.": "Upload your own or stick with your unique Unicon. You can always change this later.",
   "Urdu": "Urdu",
   "Use a longer keyboard pattern with more turns": "Use a longer keyboard pattern with more turns",
-  "Use your new password to unlock your wallet.": "Use your new password to unlock your wallet.",
-  "Username changed": "Username changed",
-  "Username deleted": "Username deleted",
-  "Usernames are free, readable names that map to your 0x address. They’re easier to remember and share than a typical crypto address.": "Usernames are free, readable names that map to your 0x address. They’re easier to remember and share than a typical crypto address.",
   "UwU Link error": "UwU Link error",
   "Version {{appVersion}}": "Version {{appVersion}}",
   "Vietnamese": "Vietnamese",
@@ -750,13 +688,13 @@
   "View": "View",
   "View {{ tokenSymbol }}": "View {{ tokenSymbol }}",
   "View all": "View all",
+  "View in private": "View in private",
   "View less": "View less",
   "View on {{ blockExplorerName }}": "View on {{ blockExplorerName }}",
   "View on MoonPay": "View on MoonPay",
   "View only wallets": "View only wallets",
   "View recovery phrase": "View recovery phrase",
   "View this in a private place": "View this in a private place",
-  "View this in private": "View this in private",
   "View this in private and do not share it with anyone": "View this in private and do not share it with anyone",
   "View transaction": "View transaction",
   "View your token balances": "View your token balances",
@@ -773,6 +711,7 @@
   "Wallets": "Wallets",
   "Warning": "Warning",
   "Watch a wallet": "Watch a wallet",
+  "We found several wallets associated with your recovery phrase.": "We found several wallets associated with your recovery phrase.",
   "We recommend using <2>both types of backups</2>, because if you lose your recovery phrase, you won’t be able to restore your wallet.": "We recommend using <2>both types of backups</2>, because if you lose your recovery phrase, you won’t be able to restore your wallet.",
   "We use anonymous usage data to enhance your experience across Uniswap Labs products. When disabled, we only track errors and essential usage.": "We use anonymous usage data to enhance your experience across Uniswap Labs products. When disabled, we only track errors and essential usage.",
   "We’ll notify you once your swap is complete.": "We’ll notify you once your swap is complete.",
@@ -781,11 +720,10 @@
   "We’ll notify you once your wrap is complete.": "We’ll notify you once your wrap is complete.",
   "Weak password": "Weak password",
   "Website": "Website",
+  "Welcome back": "Welcome back",
   "Welcome to your new wallet": "Welcome to your new wallet",
-  "What is a recovery phrase?": "What is a recovery phrase?",
   "What’s a recovery phrase?": "What’s a recovery phrase?",
   "What’s a signature request?": "What’s a signature request?",
-  "What’s the <2>{numberWithOrdinal}</2> word in your recovery phrase?": "What’s the <2>{numberWithOrdinal}</2> word in your recovery phrase?",
   "When this wallet buys or receives NFTs, they’ll appear here.": "When this wallet buys or receives NFTs, they’ll appear here.",
   "When this wallet buys or receives tokens, they’ll appear here.": "When this wallet buys or receives tokens, they’ll appear here.",
   "When this wallet makes transactions, they’ll appear here.": "When this wallet makes transactions, they’ll appear here.",
@@ -803,18 +741,13 @@
   "Wrapping": "Wrapping",
   "Write down your recovery phrase in order": "Write down your recovery phrase in order",
   "Write it down and keep it in a safe place": "Write it down and keep it in a safe place",
-  "Write your recovery phrase down and store it in a safe location": "Write your recovery phrase down and store it in a safe location",
-  "Wrong password": "Wrong password",
-  "Wrong password, try again": "Wrong password, try again",
   "Wrong password. Try again": "Wrong password. Try again",
   "Wrong recovery phrase": "Wrong recovery phrase",
-  "Yes, continue": "Yes, continue",
-  "You already have made the maximum number of changes to your unitags for this address": "You already have made the maximum number of changes to your unitags for this address",
+  "You already have a Unitag for this address": "You already have a Unitag for this address",
   "You are in offline mode": "You are in offline mode",
   "You can <1>enter</1> your recovery phrase on a new device <4>to restore your wallet</4> and its contents.": "You can <1>enter</1> your recovery phrase on a new device <4>to restore your wallet</4> and its contents.",
   "You can also manually back up your recovery phrase by <2>writing it down</2> and storing it in a safe place.": "You can also manually back up your recovery phrase by <2>writing it down</2> and storing it in a safe place.",
   "You can always add back view-only wallets by entering the wallet’s address.": "You can always add back view-only wallets by entering the wallet’s address.",
-  "You can check this in settings at any time.": "You can check this in settings at any time.",
   "You can import any of your wallet addresses that are associated with your recovery phrase.": "You can import any of your wallet addresses that are associated with your recovery phrase.",
   "You can only store one recovery phrase at a time. To continue importing a new one, you’ll need to remove your current recovery phrase and any associated wallets from this device.": "You can only store one recovery phrase at a time. To continue importing a new one, you’ll need to remove your current recovery phrase and any associated wallets from this device.",
   "You can send tokens on all of our supported networks to this address.": "You can send tokens on all of our supported networks to this address.",
@@ -822,8 +755,6 @@
   "You don’t have enough {{ nativeCurrency }} to cover the network cost": "You don’t have enough {{ nativeCurrency }} to cover the network cost",
   "You don’t have enough {{ symbol }}": "You don’t have enough {{ symbol }}",
   "You don’t have enough {{symbol}} to complete this transaction.": "You don’t have enough {{symbol}} to complete this transaction.",
-  "You got it!": "You got it!",
-  "You have hit the maximum number of unitags that can be active for this device": "You have hit the maximum number of unitags that can be active for this device",
   "You haven’t backed up your recovery phrase to Google Drive yet. By doing so, you can recover your wallet just by being logged into Google Drive on any device.": "You haven’t backed up your recovery phrase to Google Drive yet. By doing so, you can recover your wallet just by being logged into Google Drive on any device.",
   "You haven’t backed up your recovery phrase to iCloud yet. By doing so, you can recover your wallet just by being logged into iCloud on any device.": "You haven’t backed up your recovery phrase to iCloud yet. By doing so, you can recover your wallet just by being logged into iCloud on any device.",
   "You haven’t transacted with this address before. Please confirm that the address is correct before continuing.": "You haven’t transacted with this address before. Please confirm that the address is correct before continuing.",
@@ -831,32 +762,29 @@
   "You may have lost internet connection or the network may be down. Please check your internet connection and try again.": "You may have lost internet connection or the network may be down. Please check your internet connection and try again.",
   "You need to import this wallet via recovery phrase to send assets.": "You need to import this wallet via recovery phrase to send assets.",
   "You need to import this wallet via recovery phrase to swap tokens.": "You need to import this wallet via recovery phrase to swap tokens.",
-  "You only get two username changes per address. Once you change your username, you can’t change it back.": "You only get two username changes per address. Once you change your username, you can’t change it back.",
   "You sent {{ currencyAmount }}{{ tokenName }}{{ fiatValue }} to {{ recipient }}.": "You sent {{ currencyAmount }}{{ tokenName }}{{ fiatValue }} to {{ recipient }}.",
   "You swapped {{ inputAmount }}{{ inputCurrency }} for {{ outputAmount }}{{ outputCurrency }}.": "You swapped {{ inputAmount }}{{ inputCurrency }} for {{ outputAmount }}{{ outputCurrency }}.",
   "You unwrapped {{ inputAmount }}{{ inputCurrency }} for {{ inputAmount }}{{ outputCurrency }}.": "You unwrapped {{ inputAmount }}{{ inputCurrency }} for {{ inputAmount }}{{ outputCurrency }}.",
   "You wrapped {{ inputAmount }}{{ inputCurrency }} for {{ inputAmount }}{{ outputCurrency }}.": "You wrapped {{ inputAmount }}{{ inputCurrency }} for {{ inputAmount }}{{ outputCurrency }}.",
   "You’ll need ETH to get started. Buy with a card or bank.": "You’ll need ETH to get started. Buy with a card or bank.",
   "You’ll need to enter this password to recover your account. It’s not stored anywhere, so it can’t be recovered by anyone else.": "You’ll need to enter this password to recover your account. It’s not stored anywhere, so it can’t be recovered by anyone else.",
-  "You’ll need to enter this password to recover your wallet.": "You’ll need to enter this password to recover your wallet.",
-  "You’re about to delete your username and customizable profile details. You will not be able to reclaim it.": "You’re about to delete your username and customizable profile details. You will not be able to reclaim it.",
   "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.": "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.",
   "You’re offline": "You’re offline",
-  "You’re removing your recovery phrase": "You’re removing your recovery phrase",
+  "You’re sending": "You’re sending",
   "You’re swapping": "You’re swapping",
   "You’ve already completed onboarding": "You’ve already completed onboarding",
+  "You’ve got it!": "You’ve got it!",
   "Your {{ symbol }} balance has decreased since you entered the amount you’d like to send": "Your {{ symbol }} balance has decreased since you entered the amount you’d like to send",
   "Your balance": "Your balance",
   "Your other wallets": "Your other wallets",
   "Your personal space for tokens, NFTs, and all your trades.": "Your personal space for tokens, NFTs, and all your trades.",
   "Your public address will be": "Your public address will be",
-  "Your recovery phrase is what grants you (and anyone who has it) access to your funds. Be sure to keep it to yourself.": "Your recovery phrase is what grants you (and anyone who has it) access to your funds. Be sure to keep it to yourself.",
+  "Your recovery phrase is what grants you (and anyone who has it) access to your funds. Be sure to store it in a safe place.": "Your recovery phrase is what grants you (and anyone who has it) access to your funds. Be sure to store it in a safe place.",
   "Your recovery phrase will only be stored locally on your device.": "Your recovery phrase will only be stored locally on your device.",
-  "Your session timed out": "Your session timed out",
   "Your tokens": "Your tokens",
   "Your transaction will revert if the price changes more than the slippage percentage.": "Your transaction will revert if the price changes more than the slippage percentage.",
-  "Your wallet is ready": "Your wallet is ready",
-  "Your wallet isn’t connected to this site.": "Your wallet isn’t connected to this site.",
   "Your wallets": "Your wallets",
-  "Your wallets will appear below.": "Your wallets will appear below."
+  "Your wallets will appear below.": "Your wallets will appear below.",
+  "yourname": "yourname",
+  "yourusername": "yourusername"
 }
diff --git a/packages/wallet/src/provider/tamagui-provider.tsx b/packages/wallet/src/provider/tamagui-provider.tsx
index a114ef3d9ec..9aa35e76776 100644
--- a/packages/wallet/src/provider/tamagui-provider.tsx
+++ b/packages/wallet/src/provider/tamagui-provider.tsx
@@ -1,5 +1,5 @@
-import { TamaguiProvider as OGTamaguiProvider, TamaguiProviderProps, tamaguiConfig } from 'ui/src'
-import { useSelectedColorScheme } from 'wallet/src/features/appearance/hooks'
+import { tamaguiConfig, TamaguiProvider as OGTamaguiProvider, TamaguiProviderProps } from 'ui/src'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 
 // without <NavigationProvider>
 // this exported Provider is useful for tests
@@ -10,9 +10,8 @@ export function TamaguiProvider({
 }: Omit<TamaguiProviderProps, 'config'>): JSX.Element {
   // because we dont always want to wrap all of redux for visual tests, make it default to false if in test mode
   // this should be done better but release needs hotfix so for now it works
-
-  const userSelectedColorScheme = useSelectedColorScheme()
-  const isDark = process.env.NODE_ENV === 'test' ? false : userSelectedColorScheme === 'dark'
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const isDark = process.env.NODE_ENV === 'test' ? false : useIsDarkMode()
 
   return (
     <OGTamaguiProvider
diff --git a/packages/wallet/src/react-native-dotenv.d.ts b/packages/wallet/src/react-native-dotenv.d.ts
index 0515687e5e6..40b6d43f5c6 100644
--- a/packages/wallet/src/react-native-dotenv.d.ts
+++ b/packages/wallet/src/react-native-dotenv.d.ts
@@ -3,7 +3,9 @@
 declare module 'react-native-dotenv' {
   export const APPSFLYER_API_KEY: string
   export const APPSFLYER_APP_ID: string
-  export const FIAT_ON_RAMP_API_URL: string
+  export const MELD_API_KEY: string
+  export const MELD_API_VERSION: string
+  export const MELD_API_URL: string
   export const MOONPAY_API_KEY: string
   export const MOONPAY_API_URL: string
   export const MOONPAY_WIDGET_API_URL: string
@@ -19,5 +21,4 @@ declare module 'react-native-dotenv' {
   export const WALLETCONNECT_PROJECT_ID: string
   export const QUICKNODE_BNB_RPC_URL: string
   export const UNITAGS_API_URL: string
-  export const TRADING_API_KEY: string
 }
diff --git a/packages/wallet/src/state/reducer.ts b/packages/wallet/src/state/reducer.ts
index d0bc524a6dd..04146edfdb7 100644
--- a/packages/wallet/src/state/reducer.ts
+++ b/packages/wallet/src/state/reducer.ts
@@ -1,29 +1,21 @@
 import { combineReducers } from 'redux'
 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'
-import { tokensReducer } from 'wallet/src/features/tokens/tokensSlice'
 import { transactionReducer } from 'wallet/src/features/transactions/slice'
 import { walletReducer } from 'wallet/src/features/wallet/slice'
-import { timingReducer } from 'wallet/src/telemetry/timing/slice'
 
 export const sharedReducers = {
   [fiatOnRampApi.reducerPath]: fiatOnRampApi.reducer,
   [fiatOnRampAggregatorApi.reducerPath]: fiatOnRampAggregatorApi.reducer,
   appearanceSettings: appearanceSettingsReducer,
-  behaviorHistory: behaviorHistoryReducer,
   favorites: favoritesReducer,
   fiatCurrencySettings: fiatCurrencySettingsReducer,
   languageSettings: languageSettingsReducer,
   notifications: notificationReducer,
-  searchHistory: searchHistoryReducer,
-  timing: timingReducer,
-  tokens: tokensReducer,
   transactions: transactionReducer,
   wallet: walletReducer,
 } as const
diff --git a/packages/wallet/src/state/saga.ts b/packages/wallet/src/state/saga.ts
index d1336e138ee..4fb613fb81b 100644
--- a/packages/wallet/src/state/saga.ts
+++ b/packages/wallet/src/state/saga.ts
@@ -1,6 +1,5 @@
 import { combineReducers, Reducer } from '@reduxjs/toolkit'
 import { spawn } from 'typed-redux-saga'
-import { notificationWatcher } from 'wallet/src/features/notifications/notificationWatcherSaga'
 import { initProviders } from 'wallet/src/features/providers'
 import {
   transferTokenActions,
@@ -11,7 +10,7 @@ import {
 import { SagaState } from 'wallet/src/utils/saga'
 
 // Sagas that are spawned at startup
-const sharedSagas = [initProviders, notificationWatcher] as const
+const sharedSagas = [initProviders] as const
 
 export interface MonitoredSaga {
   // TODO(MOB-645): Add more specific types
diff --git a/packages/wallet/src/telemetry/constants.ts b/packages/wallet/src/telemetry/constants.ts
index c0f1270d93e..cadfda5e768 100644
--- a/packages/wallet/src/telemetry/constants.ts
+++ b/packages/wallet/src/telemetry/constants.ts
@@ -1,12 +1,9 @@
 export enum WalletEventName {
-  ExploreSearchCancel = 'Explore Search Cancel',
-  NetworkFilterSelected = 'Network Filter Selected',
   NFTsLoaded = 'NFTs Loaded',
   PortfolioBalanceFreshnessLag = 'Portfolio Balance Freshness Lag',
   SwapSubmitted = 'Swap Submitted to Provider',
   TransferSubmitted = 'Transfer Submitted',
   TransferCompleted = 'Transfer Completed',
-  TokenSelected = 'Token Selected',
 }
 
 export enum WalletAppsFlyerEvents {
@@ -14,180 +11,3 @@ export enum WalletAppsFlyerEvents {
   SwapCompleted = 'swap_completed',
   WalletFunded = 'wallet_funded',
 }
-
-export const ModalName = {
-  AccountEdit: 'account-edit-modal',
-  AccountSwitcher: 'account-switcher-modal',
-  AddWallet: 'add-wallet-modal',
-  BlockedAddress: 'blocked-address',
-  ChooseProfilePhoto: 'choose-profile-photo-modal',
-  CloudBackupInfo: 'cloud-backup-info-modal',
-  Experiments: 'experiments',
-  Explore: 'explore-modal',
-  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',
-  ForceUpgradeModal: 'force-upgrade-modal',
-  ForgotPassword: 'forgot-password',
-  LanguageSelector: 'language-selector-modal',
-  NetworkFeeInfo: 'network-fee-info',
-  NetworkSelector: 'network-selector-modal',
-  NftCollection: 'nft-collection',
-  OtpInputExpired: 'otp-input-expired',
-  OtpInputRedeemed: 'otp-input-redeemed',
-  OtpScanInput: 'otp-scan-input',
-  QRCodeNetworkInfo: 'qr-code-network-info',
-  RemoveWallet: 'remove-wallet-modal',
-  RestoreWallet: 'restore-wallet-modal',
-  RemoveSeedPhraseWarningModal: 'remove-seed-phrase-warning-modal',
-  Scantastic: 'scantastic',
-  ScreenshotWarning: 'screenshot-warning',
-  Send: 'send-modal',
-  SeedPhraseWarningModal: 'seed-phrase-warning-modal',
-  SendWarning: 'send-warning-modal',
-  SlippageInfo: 'slippage-info-modal',
-  Swap: 'swap-modal',
-  SwapSettings: 'swap-settings-modal',
-  SwapWarning: 'swap-warning-modal',
-  SwapProtection: 'swap-protection-modal',
-  TokenSelector: 'token-selector',
-  TokenWarningModal: 'token-warning-modal',
-  TooltipContent: 'tooltip-content',
-  TransactionActions: 'transaction-actions',
-  UnitagsChange: 'unitags-change-modal',
-  UnitagsDelete: 'unitags-delete-modal',
-  UnitagsIntro: 'unitags-intro-modal',
-  ViewSeedPhraseWarning: 'view-seed-phrase-warning',
-  ViewOnlyExplainer: 'view-only-explainer-modal',
-  WalletConnectScan: 'wallet-connect-scan-modal',
-  WCDappConnectedNetworks: 'wc-dapp-connected-networks-modal',
-  WCPendingConnection: 'wc-pending-connection-modal',
-  WCSignRequest: 'wc-sign-request-modal',
-  WCViewOnlyWarning: 'wc-view-only-warning-modal',
-  // alphabetize additional values.
-} as const
-
-export type ModalNameType = (typeof ModalName)[keyof typeof ModalName]
-
-/**
- * Possible names for the telement property in TraceContext
- */
-export const ElementName = {
-  AcceptNewRate: 'accept-new-rate',
-  AccountCard: 'account-card',
-  AddManualBackup: 'add-manual-backup',
-  AddViewOnlyWallet: 'add-view-only-wallet',
-  AddCloudBackup: 'add-cloud-backup',
-  Back: 'back',
-  Buy: 'buy',
-  Cancel: 'cancel',
-  Confirm: 'confirm',
-  Continue: 'continue',
-  Copy: 'copy',
-  CreateAccount: 'create-account',
-  Edit: 'edit',
-  EmptyStateBuy: 'empty-state-buy',
-  EmptyStateGetStarted: 'empty-state-get-started',
-  EmptyStateImport: 'empty-state-get-import',
-  EmptyStateReceive: 'empty-state-receive',
-  Enable: 'enable',
-  EtherscanView: 'etherscan-view',
-  Favorite: 'favorite',
-  FiatOnRampTokenSelector: 'fiat-on-ramp-token-selector',
-  FiatOnRampAggregatorTokenSelector: 'fiat-on-ramp-aggregator-token-selector',
-  FiatOnRampWidgetButton: 'fiat-on-ramp-widget-button',
-  FiatOnRampCountryPicker: 'fiat-on-ramp-country-picker',
-  GetHelp: 'get-help',
-  GetStarted: 'get-started',
-  ImportAccount: 'import',
-  Manage: 'manage',
-  MoonpayExplorerView: 'moonpay-explorer-view',
-  NetworkButton: 'network-button',
-  Next: 'next',
-  OK: 'ok',
-  OnboardingImportBackup: 'onboarding-import-backup',
-  OnboardingImportSeedPhrase: 'onboarding-import-seed-phrase',
-  OnboardingImportWatchedAccount: 'onboarding-import-watched-account',
-  OpenDeviceLanguageSettings: 'open-device-language-settings',
-  OpenCameraRoll: 'open-camera-roll',
-  OpenNftsList: 'open-nfts-list',
-  QRCodeModalToggle: 'qr-code-modal-toggle',
-  Receive: 'receive',
-  RecoveryHelpButton: 'recovery-help-button',
-  Remove: 'remove',
-  RestoreFromCloud: 'restore-from-cloud',
-  RestoreWallet: 'restore-wallet',
-  ReviewSwap: 'review-swap',
-  ReviewTransfer: 'review-transfer',
-  SearchEtherscanItem: 'search-etherscan-item',
-  SearchNFTCollectionItem: 'search-nft-collection-item',
-  SelectRecipient: 'select-recipient',
-  SearchTokenItem: 'search-token-item',
-  Sell: 'sell',
-  Send: 'send',
-  SetMaxInput: 'set-max-input',
-  SetMaxOutput: 'set-max-output',
-  Skip: 'skip',
-  Submit: 'submit',
-  Swap: 'swap',
-  SwapReview: 'swap-review',
-  SwapSettings: 'swap-settings',
-  SwitchCurrenciesButton: 'switch-currencies-button',
-  TimeFrame1H: 'time-frame-1H',
-  TimeFrame1D: 'time-frame-1D',
-  TimeFrame1W: 'time-frame-1W',
-  TimeFrame1M: 'time-frame-1M',
-  TimeFrame1Y: 'time-frame-1Y',
-  TokenAddress: 'token-address',
-  TokenInputSelector: 'token-input-selector',
-  TokenLinkEtherscan: 'token-link-etherscan',
-  TokenLinkTwitter: 'token-link-twitter',
-  TokenLinkWebsite: 'token-link-website',
-  TokenOutputSelector: 'token-output-selector',
-  TokenSelectorToggle: 'token-selector-toggle',
-  TokenWarningAccept: 'token-warning-accept',
-  Unwrap: 'unwrap',
-  WCDappSwitchAccount: 'wc-dapp-switch-account',
-  WCDappNetworks: 'wc-dapp-networks',
-  WalletCard: 'wallet-card',
-  WalletConnectScan: 'wallet-connect-scan',
-  WalletQRCode: 'wallet-qr-code',
-  WalletSettings: 'WalletSettings',
-  Wrap: 'wrap',
-  // alphabetize additional values.
-} as const
-
-export type ElementNameType = (typeof ElementName)[keyof typeof ElementName]
-
-/**
- * Possible names for the section property in TraceContext
- */
-export const SectionName = {
-  CurrencyInputPanel: 'currency-input-panel',
-  CurrencyOutputPanel: 'currency-output-panel',
-  ExploreFavoriteTokensSection: 'explore-favorite-tokens-section',
-  ExploreSearch: 'explore-search',
-  ExploreTopTokensSection: 'explore-top-tokens-section',
-  HomeActivityTab: 'home-activity-tab',
-  HomeFeedTab: 'home-feed-tab',
-  HomeNFTsTab: 'home-nfts-tab',
-  HomeTokensTab: 'home-tokens-tab',
-  ImportAccountForm: 'import-account-form',
-  ProfileActivityTab: 'profile-activity-tab',
-  ProfileNftsTab: 'profile-nfts-tab',
-  ProfileTokensTab: 'profile-tokens-tab',
-  SwapForm: 'swap-form',
-  SwapPending: 'swap-pending',
-  SwapReview: 'swap-review',
-  TokenSelector: 'token-selector',
-  TokenDetails: 'token-details',
-  TransferForm: 'transfer-form',
-  TransferPending: 'transfer-pending',
-  TransferReview: 'transfer-review',
-  // alphabetize additional values.
-} as const
-
-export type SectionNameType = (typeof SectionName)[keyof typeof SectionName]
diff --git a/packages/wallet/src/telemetry/timing/selectors.ts b/packages/wallet/src/telemetry/timing/selectors.ts
deleted file mode 100644
index 10d17614520..00000000000
--- a/packages/wallet/src/telemetry/timing/selectors.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-import { SharedState } from 'wallet/src/state/reducer'
-
-export const selectSwapStartTimestamp = (state: SharedState): number | undefined =>
-  state.timing.swap.startTimestamp
diff --git a/packages/wallet/src/telemetry/types.ts b/packages/wallet/src/telemetry/types.ts
index 1d0d79f406e..a9ba964c9d1 100644
--- a/packages/wallet/src/telemetry/types.ts
+++ b/packages/wallet/src/telemetry/types.ts
@@ -1,14 +1,8 @@
-import { ApolloError } from '@apollo/client'
-import { SerializedError } from '@reduxjs/toolkit'
-import { FetchBaseQueryError } from '@reduxjs/toolkit/dist/query'
 import { MoonpayEventName, SharedEventName, SwapEventName } from '@uniswap/analytics-events'
 import { Protocol } from '@uniswap/router-sdk'
-import { providers } from 'ethers'
 import { TraceProps } from 'utilities/src/telemetry/trace/Trace'
 import { ChainId } from 'wallet/src/constants/chains'
 import { ImportType } from 'wallet/src/features/onboarding/types'
-import { CurrencyField } from 'wallet/src/features/transactions/transactionState/types'
-import { QuoteType } from 'wallet/src/features/transactions/utils'
 import { WalletAppsFlyerEvents, WalletEventName } from 'wallet/src/telemetry/constants'
 
 export type SwapTradeBaseProperties = {
@@ -23,8 +17,6 @@ export type SwapTradeBaseProperties = {
   token_in_amount: string
   token_out_amount: string
   fee_amount?: string
-  quoteType?: QuoteType
-  requestId?: string
 } & TraceProps
 
 type SwapTransactionResultProperties = {
@@ -45,7 +37,6 @@ type SwapTransactionResultProperties = {
   submitViaPrivateRpc?: boolean
   protocol?: Protocol
   transactedUSDValue?: number
-  quoteType?: QuoteType
 }
 
 type TransferProperties = {
@@ -54,20 +45,6 @@ type TransferProperties = {
   toAddress: Address
 }
 
-export type AssetDetailsBaseProperties = {
-  name?: string
-  address: string
-  chain?: number
-}
-
-export type SearchResultContextProperties = {
-  category?: string
-  query?: string
-  suggestion_count?: number
-  position?: number
-  isHistory?: boolean
-}
-
 export type WalletEventProperties = {
   [SharedEventName.ANALYTICS_SWITCH_TOGGLED]: {
     enabled: boolean
@@ -77,12 +54,6 @@ export type WalletEventProperties = {
     success: boolean
     networkError: boolean
   } & TraceProps
-  [WalletEventName.ExploreSearchCancel]: {
-    query: string
-  }
-  [WalletEventName.NetworkFilterSelected]: TraceProps & {
-    chain: ChainId | 'All'
-  }
   [WalletEventName.NFTsLoaded]: {
     shown: number
     hidden: number
@@ -96,31 +67,6 @@ export type WalletEventProperties = {
   } & SwapTradeBaseProperties
   [SwapEventName.SWAP_TRANSACTION_COMPLETED]: SwapTransactionResultProperties
   [SwapEventName.SWAP_TRANSACTION_FAILED]: SwapTransactionResultProperties
-  [SwapEventName.SWAP_DETAILS_EXPANDED]: TraceProps | undefined
-  [SwapEventName.SWAP_QUOTE_RECEIVED]: {
-    quote_latency_milliseconds?: number
-  } & SwapTradeBaseProperties
-  [SwapEventName.SWAP_SUBMITTED_BUTTON_CLICKED]: {
-    estimated_network_fee_wei?: string
-    gas_limit?: string
-    transaction_deadline_seconds?: number
-    token_in_amount_usd?: number
-    token_out_amount_usd?: number
-    is_auto_slippage?: boolean
-    swap_quote_block_number?: string
-    swap_flow_duration_milliseconds?: number
-    is_hold_to_swap?: boolean
-    is_fiat_input_mode?: boolean
-  } & SwapTradeBaseProperties
-  [SwapEventName.SWAP_ESTIMATE_GAS_CALL_FAILED]: {
-    error?: ApolloError | FetchBaseQueryError | SerializedError | Error | string
-    txRequest?: providers.TransactionRequest
-  } & SwapTradeBaseProperties
-  [WalletEventName.TokenSelected]: TraceProps &
-    AssetDetailsBaseProperties &
-    SearchResultContextProperties & {
-      field: CurrencyField
-    }
   [WalletEventName.TransferSubmitted]: TransferProperties
   [WalletEventName.TransferCompleted]: TransferProperties
 }
diff --git a/packages/wallet/src/test/fixtures.ts b/packages/wallet/src/test/fixtures.ts
index 12561d33a7a..9e9ca73702d 100644
--- a/packages/wallet/src/test/fixtures.ts
+++ b/packages/wallet/src/test/fixtures.ts
@@ -1,4 +1,3 @@
-/* eslint-disable max-lines */
 import { faker } from '@faker-js/faker'
 import {
   NetInfoConnectedStates,
@@ -22,10 +21,7 @@ import { HistoryDuration, SafetyLevel } from 'wallet/src/data/__generated__/type
 import { AssetType } from 'wallet/src/entities/assets'
 import { SearchableRecipient } from 'wallet/src/features/address/types'
 import { ContractManager } from 'wallet/src/features/contracts/ContractManager'
-import {
-  CurrencyInfo,
-  PortfolioBalance as PortfolioBalanceType,
-} from 'wallet/src/features/dataApi/types'
+import { CurrencyInfo } from 'wallet/src/features/dataApi/types'
 import { AppNotificationType } from 'wallet/src/features/notifications/types'
 import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
 import { finalizeTransaction } from 'wallet/src/features/transactions/slice'
@@ -45,8 +41,6 @@ import { currencyId } from 'wallet/src/utils/currencyId'
 
 // Ensures stable fixtures
 export const FAKER_SEED = 123
-export const MAX_FIXTURE_TIMESTAMP = 1609459200
-
 faker.seed(FAKER_SEED)
 
 export const mockSigner = new (class {
@@ -69,11 +63,10 @@ export const SAMPLE_SEED = [
   'skull',
   'history',
 ].join(' ')
-
 export const SAMPLE_SEED_ADDRESS_1 = '0x82D56A352367453f74FC0dC7B071b311da373Fa6'
 export const SAMPLE_SEED_ADDRESS_2 = '0x55f4B664C68F398f9e81EFf63ef4444A1A184F98'
-export const SAMPLE_CURRENCY_ID_1 = '1-0x6b175474e89094c44da98b954eedeac495271d0f'
-export const SAMPLE_CURRENCY_ID_2 = '1-0x4d224452801aced8b2f0aebe155379bb5d594381'
+export const SAMPLE_CURRENCY_ID_1 = '1-0x6B175474E89094C44Da98b954EedeAC495271d0F'
+export const SAMPLE_CURRENCY_ID_2 = '1-0x4d224452801ACEd8B2F0aebE155379bb5D594381'
 
 export const MainnetEth = NativeCurrency.onChain(ChainId.Mainnet)
 export const PolygonMatic = NativeCurrency.onChain(ChainId.Polygon)
@@ -112,10 +105,7 @@ export const mockProvider = {
   getTransactionCount: (): number => 1000,
   estimateGas: (): BigNumber => BigNumber.from('30000'),
   sendTransaction: (): { hash: string } => ({ hash: '0xabcdef' }),
-  detectNetwork: (): { name: string; chainId: ChainId } => ({
-    name: 'mainnet',
-    chainId: 1,
-  }),
+  detectNetwork: (): { name: string; chainId: ChainId } => ({ name: 'mainnet', chainId: 1 }),
   getTransactionReceipt: (): typeof txReceipt => txReceipt,
   waitForTransaction: (): typeof txReceipt => txReceipt,
   getFeeData: (): typeof mockFeeData => mockFeeData,
@@ -502,67 +492,3 @@ export const historyDurationMs: Record<HistoryDuration, number> = {
   [HistoryDuration.Year]: yearMs,
   [HistoryDuration.Max]: 5 * yearMs,
 }
-
-export const PortfolioBalancesWithUSD: [
-  PortfolioBalanceType,
-  PortfolioBalanceType,
-  PortfolioBalanceType
-] = [
-  {
-    cacheId: faker.datatype.uuid(),
-    quantity: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    balanceUSD: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    currencyInfo: ethCurrencyInfo,
-    relativeChange24: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    isHidden: faker.datatype.boolean(),
-  },
-  {
-    cacheId: faker.datatype.uuid(),
-    quantity: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    balanceUSD: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    currencyInfo: uniCurrencyInfo,
-    relativeChange24: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    isHidden: faker.datatype.boolean(),
-  },
-  {
-    cacheId: faker.datatype.uuid(),
-    quantity: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    balanceUSD: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    currencyInfo: daiCurrencyInfo,
-    relativeChange24: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    isHidden: faker.datatype.boolean(),
-  },
-]
-
-export const PortfolioBalanceWithoutUSD: [
-  PortfolioBalanceType,
-  PortfolioBalanceType,
-  PortfolioBalanceType
-] = [
-  {
-    cacheId: faker.datatype.uuid(),
-    quantity: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    balanceUSD: null,
-    currencyInfo: ethCurrencyInfo,
-    relativeChange24: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    isHidden: faker.datatype.boolean(),
-  },
-  {
-    cacheId: faker.datatype.uuid(),
-    quantity: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    balanceUSD: null,
-    currencyInfo: uniCurrencyInfo,
-    relativeChange24: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    isHidden: faker.datatype.boolean(),
-  },
-  {
-    cacheId: faker.datatype.uuid(),
-    quantity: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    balanceUSD: null,
-    currencyInfo: daiCurrencyInfo,
-    relativeChange24: faker.datatype.float({ min: 0, max: 1000, precision: 0.01 }),
-    isHidden: faker.datatype.boolean(),
-  },
-]
-
-export const PortfolioBalance = PortfolioBalancesWithUSD[0]
diff --git a/packages/wallet/src/test/gqlFixtures.ts b/packages/wallet/src/test/gqlFixtures.ts
index 03c7570a441..da24d263b4a 100644
--- a/packages/wallet/src/test/gqlFixtures.ts
+++ b/packages/wallet/src/test/gqlFixtures.ts
@@ -1,9 +1,7 @@
-/* eslint-disable max-lines */
 import { faker } from '@faker-js/faker'
-import { NativeCurrency } from '@uniswap/sdk-core'
 import { getWrappedNativeAddress } from 'wallet/src/constants/addresses'
 import { ChainId } from 'wallet/src/constants/chains'
-import { DAI, USDBC_BASE, USDC, USDC_ARBITRUM } from 'wallet/src/constants/tokens'
+import { DAI, USDC } from 'wallet/src/constants/tokens'
 import {
   Amount,
   AssetActivity,
@@ -13,13 +11,12 @@ import {
   HistoryDuration,
   NftAssetTrait,
   NftCollection,
-  Portfolio as PortfolioType,
+  Portfolio,
   PriceSource,
   SafetyLevel,
   SearchTokensQuery,
   Token,
   TokenApproval,
-  TokenBalance,
   TokenMarket as TokenMarketType,
   TokenProject as TokenProjectType,
   TokenStandard,
@@ -29,23 +26,13 @@ import {
   TransactionStatus,
   TransactionType,
 } from 'wallet/src/data/__generated__/types-and-hooks'
-import { PortfolioBalance } from 'wallet/src/features/dataApi/types'
-import {
-  ETH,
-  FAKER_SEED,
-  MAX_FIXTURE_TIMESTAMP,
-  SAMPLE_SEED_ADDRESS_1,
-  SAMPLE_SEED_ADDRESS_2,
-} from 'wallet/src/test/fixtures'
-import {
-  createTokenAsset,
-  createTokenBalance,
-  mockTokenPriceHistory,
-  mockTokenProject,
-} from 'wallet/src/test/helpers'
+import { FAKER_SEED, SAMPLE_SEED_ADDRESS_1, SAMPLE_SEED_ADDRESS_2 } from 'wallet/src/test/fixtures'
+import { mockTokenPriceHistory, mockTokenProject } from 'wallet/src/test/helpers'
 
 faker.seed(FAKER_SEED)
 
+export const MAX_FIXTURE_TIMESTAMP = 1609459200
+
 export const Amounts: Record<'none' | 'xs' | 'sm' | 'md' | 'lg' | 'xl', Amount> = {
   none: {
     id: faker.datatype.uuid(),
@@ -79,10 +66,21 @@ export const Amounts: Record<'none' | 'xs' | 'sm' | 'md' | 'lg' | 'xl', Amount>
   },
 }
 
-export const EthAsset = createTokenAsset(ETH, Chain.Ethereum)
-export const DaiAsset = createTokenAsset(DAI, Chain.Ethereum)
-export const UsdBaseAsset = createTokenAsset(USDBC_BASE, Chain.Base)
-export const UsdArbitrumAsset = createTokenAsset(USDC_ARBITRUM, Chain.Arbitrum)
+export const DaiAsset: Token = {
+  id: faker.datatype.uuid(),
+  name: DAI.name,
+  symbol: DAI.symbol,
+  decimals: DAI.decimals,
+  chain: Chain.Ethereum,
+  address: DAI.address,
+  project: {
+    id: faker.datatype.uuid(),
+    isSpam: false,
+    logoUrl: faker.datatype.string(),
+    tokens: [],
+    safetyLevel: SafetyLevel.Verified,
+  },
+}
 
 /**
  * Must explicitly define the returned typename in order
@@ -94,9 +92,8 @@ type RequiredAssetActivity = Omit<AssetActivity, 'transaction' | 'assetChanges'
     assetChanges: (AssetChange & { __typename: 'TokenApproval' | 'TokenTransfer' })[]
   }
 }
-type PortfolioWithActivityAndTokenBalances = Omit<PortfolioType, 'assetActivities'> & {
+type PortfolioWithActivity = Omit<Portfolio, 'assetActivities'> & {
   assetActivities: RequiredAssetActivity[]
-  tokenBalances: TokenBalance[]
 }
 
 const AssetActivityBase = {
@@ -183,21 +180,7 @@ export const Erc20ReceiveAssetActivity: RequiredAssetActivity = {
   },
 }
 
-export const TokenBalances: [TokenBalance, TokenBalance] = [
-  createTokenBalance(SAMPLE_SEED_ADDRESS_1, DaiAsset, true),
-  createTokenBalance(SAMPLE_SEED_ADDRESS_2, EthAsset, false),
-]
-
-// These are with different chanins
-export const TokenBalances2: [TokenBalance, TokenBalance] = [
-  createTokenBalance(SAMPLE_SEED_ADDRESS_1, UsdBaseAsset, false),
-  createTokenBalance(SAMPLE_SEED_ADDRESS_2, UsdArbitrumAsset, true),
-]
-
-export const Portfolios: [
-  PortfolioWithActivityAndTokenBalances,
-  PortfolioWithActivityAndTokenBalances
-] = [
+export const Portfolios: [PortfolioWithActivity, PortfolioWithActivity] = [
   {
     id: faker.datatype.uuid(),
     ownerAddress: SAMPLE_SEED_ADDRESS_1,
@@ -207,7 +190,6 @@ export const Portfolios: [
       absolute: Amounts.sm,
       percentage: Amounts.xs,
     },
-    tokenBalances: TokenBalances,
     assetActivities: [ApproveAssetActivity, Erc20SwapAssetActivity],
   },
   {
@@ -219,12 +201,11 @@ export const Portfolios: [
       absolute: Amounts.sm,
       percentage: Amounts.xs,
     },
-    tokenBalances: TokenBalances2,
     assetActivities: [ApproveAssetActivity, Erc20SwapAssetActivity],
   },
 ]
 
-export const PortfoliosWithReceive: [PortfolioWithActivityAndTokenBalances] = [
+export const PortfoliosWithReceive: [PortfolioWithActivity] = [
   {
     id: faker.datatype.uuid(),
     ownerAddress: SAMPLE_SEED_ADDRESS_1,
@@ -234,90 +215,10 @@ export const PortfoliosWithReceive: [PortfolioWithActivityAndTokenBalances] = [
       absolute: Amounts.sm,
       percentage: Amounts.xs,
     },
-    tokenBalances: TokenBalances,
     assetActivities: [Erc20ReceiveAssetActivity],
   },
 ]
 
-export const Portfolio = Portfolios[0] as PortfolioType
-export const Portfolio2 = Portfolios[1] as PortfolioType
-
-export const PortfolioBalancesById: Record<string, PortfolioBalance> = {
-  '1-0x6b175474e89094c44da98b954eedeac495271d0f': {
-    cacheId: 'TokenBalance:d76790c0-657f-4c9c-929c-372e55d4874e',
-    quantity: 146,
-    balanceUSD: 55,
-    currencyInfo: {
-      currency: {
-        ...DAI,
-        address: DAI.address.toLocaleLowerCase(),
-      } as typeof DAI,
-      currencyId: '1-0x6b175474e89094c44da98b954eedeac495271d0f',
-      logoUrl: 'I%hYU9(rWW',
-      isSpam: false,
-      safetyLevel: SafetyLevel.Verified,
-    },
-    relativeChange24: expect.any(Number),
-    isHidden: true,
-  },
-  '1-0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee': {
-    cacheId: 'TokenBalance:da5cfdf1-6aa9-46a4-8164-b426920f017a',
-    quantity: 442,
-    balanceUSD: 55,
-    currencyInfo: {
-      currency: {
-        chainId: 1,
-        decimals: 18,
-        name: 'Ethereum',
-        symbol: 'ETH',
-        isNative: true,
-        isToken: false,
-        address: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
-      } as unknown as NativeCurrency,
-      safetyLevel: SafetyLevel.Verified,
-      currencyId: '1-0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
-      isSpam: false,
-      logoUrl: 't<|U8cUQlA',
-    },
-    relativeChange24: expect.any(Number),
-    isHidden: false,
-  },
-  '8453-0xd9aaec86b65d86f6a7b5b1b0c42ffa531710b6ca': {
-    balanceUSD: 55,
-    cacheId: 'TokenBalance:e645fd94-101e-49dc-8285-1f1ed567a9f0',
-    currencyInfo: {
-      currency: {
-        ...USDBC_BASE,
-        address: USDBC_BASE.address.toLocaleLowerCase(),
-      } as typeof USDBC_BASE,
-      currencyId: '8453-0xd9aaec86b65d86f6a7b5b1b0c42ffa531710b6ca',
-      isSpam: false,
-      logoUrl: '#_fELb,zS)',
-      safetyLevel: SafetyLevel.Verified,
-    },
-    isHidden: false,
-    quantity: 63,
-    relativeChange24: expect.any(Number),
-  },
-  '42161-0xff970a61a04b1ca14834a43f5de4533ebddb5cc8': {
-    balanceUSD: 55,
-    cacheId: 'TokenBalance:0a02bee6-7769-48dd-ba33-6c32c219f34b',
-    currencyInfo: {
-      currency: {
-        ...USDC_ARBITRUM,
-        address: USDC_ARBITRUM.address.toLocaleLowerCase(),
-      } as typeof USDC_ARBITRUM,
-      currencyId: '42161-0xff970a61a04b1ca14834a43f5de4533ebddb5cc8',
-      isSpam: false,
-      logoUrl: '7$l<tG%C=@',
-      safetyLevel: SafetyLevel.Verified,
-    },
-    isHidden: true,
-    quantity: 350,
-    relativeChange24: expect.any(Number),
-  },
-}
-
 export const TokenDayPriceHistory = mockTokenPriceHistory(HistoryDuration.Day)
 export const TokenWeekPriceHistory = mockTokenPriceHistory(HistoryDuration.Week)
 export const TokenMonthPriceHistory = mockTokenPriceHistory(HistoryDuration.Month)
@@ -470,12 +371,10 @@ export const SearchTokens: NonNullable<SearchTokensQuery['searchTokens']> = [
 
 export const EthToken: Token = {
   id: faker.datatype.uuid(),
-  address: faker.finance.ethereumAddress(),
+  address: null,
   chain: Chain.Ethereum,
-  decimals: 2,
   symbol: 'ETH',
   project: {
-    safetyLevel: SafetyLevel.Verified,
     id: faker.datatype.uuid(),
     logoUrl: faker.image.imageUrl(),
     name: 'Ethereum',
@@ -525,14 +424,11 @@ export const TopTokens: [Token, Token] = [
     id: faker.datatype.uuid(),
     address: getWrappedNativeAddress(ChainId.Mainnet),
     chain: Chain.Ethereum,
-    decimals: 18,
     symbol: 'WETH',
     project: {
       id: faker.datatype.uuid(),
-      isSpam: false,
       logoUrl: faker.image.imageUrl(),
       name: 'Wrapped Ether',
-      safetyLevel: SafetyLevel.Verified,
       tokens: [],
     },
   },
@@ -540,14 +436,11 @@ export const TopTokens: [Token, Token] = [
     id: faker.datatype.uuid(),
     address: USDC.address,
     chain: Chain.Ethereum,
-    decimals: USDC.decimals,
     symbol: 'USDC',
     project: {
       id: faker.datatype.uuid(),
-      isSpam: true,
       logoUrl: faker.image.imageUrl(),
       name: 'USD Coin',
-      safetyLevel: SafetyLevel.Verified,
       tokens: [],
     },
   },
diff --git a/packages/wallet/src/test/helpers.ts b/packages/wallet/src/test/helpers.ts
index a108a840bd4..261545290b4 100644
--- a/packages/wallet/src/test/helpers.ts
+++ b/packages/wallet/src/test/helpers.ts
@@ -1,5 +1,4 @@
 import { faker } from '@faker-js/faker'
-import { Token as NativeToken } from '@uniswap/sdk-core'
 import {
   Chain,
   Currency,
@@ -8,13 +7,11 @@ import {
   SafetyLevel,
   TimestampedAmount,
   Token,
-  TokenBalance,
   TokenMarket,
   TokenProject,
 } from 'wallet/src/data/__generated__/types-and-hooks'
-import { NativeCurrency } from 'wallet/src/features/tokens/NativeCurrency'
-import { MAX_FIXTURE_TIMESTAMP, dayMs, historyDurationMs } from 'wallet/src/test/fixtures'
-import { Amounts, EthToken } from 'wallet/src/test/gqlFixtures'
+import { dayMs, historyDurationMs } from 'wallet/src/test/fixtures'
+import { EthToken } from 'wallet/src/test/gqlFixtures'
 
 export const mockTokenPriceHistory = (
   duration: HistoryDuration,
@@ -120,35 +117,3 @@ export const mockTokenProject = (priceHistory: TimestampedAmount[]): TokenProjec
     ],
   }
 }
-
-export const createTokenAsset = (currency: NativeCurrency | NativeToken, chain: Chain): Token => ({
-  id: faker.datatype.uuid(),
-  name: currency.name,
-  symbol: currency.symbol,
-  decimals: currency.decimals,
-  chain,
-  address: currency.address,
-  project: {
-    id: faker.datatype.uuid(),
-    isSpam: false,
-    name: currency.name,
-    logoUrl: faker.datatype.string(),
-    tokens: [],
-    safetyLevel: SafetyLevel.Verified,
-  },
-})
-
-export const createTokenBalance = (
-  ownerAddress: string,
-  token: Token,
-  hidden = false
-): TokenBalance => ({
-  id: faker.datatype.uuid(),
-  blockNumber: 1,
-  blockTimestamp: faker.datatype.number({ max: MAX_FIXTURE_TIMESTAMP }),
-  denominatedValue: Amounts.md,
-  isHidden: hidden,
-  ownerAddress,
-  quantity: faker.datatype.number({ min: 1, max: 1000 }),
-  token,
-})
diff --git a/packages/wallet/src/test/mocks/mocks.ts b/packages/wallet/src/test/mocks/mocks.ts
index 9f122456c03..831b0cb69d0 100644
--- a/packages/wallet/src/test/mocks/mocks.ts
+++ b/packages/wallet/src/test/mocks/mocks.ts
@@ -6,7 +6,7 @@ import {
   SwapOrderStatus,
   TransactionStatus,
 } from 'wallet/src/data/__generated__/types-and-hooks'
-import { FAKER_SEED, faker } from 'wallet/src/test/fixtures'
+import { faker, FAKER_SEED } from 'wallet/src/test/fixtures'
 
 faker.seed(FAKER_SEED)
 
diff --git a/packages/wallet/src/test/mocks/provider.tsx b/packages/wallet/src/test/mocks/provider.tsx
index fc80f0d1533..10134631845 100644
--- a/packages/wallet/src/test/mocks/provider.tsx
+++ b/packages/wallet/src/test/mocks/provider.tsx
@@ -1,4 +1,4 @@
-import { ApolloClient, ApolloLink, ApolloProvider, InMemoryCache } from '@apollo/client'
+import { ApolloClient, ApolloLink, ApolloProvider } from '@apollo/client'
 import { SchemaLink } from '@apollo/client/link/schema'
 import { GraphQLFileLoader } from '@graphql-tools/graphql-file-loader'
 import { loadSchemaSync } from '@graphql-tools/load'
@@ -6,24 +6,22 @@ import { mergeResolvers } from '@graphql-tools/merge'
 import { addMocksToSchema } from '@graphql-tools/mock'
 import path from 'path'
 import { PropsWithChildren } from 'react'
-import { Resolvers } from 'wallet/src/data/__generated__/types-and-hooks'
-import { setupWalletCache } from 'wallet/src/data/cache'
+import { setupCache } from 'wallet/src/data/cache'
 import { getErrorLink, getRestLink } from 'wallet/src/data/links'
+import { Resolvers } from 'wallet/src/data/__generated__/types-and-hooks'
 import { mocks as defaultMocks } from './mocks'
 import { resolvers as defaultResolvers } from './resolvers'
 
-const GQL_SCHEMA_PATH = path.join(__dirname, '../../data/schema.graphql')
+const GQL_SCHEMA_PATH = path.join(__dirname, '../../data/__generated__/schema.graphql')
 
 const baseSchema = loadSchemaSync(GQL_SCHEMA_PATH, { loaders: [new GraphQLFileLoader()] })
 
 type AutoMockedApolloProviderProps = PropsWithChildren<{
-  cache?: InMemoryCache
   resolvers?: Partial<Resolvers>
 }>
 
 export function AutoMockedApolloProvider({
   children,
-  cache,
   resolvers: customResolvers,
 }: AutoMockedApolloProviderProps): JSX.Element {
   const resolvers = mergeResolvers([defaultResolvers, customResolvers])
@@ -31,7 +29,7 @@ export function AutoMockedApolloProvider({
 
   const client = new ApolloClient({
     link: ApolloLink.from([getErrorLink(1, 1), getRestLink(), new SchemaLink({ schema })]),
-    cache: cache ?? setupWalletCache(),
+    cache: setupCache(),
   })
 
   return <ApolloProvider client={client}>{children}</ApolloProvider>
diff --git a/packages/wallet/src/test/render.tsx b/packages/wallet/src/test/render.tsx
index 3e4722dec8d..a5d8f7d3dd0 100644
--- a/packages/wallet/src/test/render.tsx
+++ b/packages/wallet/src/test/render.tsx
@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { InMemoryCache } from '@apollo/client'
 import type { EnhancedStore, PreloadedState } from '@reduxjs/toolkit'
 import { configureStore } from '@reduxjs/toolkit'
 import {
@@ -12,7 +11,6 @@ import {
 } from '@testing-library/react-native'
 import React, { PropsWithChildren } from 'react'
 import { Resolvers } from 'wallet/src/data/__generated__/types-and-hooks'
-import { UnitagUpdaterContextProvider } from 'wallet/src/features/unitags/context'
 import { SharedProvider } from 'wallet/src/provider'
 import { sharedRootReducer, type SharedState } from 'wallet/src/state/reducer'
 import { AutoMockedApolloProvider } from 'wallet/src/test/mocks/provider'
@@ -20,7 +18,6 @@ import { AutoMockedApolloProvider } from 'wallet/src/test/mocks/provider'
 // 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 & {
-  cache?: InMemoryCache
   resolvers?: Resolvers
   preloadedState?: PreloadedState<SharedState>
   store?: EnhancedStore<SharedState>
@@ -36,7 +33,6 @@ type ExtendedRenderOptions = RenderOptions & {
 export function renderWithProviders(
   ui: React.ReactElement,
   {
-    cache,
     resolvers,
     preloadedState = {},
     // Automatically create a store instance if no store was passed in
@@ -52,10 +48,8 @@ export function renderWithProviders(
 } {
   function Wrapper({ children }: PropsWithChildren<unknown>): JSX.Element {
     return (
-      <AutoMockedApolloProvider cache={cache} resolvers={resolvers}>
-        <SharedProvider reduxStore={store}>
-          <UnitagUpdaterContextProvider>{children}</UnitagUpdaterContextProvider>
-        </SharedProvider>
+      <AutoMockedApolloProvider resolvers={resolvers}>
+        <SharedProvider reduxStore={store}>{children}</SharedProvider>
       </AutoMockedApolloProvider>
     )
   }
@@ -67,7 +61,6 @@ export function renderWithProviders(
 // 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> & {
-  cache?: InMemoryCache
   resolvers?: Resolvers
   preloadedState?: PreloadedState<SharedState>
   store?: EnhancedStore<SharedState>
@@ -105,7 +98,6 @@ export function renderHookWithProviders<P extends any[], R>(
   hookOptions?: ExtendedRenderHookOptions<P>
 ): RenderHookWithProvidersResult<R, P> {
   const {
-    cache,
     resolvers,
     preloadedState = {},
     // Automatically create a store instance if no store was passed in
@@ -119,7 +111,7 @@ export function renderHookWithProviders<P extends any[], R>(
 
   function Wrapper({ children }: PropsWithChildren<unknown>): JSX.Element {
     return (
-      <AutoMockedApolloProvider cache={cache} resolvers={resolvers}>
+      <AutoMockedApolloProvider resolvers={resolvers}>
         <SharedProvider reduxStore={store}>{children}</SharedProvider>
       </AutoMockedApolloProvider>
     )
diff --git a/packages/wallet/src/utils/animations.ts b/packages/wallet/src/utils/animations.ts
deleted file mode 100644
index 93ace698daa..00000000000
--- a/packages/wallet/src/utils/animations.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { Easing, SharedValue, withRepeat, withTiming } from 'react-native-reanimated'
-
-export function errorShakeAnimation(input: SharedValue<number>): number {
-  return withRepeat(
-    withTiming(5, { duration: 50, easing: Easing.inOut(Easing.ease) }),
-    3,
-    true,
-    () => {
-      input.value = 0
-    }
-  )
-}
diff --git a/packages/wallet/src/utils/clipboard.native.ts b/packages/wallet/src/utils/clipboard.native.ts
deleted file mode 100644
index 3080cd395e4..00000000000
--- a/packages/wallet/src/utils/clipboard.native.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-import * as ExpoClipboard from 'expo-clipboard'
-import { logger } from 'utilities/src/logger/logger'
-import { IClipboard } from 'wallet/src/utils/clipboard'
-
-const Clipboard: IClipboard = {
-  setClipboard: async (value: string) => {
-    try {
-      await ExpoClipboard.setStringAsync(value)
-    } catch (error) {
-      logger.error(error, { tags: { file: 'clipboard', function: 'setClipboard' } })
-    }
-  },
-  getClipboard: async () => {
-    try {
-      const value = await ExpoClipboard.getStringAsync()
-      return value
-    } catch (error) {
-      logger.error(error, { tags: { file: 'clipboard', function: 'getClipboard' } })
-    }
-  },
-  setClipboardImage: async (imageUrl: string | undefined) => {
-    if (!imageUrl) {
-      return
-    }
-    try {
-      // fetch image blob from remote source
-      const res = await fetch(imageUrl)
-      const blob = await res.blob()
-
-      // convert to base64 required for clipboard
-      const base64Encoding = await blobToBase64(blob)
-
-      // extract base64 encoding from result string
-      const formattedEncoding =
-        typeof base64Encoding === 'string' ? base64Encoding.split(',')[1] : null
-
-      // if valid result, copy to clipboard
-      if (formattedEncoding) {
-        await ExpoClipboard.setImageAsync(formattedEncoding)
-      }
-    } catch (error) {
-      logger.error(error, {
-        tags: { file: 'clipboard', function: 'setClipboardImage' },
-        extra: { imageUrl },
-      })
-    }
-  },
-} as IClipboard
-
-// Convert image data blob to base64 encoding
-function blobToBase64(blob: Blob): Promise<ArrayBuffer | string | null> {
-  const reader = new FileReader()
-  reader.readAsDataURL(blob)
-  return new Promise((resolve) => {
-    reader.onloadend = (): void => {
-      resolve(reader.result)
-    }
-  })
-}
-
-export function setClipboard(value: string): Promise<void> {
-  return Clipboard.setClipboard(value)
-}
-
-export function getClipboard(): Promise<string | void> {
-  return Clipboard.getClipboard()
-}
-
-export function setClipboardImage(imageUrl: string | undefined): Promise<void> {
-  return Clipboard.setClipboardImage(imageUrl)
-}
diff --git a/packages/wallet/src/utils/clipboard.ts b/packages/wallet/src/utils/clipboard.ts
deleted file mode 100644
index c2c8825cfce..00000000000
--- a/packages/wallet/src/utils/clipboard.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import { NotImplementedError } from 'utilities/src/errors'
-
-/** Dummy clipboard class. Overridden by mobile or extension related code. */
-
-export interface IClipboard {
-  setClipboard(value: string): Promise<void>
-  getClipboard(): Promise<string | void>
-  setClipboardImage(imageUrl: string | undefined): Promise<void>
-}
-
-/** This will be overridden by the compiler with platform-specific clipboard file. */
-const Clipboard: IClipboard = {
-  setClipboard: () => {
-    throw new NotImplementedError('setClipboard not implemented')
-  },
-  getClipboard: () => {
-    throw new NotImplementedError('getClipboard not implemented')
-  },
-  setClipboardImage: () => {
-    throw new NotImplementedError('setClipboardImage not implemented')
-  },
-}
-
-export async function setClipboard(value: string): Promise<void> {
-  return Clipboard.setClipboard(value)
-}
-
-export async function getClipboard(): Promise<string | void> {
-  return Clipboard.getClipboard()
-}
-
-export async function setClipboardImage(imageUrl: string | undefined): Promise<void> {
-  return Clipboard.setClipboardImage(imageUrl)
-}
diff --git a/packages/wallet/src/utils/clipboard.web.ts b/packages/wallet/src/utils/clipboard.web.ts
deleted file mode 100644
index c81df0ef0d0..00000000000
--- a/packages/wallet/src/utils/clipboard.web.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { logger } from 'utilities/src/logger/logger'
-import { IClipboard } from 'wallet/src/utils/clipboard'
-
-const Clipboard: IClipboard = {
-  setClipboard: async (value: string) => {
-    await navigator.clipboard.writeText(value)
-  },
-  getClipboard: async () => {
-    const value = await navigator.clipboard.readText()
-    return value
-  },
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  setClipboardImage: async (imageUrl: string | undefined) => {
-    throw new Error('setClipboardImage not implemented on web')
-  },
-} as IClipboard
-
-export async function setClipboard(value: string): Promise<void> {
-  try {
-    await navigator.clipboard.writeText(value)
-  } catch (error) {
-    logger.error(error, { tags: { file: 'clipboard', function: 'setClipboard' } })
-  }
-}
-
-export async function getClipboard(): Promise<string | void> {
-  return Clipboard.getClipboard()
-}
-
-export async function setClipboardImage(imageUrl: string | undefined): Promise<void> {
-  return Clipboard.setClipboardImage(imageUrl)
-}
diff --git a/packages/wallet/src/utils/colors.tsx b/packages/wallet/src/utils/colors.tsx
index 900e6222988..97e544afaf9 100644
--- a/packages/wallet/src/utils/colors.tsx
+++ b/packages/wallet/src/utils/colors.tsx
@@ -1,12 +1,13 @@
 /* eslint-disable max-lines */
 import { useCallback, useEffect, useMemo, useState } from 'react'
 import ImageColors from 'react-native-image-colors'
-import { useIsDarkMode, useSporeColors } from 'ui/src'
-import { ColorKeys, colors as GlobalColors, GlobalPalette, colorsLight } from 'ui/src/theme'
+import { useSporeColors } from 'ui/src'
+import { ColorKeys, colors as GlobalColors, colorsLight, GlobalPalette } from 'ui/src/theme'
 import { assert } from 'utilities/src/errors'
 import { isSVGUri } from 'utilities/src/format/urls'
 import { useAsyncData } from 'utilities/src/react/hooks'
 import { ChainId } from 'wallet/src/constants/chains'
+import { useIsDarkMode } from 'wallet/src/features/appearance/hooks'
 import { hex } from 'wcag-contrast'
 
 export const MIN_COLOR_CONTRAST_THRESHOLD = 3
@@ -315,8 +316,8 @@ const logolessColorSchemes: LogolessColorSchemes = {
     dark: { foreground: '#3271FF', background: '#10143D' },
   },
   [LOGOLESS_COLORS.PURPLE]: {
-    light: { foreground: '#9E62FF', background: '#FAF5FF' },
-    dark: { foreground: '#9E62FF', background: '#1A0040' },
+    light: { foreground: '#883FFF', background: '#FAF5FF' },
+    dark: { foreground: '#883FFF', background: '#1A0040' },
   },
 }
 
diff --git a/packages/wallet/src/utils/currency.ts b/packages/wallet/src/utils/currency.ts
index 1f2215f846b..7ffa265827d 100644
--- a/packages/wallet/src/utils/currency.ts
+++ b/packages/wallet/src/utils/currency.ts
@@ -1,7 +1,7 @@
 import { Currency } from '@uniswap/sdk-core'
 import { LocalizationContextState } from 'wallet/src/features/language/LocalizationContext'
 import { getValidAddress, shortenAddress } from 'wallet/src/utils/addresses'
-import { ValueType, getCurrencyAmount } from 'wallet/src/utils/getCurrencyAmount'
+import { getCurrencyAmount, ValueType } from 'wallet/src/utils/getCurrencyAmount'
 
 export function getFormattedCurrencyAmount(
   currency: Maybe<Currency>,
diff --git a/packages/wallet/src/utils/currencyId.ts b/packages/wallet/src/utils/currencyId.ts
index 21d1d720b11..43c92080595 100644
--- a/packages/wallet/src/utils/currencyId.ts
+++ b/packages/wallet/src/utils/currencyId.ts
@@ -1,6 +1,6 @@
 import { Currency } from '@uniswap/sdk-core'
 import { getNativeAddress, getWrappedNativeAddress } from 'wallet/src/constants/addresses'
-import { ChainId, DEFAULT_NATIVE_ADDRESS } from 'wallet/src/constants/chains'
+import { ChainId } from 'wallet/src/constants/chains'
 import { toSupportedChainId } from 'wallet/src/features/chains/utils'
 import { areAddressesEqual } from './addresses'
 
@@ -113,7 +113,3 @@ export function currencyIdToGraphQLAddress(_currencyId?: string): Address | null
 export function currencyIdToChain(_currencyId: string): ChainId | null {
   return toSupportedChainId(_currencyId.split('-')[0])
 }
-
-export function isDefaultNativeAddress(address: string): boolean {
-  return areAddressesEqual(address, DEFAULT_NATIVE_ADDRESS)
-}
diff --git a/packages/wallet/src/utils/platform/index.ts b/packages/wallet/src/utils/platform/index.ts
index 079e52cf52d..2dbc6c4d32c 100644
--- a/packages/wallet/src/utils/platform/index.ts
+++ b/packages/wallet/src/utils/platform/index.ts
@@ -1,6 +1,6 @@
 import { UAParser } from 'ua-parser-js'
 
-const parser = new UAParser(navigator.userAgent)
+const parser = new UAParser(window.navigator.userAgent)
 const { type } = parser.getDevice()
 const { name } = parser.getBrowser()
 const { name: platform } = parser.getOS()
diff --git a/packages/wallet/src/utils/useDynamicFontSizing.test.ts b/packages/wallet/src/utils/useDynamicFontSizing.test.ts
deleted file mode 100644
index 5fd6b80d3a9..00000000000
--- a/packages/wallet/src/utils/useDynamicFontSizing.test.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { act, renderHook } from '@testing-library/react-native'
-import { LayoutChangeEvent } from 'react-native'
-import { useDynamicFontSizing } from './useDynamicFontSizing'
-
-const MAX_INPUT_FONT_SIZE = 42
-const MIN_INPUT_FONT_SIZE = 28
-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)
-    )
-
-    expect(result.current.fontSize).toBe(MAX_INPUT_FONT_SIZE)
-  })
-
-  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)
-    )
-
-    await act(() => {
-      result.current.onLayout({ nativeEvent: { layout: { width: 100 } } } as LayoutChangeEvent)
-      result.current.onSetFontSize('aaaa')
-    })
-
-    // 100 / 23 = 4.34 - 4 letters should fit in the container
-    expect(result.current.fontSize).toBe(MAX_INPUT_FONT_SIZE)
-  })
-
-  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)
-    )
-
-    await act(() => {
-      result.current.onLayout({ nativeEvent: { layout: { width: 100 } } } as LayoutChangeEvent)
-      result.current.onSetFontSize('aaaaa')
-    })
-
-    // 100 / 23 = 4.34 - 5 letters should not fit in the container
-    expect(result.current.fontSize).toBeLessThan(MAX_INPUT_FONT_SIZE)
-  })
-
-  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)
-    )
-
-    await act(() => {
-      result.current.onLayout({ nativeEvent: { layout: { width: 100 } } } as LayoutChangeEvent)
-      result.current.onSetFontSize('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
-    })
-
-    expect(result.current.fontSize).toBe(MIN_INPUT_FONT_SIZE)
-  })
-})
diff --git a/packages/wallet/src/utils/useDynamicFontSizing.ts b/packages/wallet/src/utils/useDynamicFontSizing.ts
deleted file mode 100644
index 7a39ffec781..00000000000
--- a/packages/wallet/src/utils/useDynamicFontSizing.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import { useCallback, useRef, useState } from 'react'
-import { LayoutChangeEvent } from 'react-native'
-
-export function useDynamicFontSizing(
-  maxCharWidthAtMaxFontSize: number,
-  maxFontSize: number,
-  minFontSize: number
-): {
-  onLayout: (event: LayoutChangeEvent) => void
-  fontSize: number
-  onSetFontSize: (amount: string) => void
-} {
-  const [fontSize, setFontSize] = useState(maxFontSize)
-  const textInputElementWidthRef = useRef(0)
-
-  const onLayout = useCallback((event: LayoutChangeEvent) => {
-    if (textInputElementWidthRef.current) {
-      return
-    }
-
-    const width = event.nativeEvent.layout.width
-    textInputElementWidthRef.current = width
-  }, [])
-
-  const onSetFontSize = useCallback(
-    (amount: string) => {
-      const stringWidth = getStringWidth(amount, maxCharWidthAtMaxFontSize, fontSize, maxFontSize)
-      const scaledSize = fontSize * (textInputElementWidthRef.current / stringWidth)
-      const scaledSizeWithMin = Math.max(scaledSize, minFontSize)
-      const newFontSize = Math.round(Math.min(maxFontSize, scaledSizeWithMin))
-      setFontSize(newFontSize)
-    },
-    [fontSize, maxFontSize, minFontSize, maxCharWidthAtMaxFontSize]
-  )
-
-  return { onLayout, fontSize, onSetFontSize }
-}
-
-const getStringWidth = (
-  value: string,
-  maxCharWidthAtMaxFontSize: number,
-  currentFontSize: number,
-  maxFontSize: number
-): number => {
-  const widthAtMaxFontSize = value.length * maxCharWidthAtMaxFontSize
-  return widthAtMaxFontSize * (currentFontSize / maxFontSize)
-}
diff --git a/scripts/turbo-changed.sh b/scripts/turbo-changed.sh
index a8f5fe4c9ca..bc201b45ae1 100755
--- a/scripts/turbo-changed.sh
+++ b/scripts/turbo-changed.sh
@@ -9,24 +9,19 @@ if [[ ! $command =~ ^(lint|test|typecheck)$ ]]; then
     exit 1
 fi
 
-export NODE_OPTIONS="--max_old_space_size=8192"
-
 # When a GitHub Actions workflow checks out a repository, it does so in a detached HEAD state and merges the PR with the target branch.
 # To filter for all changes from this PR in turbo, we check all changes in the branch against the target branch.
 # HEAD = the merge commit of this PR into the target branch
 # HEAD^1 = last commit on the target branch (typically main)
 
-echo "Is CI mode? $CI"
-
 if [ "$CI" == "true" ]; then
-  turbo run $command --log-prefix=none --concurrency=100% --filter="...[HEAD^1]" -- "$@"
+  turbo run $command --parallel --filter="...[HEAD^1]" -- "$@"
   exit $?
 fi
 
 # If not on CI, run the turbo command with the provided or detected branch and any extra flags 
 # e.g. if you want to run dry mode locally, run `./scripts/turbo.sh lint $(git branch --show-current) --dry`
-cur_branch=$(git branch --show-current)
-branch=${1:-$cur_branch}
+branch=$1
 
 # Check if the branch name is provided
 if [[ -z "$branch" || $branch == -* ]]; then
@@ -37,5 +32,5 @@ fi
 # Shift branch argument, so $@ contains only the extra flags
 shift
 
-turbo run $command --concurrency=100% --filter="...[main...$branch]" -- "$@"
+turbo run $command --parallel --filter="...[main...$branch]" -- "$@"
 
diff --git a/scripts/web-checks-should-run.sh b/scripts/web-checks-should-run.sh
deleted file mode 100755
index 805dd612a63..00000000000
--- a/scripts/web-checks-should-run.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# This script controls whether the web quality checks run in Github
-
-# see: https://github.com/vercel/turbo/blob/main/packages/turbo-ignore/README.md
-npx turbo-ignore @uniswap/interface --fallback=HEAD^
-
-# we get exit 1 if, in the diff of the current branch vs main,
-# there was a change in web (or a sub-dependency of web)
-exit_status=$?
-
-echo "" # separate from the turbo output
-
-if [[ "$exit_status" == 1 ]] ; then
-  echo "✅ - Proceed"
-  echo "CONCLUSION=success" >> "$GITHUB_OUTPUT"
-else
-  echo "🛑 - Cancel"
-  echo "CONCLUSION=fail" >> "$GITHUB_OUTPUT"
-fi
diff --git a/turbo.json b/turbo.json
index 0ce12fbaab8..8316b7a878c 100644
--- a/turbo.json
+++ b/turbo.json
@@ -1,14 +1,9 @@
 {
-  "$schema": "https://turbo.build/schema.json",
+  "baseBranch": "origin/main",
   "pipeline": {
     "prepare": {
       "inputs": [
-        "package.json",
-        "schema.graphql",
-        "scripts/fetch-schema.js",
-        "src/graphql/**",
-        "src/data/**/*.graphql",
-        "src/data/tradingApi/api.json"
+        "package.json"
       ],
       "outputs": [
         "src/**/__generated__/**",
@@ -17,37 +12,6 @@
         "src/abis/types/**",
         "src/constants/tokenLists/**"
       ],
-      "dependsOn": [
-        "graphql:generate"
-      ]
-    },
-    "graphql:schema": {
-      "env": [
-        "THE_GRAPH_SCHEMA_ENDPOINT",
-        "REACT_APP_AWS_API_ENDPOINT"
-      ],
-      "inputs": [
-        "scripts/fetch-schema.js",
-        ".env.production",
-        "graphql.*.ts"
-      ],
-      "outputs": [
-        "schema.graphql"
-      ],
-      "dependsOn": []
-    },
-    "graphql:generate": {
-      "inputs": [
-        "schema.graphql",
-        "scripts/fetch-schema.js",
-        "src/graphql/**",
-        "src/data/**/*.graphql"
-      ],
-      "outputs": [
-        "types-and-hooks.ts",
-        "data/__generated__/*",
-        "graphql/__generated__/*"
-      ],
       "dependsOn": []
     },
     "typecheck": {
@@ -74,7 +38,9 @@
     },
     "test": {
       "dependsOn": [
-        "prepare"
+        "prepare",
+        "typecheck",
+        "lint"
       ]
     },
     "snapshots": {
diff --git a/yarn.lock b/yarn.lock
index 763e2e67291..57481a16198 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -306,49 +306,73 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.23.5, @babel/code-frame@npm:^7.8.3":
-  version: 7.23.5
-  resolution: "@babel/code-frame@npm:7.23.5"
+"@babel/code-frame@npm:^7.0.0, @babel/code-frame@npm:^7.10.4, @babel/code-frame@npm:^7.12.13, @babel/code-frame@npm:^7.16.0, @babel/code-frame@npm:^7.22.13, @babel/code-frame@npm:^7.8.3":
+  version: 7.22.13
+  resolution: "@babel/code-frame@npm:7.22.13"
   dependencies:
-    "@babel/highlight": ^7.23.4
+    "@babel/highlight": ^7.22.13
     chalk: ^2.4.2
-  checksum: d90981fdf56a2824a9b14d19a4c0e8db93633fd488c772624b4e83e0ceac6039a27cd298a247c3214faa952bf803ba23696172ae7e7235f3b97f43ba278c569a
+  checksum: 22e342c8077c8b77eeb11f554ecca2ba14153f707b85294fcf6070b6f6150aae88a7b7436dd88d8c9289970585f3fe5b9b941c5aa3aa26a6d5a8ef3f292da058
   languageName: node
   linkType: hard
 
-"@babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.3, @babel/compat-data@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/compat-data@npm:7.23.5"
-  checksum: 06ce244cda5763295a0ea924728c09bae57d35713b675175227278896946f922a63edf803c322f855a3878323d48d0255a2a3023409d2a123483c8a69ebb4744
+"@babel/compat-data@npm:^7.20.5, @babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.22.9, @babel/compat-data@npm:^7.23.3":
+  version: 7.23.3
+  resolution: "@babel/compat-data@npm:7.23.3"
+  checksum: 52fff649d4e25b10e29e8a9b1c9ef117f44d354273c17b5ef056555f8e5db2429b35df4c38bdfb6865d23133e0fba92e558d31be87bb8457db4ac688646fdbf1
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0, @babel/core@npm:^7.16.0, @babel/core@npm:^7.19.6, @babel/core@npm:^7.20.0, @babel/core@npm:^7.20.5, @babel/core@npm:^7.20.7, @babel/core@npm:^7.21.0, @babel/core@npm:^7.21.3, @babel/core@npm:^7.23.3, @babel/core@npm:^7.7.2, @babel/core@npm:^7.8.0":
-  version: 7.23.9
-  resolution: "@babel/core@npm:7.23.9"
+"@babel/core@npm:7.12.9":
+  version: 7.12.9
+  resolution: "@babel/core@npm:7.12.9"
+  dependencies:
+    "@babel/code-frame": ^7.10.4
+    "@babel/generator": ^7.12.5
+    "@babel/helper-module-transforms": ^7.12.1
+    "@babel/helpers": ^7.12.5
+    "@babel/parser": ^7.12.7
+    "@babel/template": ^7.12.7
+    "@babel/traverse": ^7.12.9
+    "@babel/types": ^7.12.7
+    convert-source-map: ^1.7.0
+    debug: ^4.1.0
+    gensync: ^1.0.0-beta.1
+    json5: ^2.1.2
+    lodash: ^4.17.19
+    resolve: ^1.3.2
+    semver: ^5.4.1
+    source-map: ^0.5.0
+  checksum: 4d34eca4688214a4eb6bd5dde906b69a7824f17b931f52cd03628a8ac94d8fbe15565aebffdde106e974c8738cd64ac62c6a6060baa7139a06db1f18c4ff872d
+  languageName: node
+  linkType: hard
+
+"@babel/core@npm:^7.1.0, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.10, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.16, @babel/core@npm:^7.14.0, @babel/core@npm:^7.16.0, @babel/core@npm:^7.19.6, @babel/core@npm:^7.20.0, @babel/core@npm:^7.20.7, @babel/core@npm:^7.21.0, @babel/core@npm:^7.21.3, @babel/core@npm:^7.21.8, @babel/core@npm:^7.7.2, @babel/core@npm:^7.8.0":
+  version: 7.23.3
+  resolution: "@babel/core@npm:7.23.3"
   dependencies:
     "@ampproject/remapping": ^2.2.0
-    "@babel/code-frame": ^7.23.5
-    "@babel/generator": ^7.23.6
-    "@babel/helper-compilation-targets": ^7.23.6
+    "@babel/code-frame": ^7.22.13
+    "@babel/generator": ^7.23.3
+    "@babel/helper-compilation-targets": ^7.22.15
     "@babel/helper-module-transforms": ^7.23.3
-    "@babel/helpers": ^7.23.9
-    "@babel/parser": ^7.23.9
-    "@babel/template": ^7.23.9
-    "@babel/traverse": ^7.23.9
-    "@babel/types": ^7.23.9
+    "@babel/helpers": ^7.23.2
+    "@babel/parser": ^7.23.3
+    "@babel/template": ^7.22.15
+    "@babel/traverse": ^7.23.3
+    "@babel/types": ^7.23.3
     convert-source-map: ^2.0.0
     debug: ^4.1.0
     gensync: ^1.0.0-beta.2
     json5: ^2.2.3
     semver: ^6.3.1
-  checksum: 634a511f74db52a5f5a283c1121f25e2227b006c095b84a02a40a9213842489cd82dc7d61cdc74e10b5bcd9bb0a4e28bab47635b54c7e2256d47ab57356e2a76
+  checksum: d306c1fa68972f4e085e9e7ad165aee80eb801ef331f6f07808c86309f03534d638b82ad00a3bc08f4d3de4860ccd38512b2790a39e6acc2caf9ea21e526afe7
   languageName: node
   linkType: hard
 
 "@babel/eslint-parser@npm:^7.16.3, @babel/eslint-parser@npm:^7.18.2":
-  version: 7.23.9
-  resolution: "@babel/eslint-parser@npm:7.23.9"
+  version: 7.23.3
+  resolution: "@babel/eslint-parser@npm:7.23.3"
   dependencies:
     "@nicolo-ribaudo/eslint-scope-5-internals": 5.1.1-v1
     eslint-visitor-keys: ^2.1.0
@@ -356,19 +380,19 @@ __metadata:
   peerDependencies:
     "@babel/core": ^7.11.0
     eslint: ^7.5.0 || ^8.0.0
-  checksum: cfb87bc48d005f181807ae8f8357ba9eeb3ece38480084fb5d997bac03ebb4cf709ee197d697f506de8faa7f665fa07579b9b9c2045d86d6c17174b6c1b0c5c9
+  checksum: 9573daebe21af5123c302c307be80cacf1c2bf236a9497068a14726d3944ef55e1282519d0ccf51882dfc369359a3442299c98cb22a419e209924db39d4030fd
   languageName: node
   linkType: hard
 
-"@babel/generator@npm:^7.14.0, @babel/generator@npm:^7.18.13, @babel/generator@npm:^7.20.0, @babel/generator@npm:^7.21.1, @babel/generator@npm:^7.23.3, @babel/generator@npm:^7.23.6, @babel/generator@npm:^7.7.2":
-  version: 7.23.6
-  resolution: "@babel/generator@npm:7.23.6"
+"@babel/generator@npm:^7.12.5, @babel/generator@npm:^7.14.0, @babel/generator@npm:^7.18.13, @babel/generator@npm:^7.20.0, @babel/generator@npm:^7.21.1, @babel/generator@npm:^7.21.5, @babel/generator@npm:^7.23.3, @babel/generator@npm:^7.7.2":
+  version: 7.23.3
+  resolution: "@babel/generator@npm:7.23.3"
   dependencies:
-    "@babel/types": ^7.23.6
+    "@babel/types": ^7.23.3
     "@jridgewell/gen-mapping": ^0.3.2
     "@jridgewell/trace-mapping": ^0.3.17
     jsesc: ^2.5.1
-  checksum: 1a1a1c4eac210f174cd108d479464d053930a812798e09fee069377de39a893422df5b5b146199ead7239ae6d3a04697b45fc9ac6e38e0f6b76374390f91fc6c
+  checksum: b6e71cca852d4e1aa01a28a30b8c74ffc3b8d56ccb7ae3ee783028ee015f63ad861a2e386c3eb490a9a8634db485a503a33521680f4af510151e90346c46da17
   languageName: node
   linkType: hard
 
@@ -390,16 +414,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.6, @babel/helper-compilation-targets@npm:^7.23.6":
-  version: 7.23.6
-  resolution: "@babel/helper-compilation-targets@npm:7.23.6"
+"@babel/helper-compilation-targets@npm:^7.20.7, @babel/helper-compilation-targets@npm:^7.22.15, @babel/helper-compilation-targets@npm:^7.22.6":
+  version: 7.22.15
+  resolution: "@babel/helper-compilation-targets@npm:7.22.15"
   dependencies:
-    "@babel/compat-data": ^7.23.5
-    "@babel/helper-validator-option": ^7.23.5
-    browserslist: ^4.22.2
+    "@babel/compat-data": ^7.22.9
+    "@babel/helper-validator-option": ^7.22.15
+    browserslist: ^4.21.9
     lru-cache: ^5.1.1
     semver: ^6.3.1
-  checksum: c630b98d4527ac8fe2c58d9a06e785dfb2b73ec71b7c4f2ddf90f814b5f75b547f3c015f110a010fd31f76e3864daaf09f3adcd2f6acdbfb18a8de3a48717590
+  checksum: ce85196769e091ae54dd39e4a80c2a9df1793da8588e335c383d536d54f06baf648d0a08fc873044f226398c4ded15c4ae9120ee18e7dfd7c639a68e3cdc9980
   languageName: node
   linkType: hard
 
@@ -494,7 +518,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-module-transforms@npm:^7.23.3":
+"@babel/helper-module-transforms@npm:^7.12.1, @babel/helper-module-transforms@npm:^7.23.3":
   version: 7.23.3
   resolution: "@babel/helper-module-transforms@npm:7.23.3"
   dependencies:
@@ -518,7 +542,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.18.9, @babel/helper-plugin-utils@npm:^7.19.0, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
+"@babel/helper-plugin-utils@npm:^7.0.0, @babel/helper-plugin-utils@npm:^7.10.4, @babel/helper-plugin-utils@npm:^7.12.13, @babel/helper-plugin-utils@npm:^7.14.5, @babel/helper-plugin-utils@npm:^7.16.7, @babel/helper-plugin-utils@npm:^7.18.6, @babel/helper-plugin-utils@npm:^7.18.9, @babel/helper-plugin-utils@npm:^7.19.0, @babel/helper-plugin-utils@npm:^7.20.2, @babel/helper-plugin-utils@npm:^7.21.5, @babel/helper-plugin-utils@npm:^7.22.5, @babel/helper-plugin-utils@npm:^7.8.0, @babel/helper-plugin-utils@npm:^7.8.3":
   version: 7.22.5
   resolution: "@babel/helper-plugin-utils@npm:7.22.5"
   checksum: c0fc7227076b6041acd2f0e818145d2e8c41968cc52fb5ca70eed48e21b8fe6dd88a0a91cbddf4951e33647336eb5ae184747ca706817ca3bef5e9e905151ff5
@@ -578,10 +602,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-string-parser@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/helper-string-parser@npm:7.23.4"
-  checksum: c0641144cf1a7e7dc93f3d5f16d5327465b6cf5d036b48be61ecba41e1eece161b48f46b7f960951b67f8c3533ce506b16dece576baef4d8b3b49f8c65410f90
+"@babel/helper-string-parser@npm:^7.22.5":
+  version: 7.22.5
+  resolution: "@babel/helper-string-parser@npm:7.22.5"
+  checksum: 836851ca5ec813077bbb303acc992d75a360267aa3b5de7134d220411c852a6f17de7c0d0b8c8dcc0f567f67874c00f4528672b2a4f1bc978a3ada64c8c78467
   languageName: node
   linkType: hard
 
@@ -592,10 +616,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helper-validator-option@npm:^7.21.0, @babel/helper-validator-option@npm:^7.22.15, @babel/helper-validator-option@npm:^7.23.5":
-  version: 7.23.5
-  resolution: "@babel/helper-validator-option@npm:7.23.5"
-  checksum: 537cde2330a8aede223552510e8a13e9c1c8798afee3757995a7d4acae564124fe2bf7e7c3d90d62d3657434a74340a274b3b3b1c6f17e9a2be1f48af29cb09e
+"@babel/helper-validator-option@npm:^7.21.0, @babel/helper-validator-option@npm:^7.22.15":
+  version: 7.22.15
+  resolution: "@babel/helper-validator-option@npm:7.22.15"
+  checksum: 68da52b1e10002a543161494c4bc0f4d0398c8fdf361d5f7f4272e95c45d5b32d974896d44f6a0ea7378c9204988879d73613ca683e13bd1304e46d25ff67a8d
   languageName: node
   linkType: hard
 
@@ -610,34 +634,34 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/helpers@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/helpers@npm:7.23.9"
+"@babel/helpers@npm:^7.12.5, @babel/helpers@npm:^7.23.2":
+  version: 7.23.2
+  resolution: "@babel/helpers@npm:7.23.2"
   dependencies:
-    "@babel/template": ^7.23.9
-    "@babel/traverse": ^7.23.9
-    "@babel/types": ^7.23.9
-  checksum: 2678231192c0471dbc2fc403fb19456cc46b1afefcfebf6bc0f48b2e938fdb0fef2e0fe90c8c8ae1f021dae5012b700372e4b5d15867f1d7764616532e4a6324
+    "@babel/template": ^7.22.15
+    "@babel/traverse": ^7.23.2
+    "@babel/types": ^7.23.0
+  checksum: aaf4828df75ec460eaa70e5c9f66e6dadc28dae3728ddb7f6c13187dbf38030e142194b83d81aa8a31bbc35a5529a5d7d3f3cf59d5d0b595f5dd7f9d8f1ced8e
   languageName: node
   linkType: hard
 
-"@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.23.4":
-  version: 7.23.4
-  resolution: "@babel/highlight@npm:7.23.4"
+"@babel/highlight@npm:^7.10.4, @babel/highlight@npm:^7.22.13":
+  version: 7.22.20
+  resolution: "@babel/highlight@npm:7.22.20"
   dependencies:
     "@babel/helper-validator-identifier": ^7.22.20
     chalk: ^2.4.2
     js-tokens: ^4.0.0
-  checksum: 643acecdc235f87d925979a979b539a5d7d1f31ae7db8d89047269082694122d11aa85351304c9c978ceeb6d250591ccadb06c366f358ccee08bb9c122476b89
+  checksum: 84bd034dca309a5e680083cd827a766780ca63cef37308404f17653d32366ea76262bd2364b2d38776232f2d01b649f26721417d507e8b4b6da3e4e739f6d134
   languageName: node
   linkType: hard
 
-"@babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.1.6, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.8, @babel/parser@npm:^7.20.0, @babel/parser@npm:^7.21.2, @babel/parser@npm:^7.21.4, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.23.3, @babel/parser@npm:^7.23.5, @babel/parser@npm:^7.23.9":
-  version: 7.23.9
-  resolution: "@babel/parser@npm:7.23.9"
+"@babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.1.6, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.13.16, @babel/parser@npm:^7.14.0, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.8, @babel/parser@npm:^7.20.0, @babel/parser@npm:^7.21.2, @babel/parser@npm:^7.21.4, @babel/parser@npm:^7.21.8, @babel/parser@npm:^7.22.15, @babel/parser@npm:^7.23.0, @babel/parser@npm:^7.23.3, @babel/parser@npm:^7.23.5":
+  version: 7.23.6
+  resolution: "@babel/parser@npm:7.23.6"
   bin:
     parser: ./bin/babel-parser.js
-  checksum: e7cd4960ac8671774e13803349da88d512f9292d7baa952173260d3e8f15620a28a3701f14f709d769209022f9e7b79965256b8be204fc550cfe783cdcabe7c7
+  checksum: 140801c43731a6c41fd193f5c02bc71fd647a0360ca616b23d2db8be4b9739b9f951a03fc7c2db4f9b9214f4b27c1074db0f18bc3fa653783082d5af7c8860d5
   languageName: node
   linkType: hard
 
@@ -1977,7 +2001,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/preset-typescript@npm:^7.13.0, @babel/preset-typescript@npm:^7.16.0, @babel/preset-typescript@npm:^7.16.7, @babel/preset-typescript@npm:^7.18.6, @babel/preset-typescript@npm:^7.21.0":
+"@babel/preset-typescript@npm:^7.13.0, @babel/preset-typescript@npm:^7.16.0, @babel/preset-typescript@npm:^7.16.7, @babel/preset-typescript@npm:^7.21.0":
   version: 7.23.3
   resolution: "@babel/preset-typescript@npm:7.23.3"
   dependencies:
@@ -2033,7 +2057,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.20.6, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
+"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.10.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.12.1, @babel/runtime@npm:^7.12.13, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.14.5, @babel/runtime@npm:^7.16.3, @babel/runtime@npm:^7.17.2, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.18.6, @babel/runtime@npm:^7.20.0, @babel/runtime@npm:^7.20.13, @babel/runtime@npm:^7.20.6, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.21.5, @babel/runtime@npm:^7.23.2, @babel/runtime@npm:^7.4.4, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.6.2, @babel/runtime@npm:^7.6.3, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4, @babel/runtime@npm:^7.9.2":
   version: 7.23.4
   resolution: "@babel/runtime@npm:7.23.4"
   dependencies:
@@ -2042,43 +2066,43 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/template@npm:^7.0.0, @babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7, @babel/template@npm:^7.22.15, @babel/template@npm:^7.23.9, @babel/template@npm:^7.3.3":
-  version: 7.23.9
-  resolution: "@babel/template@npm:7.23.9"
+"@babel/template@npm:^7.0.0, @babel/template@npm:^7.12.7, @babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7, @babel/template@npm:^7.22.15, @babel/template@npm:^7.3.3":
+  version: 7.22.15
+  resolution: "@babel/template@npm:7.22.15"
   dependencies:
-    "@babel/code-frame": ^7.23.5
-    "@babel/parser": ^7.23.9
-    "@babel/types": ^7.23.9
-  checksum: 6e67414c0f7125d7ecaf20c11fab88085fa98a96c3ef10da0a61e962e04fdf3a18a496a66047005ddd1bb682a7cc7842d556d1db2f3f3f6ccfca97d5e445d342
+    "@babel/code-frame": ^7.22.13
+    "@babel/parser": ^7.22.15
+    "@babel/types": ^7.22.15
+  checksum: 1f3e7dcd6c44f5904c184b3f7fe280394b191f2fed819919ffa1e529c259d5b197da8981b6ca491c235aee8dbad4a50b7e31304aa531271cb823a4a24a0dd8fd
   languageName: node
   linkType: hard
 
-"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.20.0, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.3, @babel/traverse@npm:^7.23.9, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.2, @babel/traverse@npm:^7.7.4":
-  version: 7.23.9
-  resolution: "@babel/traverse@npm:7.23.9"
+"@babel/traverse@npm:^7.1.6, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.14.0, @babel/traverse@npm:^7.16.8, @babel/traverse@npm:^7.20.0, @babel/traverse@npm:^7.21.5, @babel/traverse@npm:^7.23.2, @babel/traverse@npm:^7.23.3, @babel/traverse@npm:^7.4.5, @babel/traverse@npm:^7.7.2, @babel/traverse@npm:^7.7.4":
+  version: 7.23.3
+  resolution: "@babel/traverse@npm:7.23.3"
   dependencies:
-    "@babel/code-frame": ^7.23.5
-    "@babel/generator": ^7.23.6
+    "@babel/code-frame": ^7.22.13
+    "@babel/generator": ^7.23.3
     "@babel/helper-environment-visitor": ^7.22.20
     "@babel/helper-function-name": ^7.23.0
     "@babel/helper-hoist-variables": ^7.22.5
     "@babel/helper-split-export-declaration": ^7.22.6
-    "@babel/parser": ^7.23.9
-    "@babel/types": ^7.23.9
-    debug: ^4.3.1
+    "@babel/parser": ^7.23.3
+    "@babel/types": ^7.23.3
+    debug: ^4.1.0
     globals: ^11.1.0
-  checksum: a932f7aa850e158c00c97aad22f639d48c72805c687290f6a73e30c5c4957c07f5d28310c9bf59648e2980fe6c9d16adeb2ff92a9ca0f97fa75739c1328fc6c3
+  checksum: f4e0c05f2f82368b9be7e1fed38cfcc2e1074967a8b76ac837b89661adbd391e99d0b1fd8c31215ffc3a04d2d5d7ee5e627914a09082db84ec5606769409fe2b
   languageName: node
   linkType: hard
 
-"@babel/types@npm:^7.0.0, @babel/types@npm:^7.1.6, @babel/types@npm:^7.12.6, @babel/types@npm:^7.16.8, @babel/types@npm:^7.18.13, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.2, @babel/types@npm:^7.21.3, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.3, @babel/types@npm:^7.23.6, @babel/types@npm:^7.23.9, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
-  version: 7.23.9
-  resolution: "@babel/types@npm:7.23.9"
+"@babel/types@npm:^7.0.0, @babel/types@npm:^7.1.6, @babel/types@npm:^7.12.6, @babel/types@npm:^7.12.7, @babel/types@npm:^7.16.8, @babel/types@npm:^7.18.13, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.2, @babel/types@npm:^7.21.3, @babel/types@npm:^7.21.5, @babel/types@npm:^7.22.15, @babel/types@npm:^7.22.19, @babel/types@npm:^7.22.5, @babel/types@npm:^7.23.0, @babel/types@npm:^7.23.3, @babel/types@npm:^7.3.3, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3":
+  version: 7.23.3
+  resolution: "@babel/types@npm:7.23.3"
   dependencies:
-    "@babel/helper-string-parser": ^7.23.4
+    "@babel/helper-string-parser": ^7.22.5
     "@babel/helper-validator-identifier": ^7.22.20
     to-fast-properties: ^2.0.0
-  checksum: 0a9b008e9bfc89beb8c185e620fa0f8ed6c771f1e1b2e01e1596870969096fec7793898a1d64a035176abf1dd13e2668ee30bf699f2d92c210a8128f4b151e65
+  checksum: b96f1ec495351aeb2a5f98dd494aafa17df02a351548ae96999460f35c933261c839002a34c1e83552ff0d9f5e94d0b5b8e105d38131c7c9b0f5a6588676f35d
   languageName: node
   linkType: hard
 
@@ -3076,7 +3100,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint-community/eslint-utils@npm:^4.2.0, @eslint-community/eslint-utils@npm:^4.4.0":
+"@eslint-community/eslint-utils@npm:^4.2.0":
   version: 4.4.0
   resolution: "@eslint-community/eslint-utils@npm:4.4.0"
   dependencies:
@@ -3087,7 +3111,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1":
+"@eslint-community/regexpp@npm:^4.4.0, @eslint-community/regexpp@npm:^4.6.1":
   version: 4.10.0
   resolution: "@eslint-community/regexpp@npm:4.10.0"
   checksum: 2a6e345429ea8382aaaf3a61f865cae16ed44d31ca917910033c02dc00d505d939f10b81e079fa14d43b51499c640138e153b7e40743c4c094d9df97d4e56f7b
@@ -4012,67 +4036,57 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@floating-ui/core@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "@floating-ui/core@npm:1.6.0"
-  dependencies:
-    "@floating-ui/utils": ^0.2.1
-  checksum: 2e25c53b0c124c5c9577972f8ae21d081f2f7895e6695836a53074463e8c65b47722744d6d2b5a993164936da006a268bcfe87fe68fd24dc235b1cb86bed3127
+"@floating-ui/core@npm:^1.3.0, @floating-ui/core@npm:^1.3.1":
+  version: 1.3.1
+  resolution: "@floating-ui/core@npm:1.3.1"
+  checksum: fe3b40fcaec95b0825c01a98330ae75b60c61c395ca012055a32f9c22ab97fde8ce1bd14fce3d242beb9dbe4564c90ce4a7a767851911d4215b9ec7721440e5b
   languageName: node
   linkType: hard
 
-"@floating-ui/dom@npm:^1.6.1":
-  version: 1.6.1
-  resolution: "@floating-ui/dom@npm:1.6.1"
+"@floating-ui/dom@npm:^1.3.0":
+  version: 1.4.2
+  resolution: "@floating-ui/dom@npm:1.4.2"
   dependencies:
-    "@floating-ui/core": ^1.6.0
-    "@floating-ui/utils": ^0.2.1
-  checksum: 5565e4dee612bab62950913c311d75d3f773bd1d9dc437f7e33b46340f32ec565733c995c6185381adaf64e627df3c79901d0a9d555f58c02509d0764bceb57d
+    "@floating-ui/core": ^1.3.1
+  checksum: aede0dbdba0772782fbc284d086cc6a922bd97bdb72ee72a75d0623683d3898af85aa8c71c6ef1b6bfc1bba54398898ccdee51f49c33e317142c9593ee250d06
   languageName: node
   linkType: hard
 
-"@floating-ui/react-dom@npm:^2.0.6, @floating-ui/react-dom@npm:^2.0.8":
-  version: 2.0.8
-  resolution: "@floating-ui/react-dom@npm:2.0.8"
+"@floating-ui/react-dom@npm:^2.0.1":
+  version: 2.0.1
+  resolution: "@floating-ui/react-dom@npm:2.0.1"
   dependencies:
-    "@floating-ui/dom": ^1.6.1
+    "@floating-ui/dom": ^1.3.0
   peerDependencies:
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: 5da7f13a69281e38859a3203a608fe9de1d850b332b355c10c0c2427c7b7209a0374c10f6295b6577c1a70237af8b678340bd4cc0a4b1c66436a94755d81e526
+  checksum: 00fef2cf69ac2b15952e47505fd9e23f6cc5c20a26adc707862932826d1682f3c30f83c9887abfc93574fdca2d34dd2fc00271527318b1db403549cd6bc9eb00
   languageName: node
   linkType: hard
 
-"@floating-ui/react-native@npm:^0.10.3":
-  version: 0.10.4
-  resolution: "@floating-ui/react-native@npm:0.10.4"
+"@floating-ui/react-native@npm:^0.10.1":
+  version: 0.10.1
+  resolution: "@floating-ui/react-native@npm:0.10.1"
   dependencies:
-    "@floating-ui/core": ^1.6.0
+    "@floating-ui/core": ^1.3.0
   peerDependencies:
     react: ">=16.8.0"
     react-native: ">=0.64.0"
-  checksum: bc13291345380cc16a5be45353c606b949995c38215cc0c41e66ce39db1f85102ac3cb5ba2280a1df05e67d432c0912d3a91fa7481723dbde2525403937da8a6
+  checksum: 46d666616646d123bb014585260c717954ac475aefa2152e37df2899659828b7e873353f95b3022a34d2947f4cc8064ed24402e3c55ca41046c1de768e9dbba2
   languageName: node
   linkType: hard
 
-"@floating-ui/react@npm:^0.26.6":
-  version: 0.26.8
-  resolution: "@floating-ui/react@npm:0.26.8"
+"@floating-ui/react@npm:^0.24.7":
+  version: 0.24.8
+  resolution: "@floating-ui/react@npm:0.24.8"
   dependencies:
-    "@floating-ui/react-dom": ^2.0.8
-    "@floating-ui/utils": ^0.2.1
+    "@floating-ui/react-dom": ^2.0.1
+    aria-hidden: ^1.2.3
     tabbable: ^6.0.1
   peerDependencies:
     react: ">=16.8.0"
     react-dom: ">=16.8.0"
-  checksum: 7ceeb2df46bb82c4703b93c12d80f431230502591dabb8c1214b01c6bfae0c496aad8d0dcb7dab4033c136c4811e731323fb61f2fdc5703e599097017d617fa0
-  languageName: node
-  linkType: hard
-
-"@floating-ui/utils@npm:^0.2.1":
-  version: 0.2.1
-  resolution: "@floating-ui/utils@npm:0.2.1"
-  checksum: 9ed4380653c7c217cd6f66ae51f20fdce433730dbc77f95b5abfb5a808f5fdb029c6ae249b4e0490a816f2453aa6e586d9a873cd157fdba4690f65628efc6e06
+  checksum: b345d3bbb7b1eb4a8d09bb5cb0c46713b0b051578a1bb15fb49708b27009dcb992cdd55ffc79ae56d7e4494ce122f6e971e7d2737c9a2bffd88cb2408230f9af
   languageName: node
   linkType: hard
 
@@ -4245,28 +4259,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@gorhom/bottom-sheet@patch:@gorhom/bottom-sheet@npm%3A4.5.1#./.yarn/patches/@gorhom-bottom-sheet-npm-4.5.1-d8ef5d483d.patch::locator=universe%40workspace%3A.":
-  version: 4.5.1
-  resolution: "@gorhom/bottom-sheet@patch:@gorhom/bottom-sheet@npm%3A4.5.1#./.yarn/patches/@gorhom-bottom-sheet-npm-4.5.1-d8ef5d483d.patch::version=4.5.1&hash=b56743&locator=universe%40workspace%3A."
-  dependencies:
-    "@gorhom/portal": 1.0.14
-    invariant: ^2.2.4
-  peerDependencies:
-    "@types/react": "*"
-    "@types/react-native": "*"
-    react: "*"
-    react-native: "*"
-    react-native-gesture-handler: ">=1.10.1"
-    react-native-reanimated: ">=2.2.0"
-  peerDependenciesMeta:
-    "@types/react":
-      optional: true
-    "@types/react-native":
-      optional: true
-  checksum: a576f1aa155348d0f98bcce0f86f91d23f740f55974946141e07515ac4983be1497d50e7b7d0d0cd43065c3d84b0960304603f9a419b7367938ae6778267c12b
-  languageName: node
-  linkType: hard
-
 "@gorhom/portal@npm:1.0.14":
   version: 1.0.14
   resolution: "@gorhom/portal@npm:1.0.14"
@@ -5093,13 +5085,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@isaacs/string-locale-compare@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@isaacs/string-locale-compare@npm:1.1.0"
-  checksum: 7287da5d11497b82c542d3c2abe534808015be4f4883e71c26853277b5456f6bbe4108535db847a29f385ad6dc9318ffb0f55ee79bb5f39993233d7dccf8751d
-  languageName: node
-  linkType: hard
-
 "@istanbuljs/load-nyc-config@npm:^1.0.0":
   version: 1.1.0
   resolution: "@istanbuljs/load-nyc-config@npm:1.1.0"
@@ -5806,7 +5791,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.13, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15":
+"@jridgewell/sourcemap-codec@npm:^1.4.10, @jridgewell/sourcemap-codec@npm:^1.4.14, @jridgewell/sourcemap-codec@npm:^1.4.15":
   version: 1.4.15
   resolution: "@jridgewell/sourcemap-codec@npm:1.4.15"
   checksum: b881c7e503db3fc7f3c1f35a1dd2655a188cc51a3612d76efc8a6eb74728bef5606e6758ee77423e564092b4a518aba569bbb21c9bac5ab7a35b0c6ae7e344c8
@@ -6006,13 +5991,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@lukeed/csprng@npm:^1.0.0":
-  version: 1.1.0
-  resolution: "@lukeed/csprng@npm:1.1.0"
-  checksum: 926f5f7fc629470ca9a8af355bfcd0271d34535f7be3890f69902432bddc3262029bb5dbe9025542cf6c9883d878692eef2815fc2f3ba5b92e9da1f9eba2e51b
-  languageName: node
-  linkType: hard
-
 "@manypkg/cli@npm:^0.19.2":
   version: 0.19.2
   resolution: "@manypkg/cli@npm:0.19.2"
@@ -6227,64 +6205,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@nestjs/axios@npm:3.0.1":
-  version: 3.0.1
-  resolution: "@nestjs/axios@npm:3.0.1"
-  peerDependencies:
-    "@nestjs/common": ^7.0.0 || ^8.0.0 || ^9.0.0 || ^10.0.0
-    axios: ^1.3.1
-    reflect-metadata: ^0.1.12
-    rxjs: ^6.0.0 || ^7.0.0
-  checksum: 01cebc64efa7a1d9df7a9053fbc5124986a95078789a0f280a2a61c31601a70a35745e07fc385497b4f85c7bdb6216a3575728646f1e6e684c038ac31900129c
-  languageName: node
-  linkType: hard
-
-"@nestjs/common@npm:10.3.0":
-  version: 10.3.0
-  resolution: "@nestjs/common@npm:10.3.0"
+"@next/eslint-plugin-next@npm:13.2.4":
+  version: 13.2.4
+  resolution: "@next/eslint-plugin-next@npm:13.2.4"
   dependencies:
-    iterare: 1.2.1
-    tslib: 2.6.2
-    uid: 2.0.2
-  peerDependencies:
-    class-transformer: "*"
-    class-validator: "*"
-    reflect-metadata: ^0.1.12
-    rxjs: ^7.1.0
-  peerDependenciesMeta:
-    class-transformer:
-      optional: true
-    class-validator:
-      optional: true
-  checksum: c5444cb46bd4f4a4d28b5031f7c28a0cf9863bc2d5518910bfed6a49734f59e1ea08dd4651e2117ae82df81c933ef84f0963c5cdeee5ef1608cf1bd36ee291c5
-  languageName: node
-  linkType: hard
-
-"@nestjs/core@npm:10.3.0":
-  version: 10.3.0
-  resolution: "@nestjs/core@npm:10.3.0"
-  dependencies:
-    "@nuxtjs/opencollective": 0.3.2
-    fast-safe-stringify: 2.1.1
-    iterare: 1.2.1
-    path-to-regexp: 3.2.0
-    tslib: 2.6.2
-    uid: 2.0.2
-  peerDependencies:
-    "@nestjs/common": ^10.0.0
-    "@nestjs/microservices": ^10.0.0
-    "@nestjs/platform-express": ^10.0.0
-    "@nestjs/websockets": ^10.0.0
-    reflect-metadata: ^0.1.12
-    rxjs: ^7.1.0
-  peerDependenciesMeta:
-    "@nestjs/microservices":
-      optional: true
-    "@nestjs/platform-express":
-      optional: true
-    "@nestjs/websockets":
-      optional: true
-  checksum: 7677b9fb97c8dec512c2a736c273ef08698b377af8c046bc5aad442ba3d35acbc17d177e76bf44a66678cae2ced2d265183e85be4190c501a195f16496df6396
+    glob: 7.1.7
+  checksum: 95f9a84922ec1c73aa51b794f9d2dc49c165a1c793db17cab4558097d31aaf65c2e5e3390d0691c056fac105562d6dc974b13b1df79981f8b7faba005f6eb3b5
   languageName: node
   linkType: hard
 
@@ -6637,85 +6563,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/arborist@npm:^5.6.3":
-  version: 5.6.3
-  resolution: "@npmcli/arborist@npm:5.6.3"
-  dependencies:
-    "@isaacs/string-locale-compare": ^1.1.0
-    "@npmcli/installed-package-contents": ^1.0.7
-    "@npmcli/map-workspaces": ^2.0.3
-    "@npmcli/metavuln-calculator": ^3.0.1
-    "@npmcli/move-file": ^2.0.0
-    "@npmcli/name-from-folder": ^1.0.1
-    "@npmcli/node-gyp": ^2.0.0
-    "@npmcli/package-json": ^2.0.0
-    "@npmcli/query": ^1.2.0
-    "@npmcli/run-script": ^4.1.3
-    bin-links: ^3.0.3
-    cacache: ^16.1.3
-    common-ancestor-path: ^1.0.1
-    hosted-git-info: ^5.2.1
-    json-parse-even-better-errors: ^2.3.1
-    json-stringify-nice: ^1.1.4
-    minimatch: ^5.1.0
-    mkdirp: ^1.0.4
-    mkdirp-infer-owner: ^2.0.0
-    nopt: ^6.0.0
-    npm-install-checks: ^5.0.0
-    npm-package-arg: ^9.0.0
-    npm-pick-manifest: ^7.0.2
-    npm-registry-fetch: ^13.0.0
-    npmlog: ^6.0.2
-    pacote: ^13.6.1
-    parse-conflict-json: ^2.0.1
-    proc-log: ^2.0.0
-    promise-all-reject-late: ^1.0.0
-    promise-call-limit: ^1.0.1
-    read-package-json-fast: ^2.0.2
-    readdir-scoped-modules: ^1.1.0
-    rimraf: ^3.0.2
-    semver: ^7.3.7
-    ssri: ^9.0.0
-    treeverse: ^2.0.0
-    walk-up-path: ^1.0.0
-  bin:
-    arborist: bin/index.js
-  checksum: e0982108ca349d3d22d8072806941d6c7cef0cb73a4484befd6450271b35065f77178630510347b753e964e979081d306708e17a56558b386c6f7e307dd537e9
-  languageName: node
-  linkType: hard
-
-"@npmcli/ci-detect@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@npmcli/ci-detect@npm:2.0.0"
-  checksum: 26e964eca908706c1a612915cbc5614860ac7dbfacbb07870396c82b1377794f123a7aaa821c4a68575b67ff7e3ad170e296d3aa6a5e03dbab9b3f1e61491812
-  languageName: node
-  linkType: hard
-
-"@npmcli/config@npm:^4.2.1":
-  version: 4.2.2
-  resolution: "@npmcli/config@npm:4.2.2"
-  dependencies:
-    "@npmcli/map-workspaces": ^2.0.2
-    ini: ^3.0.0
-    mkdirp-infer-owner: ^2.0.0
-    nopt: ^6.0.0
-    proc-log: ^2.0.0
-    read-package-json-fast: ^2.0.3
-    semver: ^7.3.5
-    walk-up-path: ^1.0.0
-  checksum: a4b7231374b14da2f7ac4da67218ceb6591f459d93a5e52f054518316bf86e33b08bd6bab1a4e4fed794f2606accc8e6c62d720ffdd5cc7e785546f1f0436ea4
-  languageName: node
-  linkType: hard
-
-"@npmcli/disparity-colors@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@npmcli/disparity-colors@npm:2.0.0"
-  dependencies:
-    ansi-styles: ^4.3.0
-  checksum: 2e85d371bb2a705c119b0eb350beab0a67ff84f13097719f20bacae7fe6d3187b9aec33b7f27553d0774a209937c5f587f049e1a5274b3288a8456357fd2a795
-  languageName: node
-  linkType: hard
-
 "@npmcli/fs@npm:^1.0.0":
   version: 1.1.1
   resolution: "@npmcli/fs@npm:1.1.1"
@@ -6726,7 +6573,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/fs@npm:^2.1.0, @npmcli/fs@npm:^2.1.1":
+"@npmcli/fs@npm:^2.1.0":
   version: 2.1.2
   resolution: "@npmcli/fs@npm:2.1.2"
   dependencies:
@@ -6736,59 +6583,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/git@npm:^3.0.0":
-  version: 3.0.2
-  resolution: "@npmcli/git@npm:3.0.2"
-  dependencies:
-    "@npmcli/promise-spawn": ^3.0.0
-    lru-cache: ^7.4.4
-    mkdirp: ^1.0.4
-    npm-pick-manifest: ^7.0.0
-    proc-log: ^2.0.0
-    promise-inflight: ^1.0.1
-    promise-retry: ^2.0.1
-    semver: ^7.3.5
-    which: ^2.0.2
-  checksum: bdfd1229bb1113ad4883ef89b74b5dc442a2c96225d830491dd0dec4fa83d083b93cde92b6978d4956a8365521e61bc8dc1891fb905c7c693d5d6aa178f2ab44
-  languageName: node
-  linkType: hard
-
-"@npmcli/installed-package-contents@npm:^1.0.7":
-  version: 1.0.7
-  resolution: "@npmcli/installed-package-contents@npm:1.0.7"
-  dependencies:
-    npm-bundled: ^1.1.1
-    npm-normalize-package-bin: ^1.0.1
-  bin:
-    installed-package-contents: index.js
-  checksum: a4a29b99d439827ce2e7817c1f61b56be160e640696e31dc513a2c8a37c792f75cdb6258ec15a1e22904f20df0a8a3019dd3766de5e6619f259834cf64233538
-  languageName: node
-  linkType: hard
-
-"@npmcli/map-workspaces@npm:^2.0.2, @npmcli/map-workspaces@npm:^2.0.3":
-  version: 2.0.4
-  resolution: "@npmcli/map-workspaces@npm:2.0.4"
-  dependencies:
-    "@npmcli/name-from-folder": ^1.0.1
-    glob: ^8.0.1
-    minimatch: ^5.0.1
-    read-package-json-fast: ^2.0.3
-  checksum: cc8d662ac5115ad9822742a11e11d2d32eda74214bd0f4efec30c9cd833975b5b4c8409fe54ddbb451b040b17a943f770976506cba0f26cfccd58d99b5880d6f
-  languageName: node
-  linkType: hard
-
-"@npmcli/metavuln-calculator@npm:^3.0.1":
-  version: 3.1.1
-  resolution: "@npmcli/metavuln-calculator@npm:3.1.1"
-  dependencies:
-    cacache: ^16.0.0
-    json-parse-even-better-errors: ^2.3.1
-    pacote: ^13.0.3
-    semver: ^7.3.5
-  checksum: dc9846fdb82a1f4274ff8943f81452c75615bd9bca523c862956ea2c32e18c5a4be5572e169104d3a0eb262b7ede72c8dbbc202a4ab3b3f4946fa55f226dcc64
-  languageName: node
-  linkType: hard
-
 "@npmcli/move-file@npm:^1.0.1":
   version: 1.1.2
   resolution: "@npmcli/move-file@npm:1.1.2"
@@ -6809,75 +6603,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@npmcli/name-from-folder@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "@npmcli/name-from-folder@npm:1.0.1"
-  checksum: 67339f4096e32b712d2df0250cc95c087569f09e657d7f81a1760fa2cc5123e29c3c3e1524388832310ba2d96ec4679985b643b44627f6a51f4a00c3b0075de9
-  languageName: node
-  linkType: hard
-
-"@npmcli/node-gyp@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@npmcli/node-gyp@npm:2.0.0"
-  checksum: b6bbf0015000f9b64d31aefdc30f244b0348c57adb64017667e0304e96c38644d83da46a4581252652f5d606268df49118f9c9993b41d8020f62b7b15dd2c8d8
-  languageName: node
-  linkType: hard
-
-"@npmcli/package-json@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "@npmcli/package-json@npm:2.0.0"
-  dependencies:
-    json-parse-even-better-errors: ^2.3.1
-  checksum: 7a598e42d2778654ec87438ebfafbcbafbe5a5f5e89ed2ca1db6ca3f94ef14655e304aa41f77632a2a3f5c66b6bd5960bd9370e0ceb4902ea09346720364f9e4
-  languageName: node
-  linkType: hard
-
-"@npmcli/promise-spawn@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@npmcli/promise-spawn@npm:3.0.0"
-  dependencies:
-    infer-owner: ^1.0.4
-  checksum: 3454465a2731cea5875ba51f80873e2205e5bd878c31517286b0ede4ea931c7bf3de895382287e906d03710fff6f9e44186bd0eee068ce578901c5d3b58e7692
-  languageName: node
-  linkType: hard
-
-"@npmcli/query@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "@npmcli/query@npm:1.2.0"
-  dependencies:
-    npm-package-arg: ^9.1.0
-    postcss-selector-parser: ^6.0.10
-    semver: ^7.3.7
-  checksum: 2fbefe864d5c942b169264eea3bac55746b8900443114bbca970b87f9e5d20073a66dfea87864e5c5198697086b0fb4af1d29829832a5ee2a995695b1934217c
-  languageName: node
-  linkType: hard
-
-"@npmcli/run-script@npm:^4.1.0, @npmcli/run-script@npm:^4.1.3, @npmcli/run-script@npm:^4.2.0, @npmcli/run-script@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "@npmcli/run-script@npm:4.2.1"
-  dependencies:
-    "@npmcli/node-gyp": ^2.0.0
-    "@npmcli/promise-spawn": ^3.0.0
-    node-gyp: ^9.0.0
-    read-package-json-fast: ^2.0.3
-    which: ^2.0.2
-  checksum: 7b8d6676353f157e68b26baf848e01e5d887bcf90ce81a52f23fc9a5d93e6ffb60057532d664cfd7aeeb76d464d0c8b0d314ee6cccb56943acb3b6c570b756c8
-  languageName: node
-  linkType: hard
-
-"@nuxtjs/opencollective@npm:0.3.2":
-  version: 0.3.2
-  resolution: "@nuxtjs/opencollective@npm:0.3.2"
-  dependencies:
-    chalk: ^4.1.0
-    consola: ^2.15.0
-    node-fetch: ^2.6.1
-  bin:
-    opencollective: bin/opencollective.js
-  checksum: fd3737c12edf55b5c2279674664c3ed5e756410ea82e9cd324c3f0e032ed5ccd8df1959ec69ea97f2f1c9c33c884aae3d7a7108a73ea0faa90d74ea47cf364d4
-  languageName: node
-  linkType: hard
-
 "@octokit/auth-token@npm:^2.4.4":
   version: 2.5.0
   resolution: "@octokit/auth-token@npm:2.5.0"
@@ -6887,13 +6612,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/auth-token@npm:^3.0.0":
-  version: 3.0.4
-  resolution: "@octokit/auth-token@npm:3.0.4"
-  checksum: 42f533a873d4192e6df406b3176141c1f95287423ebdc4cf23a38bb77ee00ccbc0e60e3fbd5874234fc2ed2e67bbc6035e3b0561dacc1d078adb5c4ced3579e3
-  languageName: node
-  linkType: hard
-
 "@octokit/core@npm:^3.5.1":
   version: 3.6.0
   resolution: "@octokit/core@npm:3.6.0"
@@ -6909,21 +6627,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/core@npm:^4.2.1":
-  version: 4.2.4
-  resolution: "@octokit/core@npm:4.2.4"
-  dependencies:
-    "@octokit/auth-token": ^3.0.0
-    "@octokit/graphql": ^5.0.0
-    "@octokit/request": ^6.0.0
-    "@octokit/request-error": ^3.0.0
-    "@octokit/types": ^9.0.0
-    before-after-hook: ^2.2.0
-    universal-user-agent: ^6.0.0
-  checksum: ac8ab47440a31b0228a034aacac6994b64d6b073ad5b688b4c5157fc5ee0d1af1c926e6087bf17fd7244ee9c5998839da89065a90819bde4a97cb77d4edf58a6
-  languageName: node
-  linkType: hard
-
 "@octokit/endpoint@npm:^6.0.1":
   version: 6.0.12
   resolution: "@octokit/endpoint@npm:6.0.12"
@@ -6935,17 +6638,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/endpoint@npm:^7.0.0":
-  version: 7.0.6
-  resolution: "@octokit/endpoint@npm:7.0.6"
-  dependencies:
-    "@octokit/types": ^9.0.0
-    is-plain-object: ^5.0.0
-    universal-user-agent: ^6.0.0
-  checksum: 7caebf30ceec50eb7f253341ed419df355232f03d4638a95c178ee96620400db7e4a5e15d89773fe14db19b8653d4ab4cc81b2e93ca0c760b4e0f7eb7ad80301
-  languageName: node
-  linkType: hard
-
 "@octokit/graphql@npm:^4.5.8":
   version: 4.8.0
   resolution: "@octokit/graphql@npm:4.8.0"
@@ -6957,17 +6649,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/graphql@npm:^5.0.0":
-  version: 5.0.6
-  resolution: "@octokit/graphql@npm:5.0.6"
-  dependencies:
-    "@octokit/request": ^6.0.0
-    "@octokit/types": ^9.0.0
-    universal-user-agent: ^6.0.0
-  checksum: 7be545d348ef31dcab0a2478dd64d5746419a2f82f61459c774602bcf8a9b577989c18001f50b03f5f61a3d9e34203bdc021a4e4d75ff2d981e8c9c09cf8a65c
-  languageName: node
-  linkType: hard
-
 "@octokit/openapi-types@npm:^12.11.0":
   version: 12.11.0
   resolution: "@octokit/openapi-types@npm:12.11.0"
@@ -6975,13 +6656,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/openapi-types@npm:^18.0.0":
-  version: 18.1.1
-  resolution: "@octokit/openapi-types@npm:18.1.1"
-  checksum: 94f42977fd2fcb9983c781fd199bc11218885a1226d492680bfb1268524a1b2af48a768eef90c63b80a2874437de641d59b3b7f640a5afa93e7c21fe1a79069a
-  languageName: node
-  linkType: hard
-
 "@octokit/plugin-paginate-rest@npm:^2.16.8":
   version: 2.21.3
   resolution: "@octokit/plugin-paginate-rest@npm:2.21.3"
@@ -6993,18 +6667,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/plugin-paginate-rest@npm:^6.1.2":
-  version: 6.1.2
-  resolution: "@octokit/plugin-paginate-rest@npm:6.1.2"
-  dependencies:
-    "@octokit/tsconfig": ^1.0.2
-    "@octokit/types": ^9.2.3
-  peerDependencies:
-    "@octokit/core": ">=4"
-  checksum: a7b3e686c7cbd27ec07871cde6e0b1dc96337afbcef426bbe3067152a17b535abd480db1861ca28c88d93db5f7bfdbcadd0919ead19818c28a69d0e194038065
-  languageName: node
-  linkType: hard
-
 "@octokit/plugin-request-log@npm:^1.0.4":
   version: 1.0.4
   resolution: "@octokit/plugin-request-log@npm:1.0.4"
@@ -7026,30 +6688,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/plugin-retry@npm:^4.1.3":
-  version: 4.1.6
-  resolution: "@octokit/plugin-retry@npm:4.1.6"
-  dependencies:
-    "@octokit/types": ^9.0.0
-    bottleneck: ^2.15.3
-  peerDependencies:
-    "@octokit/core": ">=3"
-  checksum: 9bebaf7fc9c34683d7e97c0398ab9f5a164ce8770e92e8b8a65ed8e85ee3b0fddc5c72dfb18da112e2f643434d217ec7092f57496808c4ae6c2a824f42ae1ccf
-  languageName: node
-  linkType: hard
-
-"@octokit/plugin-throttling@npm:^5.2.3":
-  version: 5.2.3
-  resolution: "@octokit/plugin-throttling@npm:5.2.3"
-  dependencies:
-    "@octokit/types": ^9.0.0
-    bottleneck: ^2.15.3
-  peerDependencies:
-    "@octokit/core": ^4.0.0
-  checksum: ce7ca75d150c63cf1bbcb5b385513bd8cd1f714c5e59f33d25c2afd08fa730250055ef8dffa74113f92e7fb3f209a147442242151607a513f55e4ce382c8e80c
-  languageName: node
-  linkType: hard
-
 "@octokit/request-error@npm:^2.0.5, @octokit/request-error@npm:^2.1.0":
   version: 2.1.0
   resolution: "@octokit/request-error@npm:2.1.0"
@@ -7061,17 +6699,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/request-error@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "@octokit/request-error@npm:3.0.3"
-  dependencies:
-    "@octokit/types": ^9.0.0
-    deprecation: ^2.0.0
-    once: ^1.4.0
-  checksum: 5db0b514732686b627e6ed9ef1ccdbc10501f1b271a9b31f784783f01beee70083d7edcfeb35fbd7e569fa31fdd6762b1ff6b46101700d2d97e7e48e749520d0
-  languageName: node
-  linkType: hard
-
 "@octokit/request@npm:^5.6.0, @octokit/request@npm:^5.6.3":
   version: 5.6.3
   resolution: "@octokit/request@npm:5.6.3"
@@ -7086,20 +6713,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/request@npm:^6.0.0":
-  version: 6.2.8
-  resolution: "@octokit/request@npm:6.2.8"
-  dependencies:
-    "@octokit/endpoint": ^7.0.0
-    "@octokit/request-error": ^3.0.0
-    "@octokit/types": ^9.0.0
-    is-plain-object: ^5.0.0
-    node-fetch: ^2.6.7
-    universal-user-agent: ^6.0.0
-  checksum: 3747106f50d7c462131ff995b13defdd78024b7becc40283f4ac9ea0af2391ff33a0bb476a05aa710346fe766d20254979079a1d6f626112015ba271fe38f3e2
-  languageName: node
-  linkType: hard
-
 "@octokit/rest@npm:^16.43.0 || ^17.11.0 || ^18.12.0, @octokit/rest@npm:^18.12.0":
   version: 18.12.0
   resolution: "@octokit/rest@npm:18.12.0"
@@ -7112,13 +6725,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/tsconfig@npm:^1.0.2":
-  version: 1.0.2
-  resolution: "@octokit/tsconfig@npm:1.0.2"
-  checksum: 74d56f3e9f326a8dd63700e9a51a7c75487180629c7a68bbafee97c612fbf57af8347369bfa6610b9268a3e8b833c19c1e4beb03f26db9a9dce31f6f7a19b5b1
-  languageName: node
-  linkType: hard
-
 "@octokit/types@npm:^6.0.3, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.39.0, @octokit/types@npm:^6.40.0":
   version: 6.41.0
   resolution: "@octokit/types@npm:6.41.0"
@@ -7128,42 +6734,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@octokit/types@npm:^9.0.0, @octokit/types@npm:^9.2.3":
-  version: 9.3.2
-  resolution: "@octokit/types@npm:9.3.2"
-  dependencies:
-    "@octokit/openapi-types": ^18.0.0
-  checksum: f55d096aaed3e04b8308d4422104fb888f355988056ba7b7ef0a4c397b8a3e54290d7827b06774dbe0c9ce55280b00db486286954f9c265aa6b03091026d9da8
-  languageName: node
-  linkType: hard
-
-"@openapitools/openapi-generator-cli@npm:2.9.0":
-  version: 2.9.0
-  resolution: "@openapitools/openapi-generator-cli@npm:2.9.0"
-  dependencies:
-    "@nestjs/axios": 3.0.1
-    "@nestjs/common": 10.3.0
-    "@nestjs/core": 10.3.0
-    "@nuxtjs/opencollective": 0.3.2
-    axios: 1.6.5
-    chalk: 4.1.2
-    commander: 8.3.0
-    compare-versions: 4.1.4
-    concurrently: 6.5.1
-    console.table: 0.10.0
-    fs-extra: 10.1.0
-    glob: 7.2.3
-    inquirer: 8.2.6
-    lodash: 4.17.21
-    reflect-metadata: 0.1.13
-    rxjs: 7.8.1
-    tslib: 2.6.2
-  bin:
-    openapi-generator-cli: main.js
-  checksum: 102040381b42edbab4fa34aa49c3cf8188fdb892c3e251bcb5bdf7c599597f3572d52d44fed7bead5fcaec24d624491c20dc96d2f164fa44e7fc232c7d787f69
-  languageName: node
-  linkType: hard
-
 "@opensea/seaport-js@npm:1.3.0":
   version: 1.3.0
   resolution: "@opensea/seaport-js@npm:1.3.0"
@@ -7295,33 +6865,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@pnpm/config.env-replace@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "@pnpm/config.env-replace@npm:1.1.0"
-  checksum: a3d2b57e35eec9543d9eb085854f6e33e8102dac99fdef2fad2eebdbbfc345e93299f0c20e8eb61c1b4c7aa123bfd47c175678626f161cda65dd147c2b6e1fa0
-  languageName: node
-  linkType: hard
-
-"@pnpm/network.ca-file@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "@pnpm/network.ca-file@npm:1.0.2"
-  dependencies:
-    graceful-fs: 4.2.10
-  checksum: d8d0884646500576bd5390464d13db1bb9a62e32a1069293e5bddb2ad8354b354b7e2d2a35e12850025651e795e6a80ce9e601c66312504667b7e3ee7b52becc
-  languageName: node
-  linkType: hard
-
-"@pnpm/npm-conf@npm:^2.1.0":
-  version: 2.2.2
-  resolution: "@pnpm/npm-conf@npm:2.2.2"
-  dependencies:
-    "@pnpm/config.env-replace": ^1.1.0
-    "@pnpm/network.ca-file": ^1.0.1
-    config-chain: ^1.1.11
-  checksum: d64aa4464be584caa855eafa8f109509390489997e36d602d6215784e2973b896bef3968426bb00896cf4ae7d440fed2cee7bb4e0dbc90362f024ea3f9e27ab1
-  languageName: node
-  linkType: hard
-
 "@popperjs/core@npm:2.11.8":
   version: 2.11.8
   resolution: "@popperjs/core@npm:2.11.8"
@@ -7622,9 +7165,9 @@ __metadata:
   linkType: hard
 
 "@react-native-community/eslint-plugin@npm:^1.1.0":
-  version: 1.3.0
-  resolution: "@react-native-community/eslint-plugin@npm:1.3.0"
-  checksum: 5e04fa161fca6453299aed691695ea071fed8166c5da36935047eb6c169bc38c9d599e1ce20402b63cbcaf086a9bb63d2e88836be142cecabf61ba36954ccaae
+  version: 1.1.0
+  resolution: "@react-native-community/eslint-plugin@npm:1.1.0"
+  checksum: 4da7468f490139b7990d8d22347d616221590c0d85271b4ca9ff3c46df65138151bbd1c1ebeff6c0da8b344bb7deec27f96f5fbb72f162ebb492bd8056fe8845
   languageName: node
   linkType: hard
 
@@ -8089,7 +7632,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@rushstack/eslint-patch@npm:^1.1.0, @rushstack/eslint-patch@npm:^1.2.0":
+"@rushstack/eslint-patch@npm:^1.1.0, @rushstack/eslint-patch@npm:^1.1.3, @rushstack/eslint-patch@npm:^1.2.0":
   version: 1.5.1
   resolution: "@rushstack/eslint-patch@npm:1.5.1"
   checksum: e4c25322312dbaa29e835a7ab4fbac53c8731dd0da65e46646e38945e296429e7fb91c2ef3da5af5d5938d44b0cde1d5290438ebb3dcb015e02b80b5e2530d24
@@ -8203,132 +7746,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@semantic-release/changelog@npm:^6.0.2":
-  version: 6.0.3
-  resolution: "@semantic-release/changelog@npm:6.0.3"
-  dependencies:
-    "@semantic-release/error": ^3.0.0
-    aggregate-error: ^3.0.0
-    fs-extra: ^11.0.0
-    lodash: ^4.17.4
-  peerDependencies:
-    semantic-release: ">=18.0.0"
-  checksum: 63283df7aaff7b2d5c08ac322faf362fd953d4ca4f2d2a1855ca51482ff8e973e38497a4c4a35a5b6ebec8373608895ef74d41072565e5bf3766850b4a6def37
-  languageName: node
-  linkType: hard
-
-"@semantic-release/commit-analyzer@npm:^9.0.2":
-  version: 9.0.2
-  resolution: "@semantic-release/commit-analyzer@npm:9.0.2"
-  dependencies:
-    conventional-changelog-angular: ^5.0.0
-    conventional-commits-filter: ^2.0.0
-    conventional-commits-parser: ^3.2.3
-    debug: ^4.0.0
-    import-from: ^4.0.0
-    lodash: ^4.17.4
-    micromatch: ^4.0.2
-  peerDependencies:
-    semantic-release: ">=18.0.0-beta.1"
-  checksum: f7f759e608c0c044ba8ec1b3aabad4305ac057cc45156b60a2f8dc355f5193b84ff7c661aefd4522659172f4d6ecf80219b8b28714bd76e4eb32e734b2e6ead9
-  languageName: node
-  linkType: hard
-
-"@semantic-release/error@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "@semantic-release/error@npm:3.0.0"
-  checksum: 29c4391ecbefd9ea991f8fdf5ab3ceb9c4830281da56d9dbacd945c476cb86f10c3b55cd4a6597098c0ea3a59f1ec4752132abeea633e15972f49f4704e61d35
-  languageName: node
-  linkType: hard
-
-"@semantic-release/git@npm:^10.0.1":
-  version: 10.0.1
-  resolution: "@semantic-release/git@npm:10.0.1"
-  dependencies:
-    "@semantic-release/error": ^3.0.0
-    aggregate-error: ^3.0.0
-    debug: ^4.0.0
-    dir-glob: ^3.0.0
-    execa: ^5.0.0
-    lodash: ^4.17.4
-    micromatch: ^4.0.0
-    p-reduce: ^2.0.0
-  peerDependencies:
-    semantic-release: ">=18.0.0"
-  checksum: b0a346acaf13d1bbd8d8d895bb0dee025dd6d4742769b5dd875018fff8fcfe0f5414299dbe1ed026e53b8f8b04eeceef49a3d56c5f6506016c656df95d2ced04
-  languageName: node
-  linkType: hard
-
-"@semantic-release/github@npm:^8.0.0":
-  version: 8.1.0
-  resolution: "@semantic-release/github@npm:8.1.0"
-  dependencies:
-    "@octokit/core": ^4.2.1
-    "@octokit/plugin-paginate-rest": ^6.1.2
-    "@octokit/plugin-retry": ^4.1.3
-    "@octokit/plugin-throttling": ^5.2.3
-    "@semantic-release/error": ^3.0.0
-    aggregate-error: ^3.0.0
-    debug: ^4.0.0
-    dir-glob: ^3.0.0
-    fs-extra: ^11.0.0
-    globby: ^11.0.0
-    http-proxy-agent: ^7.0.0
-    https-proxy-agent: ^7.0.0
-    issue-parser: ^6.0.0
-    lodash: ^4.17.4
-    mime: ^3.0.0
-    p-filter: ^2.0.0
-    url-join: ^4.0.0
-  peerDependencies:
-    semantic-release: ">=18.0.0-beta.1"
-  checksum: ce199225ab077e25731799145873f41d8d0ab0d00ae221aa6ae4574e58c22f994f9bd8f13c424ac5580e978a8047f5a4fa4bbb681b823f4ba94a8ce4699c11c8
-  languageName: node
-  linkType: hard
-
-"@semantic-release/npm@npm:^9.0.0":
-  version: 9.0.2
-  resolution: "@semantic-release/npm@npm:9.0.2"
-  dependencies:
-    "@semantic-release/error": ^3.0.0
-    aggregate-error: ^3.0.0
-    execa: ^5.0.0
-    fs-extra: ^11.0.0
-    lodash: ^4.17.15
-    nerf-dart: ^1.0.0
-    normalize-url: ^6.0.0
-    npm: ^8.3.0
-    rc: ^1.2.8
-    read-pkg: ^5.0.0
-    registry-auth-token: ^5.0.0
-    semver: ^7.1.2
-    tempy: ^1.0.0
-  peerDependencies:
-    semantic-release: ">=19.0.0"
-  checksum: e0493a06fc4c69929b06a86e117cf907ca9435e5496b47e49076c7be50a772b39279ce0b20c36f4384aaec892a91b106273efd795ff635fbe2f4c7aad6b84414
-  languageName: node
-  linkType: hard
-
-"@semantic-release/release-notes-generator@npm:^10.0.0":
-  version: 10.0.3
-  resolution: "@semantic-release/release-notes-generator@npm:10.0.3"
-  dependencies:
-    conventional-changelog-angular: ^5.0.0
-    conventional-changelog-writer: ^5.0.0
-    conventional-commits-filter: ^2.0.0
-    conventional-commits-parser: ^3.2.3
-    debug: ^4.0.0
-    get-stream: ^6.0.0
-    import-from: ^4.0.0
-    into-stream: ^6.0.0
-    lodash: ^4.17.4
-    read-pkg-up: ^7.0.0
-  peerDependencies:
-    semantic-release: ">=18.0.0-beta.1"
-  checksum: 0237e7e6ebf41b7c6a72eea704b007442cfd05910ded7059235a5684a0e4a233b2ca3c3e39923901131e7f0a4dcb5e95737af469081529acc393223c04715505
-  languageName: node
-  linkType: hard
-
 "@sentry-internal/tracing@npm:7.45.0":
   version: 7.45.0
   resolution: "@sentry-internal/tracing@npm:7.45.0"
@@ -8391,71 +7808,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/bundler-plugin-core@npm:2.10.3":
-  version: 2.10.3
-  resolution: "@sentry/bundler-plugin-core@npm:2.10.3"
-  dependencies:
-    "@sentry/cli": ^2.22.3
-    "@sentry/node": ^7.60.0
-    "@sentry/utils": ^7.60.0
-    dotenv: ^16.3.1
-    find-up: 5.0.0
-    glob: 9.3.2
-    magic-string: 0.27.0
-    unplugin: 1.0.1
-  checksum: 12c56904caca078df97e6abf19f38ee31812fd8f795f35ccadef948100614bde622710518a9e9b5fd0a985876f97d6da7a76432326fe9829ad71e6d77d32bece
-  languageName: node
-  linkType: hard
-
-"@sentry/cli-darwin@npm:2.26.0":
-  version: 2.26.0
-  resolution: "@sentry/cli-darwin@npm:2.26.0"
-  conditions: os=darwin
-  languageName: node
-  linkType: hard
-
-"@sentry/cli-linux-arm64@npm:2.26.0":
-  version: 2.26.0
-  resolution: "@sentry/cli-linux-arm64@npm:2.26.0"
-  conditions: (os=linux | os=freebsd) & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"@sentry/cli-linux-arm@npm:2.26.0":
-  version: 2.26.0
-  resolution: "@sentry/cli-linux-arm@npm:2.26.0"
-  conditions: (os=linux | os=freebsd) & cpu=arm
-  languageName: node
-  linkType: hard
-
-"@sentry/cli-linux-i686@npm:2.26.0":
-  version: 2.26.0
-  resolution: "@sentry/cli-linux-i686@npm:2.26.0"
-  conditions: (os=linux | os=freebsd) & (cpu=x86 | cpu=ia32)
-  languageName: node
-  linkType: hard
-
-"@sentry/cli-linux-x64@npm:2.26.0":
-  version: 2.26.0
-  resolution: "@sentry/cli-linux-x64@npm:2.26.0"
-  conditions: (os=linux | os=freebsd) & cpu=x64
-  languageName: node
-  linkType: hard
-
-"@sentry/cli-win32-i686@npm:2.26.0":
-  version: 2.26.0
-  resolution: "@sentry/cli-win32-i686@npm:2.26.0"
-  conditions: os=win32 & (cpu=x86 | cpu=ia32)
-  languageName: node
-  linkType: hard
-
-"@sentry/cli-win32-x64@npm:2.26.0":
-  version: 2.26.0
-  resolution: "@sentry/cli-win32-x64@npm:2.26.0"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@sentry/cli@npm:2.17.5":
   version: 2.17.5
   resolution: "@sentry/cli@npm:2.17.5"
@@ -8471,43 +7823,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/cli@npm:^2.22.3":
-  version: 2.26.0
-  resolution: "@sentry/cli@npm:2.26.0"
-  dependencies:
-    "@sentry/cli-darwin": 2.26.0
-    "@sentry/cli-linux-arm": 2.26.0
-    "@sentry/cli-linux-arm64": 2.26.0
-    "@sentry/cli-linux-i686": 2.26.0
-    "@sentry/cli-linux-x64": 2.26.0
-    "@sentry/cli-win32-i686": 2.26.0
-    "@sentry/cli-win32-x64": 2.26.0
-    https-proxy-agent: ^5.0.0
-    node-fetch: ^2.6.7
-    progress: ^2.0.3
-    proxy-from-env: ^1.1.0
-    which: ^2.0.2
-  dependenciesMeta:
-    "@sentry/cli-darwin":
-      optional: true
-    "@sentry/cli-linux-arm":
-      optional: true
-    "@sentry/cli-linux-arm64":
-      optional: true
-    "@sentry/cli-linux-i686":
-      optional: true
-    "@sentry/cli-linux-x64":
-      optional: true
-    "@sentry/cli-win32-i686":
-      optional: true
-    "@sentry/cli-win32-x64":
-      optional: true
-  bin:
-    sentry-cli: bin/sentry-cli
-  checksum: 8fe6b45bfa5540c1a39e86a5b61fc3c9ed24afa7cb221733983a835289fecf809de1aa7bdd627c35dd6168b45e54d830a8d9801e6afa91566a9b9c2c1080a6b2
-  languageName: node
-  linkType: hard
-
 "@sentry/core@npm:7.45.0":
   version: 7.45.0
   resolution: "@sentry/core@npm:7.45.0"
@@ -8696,28 +8011,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@sentry/utils@npm:^7.60.0":
-  version: 7.98.0
-  resolution: "@sentry/utils@npm:7.98.0"
-  dependencies:
-    "@sentry/types": 7.98.0
-  checksum: 9fe60afc0b65be72020b1d889d939d608a1a3dfd03a8ab7460538d3353a12e50133fdcfe7205376ef084e094c4cfe8b4cdb64e5d99cb74ab6239b02df459da18
-  languageName: node
-  linkType: hard
-
-"@sentry/webpack-plugin@npm:2.10.3":
-  version: 2.10.3
-  resolution: "@sentry/webpack-plugin@npm:2.10.3"
-  dependencies:
-    "@sentry/bundler-plugin-core": 2.10.3
-    unplugin: 1.0.1
-    uuid: ^9.0.0
-  peerDependencies:
-    webpack: ">=4.40.0"
-  checksum: d37dadb2783258f85e410e4860c567a4fc7aa0dbe657f55baa8542611dd718a1e3a7ad02b4c859a0e716fde1223d37189d7ac430ad4a324bad0d788722235e5d
-  languageName: node
-  linkType: hard
-
 "@shopify/flash-list@npm:1.4.3":
   version: 1.4.3
   resolution: "@shopify/flash-list@npm:1.4.3"
@@ -10005,1325 +9298,1256 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@tamagui/accordion@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/accordion@npm:1.88.18"
+"@tamagui/accordion@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/accordion@npm:1.74.16"
   dependencies:
-    "@tamagui/collapsible": 1.88.18
-    "@tamagui/collection": 1.88.18
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/polyfill-dev": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
+    "@tamagui/collapsible": 1.74.16
+    "@tamagui/collection": 1.74.16
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/polyfill-dev": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: c086f33145a7d3488a9b09ee20417dfc6b97ed0ede0bf39734b0f65889f4f7ef717292325b7cea1db4072d5d4035bd5d3b8ccdc83ff1bacad8395d9b39374cc2
+  checksum: bf9f312f8333873b59d151e2f4bb14fd27f355d3574464e0eb131ab61b1b6db23070227794cb10253831f1c1ff021caed3ca228f4acd70d15e2bd95cbfd35957
   languageName: node
   linkType: hard
 
-"@tamagui/adapt@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/adapt@npm:1.88.18"
+"@tamagui/adapt@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/adapt@npm:1.74.16"
   dependencies:
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/helpers": 1.88.18
-  checksum: 1552024773c581394ad4780a580fbe37d526d6401d946ace68d077fffd2ae4d1fa6ff4f2fca86149c90cad489ec528ef1eeb93af8e982c615c7649e6b54876f2
+    "@tamagui/core": 1.74.16
+  checksum: 7f113fec0f47a4ced183182ffaa1ba217b3bb3d55ea3a1d54a3af59cf336aaf9a1813e42fa782f0bc7e4d4e29c219a5324c6a87af9907bfe6b5e3df3e1a9265d
   languageName: node
   linkType: hard
 
-"@tamagui/alert-dialog@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/alert-dialog@npm:1.88.18"
+"@tamagui/alert-dialog@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/alert-dialog@npm:1.74.16"
   dependencies:
-    "@tamagui/animate-presence": 1.88.18
-    "@tamagui/aria-hidden": 1.88.18
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/dialog": 1.88.18
-    "@tamagui/dismissable": 1.88.18
-    "@tamagui/focus-scope": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/polyfill-dev": 1.88.18
-    "@tamagui/popper": 1.88.18
-    "@tamagui/portal": 1.88.18
-    "@tamagui/remove-scroll": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/text": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
+    "@tamagui/animate-presence": 1.74.16
+    "@tamagui/aria-hidden": 1.74.16
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/dialog": 1.74.16
+    "@tamagui/dismissable": 1.74.16
+    "@tamagui/focus-scope": 1.74.16
+    "@tamagui/polyfill-dev": 1.74.16
+    "@tamagui/popper": 1.74.16
+    "@tamagui/portal": 1.74.16
+    "@tamagui/remove-scroll": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/text": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 82915d0c0bab378f0a57d895cbd98978865c981e4b37017094bcb2a104338f0dfa1e11a63d2066c93fe8ae29a31e1cc779d7a47649766f4371fe61a3c46132fb
+  checksum: 8cefaa23a10f5d62b071a11cee9deec282e335300828f24f12c23e6ac5f12b647f6aed80adb828988636afd19895434420167fbfd3a51621f243606fedfb075d
   languageName: node
   linkType: hard
 
-"@tamagui/animate-presence@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/animate-presence@npm:1.88.18"
+"@tamagui/animate-presence@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/animate-presence@npm:1.74.16"
   dependencies:
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/use-constant": 1.88.18
-    "@tamagui/use-force-update": 1.88.18
-    "@tamagui/use-presence": 1.88.18
-    "@tamagui/web": 1.88.18
-  checksum: 9f29891b615e720ac5d4bbb7b03fe081bb59d82262c8b1361d3b122fd98b087877c6299c2dd5c232dcb5daf2c264f2c504271395ef667aa4eb8aa8816c03cead
+    "@tamagui/use-force-update": 1.74.16
+    "@tamagui/use-presence": 1.74.16
+    "@tamagui/web": 1.74.16
+  checksum: fa3c02ede6a1e17314766467c1ed70502b5a8bcd5ecbb5849f3653cb9492ea282348fd4f30d19bddf96f6395aeadae055595215773cba21992059c689eb305ef
   languageName: node
   linkType: hard
 
-"@tamagui/animate@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/animate@npm:1.88.18"
+"@tamagui/animate@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/animate@npm:1.74.16"
   dependencies:
-    "@tamagui/animate-presence": 1.88.18
-  checksum: a8ed71ec12cee439618ac48d614a08162fbbcd1ff2f38ea33596d3b0a28bf9a84c2dd14a1bfcf6b13f4238864fa8ae555fcdacda25cb3e71c93bd4dfc3a39177
+    "@tamagui/animate-presence": 1.74.16
+  checksum: a92cf32bb397df730f433681e1b0bf8e5a90d774f9ac61d51d73362c4d8f893c6583f4003abc128ad205fa21337784c555545d932df4604853eb6009afff8bcf
   languageName: node
   linkType: hard
 
-"@tamagui/animations-css@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/animations-css@npm:1.88.18"
+"@tamagui/animations-css@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/animations-css@npm:1.74.16"
   dependencies:
-    "@tamagui/constants": 1.88.18
-    "@tamagui/cubic-bezier-animator": 1.88.18
-    "@tamagui/use-presence": 1.88.18
-    "@tamagui/web": 1.88.18
-    react: ^18.2.0
-  checksum: 9bdfb7171376b4e5ccbb63a91d53164bdeaa9abb3e5438b262ee337baa42092539cfe98bbc6871f702c877dda2db1dd31396c05e3cf95469dd22662fc0ffa586
+    "@tamagui/cubic-bezier-animator": 1.74.16
+    "@tamagui/use-presence": 1.74.16
+    "@tamagui/web": 1.74.16
+  checksum: 66e9fd17bac4513a821c920e72d826cfe88ccab900701d073a518219ee053a10c5f9d3edc4b6380ddd7e0b142110930be21960939ae5652496ffb0390dcb81cc
   languageName: node
   linkType: hard
 
-"@tamagui/animations-moti@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/animations-moti@npm:1.88.18"
+"@tamagui/animations-moti@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/animations-moti@npm:1.74.16"
   dependencies:
-    "@tamagui/use-presence": 1.88.18
-    "@tamagui/web": 1.88.18
-    moti: ^0.27.2
-    react: ^18.2.0
-  checksum: c66eba2bbbd682263b4d210d42089148f91c146f611901eca6742b8a2a9307550d543f5c0a842e3a2d7039a877b1fec962256d46061f63bc1f041e051f189151
+    "@tamagui/use-presence": 1.74.16
+    "@tamagui/web": 1.74.16
+    moti: ^0.25.3
+  checksum: 3a2ea38fa4327e65b4d726cfc8ba1215656c9d956920afa7460af42f9463710d5915ae00cb43d5495a7888afcef47c4d77d496c07532fc78839b51911f6fd701
   languageName: node
   linkType: hard
 
-"@tamagui/animations-react-native@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/animations-react-native@npm:1.88.18"
+"@tamagui/animations-react-native@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/animations-react-native@npm:1.74.16"
   dependencies:
-    "@tamagui/constants": 1.88.18
-    "@tamagui/use-presence": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/use-presence": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 05d89d0928faa46c561a9197f9947742b73fe874358ea458a3116d60670c8dd6ab8b969ab60e44581a857843ef2f06b15e2ac90335fcb24bc6fa026b01df2c56
+  checksum: c17e9dc54a156ee737675731b34b969e110c0bdd5bda2350453059515ef38153c80966bc007dc91781bc6c16b07834f57e5a7a5ca47afce56773e56bba7da5e1
   languageName: node
   linkType: hard
 
-"@tamagui/aria-hidden@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/aria-hidden@npm:1.88.18"
+"@tamagui/aria-hidden@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/aria-hidden@npm:1.74.16"
   dependencies:
     aria-hidden: ^1.1.3
   peerDependencies:
     react: "*"
-  checksum: 567b45c446370e511ec5f0e260fa25897a7ec705f86e1358b4166c529c97e0e678a606dcc1bde7ba34269007d967a767dc45358f3c9ab6c6c826ae4f45273b20
+  checksum: 59c57e45dc041c16ed560d4d606f58fb39a7b3e4f0d1458c71f9aa5ed2c73bb8c2d209bb91d04201f48318f85b8850c756f3468f8557d5f3c3557edf7ceb0a0e
   languageName: node
   linkType: hard
 
-"@tamagui/avatar@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/avatar@npm:1.88.18"
+"@tamagui/avatar@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/avatar@npm:1.74.16"
   dependencies:
-    "@tamagui/core": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/image": 1.88.18
-    "@tamagui/shapes": 1.88.18
-    "@tamagui/text": 1.88.18
+    "@tamagui/core": 1.74.16
+    "@tamagui/image": 1.74.16
+    "@tamagui/shapes": 1.74.16
+    "@tamagui/text": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 386823ffc2468f8af06185297a8d67e1c3e597a73eac1449f98bb6eab03478929b60347dc7e9ebff52a6189d73d84795a86434b4b4b12ab6af38298b3dec1cf9
+  checksum: f6b1f7c8bc337f2ce3509b11b565d749f7ec75122ef6f9eafb9e18b4313c4584ca8f234f25790e2d46ea07f9bab4f851a0290d5b123eefa268ec9cdd446ab1c4
   languageName: node
   linkType: hard
 
-"@tamagui/build@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/build@npm:1.88.18"
+"@tamagui/build@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/build@npm:1.74.16"
   dependencies:
-    "@babel/core": ^7.23.3
     "@types/fs-extra": ^9.0.13
-    babel-plugin-fully-specified: "*"
     chokidar: ^3.5.2
-    esbuild: ^0.19.11
+    esbuild: ~0.19.3
     execa: ^5.0.0
     fast-glob: ^3.2.11
-    fs-extra: ^11.2.0
+    fs-extra: ^11.1.0
     get-tsconfig: ^4.5.0
     lodash.debounce: ^4.0.8
-    typescript: ^5.3.3
+    typescript: ^5.2.2
   bin:
     tamagui-build: tamagui-build.js
-  checksum: 11f579faaca3f42a08255fa7e93f12a27bcc19ff59d67b769061c1f45d060acff2c58c27882a0ffba3810595de0c9a582cfc4ce23f9f4d7cc28f5ec0969af0ff
+  checksum: fac682050822e57c493df34a18ef4ced5b7732b14dbc05718c06a46a84e159b896bcc107d9cdf61a4e2e7ee9b132fcc79ebc7b393600c0ec61d14be38bda8657
   languageName: node
   linkType: hard
 
-"@tamagui/button@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/button@npm:1.88.18"
+"@tamagui/button@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/button@npm:1.74.16"
   dependencies:
-    "@tamagui/font-size": 1.88.18
-    "@tamagui/get-button-sized": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/helpers-tamagui": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/text": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/font-size": 1.74.16
+    "@tamagui/get-button-sized": 1.74.16
+    "@tamagui/helpers-tamagui": 1.74.16
+    "@tamagui/text": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 44b2599b08e204b9168495f8c135b2fa7695920d3dd74d01300deda14b156c5529e609988059ab1a858001f770ff26fb0c935c35a1d397704c05c647cf84e950
+  checksum: b219624edf9945d6e3d811f8905dc38626283b890efb11b28170a79bd867e7287019cef5c98481db9ff15ccde88a08bb43ca05d003b7fefe01a57a7d6e46d63d
   languageName: node
   linkType: hard
 
-"@tamagui/card@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/card@npm:1.88.18"
+"@tamagui/card@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/card@npm:1.74.16"
   dependencies:
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: a5fada9580cf8d093bd298aa865392467c79448a49ae4694358d98481a9e825e80c10f9bef378271558c3fb4beb1cdecfc96446a77b5c9cca3ec0e9efd3571ba
+  checksum: d14a3e5d03be624c4786cb5b38a6bccfda019895191ecd3680edfab106af10360b8791bca9a439d95dbe5ca1ea35fb50843545bed5ede221b346d1fe733934d5
   languageName: node
   linkType: hard
 
-"@tamagui/checkbox@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/checkbox@npm:1.88.18"
+"@tamagui/checkbox@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/checkbox@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/focusable": 1.88.18
-    "@tamagui/font-size": 1.88.18
-    "@tamagui/get-token": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/helpers-tamagui": 1.88.18
-    "@tamagui/label": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
-    "@tamagui/use-previous": 1.88.18
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/focusable": 1.74.16
+    "@tamagui/font-size": 1.74.16
+    "@tamagui/get-token": 1.74.16
+    "@tamagui/helpers-tamagui": 1.74.16
+    "@tamagui/label": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
+    "@tamagui/use-previous": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: b93167beaf73ad9300af2c1104693c078eba0b2d470faa2753fd653be7f66560b98f31e34fbbe445f2edf443d09590123bc2c6f19a1c303d8d6d2330a25ce07a
+  checksum: fd31f469e3c31d8e5fc7498a57689f747a2692da40e721f16cb31c47dcc77476d8ce04ac26a372cd19996b73ba74bacc1fa21986b9beef45090e0bc8faf533b2
   languageName: node
   linkType: hard
 
-"@tamagui/cli-color@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/cli-color@npm:1.88.18"
-  checksum: a5dd83ee3f31820433336e1b93217798ca1a3b16a53c0794c2e895c65bab0f131b40914286338f28123abdfba50eec7c3396d907f57211840e0724301ce1f3cb
+"@tamagui/cli-color@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/cli-color@npm:1.74.16"
+  checksum: 7e90a766c7f48a356288105d6d7c6d4347b95894cf1b9e2bddadcd38c8e3e437bbbe45afe732c43e6ff65bacf66ab04b1ad615d23e26119785f80aa2a3b71133
   languageName: node
   linkType: hard
 
-"@tamagui/collapsible@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/collapsible@npm:1.88.18"
+"@tamagui/collapsible@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/collapsible@npm:1.74.16"
   dependencies:
-    "@tamagui/animate-presence": 1.88.18
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/polyfill-dev": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
+    "@tamagui/animate-presence": 1.74.16
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/polyfill-dev": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 1f315af262647ed686603b291dcef3a4f5948ae56eea2d77c8482bb07e5d7ab6c8387227ba833553aa117df9a23a23ddd62305398d15987afd10eb1672f2ff5a
+  checksum: f92aa459dff42c6458b0371872e53e15176dcf9f28817e4878f6b192c3610d784f56fc00d0328f3d91de1123811b462f7929f452cc4398950b46596552d2b5f4
   languageName: node
   linkType: hard
 
-"@tamagui/collection@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/collection@npm:1.88.18"
+"@tamagui/collection@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/collection@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/polyfill-dev": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/polyfill-dev": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: ea5fdd9696eb7548b9ea526761deaf15a4bc6e7da91bd3b2ad1180a3e7e8290b04a1846e8de8285c74ef46673f01f49f3ce44336449c8ef8fbdfb9a9e843f275
+  checksum: e17fc54775e0843c89ebe64af1d82f5d5a5a8d31cc13d9ea615f7e28b0945f089b9693c5d5bca8da9657d6d09b9f2d3134058e1d1b261b1a2f3ee503960b5290
   languageName: node
   linkType: hard
 
-"@tamagui/compose-refs@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/compose-refs@npm:1.88.18"
+"@tamagui/compose-refs@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/compose-refs@npm:1.74.16"
   peerDependencies:
     react: "*"
-  checksum: cc281ab4b741c3d83646421dadbfa21664cee1882ecbd33b7a28d86c674e52846ff0b0e9745347b16e57ca0ee50e7948aed92b10a35454b1ed08e688dac33ba3
+  checksum: ff936b38e4861a88d91a52935d53d1503dd83facd0cca8b444084049f668453e01a767aed0f0c4c6ab8a19d091af7bf59bb4e7fc5ad48b18b8f5dbfba131c681
   languageName: node
   linkType: hard
 
-"@tamagui/config-default@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/config-default@npm:1.88.18"
+"@tamagui/config-default@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/config-default@npm:1.74.16"
   dependencies:
-    "@tamagui/core": 1.88.18
-    "@tamagui/shorthands": 1.88.18
-  checksum: ac47eecfa7c8902611d1be33cc4facfff74c2d9ab98a59ba0a046f46148364cd5730583b241955e02255e0c4fa0930d1ea064ebdb9344c5042c362b82352f50c
+    "@tamagui/core": 1.74.16
+    "@tamagui/shorthands": 1.74.16
+  checksum: 3b8f749ece7ea3781b62cb968f0fbb5525c918a52a41a9ec3348386f307e4f189d3ad98656d87b0470e4aac8a9c40d0381a6564eebda5a6b150c3ad00f2f914e
   languageName: node
   linkType: hard
 
-"@tamagui/constants@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/constants@npm:1.88.18"
+"@tamagui/constants@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/constants@npm:1.74.16"
   peerDependencies:
     react: "*"
-  checksum: 180438706b6a7b0fc172344c6bc551d9078e16cdf5c87543c016347f8c1cd3581225e0c68bc91afa9f51f829e7b83e9bd9e9ac0afb4ae888a0db035d34855c3b
+  checksum: 391654ecfda5397b73d6eaf04e249a8e079008060365339d871bbbffade8027e7fac2e409f9863cdc378876da9553b79feefcc0a1206ab3ea3e5a199df773855
   languageName: node
   linkType: hard
 
-"@tamagui/core@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/core@npm:1.88.18"
+"@tamagui/core@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/core@npm:1.74.16"
   dependencies:
-    "@tamagui/react-native-use-pressable": 1.88.18
-    "@tamagui/react-native-use-responder-events": 1.88.18
-    "@tamagui/use-event": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/react-native-use-pressable": 1.74.16
+    "@tamagui/react-native-use-responder-events": 1.74.16
+    "@tamagui/use-event": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 1e5b00358d286b2ea786dfe0373b37f483fc8bc53865b7e592d8a8f0badd995990885ce99c1369d5b7843ff9f7e130581d83cd949986a173c00b37b1b2974701
+  checksum: e7e949c3a211acbf66a239929ea40b008c18f6aa43cfce40593b9ff31c860e39c89e70fbda58bdea2e9d9a83629fb54776446b5c6379a67551ce467b92073e62
   languageName: node
   linkType: hard
 
-"@tamagui/create-context@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/create-context@npm:1.88.18"
+"@tamagui/create-context@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/create-context@npm:1.74.16"
   peerDependencies:
     react: "*"
-  checksum: 4e6b7a454b94bb65a4a21abdb799d431e3b79b0a306fde805b1c1792cd55b02eb109575cacff923c940e17428480c4a4a7a9074afdbc1ad0d594c0681507a913
+  checksum: ced1a31edf595be7f4e3bd1e2bf1bfcd4262a6e3f8e08147248c270ccdb4aa91b51e743a1b87452406f209bca4f86b89d8a701aff7c75bd1c005a6d63165a26b
   languageName: node
   linkType: hard
 
-"@tamagui/create-theme@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/create-theme@npm:1.88.18"
+"@tamagui/create-theme@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/create-theme@npm:1.74.16"
   dependencies:
-    "@tamagui/web": 1.88.18
-  checksum: 89b80c7de1d204f8a547f97f47853e6fb8cd189d9940a8566f9086843a1476730e7955de20f429b120f60fcabfc8791ce737424de7a2be459618c3c918685d57
+    "@tamagui/web": 1.74.16
+  checksum: 278671e83070516722a99be4729d7d2425908ca06841704d4eee561ae1296f779b27e89879e0d4935ac2fdbfa9f2749a95e6c2a2381a38e1336decdc90034c4f
   languageName: node
   linkType: hard
 
-"@tamagui/cubic-bezier-animator@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/cubic-bezier-animator@npm:1.88.18"
-  checksum: edd73c098c145a528e53f87e295ace54056b86aa30e433b065085b8551ad29555db4065c060e6b21d454c08df266a000ef385d8ee1b47218d7875586db2c874b
+"@tamagui/cubic-bezier-animator@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/cubic-bezier-animator@npm:1.74.16"
+  checksum: ae85df67cfa249f9d552cf1a2b62cc3496c16c38cf106405aeb7f28d3b25cab86b98e22da1dc607d5844fd2ec17d4b079d13f584db2c34154b18f18797ec2031
   languageName: node
   linkType: hard
 
-"@tamagui/dialog@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/dialog@npm:1.88.18"
+"@tamagui/dialog@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/dialog@npm:1.74.16"
   dependencies:
-    "@tamagui/adapt": 1.88.18
-    "@tamagui/animate-presence": 1.88.18
-    "@tamagui/aria-hidden": 1.88.18
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/dismissable": 1.88.18
-    "@tamagui/focus-scope": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/polyfill-dev": 1.88.18
-    "@tamagui/popper": 1.88.18
-    "@tamagui/portal": 1.88.18
-    "@tamagui/remove-scroll": 1.88.18
-    "@tamagui/sheet": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/text": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
+    "@tamagui/adapt": 1.74.16
+    "@tamagui/animate-presence": 1.74.16
+    "@tamagui/aria-hidden": 1.74.16
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/dismissable": 1.74.16
+    "@tamagui/focus-scope": 1.74.16
+    "@tamagui/polyfill-dev": 1.74.16
+    "@tamagui/popper": 1.74.16
+    "@tamagui/portal": 1.74.16
+    "@tamagui/remove-scroll": 1.74.16
+    "@tamagui/sheet": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/text": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: a4bed52f0170cf558ed2344ffe1e7bbf26d29ffed0da5bd4785e258fc7bcef66c429d45fed5df5c284d11ed634ca2dc9b4765cb7507547d41cb87aaea785787c
+  checksum: 8b666b2ae2d737d197bd39d619eb97d4ab0d6d0c87602eb6d40268932324c7fbb04d7ed8a45564bf92ffc5b06e6bf2b2b40582ab54c0c496ad744f3af5870d54
   languageName: node
   linkType: hard
 
-"@tamagui/dismissable@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/dismissable@npm:1.88.18"
+"@tamagui/dismissable@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/dismissable@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/use-escape-keydown": 1.88.18
-    "@tamagui/use-event": 1.88.18
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/use-escape-keydown": 1.74.16
+    "@tamagui/use-event": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 0e34c3d1167f4caaba914fd5a83ac78a066e2ea8546f6249f36d26580bb2f336cf94458d4678ad628bd989458849716f844715953ffb3c069104b60406dd9693
+  checksum: 289c8a2fa25d225dfaece5496ad09c7090b45de7eba1c65f81d2bbb8687694738f0395486d0002b15880d1c7a656b098a6501d0de5bd522b5edde22d2f684f25
   languageName: node
   linkType: hard
 
-"@tamagui/elements@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/elements@npm:1.88.18"
-  dependencies:
-    "@tamagui/core": 1.88.18
-  peerDependencies:
-    react: "*"
-    react-dom: "*"
-  checksum: 174d77fe43b672ce8ef1ce01ea227ca3a5202e1df34fa222e204c5fe69cb341049fcb4cee1d6fa4c911733347c66269f0e2b02d695d240edc6ed1613ffa6ad12
+"@tamagui/fake-react-native@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/fake-react-native@npm:1.74.16"
+  checksum: 686606dcd35b4a749e9e9611b96d8cf23a8080fc63e71facdf167048d5dca91042dcffec1e45e43f655cd6fdf05870fbd043cd674bb71aa8d792afcea032504c
   languageName: node
   linkType: hard
 
-"@tamagui/fake-react-native@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/fake-react-native@npm:1.88.18"
-  checksum: a55d7607ee9aca8f7ee48b8ecbe16f35cc60638407dfcdc7b209e1b1f6b4b64aa0119bbdb320b3db8d9c615865ccfe43e7f94b8fffb6d13a775d819b2d7c10e0
-  languageName: node
-  linkType: hard
-
-"@tamagui/floating@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/floating@npm:1.88.18"
+"@tamagui/floating@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/floating@npm:1.74.16"
   dependencies:
-    "@floating-ui/react-dom": ^2.0.6
-    "@floating-ui/react-native": ^0.10.3
+    "@floating-ui/react-dom": ^2.0.1
+    "@floating-ui/react-native": ^0.10.1
     react-dom: ^18.2.0
   peerDependencies:
     react: "*"
-  checksum: b373e81a8048fdd8a455b9a4d42a3a32960c580964d81568977d358fe65a8b3c1b108e7b413d9dd3a45f61944117576795ca392e04de743a7952d6a8f7f91c97
+  checksum: 910ddb33cc17bdeddf618ff00476dc4cc9436385cb48add4b4b4f04f2f6477554fc34fb6212c16937d2d72e6e00a7620165c09f1bff7ed8d264df0d5142ed773
   languageName: node
   linkType: hard
 
-"@tamagui/focus-scope@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/focus-scope@npm:1.88.18"
+"@tamagui/focus-scope@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/focus-scope@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/use-event": 1.88.18
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/use-event": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 20e65a05fcae6dc99f92373a832228f1baa3fcabc3f51942182618248d061873f4ceb85ff5ec34e082ce92ea46b4e7d684fe20e04a757f2b6a36f7b3742c3276
+  checksum: 0f9147ab56dd5382b9b62c9b9f583f4784404b5c5e7faa75dfd78779ad928fbda49677811b3a69d241d96b76af3566c9823d964d6a60b39ea6928b98b0a1c3ee
   languageName: node
   linkType: hard
 
-"@tamagui/focusable@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/focusable@npm:1.88.18"
+"@tamagui/focusable@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/focusable@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: b1f7be01133596a1b6ec72ca175b5c3b95bcf51bb82cd0aebc32dd4abadea20877e788659cfc53b55c7e6fdd4f56d2c10a55af18b740fd3fa71be2b1e31df815
+  checksum: 073fe957eee5dacaac026759411e6a2c0e2bf513a3969800cf76a929493dcded86f4372928049a86b3e19e0d0a68659655864b5ae7c5045a6210659ba5e5aea3
   languageName: node
   linkType: hard
 
-"@tamagui/font-inter@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/font-inter@npm:1.88.18"
+"@tamagui/font-inter@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/font-inter@npm:1.74.16"
   dependencies:
-    "@tamagui/core": 1.88.18
-  checksum: fca75c855b9564c500b4cd7a9bdae504f4141db8652ca7d303f08f83a4558df5f330ff3e4e62a31ec1130740d0a65fc39fd66e0f81b8652a85c9e579276de3ce
+    "@tamagui/core": 1.74.16
+  checksum: ca715f8d59e1bb726226da461b67f7873da3c0d205336cfaa56f550c84d50a258d95530104644e5789e920ebab71e41ee9c1bf70943e75edeff24ae5f44bfc9a
   languageName: node
   linkType: hard
 
-"@tamagui/font-size@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/font-size@npm:1.88.18"
+"@tamagui/font-size@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/font-size@npm:1.74.16"
   dependencies:
-    "@tamagui/core": 1.88.18
+    "@tamagui/core": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 2f8a0bfaaa628b56437afbf899fc6527b1e6f388d4b597e0f72e037d686fb2f80471f1887e3e1707ba798acafe5eb13eee8c0a5cf4a14d2ee882c2a4fb88c7cd
+  checksum: 043422f774c66c98d5f862d57a4d2d4f1640094ee30610396bb691f39100dbb79d58b546f7213b83b2ac73a9b601aff47956af6864c7509de22df538f2369fa7
   languageName: node
   linkType: hard
 
-"@tamagui/form@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/form@npm:1.88.18"
+"@tamagui/form@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/form@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/focusable": 1.88.18
-    "@tamagui/get-button-sized": 1.88.18
-    "@tamagui/get-font-sized": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/text": 1.88.18
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/focusable": 1.74.16
+    "@tamagui/get-button-sized": 1.74.16
+    "@tamagui/get-font-sized": 1.74.16
+    "@tamagui/text": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 1c8480c9e1935ddfda6a6f3f902e9280d0f7d269d00263217be42112caf04a1ede2d08927931a252760ed6cac03f1872bccb786cf309e0c1eced18531ef375f1
+  checksum: 5103a5516e89693e32c30902c1f8a3102cd258d74f068ff12410a7e1841dba71fd43662980fec004f7e6e5827eca9877c82aa33f6b677951f9deccdaa5d6f241
   languageName: node
   linkType: hard
 
-"@tamagui/generate-themes@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/generate-themes@npm:1.88.18"
+"@tamagui/generate-themes@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/generate-themes@npm:1.74.16"
   dependencies:
-    "@tamagui/create-theme": 1.88.18
-    "@tamagui/types": 1.88.18
+    "@tamagui/create-theme": 1.74.16
+    "@tamagui/types": 1.74.16
     esbuild-register: ^3.4.2
-    fs-extra: ^11.2.0
-  checksum: dc518f5b2ad673946bb21cbc68497c0ed7f24d178eed728baf4761395698fffb71539edf2f8d6f15c531a6c2d8949982fb3b1c7b73ec8882701b9b42502a0c12
+    fs-extra: ^11.1.0
+  checksum: 0f7fb917151674fb0fc5c153790044c64b3583fd8d776519e820998b998f477e7c63073501decd2b8e98cddb06656dcb7976b17b02b4ab2d4d49b609447e2c7b
   languageName: node
   linkType: hard
 
-"@tamagui/get-button-sized@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/get-button-sized@npm:1.88.18"
+"@tamagui/get-button-sized@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/get-button-sized@npm:1.74.16"
   dependencies:
-    "@tamagui/get-token": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/get-token": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 64876e79089dc24c233d62efb2da5ecf44695a967d92d114d74884981174d388d4a37e0bd619191f05b8821a629c7c8d376730dc02fe4594e28719f7971131d7
+  checksum: 86762cf6754a9315fff947269de636ec3fd7fa0f4264a1c4d997dc412393bc0a1d694919d7e06ba0dff1788968d359c6155f73086fb42e10a906b9887b6803b8
   languageName: node
   linkType: hard
 
-"@tamagui/get-font-sized@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/get-font-sized@npm:1.88.18"
+"@tamagui/get-font-sized@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/get-font-sized@npm:1.74.16"
   dependencies:
-    "@tamagui/core": 1.88.18
+    "@tamagui/core": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 6ae4348c8a78f7eb6735d6b8cbb363494aeafafaf1959f03f2fba3f13e2e5825780b3014cc5b248f3535d72ae4b6d30fd9bf35ed54206e81a190f9640af2f473
+  checksum: 0ce5c1cc3432b978910a2c4c77fdeb965a54d2e538c22b57ffcbca92a3f08c922e4754e9e3330d93cf8cf996d38ce59e4d50220b175ef3fabaf7bbfe5c60bd8e
   languageName: node
   linkType: hard
 
-"@tamagui/get-token@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/get-token@npm:1.88.18"
+"@tamagui/get-token@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/get-token@npm:1.74.16"
   dependencies:
-    "@tamagui/web": 1.88.18
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: e6e81c8e2ac3a2cfbea9d3a60d92d1fc35863574f8e746d72eb6e635728f7941810cb9a54de94218229ef40f02a6110850383b4cf1fdc2268ed16446ce3cf1f2
+  checksum: 3e9809db0340caaef6728dc60d207fef0be0ae080212632046c2ab7e4b08e5f9b84690de2f6fbdf79fcc5c6d99c6886d86973901452eea7cded9211b47ca2c1f
   languageName: node
   linkType: hard
 
-"@tamagui/group@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/group@npm:1.88.18"
+"@tamagui/group@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/group@npm:1.74.16"
   dependencies:
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
     reforest: ^0.13.0
   peerDependencies:
     react: "*"
-  checksum: be75878da4c02c546b45da2bc0027bef5c1f0c503e1e1154847e3fff655854f2b8dab22479f561ed85a453009842eaef279ac2b4cc73a4dd3a6fc3a5d75ccd67
+  checksum: cddd9fa30f1cab9dedd5cd5039a4e3ff10252ef57b1484d0809060769a0570e175d86a7388df11f0c02a424247ca548174ff95134eb1c1e20c0253cc732ddc57
   languageName: node
   linkType: hard
 
-"@tamagui/helpers-icon@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/helpers-icon@npm:1.88.18"
+"@tamagui/helpers-icon@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/helpers-icon@npm:1.74.16"
   dependencies:
-    "@tamagui/core": 1.88.18
+    "@tamagui/core": 1.74.16
   peerDependencies:
     react: "*"
     react-native-svg: ">=12"
-  checksum: bb83b0bf7ef1dbfd4c47453725f22e541a1667e720537af6af430e4733220202f6954be13aa4a9b0cd2ac0f8f44c1cee78f2f4e6bfe07b99a1eed955fee1eb0c
+  checksum: 56a63cb893fb1889c95acaddcfbe4f452d64aa43cc126bc7b540a4809919d15444e39a7f34ae263bd1725f4475827adfaf58fbc6a8b7580e43a183232da09d49
   languageName: node
   linkType: hard
 
-"@tamagui/helpers-node@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/helpers-node@npm:1.88.18"
+"@tamagui/helpers-node@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/helpers-node@npm:1.74.16"
   dependencies:
-    "@tamagui/types": 1.88.18
-  checksum: 8ab060ea1da93f99b555b43eaa35372b01389d39980a9ee97658972416930b2b1f96118d0d214bfe7559d2328f09350ce0138e03ca7e440f55d7c97d6088f760
+    "@tamagui/types": 1.74.16
+  checksum: 1b995595d81c83346966320ccac79379adefa72335656409e44c0ffc49cb0d5961026334952cf768f5684f0d90b149d03edce597ad63c418bd6f01f3b696ccc0
   languageName: node
   linkType: hard
 
-"@tamagui/helpers-tamagui@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/helpers-tamagui@npm:1.88.18"
+"@tamagui/helpers-tamagui@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/helpers-tamagui@npm:1.74.16"
   dependencies:
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/helpers": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: b3149e2a86ef2ac81bf21d9c8d8e30cf1f809cf2f8868b3b458683219a21f850ce6e5951cb058fa45be032ea1b6b096a8ed7864a7c9acb21ddb0dd4c4a27c947
+  checksum: f0ad336e499e218690563301458870b8a4476289a28f19fbfc91765f34ef439021f2fd6cb327fe79269137b7428da9dca12d764927d30a9ceb588f6d5d715721
   languageName: node
   linkType: hard
 
-"@tamagui/helpers@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/helpers@npm:1.88.18"
+"@tamagui/helpers@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/helpers@npm:1.74.16"
   dependencies:
-    "@tamagui/constants": 1.88.18
-    "@tamagui/simple-hash": 1.88.18
-  checksum: b9ac4e27e90af171eb28a4bb1006dbfd72a03cd778d0e13dfd49454833677c7d9f34f7592d46aabfb2294e2791a61ce273921e7ce8a48d960c541e2758478c50
+    "@tamagui/constants": 1.74.16
+    "@tamagui/simple-hash": 1.74.16
+  checksum: 2d54722d3c260c209b5d09f0b3f3d07f80b6e6e94cbe31a198ab4e48cb7299352df12078be708195f5e813be266cd360d66f8624c320c0fde106b32f0ac89efd
   languageName: node
   linkType: hard
 
-"@tamagui/image@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/image@npm:1.88.18"
+"@tamagui/image@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/image@npm:1.74.16"
   dependencies:
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
+    "@tamagui/core": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 1371a7473266b6360cfd90da2c2453288a9041aec44f7b07a776f295fb002f0938de1d89f3c8d4e990f4ed51449f1d335c10ee224fb06ccb4f08be22f58ee096
+  checksum: ade9eef25b1abc917a8951ed384e76b9e9bfc0fae42d773cbc8702d2ec2a70fd33d8608da579fc95fa326bbf3efcaeef5ee4e02c80215ad6d082a33bfcfd9051
   languageName: node
   linkType: hard
 
-"@tamagui/label@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/label@npm:1.88.18"
+"@tamagui/label@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/label@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/focusable": 1.88.18
-    "@tamagui/get-button-sized": 1.88.18
-    "@tamagui/get-font-sized": 1.88.18
-    "@tamagui/text": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/focusable": 1.74.16
+    "@tamagui/get-button-sized": 1.74.16
+    "@tamagui/get-font-sized": 1.74.16
+    "@tamagui/text": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 83b3736b12ff3a2913192638775e304ae64d274c3c353567bdf8ba262e1dfc17163764fbdf6dc82d4e4edf2be340741e8273739e7ef67ca2b2cef88b59a47876
+  checksum: 84cddd34b6c1fed87ba2feb32f43e88ff3462b15f1af07454554d006ff2f9dca04409873a0eb8e1ca826c3b9e0a0fb83804270fff98cf50e68dfe0c1f29ed6b5
   languageName: node
   linkType: hard
 
-"@tamagui/linear-gradient@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/linear-gradient@npm:1.88.18"
+"@tamagui/linear-gradient@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/linear-gradient@npm:1.74.16"
   dependencies:
-    "@tamagui/core": 1.88.18
-    "@tamagui/stacks": 1.88.18
+    "@tamagui/core": 1.74.16
+    "@tamagui/stacks": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: b35b2fab3e8070c3ce45ea57824bf29a7db725fe1e1525235fb45b465342e584997cd2c496d8a444ef5157bbe377754b95b3a16cea3193ad0df4b7555b6bad02
+  checksum: a95e9ef929f14daf3a234dae2cd71876b1483a0bff7affea167b9bd196b0f35ac51566cf27cfec7c1aa67c65a9fc7ec58603869c728001ff28952e1c569b4e0d
   languageName: node
   linkType: hard
 
-"@tamagui/list-item@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/list-item@npm:1.88.18"
+"@tamagui/list-item@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/list-item@npm:1.74.16"
   dependencies:
-    "@tamagui/font-size": 1.88.18
-    "@tamagui/get-font-sized": 1.88.18
-    "@tamagui/get-token": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/helpers-tamagui": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/text": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/font-size": 1.74.16
+    "@tamagui/get-font-sized": 1.74.16
+    "@tamagui/get-token": 1.74.16
+    "@tamagui/helpers-tamagui": 1.74.16
+    "@tamagui/text": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 07cf6c67d7920d1cb7df01fc3adc229793f4ae712b5f4d7700b9e7954470d7a8a234913d7d8d56e0c93abbcf4e364bd7a2164125a5a2cc4d7dd63be5b5e94eb1
+  checksum: 1b9d8a5702cc36741689d685265957adc5a9a7edb459692c35e87a6e60a9f493d820a5e9ab6f70d74ddbb80eb8991bb2758e636b87794c7001f9eae2e9ea258f
   languageName: node
   linkType: hard
 
-"@tamagui/normalize-css-color@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/normalize-css-color@npm:1.88.18"
+"@tamagui/normalize-css-color@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/normalize-css-color@npm:1.74.16"
   dependencies:
     "@react-native/normalize-color": ^2.1.0
-  checksum: 70243d1649ba31c00d62e24ab4c20cb22d9de83dc2e9b8bc4b919fcc4a3528d0f3fa7edb3fdb469025cc458ae3fbef8bde2a6b6bdbfd56c213f94dbc849816e5
-  languageName: node
-  linkType: hard
-
-"@tamagui/polyfill-dev@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/polyfill-dev@npm:1.88.18"
-  checksum: 82560b98a9c622c94623039e24968480f81acb9a0e5f5959a4b0ec352342a3b9700f2dd428b273e7a42574803a4e0cc45c79bd8b1b7a48bb9ee8c9e1c2f83887
-  languageName: node
-  linkType: hard
-
-"@tamagui/popover@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/popover@npm:1.88.18"
-  dependencies:
-    "@floating-ui/react": ^0.26.6
-    "@tamagui/adapt": 1.88.18
-    "@tamagui/animate": 1.88.18
-    "@tamagui/aria-hidden": 1.88.18
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/dismissable": 1.88.18
-    "@tamagui/floating": 1.88.18
-    "@tamagui/focus-scope": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/polyfill-dev": 1.88.18
-    "@tamagui/popper": 1.88.18
-    "@tamagui/portal": 1.88.18
-    "@tamagui/remove-scroll": 1.88.18
-    "@tamagui/scroll-view": 1.88.18
-    "@tamagui/sheet": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
+  checksum: a91bbe9a4d67c6c9cf8e1544db8c7a656e1855d3d3435f3ddb404beb416273e1154889169cb0d3426b95a489490c7c4770bb504b045468bbb23f2b2c7688520e
+  languageName: node
+  linkType: hard
+
+"@tamagui/polyfill-dev@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/polyfill-dev@npm:1.74.16"
+  checksum: 711f0aa2280992dfeeedb9089da466a4cf1fca07e5e5d2bc502ee1900f32607acb8a770d2b79b8844499b28ee9fb90496aa4e13428496544ec5c82fa27270c19
+  languageName: node
+  linkType: hard
+
+"@tamagui/popover@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/popover@npm:1.74.16"
+  dependencies:
+    "@floating-ui/react": ^0.24.7
+    "@tamagui/adapt": 1.74.16
+    "@tamagui/animate": 1.74.16
+    "@tamagui/aria-hidden": 1.74.16
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/dismissable": 1.74.16
+    "@tamagui/floating": 1.74.16
+    "@tamagui/focus-scope": 1.74.16
+    "@tamagui/polyfill-dev": 1.74.16
+    "@tamagui/popper": 1.74.16
+    "@tamagui/portal": 1.74.16
+    "@tamagui/remove-scroll": 1.74.16
+    "@tamagui/scroll-view": 1.74.16
+    "@tamagui/sheet": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
     react-freeze: ^1.0.3
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 9f8f872b2c0ee01410f400f660a4b4b04ea3e352e5805710ef82fb026db18a458d87c18ac16a7f2aaf9f89d008f94daf519b5835fbd6a9afc06404f2e48144b1
+  checksum: 017be1bcdca03ce8da764e947685b1341497a11eb6d09d838650a416d9ca5bdea5abc043ad9a9c72431157ba211e7ce218321ac79655c42d45c22a5fac421546
   languageName: node
   linkType: hard
 
-"@tamagui/popper@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/popper@npm:1.88.18"
+"@tamagui/popper@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/popper@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/floating": 1.88.18
-    "@tamagui/get-token": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/floating": 1.74.16
+    "@tamagui/get-token": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 943f3218e8fd558a4810c474946d1b01db113a5adcda0ca41425507c4a3f738572464e8805d7967c38c677be0f0d47aae62e85e0ab4d13e070e31666736bd455
+  checksum: 0cbe2ec38c4cfbecae06c8c268b418150db05ef4851a9f256d45d24fef9d26e62f1121e1e779beb8c20b309868e54cf7a9ba2931f86e05003dbc5360fdd7ee7f
   languageName: node
   linkType: hard
 
-"@tamagui/portal@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/portal@npm:1.88.18"
+"@tamagui/portal@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/portal@npm:1.74.16"
   dependencies:
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-event": 1.88.18
+    "@tamagui/core": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-event": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: da021d00af7b0835dea3bb338586d7b73b5821eaa5359c917a68a74eccdfaf4674b8d42f8533080ac9c257f88e50464a03a85be53455d1168469452be995a0c7
+  checksum: 076bea0038b907017a0f8fc09a8a1a5d34b4c7c964217610bf148dede40025ef8ea89ecb397db15b0818fbc020ff079a552d9f792f3a997dfcf352cc39a3caaa
   languageName: node
   linkType: hard
 
-"@tamagui/progress@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/progress@npm:1.88.18"
+"@tamagui/progress@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/progress@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/get-token": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/stacks": 1.88.18
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/get-token": 1.74.16
+    "@tamagui/stacks": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 445ff7176cb8c1341684178f9c786fe80e00ad24619aeda3cad8d693c6d1de70a9af3d447004db9f5d5d5e669bc171ef9f36fb6c153722ab81dc4a763fc68789
+  checksum: d6ffa33a787c243bf40b014402b3a650b43abc75ec4b2d2c0716180278c6355b4cd21b7a8d2384ee200807ed06b7e59dd4d8e195e83d854b6b7a641c2d7dcf0b
   languageName: node
   linkType: hard
 
-"@tamagui/proxy-worm@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/proxy-worm@npm:1.88.18"
-  checksum: 352122c7e14ea0832dab02ef2a5684e9de8108af1bc16defbb381132abf7e5793668c609421cbb2cee7b2327ff019759e4e48d1108bd48325183e932acc7233e
+"@tamagui/proxy-worm@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/proxy-worm@npm:1.74.16"
+  checksum: d35e41d45c1c38d6de69591a8a0b52dc9d9ba6a7d7cacc3d01c61d7962879b94b6983312990b663160dba2248923fabf973f918dce90b0f7e5af44a4d782d7d3
   languageName: node
   linkType: hard
 
-"@tamagui/radio-group@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/radio-group@npm:1.88.18"
+"@tamagui/radio-group@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/radio-group@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/focusable": 1.88.18
-    "@tamagui/get-token": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/label": 1.88.18
-    "@tamagui/roving-focus": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
-    "@tamagui/use-previous": 1.88.18
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/focusable": 1.74.16
+    "@tamagui/get-token": 1.74.16
+    "@tamagui/label": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
+    "@tamagui/use-previous": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 14eba4b3713ce0426fc9b87d787725d099e01a271fecd42d3fe0a8d85831eb1943de0e918957606a61e044c0328920a3d770f46219c7db2de9c6a43c2f1e61c8
+  checksum: 72764065aef9b7613886c16c1bf9f89693064db39d1d6cc5417cafe4ecf3fe84a70e87b68a038d7d6a73cca876360ecadcd05ff5bf3ff710eda89f3e6a72b602
   languageName: node
   linkType: hard
 
-"@tamagui/react-native-media-driver@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/react-native-media-driver@npm:1.88.18"
+"@tamagui/react-native-media-driver@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/react-native-media-driver@npm:1.74.16"
   dependencies:
-    "@tamagui/web": 1.88.18
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react-native: "*"
-  checksum: 91867d82d85dcbd68599bf4e995dd711d62299ba84f1793903d88f7735452925ba157a83044efdfe482fe6fdbf92af285d516ab72b7c20200fcfcf6a9d20e405
+  checksum: 1067c311d4401f064bdc9529307d83686b06d96d21f9a288cf2b99705a6b831c32c1db3eb064a8c75c336034a20f33869f700c22636b1673dc698780a595e1ab
   languageName: node
   linkType: hard
 
-"@tamagui/react-native-use-pressable@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/react-native-use-pressable@npm:1.88.18"
+"@tamagui/react-native-prebuilt@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/react-native-prebuilt@npm:1.74.16"
+  checksum: 96711bdf9774a560386eaf461901c4ba1860be387bc1304492e09d045089759c111c56f4aaa11bc9f08ef1a9a0c918cb7f82ac74e935676eefd22c92587f5a57
+  languageName: node
+  linkType: hard
+
+"@tamagui/react-native-use-pressable@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/react-native-use-pressable@npm:1.74.16"
   peerDependencies:
     react: "*"
-  checksum: bd632853c3a8f2713c559781320d584217dfec7ea0df5ac230c0fc4a1ab089d56a64edb104b19aed9e41bf21eb35d7e3f616870fdd1989070ff40ff20decb292
+  checksum: bf5105c2b31ab90652b24c190c315b14337cd5e9f37f89ec6e3f7ded2f350207f40f96c99c482d7c94094eefcf58b79a3bed195b4d4e37183ff33f60cec5dab3
   languageName: node
   linkType: hard
 
-"@tamagui/react-native-use-responder-events@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/react-native-use-responder-events@npm:1.88.18"
+"@tamagui/react-native-use-responder-events@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/react-native-use-responder-events@npm:1.74.16"
   peerDependencies:
     react: "*"
-  checksum: 35bdd58fabe84e7e15dd40992c1ecd66bbd8b43f2e0ae9afe2d8178c060c48948760d6663191813f3f4b1e01d7b782535b5cf670e6a267bd23a1effe830f975c
+  checksum: cb84bcfbb2dde99c54974432d07227250d4d8f9d83395c90d1f1768555791b767b0d092574d33364eb36e3d31eace69d7229d4ed4ef489e5f21ea0bd8cffe19d
   languageName: node
   linkType: hard
 
-"@tamagui/remove-scroll@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/remove-scroll@npm:1.88.18"
+"@tamagui/remove-scroll@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/remove-scroll@npm:1.74.16"
   dependencies:
     react-remove-scroll: ^2.5.5
   peerDependencies:
     react: "*"
-  checksum: 98dc801c46e2198d7afca2da8f2fd5445c4f445196b20687335cf6646aede3c4262a42820e70f63c350827931136a6816e504b8fe161374e1843dc37cb343f2a
+  checksum: f41002b919ac42b587cbf5a788a8f903a01324ca2a9016124691f0d7fc471e47204ced1d4c5cf18c54583ac4a73f6dd826158f886abd51304058ac2e260ac592
   languageName: node
   linkType: hard
 
-"@tamagui/roving-focus@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/roving-focus@npm:1.88.18"
+"@tamagui/roving-focus@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/roving-focus@npm:1.74.16"
   dependencies:
-    "@tamagui/collection": 1.88.18
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
-    "@tamagui/use-direction": 1.88.18
-    "@tamagui/use-event": 1.88.18
+    "@tamagui/collection": 1.74.16
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
+    "@tamagui/use-direction": 1.74.16
+    "@tamagui/use-event": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 24b78ce150216f03e5d4518b677a1f5f9db6cdb49032502cbab1526658d0e4d32ad848dbd43c092259fbc547295ef663078d5dec6999aeb120242ae9c7064097
+  checksum: dad7669a53809723562353078e347dc82ead8aebf8faadbda487bb2fc02109d298059ea4ffbf25f3c689aa3669b74b39ef29fe93b311fb26ea640f5cb4d4009a
   languageName: node
   linkType: hard
 
-"@tamagui/scroll-view@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/scroll-view@npm:1.88.18"
+"@tamagui/scroll-view@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/scroll-view@npm:1.74.16"
   dependencies:
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: e28c782c6885e8fb3d9df15384b8e3e9084cd9999e4070605e6e646727f2c3c27186e2d63a4655e0c6d9cda220b5652f4df13dcf32730e02336be8c21bdc899d
-  languageName: node
-  linkType: hard
-
-"@tamagui/select@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/select@npm:1.88.18"
-  dependencies:
-    "@floating-ui/react": ^0.26.6
-    "@floating-ui/react-dom": ^2.0.6
-    "@floating-ui/react-native": ^0.10.3
-    "@tamagui/adapt": 1.88.18
-    "@tamagui/animate-presence": 1.88.18
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/dismissable": 1.88.18
-    "@tamagui/focus-scope": 1.88.18
-    "@tamagui/get-token": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/list-item": 1.88.18
-    "@tamagui/portal": 1.88.18
-    "@tamagui/remove-scroll": 1.88.18
-    "@tamagui/separator": 1.88.18
-    "@tamagui/sheet": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/text": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
-    "@tamagui/use-debounce": 1.88.18
-    "@tamagui/use-event": 1.88.18
-    "@tamagui/use-previous": 1.88.18
+  checksum: 6762bfb40ac289e8aaaaffa901190e85a2eef6efb6806dbe05ff1fa4a76a8b29f930dafc23015fbef5ee82e4181ce9fbe2d60ad637cb4970a9bb1a0e001efc1c
+  languageName: node
+  linkType: hard
+
+"@tamagui/select@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/select@npm:1.74.16"
+  dependencies:
+    "@floating-ui/react": ^0.24.7
+    "@floating-ui/react-dom": ^2.0.1
+    "@floating-ui/react-native": ^0.10.1
+    "@tamagui/adapt": 1.74.16
+    "@tamagui/animate-presence": 1.74.16
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/dismissable": 1.74.16
+    "@tamagui/focus-scope": 1.74.16
+    "@tamagui/get-token": 1.74.16
+    "@tamagui/list-item": 1.74.16
+    "@tamagui/portal": 1.74.16
+    "@tamagui/remove-scroll": 1.74.16
+    "@tamagui/separator": 1.74.16
+    "@tamagui/sheet": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/text": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
+    "@tamagui/use-event": 1.74.16
+    "@tamagui/use-previous": 1.74.16
     react-dom: ^18.2.0
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 09823639125a4a3a083a0e57129d9fd269ded2c4e99cbb6ac74a67896c70de238f74e5cd94a5ad8b24006c88b1f9be3e46420c8136b4171332a103aa571ace01
+  checksum: 44384168a2e7aa7eeb34e00f01290d355e655ccd9aae6a6d4540a877caf2c7878db0a4b05a2b899e9dac48b777da50a90548159980aaf8ef723f6a15010d86f3
   languageName: node
   linkType: hard
 
-"@tamagui/separator@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/separator@npm:1.88.18"
+"@tamagui/separator@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/separator@npm:1.74.16"
   dependencies:
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
+    "@tamagui/core": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 41dd1e144d1b2fcccee63b94cc98aed5269220abeee0fef23f34c61862e1c142b456cdd6ac6a1752344b06a0393a5a030c007bea093786de25f387c19db845ca
+  checksum: 9d92a0b6f53cf796ac604fab84aa7ba0e139be2abe438e505d8529193ed5f19095b2673daf2f11ef144265088599ca75e49f9461ad8db34755f4f6d5fb02cde5
   languageName: node
   linkType: hard
 
-"@tamagui/shapes@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/shapes@npm:1.88.18"
+"@tamagui/shapes@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/shapes@npm:1.74.16"
   dependencies:
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: b2b3fec3dd25fa64cbb0f91e74b02bb9d816243311aa14c050dc297a7a60862ec13aad51247e8f7b42acf2c3fd757c6ada626189c473a1fd42d7154b2b327c3f
+  checksum: b601a9ef068791969353d574269ff1c7c8c1a613ed8f1731f8f81906e7a350903c0e31d27600bb50e9c15b6260c26cc9961b158011ef6191d7289cd2ce9731c7
   languageName: node
   linkType: hard
 
-"@tamagui/sheet@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/sheet@npm:1.88.18"
+"@tamagui/sheet@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/sheet@npm:1.74.16"
   dependencies:
-    "@tamagui/animate-presence": 1.88.18
-    "@tamagui/animations-react-native": 1.88.18
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/portal": 1.88.18
-    "@tamagui/remove-scroll": 1.88.18
-    "@tamagui/scroll-view": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-constant": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
-    "@tamagui/use-keyboard-visible": 1.88.18
+    "@tamagui/animate-presence": 1.74.16
+    "@tamagui/animations-react-native": 1.74.16
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/portal": 1.74.16
+    "@tamagui/remove-scroll": 1.74.16
+    "@tamagui/scroll-view": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-constant": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
+    "@tamagui/use-keyboard-visible": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: c3233a32bf3684aa770fad07dc9849649fb91647c721716aba4debbc1ef027937facc17ab8092df19b617ad3d89bfb54d91bd4ba90519209c93b730b7fc6f2a4
+  checksum: 2ab51b337db7ba415f303e9ef5836a09c19c0d1ad132c5e02bf072585630713642b1d30dcf820a6da96025947dd1001768b8bc5936a8fe6f35d20c1369abb246
   languageName: node
   linkType: hard
 
-"@tamagui/shorthands@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/shorthands@npm:1.88.18"
-  checksum: 253e03bd284ddb859639a989e3e0aa1965ce0501b72ff7ea80d61ee58b571b9ab41557cd96a8ef4f035a696047dddbd453e62f8bb822b109e518456de8c34d11
+"@tamagui/shorthands@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/shorthands@npm:1.74.16"
+  checksum: 40bd1f3765b27fc6f79ff0d02f0a6db96d479501a3b4d1b8efe087be69daf5343d4d68eb42d3a4f6ed0e28388635612a3a7bda2de8f5e0bb644312837ccd34e9
   languageName: node
   linkType: hard
 
-"@tamagui/simple-hash@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/simple-hash@npm:1.88.18"
-  checksum: f8e70d72eb18fdf6b683ae108f223a95b013840254052d40a5208b482e2c31b2ea7561a6b59f14482569d30142c2424f0ef4b96383b988c0f7cb369c2d685043
+"@tamagui/simple-hash@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/simple-hash@npm:1.74.16"
+  checksum: 7b38e5215e6e00f427f2755a1315ac616c0017e3de47f685642b369d4d99511ee4717b3c70fd36a1f7f02f8b92145a48699354d2b68d619a2a83d691df022585
   languageName: node
   linkType: hard
 
-"@tamagui/slider@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/slider@npm:1.88.18"
+"@tamagui/slider@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/slider@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/get-token": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
-    "@tamagui/use-direction": 1.88.18
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/get-token": 1.74.16
+    "@tamagui/helpers": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
+    "@tamagui/use-direction": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: c95dd746d058bae84b3d2dc52ba37213af6aa7c8e5e71b64566010935930e11ef3a1fca1cac494cd3a79595aa1665f514ce8ed66033373ad7c3c65a5f6312758
+  checksum: 5bbb0e9c821bcef8d488a3cf0bc1140afe65d3071655fbcf84259fc4c4d2a9a0db3dd1daf22be7cfa2fa7f970daf77f2504d5d9e4c0cf92139caf57db1144eef
   languageName: node
   linkType: hard
 
-"@tamagui/stacks@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/stacks@npm:1.88.18"
+"@tamagui/stacks@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/stacks@npm:1.74.16"
   dependencies:
-    "@tamagui/core": 1.88.18
+    "@tamagui/core": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: bcbb5287f7eb503989d66c7e08eb7887da31d701083f21eae1099d8f034e4c80736bf34e854c324b045ca65a4080a6682efbd842297cce0d72b9ef3d6f39a6ae
+  checksum: d7ebc70671a8122fba02f53d25e5d42b533abec871b7333c0b838d44768ad1d714338f37ed8fab5aef9703f91ce2104f9c2e88e378934b671e795771ced925a3
   languageName: node
   linkType: hard
 
-"@tamagui/static@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/static@npm:1.88.18"
+"@tamagui/static@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/static@npm:1.74.16"
   dependencies:
-    "@babel/core": ^7.23.3
-    "@babel/generator": ^7.23.3
-    "@babel/helper-plugin-utils": ^7.22.5
-    "@babel/parser": ^7.23.3
-    "@babel/plugin-transform-react-jsx": ^7.22.15
-    "@babel/runtime": ^7.23.2
-    "@babel/traverse": ^7.23.3
-    "@babel/types": ^7.23.3
-    "@tamagui/build": 1.88.18
-    "@tamagui/cli-color": 1.88.18
-    "@tamagui/config-default": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/fake-react-native": 1.88.18
-    "@tamagui/generate-themes": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/helpers-node": 1.88.18
-    "@tamagui/proxy-worm": 1.88.18
-    "@tamagui/shorthands": 1.88.18
-    "@tamagui/types": 1.88.18
+    "@babel/core": ^7.21.8
+    "@babel/generator": ^7.21.5
+    "@babel/helper-plugin-utils": ^7.21.5
+    "@babel/parser": ^7.21.8
+    "@babel/plugin-transform-react-jsx": ^7.22.5
+    "@babel/runtime": ^7.21.5
+    "@babel/traverse": ^7.21.5
+    "@babel/types": ^7.21.5
+    "@tamagui/build": 1.74.16
+    "@tamagui/cli-color": 1.74.16
+    "@tamagui/config-default": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/fake-react-native": 1.74.16
+    "@tamagui/generate-themes": 1.74.16
+    "@tamagui/helpers": 1.74.16
+    "@tamagui/helpers-node": 1.74.16
+    "@tamagui/proxy-worm": 1.74.16
+    "@tamagui/react-native-prebuilt": 1.74.16
+    "@tamagui/shorthands": 1.74.16
+    "@tamagui/types": 1.74.16
     babel-literal-to-ast: ^2.1.0
-    browserslist: ^4.22.2
-    esbuild: ^0.19.11
+    esbuild: ~0.19.3
     esbuild-register: ^3.4.2
     find-cache-dir: ^3.3.2
     find-root: ^1.1.0
-    fs-extra: ^11.2.0
+    fs-extra: ^11.1.0
     invariant: ^2.2.4
-    lightningcss: "*"
     lodash: ^4.17.21
-    react-native-web: ^0.19.10
-    react-native-web-internals: 1.88.18
-    react-native-web-lite: 1.88.18
-  dependenciesMeta:
-    lightningcss:
-      optional: true
-  checksum: 2521491bcbfb3fb1d0943f5f6fc35cb0a2488da1a496b0f89ffe093a88ab99ee661c838fa42e68949916a8a87854574ff492a4bf0f9e3a8d511a3293a5dcdafd
+    react-native-web: ^0.19.6
+    react-native-web-internals: 1.74.16
+    react-native-web-lite: 1.74.16
+  checksum: 7c451b90343e50647faf3644e7d30783b4b1d1c9a03328a54db42e1d9efa2bf0314e9274446dedef6d8cb121d98225f19f738ba371c1ef14d2eac322fba90c67
   languageName: node
   linkType: hard
 
-"@tamagui/switch@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/switch@npm:1.88.18"
+"@tamagui/switch@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/switch@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/focusable": 1.88.18
-    "@tamagui/get-token": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/label": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
-    "@tamagui/use-previous": 1.88.18
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/focusable": 1.74.16
+    "@tamagui/get-token": 1.74.16
+    "@tamagui/label": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
+    "@tamagui/use-previous": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: a9475fcf2e79f302c429879803c4b02771a8368fddbb24d28129430ee2152a42d157f27354d9935a775e083a7d8010533596d1af1385a79154178f53804ec963
+  checksum: 4bdb7893f196c2aed9e72862e7f5d290c24213b610b9580e5d6b3fb7ff1408a5d517b4c0eb1ef749cf64a8441882028aad819483664958ef5ef7f6dda4112440
   languageName: node
   linkType: hard
 
-"@tamagui/tabs@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/tabs@npm:1.88.18"
+"@tamagui/tabs@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/tabs@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/get-button-sized": 1.88.18
-    "@tamagui/group": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/roving-focus": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
-    "@tamagui/use-direction": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/get-button-sized": 1.74.16
+    "@tamagui/group": 1.74.16
+    "@tamagui/roving-focus": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
+    "@tamagui/use-direction": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
     react-dom: "*"
-  checksum: b544b10bf6cdb5653253904e7e92487aa3c660a03b82bb99b411dc0987e030901904a214565abcf1f45956297720e26556605092abc134532d43cbadff2bff45
+  checksum: d7eb919d34b420d26fdce1b14be71da6b5e5f2e303020b865132d0f1eaef24d4923db143c24682398c6da00c331e3d7ef89dd253372bed5ddc89eefe85e088bc
   languageName: node
   linkType: hard
 
-"@tamagui/text@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/text@npm:1.88.18"
+"@tamagui/text@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/text@npm:1.74.16"
   dependencies:
-    "@tamagui/get-font-sized": 1.88.18
-    "@tamagui/helpers-tamagui": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/get-font-sized": 1.74.16
+    "@tamagui/helpers-tamagui": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 9301ebe7badf1e25a99f008f37d76f63ef84a49514dff11aaf08d167bc47b69d7cf38db8973e9ca230f727e683d4bd9452230d7a8e6c1bdb9c84073eaa5ffa1a
+  checksum: 8190df4b6e45bb325e67a0edee1e315407706cf087dbbf0385989499c420c43047d75fdf2a8fc5a07a37df9c3d78eb71b77b85b556782a74b6784bb1783d2538
   languageName: node
   linkType: hard
 
-"@tamagui/theme-base@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/theme-base@npm:1.88.18"
-  checksum: 1cdca1b089df6828fd5f8d9c8f9fa20d751a4e1f4286f5c5a1ebc477964fb9a699b377a0aa9e29a7ce97e5b28becf30b23166a1b142e89ed9d2754bf2a3dcb35
+"@tamagui/theme-base@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/theme-base@npm:1.74.16"
+  checksum: 416d3d2201f3b949c90295d465ad9694ff78d34d8adc28ab73ee7552b4aae456e2593ec8d8979d94a66cf91ef3666a2adc678e3302a10447badc6603a2e992a4
   languageName: node
   linkType: hard
 
-"@tamagui/theme@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/theme@npm:1.88.18"
+"@tamagui/theme@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/theme@npm:1.74.16"
   dependencies:
-    "@tamagui/constants": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/constants": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 19f8909f8c7442cf73a8cd541ea2a2b11072c0a347ad4b6fb2233ec9b14c16d5c3d25e72fe43314b894970c32eee1a965b15c6ba6c88bddfdb72723baf4a798b
+  checksum: e3c69ed95f34bd26dd16e971fbfa7efbc7c21a1e489c6a459bc4aa2a9352aed82176069208ea773eaa835c8ed93518dc76d49095391d2091e2fcd8ee378fed36
   languageName: node
   linkType: hard
 
-"@tamagui/timer@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/timer@npm:1.88.18"
-  checksum: e4689e2d82360931070d291c206ddb1490ae5f854b5872d6bdd66d8315d066a3d2061ac4d1f9e5754b55a968dfdaf3636aaec48fbd6eac55b1e0b9c254e54336
+"@tamagui/timer@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/timer@npm:1.74.16"
+  checksum: cba91c72fa6713f82a4c627079a9fad27bdb8c9758e39a94806dbbbde96501ad1d10b8d894005a2d7ee2d7af4985a3e4cd035c9cc161b9bdb3cb2092e191b0c0
   languageName: node
   linkType: hard
 
-"@tamagui/toast@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/toast@npm:1.88.18"
+"@tamagui/toast@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/toast@npm:1.74.16"
   dependencies:
-    "@tamagui/animate-presence": 1.88.18
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/dismissable": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/polyfill-dev": 1.88.18
-    "@tamagui/portal": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/text": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
-    "@tamagui/visually-hidden": 1.88.18
+    "@tamagui/animate-presence": 1.74.16
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/dismissable": 1.74.16
+    "@tamagui/polyfill-dev": 1.74.16
+    "@tamagui/portal": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/text": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
+    "@tamagui/visually-hidden": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 87a887315719bbc9483efe54d3a244b4e370f44c0e527570662383a5a20d5606c3efa5c13ed8fc0d1602d89fe4e0d6771dcdeafc0776b682f01fe430c431e92a
+  checksum: e11dcd9cf60e8af78e6a3567382f17bfe2e151ef5b61200f7d0e50feeeb01fb5a1d325b6f6d6b926ce2afffd7f0349d64ad605f70a17007e25e6f8e364601661
   languageName: node
   linkType: hard
 
-"@tamagui/toggle-group@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/toggle-group@npm:1.88.18"
+"@tamagui/toggle-group@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/toggle-group@npm:1.74.16"
   dependencies:
-    "@tamagui/constants": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/focusable": 1.88.18
-    "@tamagui/font-size": 1.88.18
-    "@tamagui/get-token": 1.88.18
-    "@tamagui/group": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/helpers-tamagui": 1.88.18
-    "@tamagui/roving-focus": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
-    "@tamagui/use-direction": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/focusable": 1.74.16
+    "@tamagui/font-size": 1.74.16
+    "@tamagui/get-token": 1.74.16
+    "@tamagui/group": 1.74.16
+    "@tamagui/helpers-tamagui": 1.74.16
+    "@tamagui/roving-focus": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
+    "@tamagui/use-direction": 1.74.16
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: affb2eeb421bf43ee712da634b77ad85b16a8e7c170515da9b53a23e1d4a0e997f57b335c38882f6a701bd3dfeee63484631884912616731bbd656b43cb7b943
+  checksum: 3da0269138520f5bb9f5df055fe4920437702b6a7234f51aef246cc2444c77c363f3591e99e14194a93e72f4aa4bea9d6323f3321e74a1732c193dc03bb5e0a1
   languageName: node
   linkType: hard
 
-"@tamagui/tooltip@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/tooltip@npm:1.88.18"
+"@tamagui/tooltip@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/tooltip@npm:1.74.16"
   dependencies:
-    "@floating-ui/react": ^0.26.6
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/floating": 1.88.18
-    "@tamagui/get-token": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/polyfill-dev": 1.88.18
-    "@tamagui/popover": 1.88.18
-    "@tamagui/popper": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/text": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
+    "@floating-ui/react": ^0.24.7
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/floating": 1.74.16
+    "@tamagui/get-token": 1.74.16
+    "@tamagui/polyfill-dev": 1.74.16
+    "@tamagui/popover": 1.74.16
+    "@tamagui/popper": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/text": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 27d15354367ac98481b429b464864cf49208c886787ac330d118bfed38ec421f91402296f6a838343c453cc3c811840ace4a11951c66f51874877d215e1a7d1c
+  checksum: f3deb69329e87596dd3ff6ea615b72085f6afc345a3cb34fb034d41e72de40c284a413191457a3e056f5af86dad4c695ead545075dd7b943fbd33e569d65a35e
   languageName: node
   linkType: hard
 
-"@tamagui/types@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/types@npm:1.88.18"
-  checksum: 755279f1582b13a0ea9de29e10d05e9fd306fc4e5b6dc0eeba20295905ab9bd4bed7e94e468a06974c9a015a3bffa9687e1898fdbe51cfc49b12f9a695ccede3
+"@tamagui/types@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/types@npm:1.74.16"
+  checksum: 1926dc510c1ebaa5d4388f6ae1afef926194710cb5f10793756afc157126eda50a96e8a6e49f4eeb78487745d97c62c2444f9256a51d1f2e38db242b3e4ff724
   languageName: node
   linkType: hard
 
-"@tamagui/use-callback-ref@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/use-callback-ref@npm:1.88.18"
-  checksum: 67948cce91c449b95ca1702ccf0587479f3fa58f2f2bce4bc3c8df96fb896a58552d090440871ecc46da2fc36acd2bd077c07e74b2098c8053ce6f1ab2baed45
+"@tamagui/use-callback-ref@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/use-callback-ref@npm:1.74.16"
+  checksum: a7e02927c9b6ca1f2af077c333be488246844149ab9068b2d6fe8d30d7a5fed3952d5f6f684299b29eae466f4829b5ac59c1094ee5c78de40de3391db264ed9e
   languageName: node
   linkType: hard
 
-"@tamagui/use-constant@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/use-constant@npm:1.88.18"
+"@tamagui/use-constant@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/use-constant@npm:1.74.16"
   peerDependencies:
     react: "*"
-  checksum: 0cb9eaec769dc1a0bb257e1d730b2d87d02ce59edc21434736b771fcca2b4b9f04ed273392aed0a66c4a966c73488ee7321f46f56670778564516a13955449e4
+  checksum: 2a3f6f85f3df619cd5a9b7e230c148841d99d1616350378e10c6872a7c5efbed394f3b6f4a6e97bf66e9832f6c24f79763bbe915f0434bdc17dca8d42ecc6194
   languageName: node
   linkType: hard
 
-"@tamagui/use-controllable-state@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/use-controllable-state@npm:1.88.18"
+"@tamagui/use-controllable-state@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/use-controllable-state@npm:1.74.16"
   dependencies:
-    "@tamagui/use-event": 1.88.18
+    "@tamagui/use-event": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 310e680f6fda140fdeed2bfcaa9c2029b02379340732f0d074108ad6cdbacb5996d0188a671622a7336553d06428feb159e04e916d0ede4d2624d4ca9859dd19
+  checksum: 5e80779baf4e6bc889600145ddfbf10861e5874036e4d6e0a409d689bebb1b07062d44de2c270c85c51d3870d1072b7a7812f198aa9be8246e3262f9ed64da1d
   languageName: node
   linkType: hard
 
-"@tamagui/use-debounce@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/use-debounce@npm:1.88.18"
+"@tamagui/use-debounce@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/use-debounce@npm:1.74.16"
   peerDependencies:
     react: "*"
-  checksum: dcc3c3820d305c11b4751481210e701f6770284f0f5257c806b5ede7762b2b1774cb0a913c7db756113b92f82e75a999cbb1e63f5ab8676b10726074aad79196
+  checksum: 1d9b5979d7b18ccb89a786af0f9a0dd85b6a16e617c6e46ffdfa30d28450482d8b3084a726860fef961ef1fd737619702a9ed243d4244a47c1aed622e2e5a8b0
   languageName: node
   linkType: hard
 
-"@tamagui/use-did-finish-ssr@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/use-did-finish-ssr@npm:1.88.18"
+"@tamagui/use-did-finish-ssr@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/use-did-finish-ssr@npm:1.74.16"
   dependencies:
-    "@tamagui/constants": 1.88.18
+    "@tamagui/constants": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: c5d04a66e88f63b22ffa0091ce1b819e9430de81d985a67736fd6f2e5859ffa024ba1eed8a1a20f6b6ad4c13b94fcfb4a723c3a5fa1885f94bca09effe0bc4f0
+  checksum: 6c7405672764d65de7f3c98939834b70fc961b8be3015f91f977568ba0ceac5ffa9f07bec394cb6606a3d1dfb75b89b6ee34217947c28166b75832f174bc10ce
   languageName: node
   linkType: hard
 
-"@tamagui/use-direction@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/use-direction@npm:1.88.18"
+"@tamagui/use-direction@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/use-direction@npm:1.74.16"
   peerDependencies:
     react: "*"
-  checksum: 4f0b61fb480531a733dc3b863d930caad45fe2fdaf22e976151831010426fef87bf48d7dce578f33242c9927d4a464ef6cc5cf33d4b3e95a8e29a60e1aaa67cb
+  checksum: 9f326f4865f004fe7baef93abcb0e4aa008c7c12b7e24747646674ad0b15ce977d32e23705a3287f4a465fc2295a09fb3c969683da2c649fa6e32772f01531bf
   languageName: node
   linkType: hard
 
-"@tamagui/use-escape-keydown@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/use-escape-keydown@npm:1.88.18"
+"@tamagui/use-escape-keydown@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/use-escape-keydown@npm:1.74.16"
   dependencies:
-    "@tamagui/use-callback-ref": 1.88.18
-  checksum: d34b3f3b897dbfefb2605f0b2ae10c1497f9c45058584d456b796ba53c5cd6b8798e6c0b51b9d8167eb4b0907802f9e444a64130a7540ff5e7f95a0e6f2c81ec
+    "@tamagui/use-callback-ref": 1.74.16
+  checksum: ee5c1e403a3b470a355ad4f9a334c0b0e1daa344d3fcff2d6da00fe3ba4f7f462d031ddeaf02388830e367ba63a1707688bf0602973d393f084c79ab0aa9c5d0
   languageName: node
   linkType: hard
 
-"@tamagui/use-event@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/use-event@npm:1.88.18"
-  dependencies:
-    "@tamagui/constants": 1.88.18
+"@tamagui/use-event@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/use-event@npm:1.74.16"
   peerDependencies:
     react: "*"
-  checksum: 22965e932377574d8b0c3f58316a3312fa8cf6beb4275553924b6d6b723c172085d62f3b52cb3751ffc0e4dcb511693ce2e409fb5a05e2c1638cdc4ceafa0767
+  checksum: 028b90464de63a224ee17656461519e3953cc4874c1a25d8173ae32eef7e63f513401534e329edac92ad1642c2dea5ec1e3d31a072e860834e8d45b02dc0a420
   languageName: node
   linkType: hard
 
-"@tamagui/use-force-update@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/use-force-update@npm:1.88.18"
+"@tamagui/use-force-update@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/use-force-update@npm:1.74.16"
   peerDependencies:
     react: "*"
-  checksum: 5f24f38e240dff4c15211a697fdf6fe5f045a7235f9e9e6765a9202e9d6bfab34e829385f3a29d62786574c5267aa35b076621353610b146827cc72f0031ae27
+  checksum: ffec52b3287b86b520b5fd54a71ada72ee458ae325c1bb61a44933a34935947a84996d0d32d02b9b5c7cb39723a7d20be26b9d680c5b2a8da26d8e53069baeba
   languageName: node
   linkType: hard
 
-"@tamagui/use-keyboard-visible@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/use-keyboard-visible@npm:1.88.18"
+"@tamagui/use-keyboard-visible@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/use-keyboard-visible@npm:1.74.16"
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 179339103f9798591b7c6ee68fae36460c7ebc4f5b66d660c30fb40beb2af2acf99f49d09698fb8f45996cab1d47319dac1e90002e955ee464e10c100a1f9fb9
+  checksum: e1a21cb14dc9a058b4be5db4c1674cbe268f1e479a1ffbb0697d92b3d32932ce2e92868a8c6bf66bf03e9b157815e9b58855eb055cf12bd3a5bdef1e72e39231
   languageName: node
   linkType: hard
 
-"@tamagui/use-presence@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/use-presence@npm:1.88.18"
+"@tamagui/use-presence@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/use-presence@npm:1.74.16"
   dependencies:
-    "@tamagui/web": 1.88.18
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 648d73e36be9b478c2776fa729d20533ef9141da388ca40c3796842e4f38f9b7ed6ff81777ba649bd66face013c37965afd7a23ed01e37ae2ea89de0880e6ceb
+  checksum: c36a79d5ec59ef850252ad419cbdcdf1809b6a1fb24d9861efe71c197db21b2e930cf50769e8f1850967d076f712f249b8bc99705c46c19d764906e8de7eb98d
   languageName: node
   linkType: hard
 
-"@tamagui/use-previous@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/use-previous@npm:1.88.18"
-  checksum: a752490865d2ae497a8ccfdf42f15b4a57d959cd963b9e82c7c6ed29459a71694d9e9157291f5cd75dd46ccd5b9bc00e14742316a0de2a6bf4e14697499f186a
+"@tamagui/use-previous@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/use-previous@npm:1.74.16"
+  checksum: 60b9a8efb87e574eaf1b928739a36a4d0415c885bd92f7b824bea8a042ea97a8454e6133d8cacb3f030a3584dc780e86abadd086b7ecfff7d78bfa829c07a3ef
   languageName: node
   linkType: hard
 
-"@tamagui/use-window-dimensions@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/use-window-dimensions@npm:1.88.18"
+"@tamagui/use-window-dimensions@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/use-window-dimensions@npm:1.74.16"
   dependencies:
-    "@tamagui/constants": 1.88.18
+    "@tamagui/constants": 1.74.16
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: c471395d817d3375c07aafd99d0e8a6ae7bf3cd3b7454abf73272fdedf8ca0c86abc3601e74e8fffea23583623382608334010a0d1199d9542eec79f10e0a0dc
+  checksum: 3510fcd6dd1647ba5066d33db14c4aff2258e272a3c26b7d3275742292d445bcb06f1834d3188657f73ccc8dd5eba702409bb8ab2e09810869d938f9507b97ee
   languageName: node
   linkType: hard
 
-"@tamagui/visually-hidden@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/visually-hidden@npm:1.88.18"
+"@tamagui/visually-hidden@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/visually-hidden@npm:1.74.16"
   dependencies:
-    "@tamagui/web": 1.88.18
+    "@tamagui/web": 1.74.16
   peerDependencies:
     react: "*"
-  checksum: 60bea48bc50517be0336f75b99d69e611c89dfae0f043fa1afc7b9ff47f6512b423759bcbfad76db42a1344b2e69305154f1b6cd9dd8393033074a754dddda1c
+  checksum: 5b55e490491fda0b6d5e22299bbe7b192ef7a486530b3c4b49c02074fc5c73ee618cb6b98d5bd0e59030c2771e651cbcfc893282ff17be2317e453cd876c24f3
   languageName: node
   linkType: hard
 
-"@tamagui/web@npm:1.88.18":
-  version: 1.88.18
-  resolution: "@tamagui/web@npm:1.88.18"
+"@tamagui/web@npm:1.74.16":
+  version: 1.74.16
+  resolution: "@tamagui/web@npm:1.74.16"
   dependencies:
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/helpers": 1.88.18
-    "@tamagui/normalize-css-color": 1.88.18
-    "@tamagui/timer": 1.88.18
-    "@tamagui/use-did-finish-ssr": 1.88.18
-    "@tamagui/use-event": 1.88.18
-    "@tamagui/use-force-update": 1.88.18
-    react: ^18.2.0
-    react-dom: ^18.2.0
-  checksum: 900a3797e9d86708a04add663dcd7bbc2b09f9e46afa36bc44c5508df86aaca7ca7aea71067d4967da73208c74dac5e2ead257130ed09821d3c4bcb79b94497c
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/constants": 1.74.16
+    "@tamagui/helpers": 1.74.16
+    "@tamagui/normalize-css-color": 1.74.16
+    "@tamagui/timer": 1.74.16
+    "@tamagui/use-did-finish-ssr": 1.74.16
+    "@tamagui/use-force-update": 1.74.16
+  peerDependencies:
+    react: "*"
+  checksum: 9724a3b6b913ce494d674fbbc41f5c7c07bf5b151de67d6170b35f13177203c4bf5aab103a53da36f73d4adfbd69bb50c2a8defab3331e2e6d21389fcd5664ca
   languageName: node
   linkType: hard
 
@@ -12265,7 +11489,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
+"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
   version: 7.0.15
   resolution: "@types/json-schema@npm:7.0.15"
   checksum: 97ed0cb44d4070aecea772b7b2e2ed971e10c81ec87dd4ecc160322ffa55ff330dace1793489540e3e318d90942064bb697cc0f8989391797792d919737b3b98
@@ -12751,10 +11975,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/semver@npm:^7.3.12, @types/semver@npm:^7.5.0":
-  version: 7.5.6
-  resolution: "@types/semver@npm:7.5.6"
-  checksum: 563a0120ec0efcc326567db2ed920d5d98346f3638b6324ea6b50222b96f02a8add3c51a916b6897b51523aad8ac227d21d3dcf8913559f1bfc6c15b14d23037
+"@types/semver@npm:^7.3.12":
+  version: 7.3.13
+  resolution: "@types/semver@npm:7.3.13"
+  checksum: 00c0724d54757c2f4bc60b5032fe91cda6410e48689633d5f35ece8a0a66445e3e57fa1d6e07eb780f792e82ac542948ec4d0b76eb3484297b79bd18b8cf1cb0
   languageName: node
   linkType: hard
 
@@ -13006,32 +12230,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/eslint-plugin@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/eslint-plugin@npm:6.20.0"
-  dependencies:
-    "@eslint-community/regexpp": ^4.5.1
-    "@typescript-eslint/scope-manager": 6.20.0
-    "@typescript-eslint/type-utils": 6.20.0
-    "@typescript-eslint/utils": 6.20.0
-    "@typescript-eslint/visitor-keys": 6.20.0
-    debug: ^4.3.4
-    graphemer: ^1.4.0
-    ignore: ^5.2.4
-    natural-compare: ^1.4.0
-    semver: ^7.5.4
-    ts-api-utils: ^1.0.1
-  peerDependencies:
-    "@typescript-eslint/parser": ^6.0.0 || ^6.0.0-alpha
-    eslint: ^7.0.0 || ^8.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: d002cbe1a99aef5d5b1601702f08a9e3c060ab5355707b4428ec61854b88513e625e5a898dc9fded669a4b33bb71a216aa7799f0e0c58ee00150218c69e7959c
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/eslint-plugin@npm:^5.15.0, @typescript-eslint/eslint-plugin@npm:^5.5.0":
+"@typescript-eslint/eslint-plugin@npm:5.62.0, @typescript-eslint/eslint-plugin@npm:^5.15.0, @typescript-eslint/eslint-plugin@npm:^5.45.1, @typescript-eslint/eslint-plugin@npm:^5.5.0":
   version: 5.62.0
   resolution: "@typescript-eslint/eslint-plugin@npm:5.62.0"
   dependencies:
@@ -13066,25 +12265,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/parser@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/parser@npm:6.20.0"
-  dependencies:
-    "@typescript-eslint/scope-manager": 6.20.0
-    "@typescript-eslint/types": 6.20.0
-    "@typescript-eslint/typescript-estree": 6.20.0
-    "@typescript-eslint/visitor-keys": 6.20.0
-    debug: ^4.3.4
-  peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 91c0a715e7a37a0386770b0c4c208d0732736828294a3f58901655f0edf9230d1211dbfb8ac0ea562993506130773131fc1ee241311f43d78007af959bd46b9a
-  languageName: node
-  linkType: hard
-
-"@typescript-eslint/parser@npm:^5.15.0, @typescript-eslint/parser@npm:^5.5.0":
+"@typescript-eslint/parser@npm:5.62.0, @typescript-eslint/parser@npm:^5.15.0, @typescript-eslint/parser@npm:^5.42.0, @typescript-eslint/parser@npm:^5.45.1, @typescript-eslint/parser@npm:^5.5.0":
   version: 5.62.0
   resolution: "@typescript-eslint/parser@npm:5.62.0"
   dependencies:
@@ -13121,16 +12302,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/scope-manager@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/scope-manager@npm:6.20.0"
-  dependencies:
-    "@typescript-eslint/types": 6.20.0
-    "@typescript-eslint/visitor-keys": 6.20.0
-  checksum: 54a06c485d4be6ac95b283fe2e29c2cd8a9a0b159d0f38e5f670dd2e1265358e2ad7b4442a0c61870430b38a6d0bf640843caaaf4c7f122523455221bbb3b011
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/type-utils@npm:5.62.0":
   version: 5.62.0
   resolution: "@typescript-eslint/type-utils@npm:5.62.0"
@@ -13148,23 +12319,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/type-utils@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/type-utils@npm:6.20.0"
-  dependencies:
-    "@typescript-eslint/typescript-estree": 6.20.0
-    "@typescript-eslint/utils": 6.20.0
-    debug: ^4.3.4
-    ts-api-utils: ^1.0.1
-  peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 438702c626706cb62f0fcbbb3e3c5c8946ade84f170c182eaebb43604716d2dbf05fac105bdbcb968f3d3375e8076bed8bf095ab65dc891666c91d9174bced6f
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/types@npm:4.33.0":
   version: 4.33.0
   resolution: "@typescript-eslint/types@npm:4.33.0"
@@ -13186,13 +12340,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/types@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/types@npm:6.20.0"
-  checksum: a4551ce9ce40119c2401a70d5a0f9fd16eec4771d076933983fd5fd4a42c0d9a1ac883dfa7640ddec0459057005d4ef4fd19d681b14b8cef89b094283a117f5f
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/typescript-estree@npm:5.30.7":
   version: 5.30.7
   resolution: "@typescript-eslint/typescript-estree@npm:5.30.7"
@@ -13229,25 +12376,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/typescript-estree@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/typescript-estree@npm:6.20.0"
-  dependencies:
-    "@typescript-eslint/types": 6.20.0
-    "@typescript-eslint/visitor-keys": 6.20.0
-    debug: ^4.3.4
-    globby: ^11.1.0
-    is-glob: ^4.0.3
-    minimatch: 9.0.3
-    semver: ^7.5.4
-    ts-api-utils: ^1.0.1
-  peerDependenciesMeta:
-    typescript:
-      optional: true
-  checksum: 256cdeae8c9c365f23ab1cefb29b9bc20451fc7b879651f47fd388e13976b62ecd0da56bf5b7a5d7050de1160b0e05fc841c4e5b0e91d8b03728a52d76e8caf9
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/typescript-estree@npm:^4.33.0":
   version: 4.33.0
   resolution: "@typescript-eslint/typescript-estree@npm:4.33.0"
@@ -13300,23 +12428,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/utils@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/utils@npm:6.20.0"
-  dependencies:
-    "@eslint-community/eslint-utils": ^4.4.0
-    "@types/json-schema": ^7.0.12
-    "@types/semver": ^7.5.0
-    "@typescript-eslint/scope-manager": 6.20.0
-    "@typescript-eslint/types": 6.20.0
-    "@typescript-eslint/typescript-estree": 6.20.0
-    semver: ^7.5.4
-  peerDependencies:
-    eslint: ^7.0.0 || ^8.0.0
-  checksum: 1c248ce34b612e922796c3bbb323d05994f4bca5d49a200ff14f2d7522c9ca5bdf08613c4f2187c9242f67d73f9c2ec5d07b05c5af7034a2e57843b99230b0b0
-  languageName: node
-  linkType: hard
-
 "@typescript-eslint/visitor-keys@npm:4.33.0":
   version: 4.33.0
   resolution: "@typescript-eslint/visitor-keys@npm:4.33.0"
@@ -13347,16 +12458,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@typescript-eslint/visitor-keys@npm:6.20.0":
-  version: 6.20.0
-  resolution: "@typescript-eslint/visitor-keys@npm:6.20.0"
-  dependencies:
-    "@typescript-eslint/types": 6.20.0
-    eslint-visitor-keys: ^3.4.1
-  checksum: 6a360f16b7b28d3cbb539252d17c6ac8519fd26e5f27f895cd7d400e9ec428b67ecda131f2bd2d57144c0436dcdb15022749b163a46c61e62af2312e8e3be488
-  languageName: node
-  linkType: hard
-
 "@ungap/structured-clone@npm:^1.2.0":
   version: 1.2.0
   resolution: "@ungap/structured-clone@npm:1.2.0"
@@ -13389,49 +12490,29 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@uniswap/eslint-config@workspace:^, @uniswap/eslint-config@workspace:packages/eslint-config":
-  version: 0.0.0-use.local
-  resolution: "@uniswap/eslint-config@workspace:packages/eslint-config"
+"@uniswap/eslint-config@npm:1.2.0":
+  version: 1.2.0
+  resolution: "@uniswap/eslint-config@npm:1.2.0"
   dependencies:
-    "@babel/core": ^7.20.5
-    "@babel/preset-env": 7.23.3
-    "@babel/preset-typescript": ^7.18.6
-    "@jambit/eslint-plugin-typed-redux-saga": 0.4.0
-    "@react-native-community/eslint-config": 3.0.3
     "@rushstack/eslint-patch": ^1.2.0
-    "@semantic-release/changelog": ^6.0.2
-    "@semantic-release/git": ^10.0.1
-    "@types/jest": 29.5.0
-    "@typescript-eslint/eslint-plugin": 6.20.0
-    "@typescript-eslint/parser": 6.20.0
-    babel-jest: 29.6.1
-    eslint: 8.44.0
+    "@typescript-eslint/eslint-plugin": ^5.45.1
+    "@typescript-eslint/parser": ^5.45.1
     eslint-config-prettier: ^8.5.0
-    eslint-config-turbo: latest
     eslint-import-resolver-typescript: ^3.5.2
     eslint-plugin-cypress: ^2.12.1
-    eslint-plugin-detox: 1.0.0
-    eslint-plugin-import: 2.27.5
+    eslint-plugin-import: ^2.26.0
     eslint-plugin-jest: ^27.1.6
-    eslint-plugin-no-relative-import-paths: 1.5.2
-    eslint-plugin-no-unsanitized: 4.0.1
     eslint-plugin-prettier: ^4.2.1
     eslint-plugin-react: ^7.31.11
     eslint-plugin-react-hooks: ^4.6.0
-    eslint-plugin-react-native: 3.11.0
-    eslint-plugin-security: 1.5.0
-    eslint-plugin-spellcheck: 0.0.20
-    eslint-plugin-storybook: ^0.6.10
+    eslint-plugin-simple-import-sort: ^8.0.0
     eslint-plugin-unused-imports: ^2.0.0
-    jest: 29.6.4
     prettier: ^2.8.0
-    prettier-plugin-organize-imports: 3.2.4
-    semantic-release: ^19.0.5
-    typescript: 5.3.3
   peerDependencies:
     eslint: ^8.0.0
-  languageName: unknown
-  linkType: soft
+  checksum: 030e6d3ecac08255999da2da43584fc152aedb9796ffff6c0a280298d4a94b84cf4a80692c4da090610355cd8bd11d8fa8d8ac48d8beda74b82a298425689003
+  languageName: node
+  linkType: hard
 
 "@uniswap/ethers-rs-mobile@npm:0.0.5":
   version: 0.0.5
@@ -13518,7 +12599,7 @@ __metadata:
     "@uniswap/analytics": 1.7.0
     "@uniswap/analytics-events": 2.29.0
     "@uniswap/default-token-list": 11.11.0
-    "@uniswap/eslint-config": "workspace:^"
+    "@uniswap/eslint-config": 1.2.0
     "@uniswap/governance": 1.0.2
     "@uniswap/liquidity-staker": 1.0.2
     "@uniswap/merkle-distributor": 1.0.1
@@ -13532,10 +12613,10 @@ __metadata:
     "@uniswap/universal-router-sdk": 1.5.8
     "@uniswap/v2-core": 1.0.1
     "@uniswap/v2-periphery": 1.1.0-beta.0
-    "@uniswap/v2-sdk": 4.1.0
+    "@uniswap/v2-sdk": 3.2.3
     "@uniswap/v3-core": 1.0.1
     "@uniswap/v3-periphery": 1.4.4
-    "@uniswap/v3-sdk": 3.10.2
+    "@uniswap/v3-sdk": 3.10.0
     "@vanilla-extract/css": 1.14.0
     "@vanilla-extract/dynamic": 2.1.0
     "@vanilla-extract/jest-transform": 1.1.1
@@ -13575,7 +12656,7 @@ __metadata:
     date-fns: 2.30.0
     dotenv: 16.0.3
     eslint: 8.44.0
-    eslint-plugin-import: 2.27.5
+    eslint-plugin-import: 2.27
     eslint-plugin-rulesdir: 0.2.2
     ethers: 5.7.2
     fancy-canvas: 2.1.0
@@ -13651,12 +12732,11 @@ __metadata:
     tiny-invariant: 1.3.1
     ts-jest: ^29.1.1
     tsafe: 1.6.4
-    typescript: 5.3.3
+    typechain: 5.2.0
+    typescript: 4.9.4
     use-resize-observer: 9.1.0
-    utilities: "workspace:^"
     uuid: 9.0.0
     video-extensions: 1.2.0
-    wallet: "workspace:^"
     wcag-contrast: 3.0.0
     web-vitals: 2.1.4
     webpack: 5.89.0
@@ -13708,7 +12788,7 @@ __metadata:
   dependencies:
     "@amplitude/analytics-react-native": 1.4.0
     "@apollo/client": 3.7.11
-    "@babel/core": ^7.20.5
+    "@babel/core": 7.12.9
     "@babel/plugin-proposal-export-namespace-from": 7.18.9
     "@babel/plugin-proposal-logical-assignment-operators": 7.16.7
     "@babel/plugin-proposal-nullish-coalescing-operator": 7.18.6
@@ -13748,10 +12828,12 @@ __metadata:
     "@types/redux-mock-store": 1.0.6
     "@uniswap/analytics": 1.7.0
     "@uniswap/analytics-events": 2.29.0
-    "@uniswap/eslint-config": "workspace:^"
     "@uniswap/ethers-rs-mobile": 0.0.5
+    "@uniswap/permit2-sdk": 1.2.0
+    "@uniswap/router-sdk": 1.7.1
     "@uniswap/sdk-core": 4.0.7
-    "@uniswap/v3-sdk": 3.10.2
+    "@uniswap/universal-router-sdk": 1.5.8
+    "@uniswap/v3-sdk": 3.10.0
     "@walletconnect/core": 2.10.1
     "@walletconnect/react-native-compat": 2.10.1
     "@walletconnect/types": 2.8.6
@@ -13759,7 +12841,6 @@ __metadata:
     "@walletconnect/web3wallet": 1.9.1
     "@welldone-software/why-did-you-render": 7.0.1
     apollo3-cache-persist: 0.14.1
-    axios: 1.6.5
     babel-jest: 29.6.1
     babel-loader: 8.2.3
     babel-plugin-react-native-web: 0.17.5
@@ -13776,6 +12857,7 @@ __metadata:
     expo-av: 13.4.1
     expo-barcode-scanner: 12.7.0
     expo-blur: 12.2.2
+    expo-clipboard: 4.1.2
     expo-haptics: 12.0.1
     expo-linear-gradient: 12.3.0
     expo-linking: 4.0.1
@@ -13784,12 +12866,14 @@ __metadata:
     expo-modules-core: 1.5.8
     expo-screen-capture: 4.2.0
     expo-store-review: ~6.2.1
+    expo-web-browser: 12.0.0
     fuse.js: 6.5.3
     hardhat: 2.14.0
     jest: 29.6.4
     jest-expo: 49.0.0
     jest-extended: 4.0.1
     jest-transformer-svg: 2.0.0
+    jsbi: 3.2.5
     lodash: 4.17.21
     madge: 6.1.0
     mockdate: 3.0.5
@@ -13823,7 +12907,7 @@ __metadata:
     react-native-onesignal: 4.5.2
     react-native-pager-view: 6.0.1
     react-native-permissions: 3.6.0
-    react-native-reanimated: 3.6.2
+    react-native-reanimated: 3.3.0
     react-native-restart: 0.0.27
     react-native-safe-area-context: 4.5.0
     react-native-screens: 3.24.0
@@ -13846,7 +12930,7 @@ __metadata:
     rive-react-native: 6.1.1
     statsig-react-native: 4.11.0
     typed-redux-saga: 1.5.0
-    typescript: 5.3.3
+    typescript: 4.9.4
     utilities: "workspace:^"
     wallet: "workspace:^"
     yarn-deduplicate: 6.0.0
@@ -13945,9 +13029,6 @@ __metadata:
     "@ethersproject/providers": 5.7.2
     "@pmmmwh/react-refresh-webpack-plugin": ^0.5.10
     "@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
     "@swc/core": 1.3.72
     "@types/chrome": 0.0.254
@@ -13956,13 +13037,13 @@ __metadata:
     "@types/react-dom": ^18.0.6
     "@types/redux-logger": 3.0.9
     "@types/uuid": 9.0.1
-    "@uniswap/eslint-config": "workspace:^"
     "@uniswap/sdk-core": 4.0.7
     clean-webpack-plugin: ^4.0.0
     copy-webpack-plugin: ^11.0.0
     dotenv-webpack: 8.0.1
     esbuild-loader: ^3.0.1
     eslint: 8.44.0
+    eslint-config-custom: "workspace:^"
     eth-rpc-errors: 4.0.3
     ethers: 5.7.2
     jest: 29.6.4
@@ -13974,10 +13055,8 @@ __metadata:
     react-dom: 18.2.0
     react-i18next: 11.18.6
     react-native: 0.71.13
-    react-native-safe-area-context: 4.5.0
     react-native-svg: 13.9.0
     react-native-web: 0.18.12
-    react-qr-code: 2.0.12
     react-redux: 8.0.5
     react-refresh: ^0.14.0
     react-router-dom: 6.10.0
@@ -13987,10 +13066,9 @@ __metadata:
     redux-saga: 1.2.2
     serve: ^14.2.0
     swc-loader: ^0.2.3
-    tamagui-loader: 1.88.18
+    tamagui-loader: 1.74.16
     typed-redux-saga: 1.5.0
-    typescript: 5.3.3
-    ua-parser-js: 1.0.37
+    typescript: 4.9.4
     ui: "workspace:^"
     utilities: "workspace:^"
     uuid: 9.0.0
@@ -14098,16 +13176,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@uniswap/v2-sdk@npm:4.1.0":
-  version: 4.1.0
-  resolution: "@uniswap/v2-sdk@npm:4.1.0"
+"@uniswap/v2-sdk@npm:3.2.3":
+  version: 3.2.3
+  resolution: "@uniswap/v2-sdk@npm:3.2.3"
   dependencies:
     "@ethersproject/address": ^5.0.0
     "@ethersproject/solidity": ^5.0.0
     "@uniswap/sdk-core": ^4.0.7
     tiny-invariant: ^1.1.0
     tiny-warning: ^1.0.3
-  checksum: c2722fc800339fd0cd4c3aa9aa2b083e3f29ce6df15ddf0e6f671c378d50a9ec2d05035d80e9ecf6418aeb716a26c43e13f79b6e7c05931f324954ed4f44b0e7
+  checksum: 0e1838673508654b8270c54d9ee97c010e9a2463065e623aa78f96ade47f424627a9858fb39587331fb4e9b016d5113b821a475450018f1f62e8e4ab166e2893
   languageName: node
   linkType: hard
 
@@ -14138,19 +13216,19 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@uniswap/v3-sdk@npm:3.10.2, @uniswap/v3-sdk@npm:^3.10.0":
-  version: 3.10.2
-  resolution: "@uniswap/v3-sdk@npm:3.10.2"
+"@uniswap/v3-sdk@npm:3.10.0, @uniswap/v3-sdk@npm:^3.10.0":
+  version: 3.10.0
+  resolution: "@uniswap/v3-sdk@npm:3.10.0"
   dependencies:
     "@ethersproject/abi": ^5.0.12
     "@ethersproject/solidity": ^5.0.9
-    "@uniswap/sdk-core": ^4.0.7
+    "@uniswap/sdk-core": ^4
     "@uniswap/swap-router-contracts": ^1.2.1
     "@uniswap/v3-periphery": ^1.1.1
     "@uniswap/v3-staker": 1.0.0
     tiny-invariant: ^1.1.0
     tiny-warning: ^1.0.3
-  checksum: 187c34255fc082f8d424bd6e5faba825cd8dda01a9ae1d3a4377c4f11cec123562426afedff8c0513ad86f4458f37ee4ef8a186b86a087b8bd2736d74402cc92
+  checksum: 664d40550aa5c88b21bce3dc209746bc61490e4afaa5686d12d6a5839e26211ae5093d82eeff3e3ec80df5df3eb1d40f9a7510b61a389e2779a9b1e5eca9ed25
   languageName: node
   linkType: hard
 
@@ -15393,7 +14471,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"abbrev@npm:^1.0.0, abbrev@npm:~1.1.1":
+"abbrev@npm:^1.0.0":
   version: 1.1.1
   resolution: "abbrev@npm:1.1.1"
   checksum: a4a97ec07d7ea112c517036882b2ac22f3109b7b19077dc656316d07d308438aac28e4d9746dc4d84bf6b1e75b4a7b0a5f3cb30592419f128ca9a8cee3bcfa17
@@ -15573,15 +14651,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0":
-  version: 7.1.0
-  resolution: "agent-base@npm:7.1.0"
-  dependencies:
-    debug: ^4.3.4
-  checksum: f7828f991470a0cc22cb579c86a18cbae83d8a3cbed39992ab34fc7217c4d126017f1c74d0ab66be87f71455318a8ea3e757d6a37881b8d0f2a2c6aa55e5418f
-  languageName: node
-  linkType: hard
-
 "agentkeepalive@npm:^4.2.1, agentkeepalive@npm:^4.3.0":
   version: 4.5.0
   resolution: "agentkeepalive@npm:4.5.0"
@@ -15728,7 +14797,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-escapes@npm:^6.0.0, ansi-escapes@npm:^6.2.0":
+"ansi-escapes@npm:^6.0.0":
   version: 6.2.0
   resolution: "ansi-escapes@npm:6.2.0"
   dependencies:
@@ -15801,7 +14870,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0, ansi-styles@npm:^4.3.0":
+"ansi-styles@npm:^4.0.0, ansi-styles@npm:^4.1.0":
   version: 4.3.0
   resolution: "ansi-styles@npm:4.3.0"
   dependencies:
@@ -15824,13 +14893,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ansicolors@npm:~0.3.2":
-  version: 0.3.2
-  resolution: "ansicolors@npm:0.3.2"
-  checksum: e84fae7ebc27ac96d9dbb57f35f078cd6dde1b7046b0f03f73dcefc9fbb1f2e82e3685d083466aded8faf038f9fa9ebb408d215282bcd7aaa301d5ac3c486815
-  languageName: node
-  linkType: hard
-
 "any-base@npm:^1.1.0":
   version: 1.1.0
   resolution: "any-base@npm:1.1.0"
@@ -15919,7 +14981,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"aproba@npm:^1.0.3 || ^2.0.0, aproba@npm:^2.0.0":
+"aproba@npm:^1.0.3 || ^2.0.0":
   version: 2.0.0
   resolution: "aproba@npm:2.0.0"
   checksum: 5615cadcfb45289eea63f8afd064ab656006361020e1735112e346593856f87435e02d8dcc7ff0d11928bc7d425f27bc7c2a84f6c0b35ab0ff659c814c138a24
@@ -15933,13 +14995,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"archy@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "archy@npm:1.0.0"
-  checksum: 504ae7af655130bab9f471343cfdb054feaec7d8e300e13348bc9fe9e660f83d422e473069584f73233c701ae37d1c8452ff2522f2a20c38849e0f406f1732ac
-  languageName: node
-  linkType: hard
-
 "are-we-there-yet@npm:^2.0.0":
   version: 2.0.0
   resolution: "are-we-there-yet@npm:2.0.0"
@@ -16007,14 +15062,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"argv-formatter@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "argv-formatter@npm:1.0.0"
-  checksum: cf95ea091f4eb0fefdbbc595dbe2e307afee16fc87aad48d72e5e45d5b0b59566dbaa77e45d515242289670904838a501313efffb48ff02f49c6de0c03536a54
-  languageName: node
-  linkType: hard
-
-"aria-hidden@npm:^1.1.3":
+"aria-hidden@npm:^1.1.3, aria-hidden@npm:^1.2.3":
   version: 1.2.3
   resolution: "aria-hidden@npm:1.2.3"
   dependencies:
@@ -16246,7 +15294,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"asap@npm:^2.0.0, asap@npm:~2.0.3, asap@npm:~2.0.6":
+"asap@npm:~2.0.3, asap@npm:~2.0.6":
   version: 2.0.6
   resolution: "asap@npm:2.0.6"
   checksum: b296c92c4b969e973260e47523207cd5769abd27c245a68c26dc7a0fe8053c55bb04360237cb51cab1df52be939da77150ace99ad331fb7fb13b3423ed73ff3d
@@ -16502,17 +15550,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"axios@npm:1.6.5":
-  version: 1.6.5
-  resolution: "axios@npm:1.6.5"
-  dependencies:
-    follow-redirects: ^1.15.4
-    form-data: ^4.0.0
-    proxy-from-env: ^1.1.0
-  checksum: e28d67b2d9134cb4608c44d8068b0678cfdccc652742e619006f27264a30c7aba13b2cd19c6f1f52ae195b5232734925928fb192d5c85feea7edd2f273df206d
-  languageName: node
-  linkType: hard
-
 "axios@npm:^0.21.1":
   version: 0.21.4
   resolution: "axios@npm:0.21.4"
@@ -16663,15 +15700,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"babel-plugin-fully-specified@npm:*":
-  version: 1.3.0
-  resolution: "babel-plugin-fully-specified@npm:1.3.0"
-  peerDependencies:
-    "@babel/core": "*"
-  checksum: a561b33da1f0e976d34721f55c25c4132c24194ad5d089ac7427db229a852dcb3e83044f9ca34e380e0eba31d789cbaf73b2d8efefb95952c7daedbf83ccd4b8
-  languageName: node
-  linkType: hard
-
 "babel-plugin-istanbul@npm:^6.1.1":
   version: 6.1.1
   resolution: "babel-plugin-istanbul@npm:6.1.1"
@@ -17138,21 +16166,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bin-links@npm:^3.0.3":
-  version: 3.0.3
-  resolution: "bin-links@npm:3.0.3"
-  dependencies:
-    cmd-shim: ^5.0.0
-    mkdirp-infer-owner: ^2.0.0
-    npm-normalize-package-bin: ^2.0.0
-    read-cmd-shim: ^3.0.0
-    rimraf: ^3.0.0
-    write-file-atomic: ^4.0.0
-  checksum: ea2dc6f91a6ef8b3840ceb48530bbeb8d6d1c6f7985fe1409b16d7e7db39432f0cb5ce15cc2788bb86d989abad6e2c7fba3500996a210a682eec18fb26a66e72
-  languageName: node
-  linkType: hard
-
-"binary-extensions@npm:^2.0.0, binary-extensions@npm:^2.2.0":
+"binary-extensions@npm:^2.0.0":
   version: 2.2.0
   resolution: "binary-extensions@npm:2.2.0"
   checksum: ccd267956c58d2315f5d3ea6757cf09863c5fc703e50fbeb13a7dc849b812ef76e3cf9ca8f35a0c48498776a7478d7b4a0418e1e2b8cb9cb9731f2922aaad7f8
@@ -17306,13 +16320,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"bottleneck@npm:^2.15.3":
-  version: 2.19.5
-  resolution: "bottleneck@npm:2.19.5"
-  checksum: c5eef1bbea12cef1f1405e7306e7d24860568b0f7ac5eeab706a86762b3fc65ef6d1c641c8a166e4db90f412fc5c948fc5ce8008a8cd3d28c7212ef9c3482bda
-  languageName: node
-  linkType: hard
-
 "boxen@npm:7.0.0":
   version: 7.0.0
   resolution: "boxen@npm:7.0.0"
@@ -17577,17 +16584,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.18.1, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.22.1, browserslist@npm:^4.22.2":
-  version: 4.22.2
-  resolution: "browserslist@npm:4.22.2"
+"browserslist@npm:^4.0.0, browserslist@npm:^4.14.5, browserslist@npm:^4.18.1, browserslist@npm:^4.21.10, browserslist@npm:^4.21.4, browserslist@npm:^4.21.9, browserslist@npm:^4.22.1":
+  version: 4.22.1
+  resolution: "browserslist@npm:4.22.1"
   dependencies:
-    caniuse-lite: ^1.0.30001565
-    electron-to-chromium: ^1.4.601
-    node-releases: ^2.0.14
+    caniuse-lite: ^1.0.30001541
+    electron-to-chromium: ^1.4.535
+    node-releases: ^2.0.13
     update-browserslist-db: ^1.0.13
   bin:
     browserslist: cli.js
-  checksum: 33ddfcd9145220099a7a1ac533cecfe5b7548ffeb29b313e1b57be6459000a1f8fa67e781cf4abee97268ac594d44134fcc4a6b2b4750ceddc9796e3a22076d9
+  checksum: 7e6b10c53f7dd5d83fd2b95b00518889096382539fed6403829d447e05df4744088de46a571071afb447046abc3c66ad06fbc790e70234ec2517452e32ffd862
   languageName: node
   linkType: hard
 
@@ -17762,15 +16769,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"builtins@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "builtins@npm:5.0.1"
-  dependencies:
-    semver: ^7.0.0
-  checksum: 66d204657fe36522822a95b288943ad11b58f5eaede235b11d8c4edaa28ce4800087d44a2681524c340494aadb120a0068011acabe99d30e8f11a7d826d83515
-  languageName: node
-  linkType: hard
-
 "bunyan-blackhole@npm:^1.1.1":
   version: 1.1.1
   resolution: "bunyan-blackhole@npm:1.1.1"
@@ -17887,7 +16885,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cacache@npm:^16.0.0, cacache@npm:^16.1.0, cacache@npm:^16.1.3":
+"cacache@npm:^16.1.0":
   version: 16.1.3
   resolution: "cacache@npm:16.1.3"
   dependencies:
@@ -18099,10 +17097,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001565":
-  version: 1.0.30001580
-  resolution: "caniuse-lite@npm:1.0.30001580"
-  checksum: 8d287d1e2a64348365f55562457b52afc8c5e0e8ddf040e18e53395ca165241a697205611dc209dace5c7f7d1d3ee8d566672cce6f9668d658d7930b7a200875
+"caniuse-lite@npm:^1.0.0, caniuse-lite@npm:^1.0.30001538, caniuse-lite@npm:^1.0.30001541":
+  version: 1.0.30001561
+  resolution: "caniuse-lite@npm:1.0.30001561"
+  checksum: 949829fe037e23346595614e01d362130245920503a12677f2506ce68e1240360113d6383febed41e8aa38cd0f5fd9c69c21b0af65a71c0246d560db489f1373
   languageName: node
   linkType: hard
 
@@ -18141,18 +17139,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cardinal@npm:^2.1.1":
-  version: 2.1.1
-  resolution: "cardinal@npm:2.1.1"
-  dependencies:
-    ansicolors: ~0.3.2
-    redeyed: ~2.1.0
-  bin:
-    cdl: ./bin/cdl.js
-  checksum: e8d4ae46439cf8fed481c0efd267711ee91e199aa7821a9143e784ed94a6495accd01a0b36d84d377e8ee2cc9928a6c9c123b03be761c60b805f2c026b8a99ad
-  languageName: node
-  linkType: hard
-
 "case-sensitive-paths-webpack-plugin@npm:^2.4.0":
   version: 2.4.0
   resolution: "case-sensitive-paths-webpack-plugin@npm:2.4.0"
@@ -18207,14 +17193,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"chalk@npm:5.3.0, chalk@npm:^5.0.1, chalk@npm:^5.2.0":
+"chalk@npm:5.3.0, chalk@npm:^5.0.1":
   version: 5.3.0
   resolution: "chalk@npm:5.3.0"
   checksum: 623922e077b7d1e9dedaea6f8b9e9352921f8ae3afe739132e0e00c275971bdd331268183b2628cf4ab1727c45ea1f28d7e24ac23ce1db1eb653c414ca8a5a80
   languageName: node
   linkType: hard
 
-"chalk@npm:^2.0.1, chalk@npm:^2.3.0, chalk@npm:^2.3.2, chalk@npm:^2.4.1, chalk@npm:^2.4.2":
+"chalk@npm:^2.0.1, chalk@npm:^2.3.0, chalk@npm:^2.4.1, chalk@npm:^2.4.2":
   version: 2.4.2
   resolution: "chalk@npm:2.4.2"
   dependencies:
@@ -18474,15 +17460,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cidr-regex@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "cidr-regex@npm:3.1.1"
-  dependencies:
-    ip-regex: ^4.1.0
-  checksum: ef9306d086928ee82b3f841b3bdab6e072230f3623a57cf19e06174946f2cbfeb70ca52bc106b127db27a628b9e84fb39284f5851003898ffdb957fe330478ee
-  languageName: node
-  linkType: hard
-
 "cids@npm:1.1.6":
   version: 1.1.6
   resolution: "cids@npm:1.1.6"
@@ -18586,16 +17563,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-columns@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "cli-columns@npm:4.0.0"
-  dependencies:
-    string-width: ^4.2.3
-    strip-ansi: ^6.0.1
-  checksum: fa1a3a7f4e8f26a18e47969c248a2b9a016391bca2588abbe77026255390bee71dc9b7b876f317f46e40164c3c5200972e77ec58b823a05154f26e81a74a54c3
-  languageName: node
-  linkType: hard
-
 "cli-cursor@npm:^2.1.0":
   version: 2.1.0
   resolution: "cli-cursor@npm:2.1.0"
@@ -18630,7 +17597,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cli-table3@npm:^0.6.2, cli-table3@npm:^0.6.3, cli-table3@npm:~0.6.1":
+"cli-table3@npm:~0.6.1":
   version: 0.6.3
   resolution: "cli-table3@npm:0.6.3"
   dependencies:
@@ -18801,15 +17768,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cmd-shim@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "cmd-shim@npm:5.0.0"
-  dependencies:
-    mkdirp-infer-owner: ^2.0.0
-  checksum: 83d2a46cdf4adbb38d3d3184364b2df0e4c001ac770f5ca94373825d7a48838b4cb8a59534ef48f02b0d556caa047728589ca65c640c17c0b417b3afb34acfbb
-  languageName: node
-  linkType: hard
-
 "co@npm:^4.6.0":
   version: 4.6.0
   resolution: "co@npm:4.6.0"
@@ -18975,16 +17933,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"columnify@npm:^1.6.0":
-  version: 1.6.0
-  resolution: "columnify@npm:1.6.0"
-  dependencies:
-    strip-ansi: ^6.0.1
-    wcwidth: ^1.0.0
-  checksum: 0d590023616a27bcd2135c0f6ddd6fac94543263f9995538bbe391068976e30545e5534d369737ec7c3e9db4e53e70a277462de46aeb5a36e6997b4c7559c335
-  languageName: node
-  linkType: hard
-
 "combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8, combined-stream@npm:~1.0.6":
   version: 1.0.8
   resolution: "combined-stream@npm:1.0.8"
@@ -19049,13 +17997,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"commander@npm:8.3.0, commander@npm:^8.3.0":
-  version: 8.3.0
-  resolution: "commander@npm:8.3.0"
-  checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0
-  languageName: node
-  linkType: hard
-
 "commander@npm:^10.0.0, commander@npm:^10.0.1":
   version: 10.0.1
   resolution: "commander@npm:10.0.1"
@@ -19084,6 +18025,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"commander@npm:^8.3.0":
+  version: 8.3.0
+  resolution: "commander@npm:8.3.0"
+  checksum: 0f82321821fc27b83bd409510bb9deeebcfa799ff0bf5d102128b500b7af22872c0c92cb6a0ebc5a4cf19c6b550fba9cedfa7329d18c6442a625f851377bacf0
+  languageName: node
+  linkType: hard
+
 "commander@npm:^9.4.0, commander@npm:^9.4.1, commander@npm:^9.5.0":
   version: 9.5.0
   resolution: "commander@npm:9.5.0"
@@ -19098,13 +18046,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"common-ancestor-path@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "common-ancestor-path@npm:1.0.1"
-  checksum: 1d2e4186067083d8cc413f00fc2908225f04ae4e19417ded67faa6494fb313c4fcd5b28a52326d1a62b466e2b3a4325e92c31133c5fee628cdf8856b3a57c3d7
-  languageName: node
-  linkType: hard
-
 "common-path-prefix@npm:^3.0.0":
   version: 3.0.0
   resolution: "common-path-prefix@npm:3.0.0"
@@ -19145,13 +18086,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"compare-versions@npm:4.1.4":
-  version: 4.1.4
-  resolution: "compare-versions@npm:4.1.4"
-  checksum: c1617544b79c2f36a1d543c50efd0da1a994040294c8923218080bc0df46da83ca414e3378282e93cab073744995124946417d130d8987e8efb5d1a73c0c4ba6
-  languageName: node
-  linkType: hard
-
 "compare-versions@npm:^3.4.0":
   version: 3.6.0
   resolution: "compare-versions@npm:3.6.0"
@@ -19204,24 +18138,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"concurrently@npm:6.5.1":
-  version: 6.5.1
-  resolution: "concurrently@npm:6.5.1"
-  dependencies:
-    chalk: ^4.1.0
-    date-fns: ^2.16.1
-    lodash: ^4.17.21
-    rxjs: ^6.6.3
-    spawn-command: ^0.0.2-1
-    supports-color: ^8.1.0
-    tree-kill: ^1.2.2
-    yargs: ^16.2.0
-  bin:
-    concurrently: bin/concurrently.js
-  checksum: 3f4d89b464fa5c9fb6f9489b46594c30ba54eff6ff10ab3cb5f30f64b74c83be664623a0f0cc731a3cb3f057a1f4a3292f7d3470c012a292c44aca31f214a3fa
-  languageName: node
-  linkType: hard
-
 "concurrently@npm:^8.0.1":
   version: 8.2.2
   resolution: "concurrently@npm:8.2.2"
@@ -19242,16 +18158,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"config-chain@npm:^1.1.11":
-  version: 1.1.13
-  resolution: "config-chain@npm:1.1.13"
-  dependencies:
-    ini: ^1.3.4
-    proto-list: ~1.2.1
-  checksum: 828137a28e7c2fc4b7fb229bd0cd6c1397bcf83434de54347e608154008f411749041ee392cbe42fab6307e02de4c12480260bf769b7d44b778fdea3839eafab
-  languageName: node
-  linkType: hard
-
 "configstore@npm:^3.0.0":
   version: 3.1.5
   resolution: "configstore@npm:3.1.5"
@@ -19292,13 +18198,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"consola@npm:^2.15.0":
-  version: 2.15.3
-  resolution: "consola@npm:2.15.3"
-  checksum: 8ef7a09b703ec67ac5c389a372a33b6dc97eda6c9876443a60d76a3076eea0259e7f67a4e54fd5a52f97df73690822d090cf8b7e102b5761348afef7c6d03e28
-  languageName: node
-  linkType: hard
-
 "console-browserify@npm:^1.2.0":
   version: 1.2.0
   resolution: "console-browserify@npm:1.2.0"
@@ -19313,15 +18212,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"console.table@npm:0.10.0":
-  version: 0.10.0
-  resolution: "console.table@npm:0.10.0"
-  dependencies:
-    easy-table: 1.1.0
-  checksum: 4c1460e3105a5f7df5bfa372844104a20e487fc0fccc5821c169a39def3249759554fc132621074ad6695664a1a8d558dd385c0e7f290acb2eaca51466474bb9
-  languageName: node
-  linkType: hard
-
 "constant-case@npm:^3.0.4":
   version: 3.0.4
   resolution: "constant-case@npm:3.0.4"
@@ -19363,7 +18253,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"conventional-changelog-angular@npm:^5.0.0, conventional-changelog-angular@npm:^5.0.11":
+"conventional-changelog-angular@npm:^5.0.11":
   version: 5.0.13
   resolution: "conventional-changelog-angular@npm:5.0.13"
   dependencies:
@@ -19384,36 +18274,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"conventional-changelog-writer@npm:^5.0.0":
-  version: 5.0.1
-  resolution: "conventional-changelog-writer@npm:5.0.1"
-  dependencies:
-    conventional-commits-filter: ^2.0.7
-    dateformat: ^3.0.0
-    handlebars: ^4.7.7
-    json-stringify-safe: ^5.0.1
-    lodash: ^4.17.15
-    meow: ^8.0.0
-    semver: ^6.0.0
-    split: ^1.0.0
-    through2: ^4.0.0
-  bin:
-    conventional-changelog-writer: cli.js
-  checksum: 5c0129db44577f14b1f8de225b62a392a9927ba7fe3422cb21ad71a771b8472bd03badb7c87cb47419913abc3f2ce3759b69f59550cdc6f7a7b0459015b3b44c
-  languageName: node
-  linkType: hard
-
-"conventional-commits-filter@npm:^2.0.0, conventional-commits-filter@npm:^2.0.7":
-  version: 2.0.7
-  resolution: "conventional-commits-filter@npm:2.0.7"
-  dependencies:
-    lodash.ismatch: ^4.4.0
-    modify-values: ^1.0.0
-  checksum: feb567f680a6da1baaa1ef3cff393b3c56a5828f77ab9df5e70626475425d109a6fee0289b4979223c62bbd63bf9c98ef532baa6fcb1b66ee8b5f49077f5d46c
-  languageName: node
-  linkType: hard
-
-"conventional-commits-parser@npm:^3.2.2, conventional-commits-parser@npm:^3.2.3":
+"conventional-commits-parser@npm:^3.2.2":
   version: 3.2.4
   resolution: "conventional-commits-parser@npm:3.2.4"
   dependencies:
@@ -20899,13 +19760,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dateformat@npm:^3.0.0":
-  version: 3.0.3
-  resolution: "dateformat@npm:3.0.3"
-  checksum: ca4911148abb09887bd9bdcd632c399b06f3ecad709a18eb594d289a1031982f441e08e281db77ffebcb2cbcbfa1ac578a7cbfbf8743f41009aa5adc1846ed34
-  languageName: node
-  linkType: hard
-
 "dayjs@npm:1.11.7":
   version: 1.11.7
   resolution: "dayjs@npm:1.11.7"
@@ -20964,13 +19818,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"debuglog@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "debuglog@npm:1.0.1"
-  checksum: 970679f2eb7a73867e04d45b52583e7ec6dee1f33c058e9147702e72a665a9647f9c3d6e7c2f66f6bf18510b23eb5ded1b617e48ac1db23603809c5ddbbb9763
-  languageName: node
-  linkType: hard
-
 "decamelize-keys@npm:^1.1.0":
   version: 1.1.1
   resolution: "decamelize-keys@npm:1.1.1"
@@ -21426,15 +20273,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"detect-libc@npm:^1.0.3":
-  version: 1.0.3
-  resolution: "detect-libc@npm:1.0.3"
-  bin:
-    detect-libc: ./bin/detect-libc.js
-  checksum: daaaed925ffa7889bd91d56e9624e6c8033911bb60f3a50a74a87500680652969dbaab9526d1e200a4c94acf80fc862a22131841145a0a8482d60a99c24f4a3e
-  languageName: node
-  linkType: hard
-
 "detect-newline@npm:^3.0.0":
   version: 3.1.0
   resolution: "detect-newline@npm:3.1.0"
@@ -21697,16 +20535,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dezalgo@npm:^1.0.0":
-  version: 1.0.4
-  resolution: "dezalgo@npm:1.0.4"
-  dependencies:
-    asap: ^2.0.0
-    wrappy: 1
-  checksum: 895389c6aead740d2ab5da4d3466d20fa30f738010a4d3f4dcccc9fc645ca31c9d10b7e1804ae489b1eb02c7986f9f1f34ba132d409b043082a86d9a4e745624
-  languageName: node
-  linkType: hard
-
 "didyoumean@npm:^1.2.2":
   version: 1.2.2
   resolution: "didyoumean@npm:1.2.2"
@@ -21742,13 +20570,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"diff@npm:^5.1.0":
-  version: 5.1.0
-  resolution: "diff@npm:5.1.0"
-  checksum: c7bf0df7c9bfbe1cf8a678fd1b2137c4fb11be117a67bc18a0e03ae75105e8533dbfb1cda6b46beb3586ef5aed22143ef9d70713977d5fb1f9114e21455fba90
-  languageName: node
-  linkType: hard
-
 "diffie-hellman@npm:^5.0.0":
   version: 5.0.3
   resolution: "diffie-hellman@npm:5.0.3"
@@ -21767,7 +20588,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dir-glob@npm:^3.0.0, dir-glob@npm:^3.0.1":
+"dir-glob@npm:^3.0.1":
   version: 3.0.1
   resolution: "dir-glob@npm:3.0.1"
   dependencies:
@@ -22037,7 +20858,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dotenv@npm:16.0.3":
+"dotenv@npm:16.0.3, dotenv@npm:^16.0.0":
   version: 16.0.3
   resolution: "dotenv@npm:16.0.3"
   checksum: afcf03f373d7a6d62c7e9afea6328e62851d627a4e73f2e12d0a8deae1cd375892004f3021883f8aec85932cd2834b091f568ced92b4774625b321db83b827f8
@@ -22058,13 +20879,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dotenv@npm:^16.0.0, dotenv@npm:^16.3.1":
-  version: 16.4.1
-  resolution: "dotenv@npm:16.4.1"
-  checksum: a343f0a1d156deef8c60034f797969867af4dbccfacedd4ac15fad04547e7ffe0553b58fc3b27a5837950f0d977e38e9234943fbcec4aeced4e3d044309a76ab
-  languageName: node
-  linkType: hard
-
 "dotenv@npm:^8.2.0":
   version: 8.6.0
   resolution: "dotenv@npm:8.6.0"
@@ -22089,15 +20903,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"duplexer2@npm:~0.1.0":
-  version: 0.1.4
-  resolution: "duplexer2@npm:0.1.4"
-  dependencies:
-    readable-stream: ^2.0.2
-  checksum: 744961f03c7f54313f90555ac20284a3fb7bf22fdff6538f041a86c22499560eb6eac9d30ab5768054137cb40e6b18b40f621094e0261d7d8c35a37b7a5ad241
-  languageName: node
-  linkType: hard
-
 "duplexer3@npm:^0.1.4":
   version: 0.1.4
   resolution: "duplexer3@npm:0.1.4"
@@ -22143,18 +20948,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"easy-table@npm:1.1.0":
-  version: 1.1.0
-  resolution: "easy-table@npm:1.1.0"
-  dependencies:
-    wcwidth: ">=1.0.1"
-  dependenciesMeta:
-    wcwidth:
-      optional: true
-  checksum: 49b960fefe5670076773824386f22070dce185ebc0a99542035496700cc39a0b9346f65fd4307f5fe3dbbe7e6d9c4b59966e77e32f915e0fe71de71c3d0efcf7
-  languageName: node
-  linkType: hard
-
 "ecc-jsbn@npm:~0.1.1":
   version: 0.1.2
   resolution: "ecc-jsbn@npm:0.1.2"
@@ -22192,10 +20985,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"electron-to-chromium@npm:^1.4.601":
-  version: 1.4.645
-  resolution: "electron-to-chromium@npm:1.4.645"
-  checksum: ac7d23b8123f09e2343016216b1a8f297ccfb4ae9dccefe3716023344cda8a81656916d40a87039fa3d448cac31c2c4147c6b913b22178a3a00d0221a8019513
+"electron-to-chromium@npm:^1.4.535":
+  version: 1.4.582
+  resolution: "electron-to-chromium@npm:1.4.582"
+  checksum: a87ea18b4fbad7c96ae5fe587c3273c3878ee52b08c8a7acd6156949d05fd370f91809691126b0cee223a6cdd4688e6ff2f086c6603a712d004485f36a4b9093
   languageName: node
   linkType: hard
 
@@ -22349,17 +21142,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"env-ci@npm:^5.0.0":
-  version: 5.5.0
-  resolution: "env-ci@npm:5.5.0"
-  dependencies:
-    execa: ^5.0.0
-    fromentries: ^1.3.2
-    java-properties: ^1.0.0
-  checksum: 0984298e0eca8461f898f5ab92edb8d1d440a117aa1864ee04b8e3cb785a8f48d3a30d1ede88f9775da8e8ae38b2afdb890072d819170f085ae47507e324e915
-  languageName: node
-  linkType: hard
-
 "env-editor@npm:^0.4.1":
   version: 0.4.2
   resolution: "env-editor@npm:0.4.2"
@@ -22754,6 +21536,68 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-config-custom@workspace:^, eslint-config-custom@workspace:config/eslint-config-custom":
+  version: 0.0.0-use.local
+  resolution: "eslint-config-custom@workspace:config/eslint-config-custom"
+  dependencies:
+    "@jambit/eslint-plugin-typed-redux-saga": 0.4.0
+    "@react-native-community/eslint-config": 3.0.3
+    "@typescript-eslint/eslint-plugin": 5.62.0
+    "@typescript-eslint/parser": 5.62.0
+    eslint: 8.44.0
+    eslint-config-next: ^13.1.3
+    eslint-config-prettier: 8.7.0
+    eslint-config-turbo: latest
+    eslint-plugin-detox: 1.0.0
+    eslint-plugin-jest: 27.2.1
+    eslint-plugin-no-relative-import-paths: 1.5.2
+    eslint-plugin-no-unsanitized: 4.0.1
+    eslint-plugin-prettier: 4.2.1
+    eslint-plugin-react: 7.33.2
+    eslint-plugin-react-native: 3.11.0
+    eslint-plugin-security: 1.5.0
+    eslint-plugin-spellcheck: 0.0.20
+    eslint-plugin-storybook: ^0.6.10
+    prettier: latest
+    prettier-plugin-organize-imports: 3.1.1
+    typescript: 4.9.4
+  languageName: unknown
+  linkType: soft
+
+"eslint-config-next@npm:^13.1.3":
+  version: 13.2.4
+  resolution: "eslint-config-next@npm:13.2.4"
+  dependencies:
+    "@next/eslint-plugin-next": 13.2.4
+    "@rushstack/eslint-patch": ^1.1.3
+    "@typescript-eslint/parser": ^5.42.0
+    eslint-import-resolver-node: ^0.3.6
+    eslint-import-resolver-typescript: ^3.5.2
+    eslint-plugin-import: ^2.26.0
+    eslint-plugin-jsx-a11y: ^6.5.1
+    eslint-plugin-react: ^7.31.7
+    eslint-plugin-react-hooks: ^4.5.0
+  peerDependencies:
+    eslint: ^7.23.0 || ^8.0.0
+    typescript: ">=3.3.1"
+  peerDependenciesMeta:
+    typescript:
+      optional: true
+  checksum: 84c202db75ec17c8a7fcebb3364f5b66fc9e81199442cb85d9531f284be5e102935f17aec5274da9ea39752ae9fc8a6afaf5a1e06fe4c8cb8695cf9bee8ea24f
+  languageName: node
+  linkType: hard
+
+"eslint-config-prettier@npm:8.7.0":
+  version: 8.7.0
+  resolution: "eslint-config-prettier@npm:8.7.0"
+  peerDependencies:
+    eslint: ">=7.0.0"
+  bin:
+    eslint-config-prettier: bin/cli.js
+  checksum: b05bc7f2296ce3e0925c14147849706544870e0382d38af2352d709a6cf8521bdaff2bd8e5021f1780e570775a8ffa1d2bac28b8065d90d43a3f1f98fd26ce52
+  languageName: node
+  linkType: hard
+
 "eslint-config-prettier@npm:^8.3.0, eslint-config-prettier@npm:^8.5.0":
   version: 8.10.0
   resolution: "eslint-config-prettier@npm:8.10.0"
@@ -22790,17 +21634,17 @@ __metadata:
   linkType: hard
 
 "eslint-config-turbo@npm:latest":
-  version: 1.11.3
-  resolution: "eslint-config-turbo@npm:1.11.3"
+  version: 0.0.10
+  resolution: "eslint-config-turbo@npm:0.0.10"
   dependencies:
-    eslint-plugin-turbo: 1.11.3
+    eslint-plugin-turbo: 0.0.10
   peerDependencies:
     eslint: ">6.6.0"
-  checksum: e30c478f0435a289a6d921774a798b3a724492203f990a7cf0171eb913b9f160e652b3adb5195d12f480a68113452baf4c1f5aeed0c134f834e805098607224b
+  checksum: ad4d9fa596b549b985957ecc94546d06c366e88851dc46f766884a334cdd362b1cad6ea2b80c583b877b10ff27ff9323eff699b225342de101efc4a4fdf4b468
   languageName: node
   linkType: hard
 
-"eslint-import-resolver-node@npm:^0.3.7":
+"eslint-import-resolver-node@npm:^0.3.6, eslint-import-resolver-node@npm:^0.3.7":
   version: 0.3.7
   resolution: "eslint-import-resolver-node@npm:0.3.7"
   dependencies:
@@ -22887,7 +21731,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-import@npm:2.27.5":
+"eslint-plugin-import@npm:2.27":
   version: 2.27.5
   resolution: "eslint-plugin-import@npm:2.27.5"
   dependencies:
@@ -22912,6 +21756,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-jest@npm:27.2.1":
+  version: 27.2.1
+  resolution: "eslint-plugin-jest@npm:27.2.1"
+  dependencies:
+    "@typescript-eslint/utils": ^5.10.0
+  peerDependencies:
+    "@typescript-eslint/eslint-plugin": ^5.0.0
+    eslint: ^7.0.0 || ^8.0.0
+  peerDependenciesMeta:
+    "@typescript-eslint/eslint-plugin":
+      optional: true
+    jest:
+      optional: true
+  checksum: 579a4d26304cc6748b2e6dff6c965ea7a21b618d8b051eb02727d25cf5c7767f6db8ef5237531635ff77e242b983b973e7cb8c820a4d20d5bda73358c452a8ab
+  languageName: node
+  linkType: hard
+
 "eslint-plugin-jest@npm:^25.2.4, eslint-plugin-jest@npm:^25.3.0":
   version: 25.7.0
   resolution: "eslint-plugin-jest@npm:25.7.0"
@@ -22930,8 +21791,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-jest@npm:^27.1.6":
-  version: 27.6.3
-  resolution: "eslint-plugin-jest@npm:27.6.3"
+  version: 27.6.0
+  resolution: "eslint-plugin-jest@npm:27.6.0"
   dependencies:
     "@typescript-eslint/utils": ^5.10.0
   peerDependencies:
@@ -22943,7 +21804,7 @@ __metadata:
       optional: true
     jest:
       optional: true
-  checksum: e22e8dbd941b34bb95958f035ffabb94114506b294e74d6e411bc85bc9dc57888ffd3ebb5c28316a8b7cc9d391cca35557acc64bf815f48d1dcc5ea3d28fa43a
+  checksum: 4c42641f9bf2d597761637028083e20b9f81762308e98baae40eb805d3e81ff8d837f06f4f0c1a2fd249e2be2fb24d33b7aafeaa8942de805c2b8d7c3b6fc4e4
   languageName: node
   linkType: hard
 
@@ -22989,7 +21850,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-prettier@npm:^4.0.0, eslint-plugin-prettier@npm:^4.2.1":
+"eslint-plugin-prettier@npm:4.2.1, eslint-plugin-prettier@npm:^4.0.0, eslint-plugin-prettier@npm:^4.2.1":
   version: 4.2.1
   resolution: "eslint-plugin-prettier@npm:4.2.1"
   dependencies:
@@ -23004,7 +21865,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react-hooks@npm:^4.2.0, eslint-plugin-react-hooks@npm:^4.3.0, eslint-plugin-react-hooks@npm:^4.6.0":
+"eslint-plugin-react-hooks@npm:^4.2.0, eslint-plugin-react-hooks@npm:^4.3.0, eslint-plugin-react-hooks@npm:^4.5.0, eslint-plugin-react-hooks@npm:^4.6.0":
   version: 4.6.0
   resolution: "eslint-plugin-react-hooks@npm:4.6.0"
   peerDependencies:
@@ -23032,7 +21893,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-react@npm:^7.26.1, eslint-plugin-react@npm:^7.27.1, eslint-plugin-react@npm:^7.31.11":
+"eslint-plugin-react@npm:7.33.2, eslint-plugin-react@npm:^7.26.1, eslint-plugin-react@npm:^7.27.1, eslint-plugin-react@npm:^7.31.11, eslint-plugin-react@npm:^7.31.7":
   version: 7.33.2
   resolution: "eslint-plugin-react@npm:7.33.2"
   dependencies:
@@ -23074,6 +21935,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"eslint-plugin-simple-import-sort@npm:^8.0.0":
+  version: 8.0.0
+  resolution: "eslint-plugin-simple-import-sort@npm:8.0.0"
+  peerDependencies:
+    eslint: ">=5.0.0"
+  checksum: d2a92a7d148803ee9ad4f081892a8d03820198c36a0f4f16a97d9f686a714edc9c9a9e51cc79cb0ba1afff76a1fde6a5eae50e9e3754928068227c92a2db5d6b
+  languageName: node
+  linkType: hard
+
 "eslint-plugin-spellcheck@npm:0.0.20":
   version: 0.0.20
   resolution: "eslint-plugin-spellcheck@npm:0.0.20"
@@ -23088,8 +21958,8 @@ __metadata:
   linkType: hard
 
 "eslint-plugin-storybook@npm:^0.6.10":
-  version: 0.6.15
-  resolution: "eslint-plugin-storybook@npm:0.6.15"
+  version: 0.6.11
+  resolution: "eslint-plugin-storybook@npm:0.6.11"
   dependencies:
     "@storybook/csf": ^0.0.1
     "@typescript-eslint/utils": ^5.45.0
@@ -23097,7 +21967,7 @@ __metadata:
     ts-dedent: ^2.2.0
   peerDependencies:
     eslint: ">=6"
-  checksum: e2c4d7be3e695c88d7194c363fba8ac644b36583bf9d608aa59dcd53cc5e422f7828611ee49c7934639ce827c0206d33fa94b3ea452ffbd2c8e7254ed90bc412
+  checksum: efb85688041d4fd02be0cc51f07803acffaa54fdf61c21e9ae9eb18f26e6b8aec50911cfa71855ff4322b377b62cd53e7bf549faf60df4f20b8840171eab0029
   languageName: node
   linkType: hard
 
@@ -23112,14 +21982,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-plugin-turbo@npm:1.11.3":
-  version: 1.11.3
-  resolution: "eslint-plugin-turbo@npm:1.11.3"
-  dependencies:
-    dotenv: 16.0.3
+"eslint-plugin-turbo@npm:0.0.10":
+  version: 0.0.10
+  resolution: "eslint-plugin-turbo@npm:0.0.10"
   peerDependencies:
     eslint: ">6.6.0"
-  checksum: 36d8f89ca3c04e1dff0d6434de05913d37010150cdbdff6b63f4af75f784b0903a9165ec546c8187f02f7c947c717610f6f4ac79b8e58f5fe64b302a1147dbe2
+  checksum: 25c6e8ce279b4dc2bb89edaf81267286dd10a7770b397131911e43354d0f4a3b3d9bb86408247b58116fadc461a18eb5fa1260bae48268c494d6975b82944e00
   languageName: node
   linkType: hard
 
@@ -23303,13 +22171,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"esm-resolve@npm:^1.0.8":
-  version: 1.0.8
-  resolution: "esm-resolve@npm:1.0.8"
-  checksum: aa44828ecf3f417e3dc237658fb3f30ad91b7a3dc0896358c2c15f5ae54f95cc50804c5859aa7afcd7b96c0bbbdb47978f919379386ac4a6c5d2562c4ebd22f2
-  languageName: node
-  linkType: hard
-
 "esm@npm:^3.0.84":
   version: 3.2.25
   resolution: "esm@npm:3.2.25"
@@ -24165,13 +23026,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"exponential-backoff@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "exponential-backoff@npm:3.1.1"
-  checksum: 3d21519a4f8207c99f7457287291316306255a328770d320b401114ec8481986e4e467e854cb9914dd965e0a1ca810a23ccb559c642c88f4c7f55c55778a9b48
-  languageName: node
-  linkType: hard
-
 "express@npm:^4.17.3":
   version: 4.18.2
   resolution: "express@npm:4.18.2"
@@ -24415,7 +23269,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fast-safe-stringify@npm:2.1.1, fast-safe-stringify@npm:^2.0.6":
+"fast-safe-stringify@npm:^2.0.6":
   version: 2.1.1
   resolution: "fast-safe-stringify@npm:2.1.1"
   checksum: a851cbddc451745662f8f00ddb622d6766f9bd97642dabfd9a405fb0d646d69fc0b9a1243cbf67f5f18a39f40f6fa821737651ff1bceeba06c9992ca2dc5bd3d
@@ -24544,15 +23398,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"figures@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "figures@npm:2.0.0"
-  dependencies:
-    escape-string-regexp: ^1.0.5
-  checksum: 081beb16ea57d1716f8447c694f637668322398b57017b20929376aaf5def9823b35245b734cdd87e4832dc96e9c6f46274833cada77bfe15e5f980fea1fd21f
-  languageName: node
-  linkType: hard
-
 "figures@npm:^3.0.0, figures@npm:^3.2.0":
   version: 3.2.0
   resolution: "figures@npm:3.2.0"
@@ -24770,7 +23615,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"find-up@npm:^2.0.0, find-up@npm:^2.1.0":
+"find-up@npm:^2.1.0":
   version: 2.1.0
   resolution: "find-up@npm:2.1.0"
   dependencies:
@@ -24798,15 +23643,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"find-versions@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "find-versions@npm:4.0.0"
-  dependencies:
-    semver-regex: ^3.1.2
-  checksum: 2b4c749dc33e3fa73a457ca4df616ac13b4b32c53f6297bc862b0814d402a6cfec93a0d308d5502eeb47f2c125906e0f861bf01b756f08395640892186357711
-  languageName: node
-  linkType: hard
-
 "find-yarn-workspace-root@npm:^2.0.0, find-yarn-workspace-root@npm:~2.0.0":
   version: 2.0.0
   resolution: "find-yarn-workspace-root@npm:2.0.0"
@@ -24894,13 +23730,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.12.1, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9, follow-redirects@npm:^1.15.4":
-  version: 1.15.5
-  resolution: "follow-redirects@npm:1.15.5"
+"follow-redirects@npm:^1.0.0, follow-redirects@npm:^1.12.1, follow-redirects@npm:^1.14.0, follow-redirects@npm:^1.14.9":
+  version: 1.15.4
+  resolution: "follow-redirects@npm:1.15.4"
   peerDependenciesMeta:
     debug:
       optional: true
-  checksum: 5ca49b5ce6f44338cbfc3546823357e7a70813cecc9b7b768158a1d32c1e62e7407c944402a918ea8c38ae2e78266312d617dc68783fac502cbb55e1047b34ec
+  checksum: e178d1deff8b23d5d24ec3f7a94cde6e47d74d0dc649c35fc9857041267c12ec5d44650a0c5597ef83056ada9ea6ca0c30e7c4f97dbf07d035086be9e6a5b7b6
   languageName: node
   linkType: hard
 
@@ -25133,16 +23969,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"from2@npm:^2.3.0":
-  version: 2.3.0
-  resolution: "from2@npm:2.3.0"
-  dependencies:
-    inherits: ^2.0.1
-    readable-stream: ^2.0.0
-  checksum: 6080eba0793dce32f475141fb3d54cc15f84ee52e420ee22ac3ab0ad639dc95a1875bc6eb9c0e1140e94972a36a89dc5542491b85f1ab8df0c126241e0f1a61b
-  languageName: node
-  linkType: hard
-
 "from@npm:~0":
   version: 0.1.7
   resolution: "from@npm:0.1.7"
@@ -25150,13 +23976,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fromentries@npm:^1.3.2":
-  version: 1.3.2
-  resolution: "fromentries@npm:1.3.2"
-  checksum: 33729c529ce19f5494f846f0dd4945078f4e37f4e8955f4ae8cc7385c218f600e9d93a7d225d17636c20d1889106fd87061f911550861b7072f53bf891e6b341
-  languageName: node
-  linkType: hard
-
 "fs-exists-sync@npm:^0.1.0":
   version: 0.1.0
   resolution: "fs-exists-sync@npm:0.1.0"
@@ -25164,17 +23983,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:10.1.0, fs-extra@npm:^10.0.0":
-  version: 10.1.0
-  resolution: "fs-extra@npm:10.1.0"
-  dependencies:
-    graceful-fs: ^4.2.0
-    jsonfile: ^6.0.1
-    universalify: ^2.0.0
-  checksum: dc94ab37096f813cc3ca12f0f1b5ad6744dfed9ed21e953d72530d103cea193c2f81584a39e9dee1bea36de5ee66805678c0dddc048e8af1427ac19c00fffc50
-  languageName: node
-  linkType: hard
-
 "fs-extra@npm:11.1.0":
   version: 11.1.0
   resolution: "fs-extra@npm:11.1.0"
@@ -25211,14 +24019,25 @@ __metadata:
   languageName: node
   linkType: hard
 
-"fs-extra@npm:^11.0.0, fs-extra@npm:^11.1.0, fs-extra@npm:^11.1.1, fs-extra@npm:^11.2.0":
-  version: 11.2.0
-  resolution: "fs-extra@npm:11.2.0"
+"fs-extra@npm:^10.0.0":
+  version: 10.0.0
+  resolution: "fs-extra@npm:10.0.0"
+  dependencies:
+    graceful-fs: ^4.2.0
+    jsonfile: ^6.0.1
+    universalify: ^2.0.0
+  checksum: 5285a3d8f34b917cf2b66af8c231a40c1623626e9d701a20051d3337be16c6d7cac94441c8b3732d47a92a2a027886ca93c69b6a4ae6aee3c89650d2a8880c0a
+  languageName: node
+  linkType: hard
+
+"fs-extra@npm:^11.0.0, fs-extra@npm:^11.1.0, fs-extra@npm:^11.1.1":
+  version: 11.1.1
+  resolution: "fs-extra@npm:11.1.1"
   dependencies:
     graceful-fs: ^4.2.0
     jsonfile: ^6.0.1
     universalify: ^2.0.0
-  checksum: b12e42fa40ba47104202f57b8480dd098aa931c2724565e5e70779ab87605665594e76ee5fb00545f772ab9ace167fe06d2ab009c416dc8c842c5ae6df7aa7e8
+  checksum: fb883c68245b2d777fbc1f2082c9efb084eaa2bbf9fddaa366130d196c03608eebef7fb490541276429ee1ca99f317e2d73e96f5ca0999eefedf5a624ae1edfd
   languageName: node
   linkType: hard
 
@@ -25457,7 +24276,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"gensync@npm:^1.0.0-beta.2":
+"gensync@npm:^1.0.0-beta.1, gensync@npm:^1.0.0-beta.2":
   version: 1.0.0-beta.2
   resolution: "gensync@npm:1.0.0-beta.2"
   checksum: a7437e58c6be12aa6c90f7730eac7fa9833dc78872b4ad2963d2031b00a3367a93f98aec75f9aaac7220848e4026d67a8655e870b24f20a543d103c0d65952ec
@@ -25666,20 +24485,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"git-log-parser@npm:^1.2.0":
-  version: 1.2.0
-  resolution: "git-log-parser@npm:1.2.0"
-  dependencies:
-    argv-formatter: ~1.0.0
-    spawn-error-forwarder: ~1.0.0
-    split2: ~1.0.0
-    stream-combiner2: ~1.1.1
-    through2: ~2.0.0
-    traverse: ~0.6.6
-  checksum: 57294e72f91920d3262ff51fb0fd81dba1465c9e1b25961e19c757ae39bb38e72dd4a5da40649eeb368673b08be449a0844a2bafc0c0ded7375a8a56a6af8640
-  languageName: node
-  linkType: hard
-
 "git-raw-commits@npm:^2.0.0":
   version: 2.0.11
   resolution: "git-raw-commits@npm:2.0.11"
@@ -25773,9 +24578,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:7.2.0":
-  version: 7.2.0
-  resolution: "glob@npm:7.2.0"
+"glob@npm:7.1.7":
+  version: 7.1.7
+  resolution: "glob@npm:7.1.7"
   dependencies:
     fs.realpath: ^1.0.0
     inflight: ^1.0.4
@@ -25783,21 +24588,21 @@ __metadata:
     minimatch: ^3.0.4
     once: ^1.3.0
     path-is-absolute: ^1.0.0
-  checksum: 78a8ea942331f08ed2e055cb5b9e40fe6f46f579d7fd3d694f3412fe5db23223d29b7fee1575440202e9a7ff9a72ab106a39fee39934c7bedafe5e5f8ae20134
+  checksum: b61f48973bbdcf5159997b0874a2165db572b368b931135832599875919c237fc05c12984e38fe828e69aa8a921eb0e8a4997266211c517c9cfaae8a93988bb8
   languageName: node
   linkType: hard
 
-"glob@npm:7.2.3, glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.1.7":
-  version: 7.2.3
-  resolution: "glob@npm:7.2.3"
+"glob@npm:7.2.0":
+  version: 7.2.0
+  resolution: "glob@npm:7.2.0"
   dependencies:
     fs.realpath: ^1.0.0
     inflight: ^1.0.4
     inherits: 2
-    minimatch: ^3.1.1
+    minimatch: ^3.0.4
     once: ^1.3.0
     path-is-absolute: ^1.0.0
-  checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133
+  checksum: 78a8ea942331f08ed2e055cb5b9e40fe6f46f579d7fd3d694f3412fe5db23223d29b7fee1575440202e9a7ff9a72ab106a39fee39934c7bedafe5e5f8ae20134
   languageName: node
   linkType: hard
 
@@ -25814,18 +24619,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"glob@npm:9.3.2":
-  version: 9.3.2
-  resolution: "glob@npm:9.3.2"
-  dependencies:
-    fs.realpath: ^1.0.0
-    minimatch: ^7.4.1
-    minipass: ^4.2.4
-    path-scurry: ^1.6.1
-  checksum: f3d188e9f70e24fa729a63ca197bcdb36d838677abec1fb9bbfe4b7620063bf90dc0f8d195203d632abfdfa049fad0edf22f93c60076de67cef20c23bcbfaee8
-  languageName: node
-  linkType: hard
-
 "glob@npm:^6.0.1":
   version: 6.0.4
   resolution: "glob@npm:6.0.4"
@@ -25839,6 +24632,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"glob@npm:^7.0.0, glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.1.7":
+  version: 7.2.3
+  resolution: "glob@npm:7.2.3"
+  dependencies:
+    fs.realpath: ^1.0.0
+    inflight: ^1.0.4
+    inherits: 2
+    minimatch: ^3.1.1
+    once: ^1.3.0
+    path-is-absolute: ^1.0.0
+  checksum: 29452e97b38fa704dabb1d1045350fb2467cf0277e155aa9ff7077e90ad81d1ea9d53d3ee63bd37c05b09a065e90f16aec4a65f5b8de401d1dac40bc5605d133
+  languageName: node
+  linkType: hard
+
 "global-agent@npm:^3.0.0":
   version: 3.0.0
   resolution: "global-agent@npm:3.0.0"
@@ -25933,11 +24740,11 @@ __metadata:
   linkType: hard
 
 "globals@npm:^13.0.0, globals@npm:^13.19.0, globals@npm:^13.20.0":
-  version: 13.24.0
-  resolution: "globals@npm:13.24.0"
+  version: 13.23.0
+  resolution: "globals@npm:13.23.0"
   dependencies:
     type-fest: ^0.20.2
-  checksum: 56066ef058f6867c04ff203b8a44c15b038346a62efbc3060052a1016be9f56f4cf0b2cd45b74b22b81e521a889fc7786c73691b0549c2f3a6e825b3d394f43c
+  checksum: 194c97cf8d1ef6ba59417234c2386549c4103b6e5f24b1ff1952de61a4753e5d2069435ba629de711a6480b1b1d114a98e2ab27f85e966d5a10c319c3bbd3dc3
   languageName: node
   linkType: hard
 
@@ -26081,14 +24888,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"graceful-fs@npm:4.2.10":
-  version: 4.2.10
-  resolution: "graceful-fs@npm:4.2.10"
-  checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da
-  languageName: node
-  linkType: hard
-
-"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.3, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
+"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.3, graceful-fs@npm:^4.1.5, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.1.9, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9":
   version: 4.2.11
   resolution: "graceful-fs@npm:4.2.11"
   checksum: ac85f94da92d8eb6b7f5a8b20ce65e43d66761c55ce85ac96df6865308390da45a8d3f0296dd3a663de65d30ba497bd46c696cc1e248c72b13d6d567138a4fc7
@@ -26593,13 +25393,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hook-std@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "hook-std@npm:2.0.0"
-  checksum: 1e6051dd3ba89980027f9fe9675874e890958ee416f239d2a83bea6d3a2ae00bdca3da525933036d2b63638bdadd71b74aeb37f9cdb90338e555a0da5b9e74f9
-  languageName: node
-  linkType: hard
-
 "hoopy@npm:^0.1.4":
   version: 0.1.4
   resolution: "hoopy@npm:0.1.4"
@@ -26623,7 +25416,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hosted-git-info@npm:^4.0.0, hosted-git-info@npm:^4.0.1":
+"hosted-git-info@npm:^4.0.1":
   version: 4.1.0
   resolution: "hosted-git-info@npm:4.1.0"
   dependencies:
@@ -26632,15 +25425,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"hosted-git-info@npm:^5.0.0, hosted-git-info@npm:^5.2.1":
-  version: 5.2.1
-  resolution: "hosted-git-info@npm:5.2.1"
-  dependencies:
-    lru-cache: ^7.5.1
-  checksum: fa35df185224adfd69141f3b2f8cc31f50e705a5ebb415ccfbfd055c5b94bd08d3e658edf1edad9e2ac7d81831ac7cf261f5d219b3adc8d744fb8cdacaaf2ead
-  languageName: node
-  linkType: hard
-
 "hpack.js@npm:^2.1.6":
   version: 2.1.6
   resolution: "hpack.js@npm:2.1.6"
@@ -26850,16 +25634,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"http-proxy-agent@npm:^7.0.0":
-  version: 7.0.0
-  resolution: "http-proxy-agent@npm:7.0.0"
-  dependencies:
-    agent-base: ^7.1.0
-    debug: ^4.3.4
-  checksum: 48d4fac997917e15f45094852b63b62a46d0c8a4f0b9c6c23ca26d27b8df8d178bed88389e604745e748bd9a01f5023e25093722777f0593c3f052009ff438b6
-  languageName: node
-  linkType: hard
-
 "http-proxy-middleware@npm:^2.0.3":
   version: 2.0.6
   resolution: "http-proxy-middleware@npm:2.0.6"
@@ -26927,16 +25701,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^7.0.0":
-  version: 7.0.2
-  resolution: "https-proxy-agent@npm:7.0.2"
-  dependencies:
-    agent-base: ^7.0.2
-    debug: 4
-  checksum: 088969a0dd476ea7a0ed0a2cf1283013682b08f874c3bc6696c83fa061d2c157d29ef0ad3eb70a2046010bb7665573b2388d10fdcb3e410a66995e5248444292
-  languageName: node
-  linkType: hard
-
 "human-signals@npm:^1.1.1":
   version: 1.1.1
   resolution: "human-signals@npm:1.1.1"
@@ -27094,15 +25858,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ignore-walk@npm:^5.0.1":
-  version: 5.0.1
-  resolution: "ignore-walk@npm:5.0.1"
-  dependencies:
-    minimatch: ^5.0.1
-  checksum: 1a4ef35174653a1aa6faab3d9f8781269166536aee36a04946f6e2b319b2475c1903a75ed42f04219274128242f49d0a10e20c4354ee60d9548e97031451150b
-  languageName: node
-  linkType: hard
-
 "ignore@npm:^5.0.5, ignore@npm:^5.2.0, ignore@npm:^5.2.4":
   version: 5.3.0
   resolution: "ignore@npm:5.3.0"
@@ -27176,7 +25931,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"import-from@npm:4.0.0, import-from@npm:^4.0.0":
+"import-from@npm:4.0.0":
   version: 4.0.0
   resolution: "import-from@npm:4.0.0"
   checksum: 1fa29c05b048da18914e91d9a529e5d9b91774bebbfab10e53f59bcc1667917672b971cf102fee857f142e5e433ce69fa1f0a596e1c7d82f9947a5ec352694b9
@@ -27268,28 +26023,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ini@npm:^3.0.0, ini@npm:^3.0.1":
-  version: 3.0.1
-  resolution: "ini@npm:3.0.1"
-  checksum: 947b582a822f06df3c22c75c90aec217d604ea11f7a20249530ee5c1cf8f508288439abe17b0e1d9b421bda5f4fae5e7aae0b18cb3ded5ac9d68f607df82f10f
-  languageName: node
-  linkType: hard
-
-"init-package-json@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "init-package-json@npm:3.0.2"
-  dependencies:
-    npm-package-arg: ^9.0.1
-    promzard: ^0.3.0
-    read: ^1.0.7
-    read-package-json: ^5.0.0
-    semver: ^7.3.5
-    validate-npm-package-license: ^3.0.4
-    validate-npm-package-name: ^4.0.0
-  checksum: e027f60e4a1564809eee790d5a842341c784888fd7c7ace5f9a34ea76224c0adb6f3ab3bf205cf1c9c877a6e1a76c68b00847a984139f60813125d7b42a23a13
-  languageName: node
-  linkType: hard
-
 "inline-style-prefixer@npm:^6.0.1":
   version: 6.0.4
   resolution: "inline-style-prefixer@npm:6.0.4"
@@ -27300,47 +26033,47 @@ __metadata:
   languageName: node
   linkType: hard
 
-"inquirer@npm:8.2.6, inquirer@npm:^8.0.0":
-  version: 8.2.6
-  resolution: "inquirer@npm:8.2.6"
+"inquirer@npm:^7.3.3":
+  version: 7.3.3
+  resolution: "inquirer@npm:7.3.3"
   dependencies:
     ansi-escapes: ^4.2.1
-    chalk: ^4.1.1
+    chalk: ^4.1.0
     cli-cursor: ^3.1.0
     cli-width: ^3.0.0
     external-editor: ^3.0.3
     figures: ^3.0.0
-    lodash: ^4.17.21
+    lodash: ^4.17.19
     mute-stream: 0.0.8
-    ora: ^5.4.1
     run-async: ^2.4.0
-    rxjs: ^7.5.5
+    rxjs: ^6.6.0
     string-width: ^4.1.0
     strip-ansi: ^6.0.0
     through: ^2.3.6
-    wrap-ansi: ^6.0.1
-  checksum: 387ffb0a513559cc7414eb42c57556a60e302f820d6960e89d376d092e257a919961cd485a1b4de693dbb5c0de8bc58320bfd6247dfd827a873aa82a4215a240
+  checksum: 4d387fc1eb6126acbd58cbdb9ad99d2887d181df86ab0c2b9abdf734e751093e2d5882c2b6dc7144d9ab16b7ab30a78a1d7f01fb6a2850a44aeb175d1e3f8778
   languageName: node
   linkType: hard
 
-"inquirer@npm:^7.3.3":
-  version: 7.3.3
-  resolution: "inquirer@npm:7.3.3"
+"inquirer@npm:^8.0.0":
+  version: 8.2.5
+  resolution: "inquirer@npm:8.2.5"
   dependencies:
     ansi-escapes: ^4.2.1
-    chalk: ^4.1.0
+    chalk: ^4.1.1
     cli-cursor: ^3.1.0
     cli-width: ^3.0.0
     external-editor: ^3.0.3
     figures: ^3.0.0
-    lodash: ^4.17.19
+    lodash: ^4.17.21
     mute-stream: 0.0.8
+    ora: ^5.4.1
     run-async: ^2.4.0
-    rxjs: ^6.6.0
+    rxjs: ^7.5.5
     string-width: ^4.1.0
     strip-ansi: ^6.0.0
     through: ^2.3.6
-  checksum: 4d387fc1eb6126acbd58cbdb9ad99d2887d181df86ab0c2b9abdf734e751093e2d5882c2b6dc7144d9ab16b7ab30a78a1d7f01fb6a2850a44aeb175d1e3f8778
+    wrap-ansi: ^7.0.0
+  checksum: f13ee4c444187786fb393609dedf6b30870115a57b603f2e6424f29a99abc13446fd45ee22461c33c9c40a92a60a8df62d0d6b25d74fc6676fa4cb211de55b55
   languageName: node
   linkType: hard
 
@@ -27400,16 +26133,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"into-stream@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "into-stream@npm:6.0.0"
-  dependencies:
-    from2: ^2.3.0
-    p-is-promise: ^3.0.0
-  checksum: 8df24c9eadd7cdd1cbc160bc20914b961dfd0ca29767785b69e698f799e85466b6f7c637d237dca1472d09d333399f70cc05a2fb8d08cb449dc9a80d92193980
-  languageName: node
-  linkType: hard
-
 "invariant@npm:*, invariant@npm:2.2.4, invariant@npm:^2.2.2, invariant@npm:^2.2.4":
   version: 2.2.4
   resolution: "invariant@npm:2.2.4"
@@ -27435,13 +26158,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ip-regex@npm:^4.1.0":
-  version: 4.3.0
-  resolution: "ip-regex@npm:4.3.0"
-  checksum: 7ff904b891221b1847f3fdf3dbb3e6a8660dc39bc283f79eb7ed88f5338e1a3d1104b779bc83759159be266249c59c2160e779ee39446d79d4ed0890dfd06f08
-  languageName: node
-  linkType: hard
-
 "ip@npm:^1.1.4, ip@npm:^1.1.5":
   version: 1.1.8
   resolution: "ip@npm:1.1.8"
@@ -27630,15 +26346,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"is-cidr@npm:^4.0.2":
-  version: 4.0.2
-  resolution: "is-cidr@npm:4.0.2"
-  dependencies:
-    cidr-regex: ^3.1.1
-  checksum: ee6e670e655a835710a7fa15268b428adbf80267114a494ce1c2ca2b09e1ca0b629fe1375aae621d4c093b32930d5ff7c4ee6da97eae14e3836bc7b3a07b171f
-  languageName: node
-  linkType: hard
-
 "is-core-module@npm:2.13.0":
   version: 2.13.0
   resolution: "is-core-module@npm:2.13.0"
@@ -28435,19 +27142,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"issue-parser@npm:^6.0.0":
-  version: 6.0.0
-  resolution: "issue-parser@npm:6.0.0"
-  dependencies:
-    lodash.capitalize: ^4.2.1
-    lodash.escaperegexp: ^4.1.2
-    lodash.isplainobject: ^4.0.6
-    lodash.isstring: ^4.0.1
-    lodash.uniqby: ^4.7.0
-  checksum: 3357928af6c78c4803340f978bd55dc922b6b15b3f6c76aaa78a08999d39002729502ce1650863d1a9d728a7e31ccc0a865087244225ef6e8fc85aaf2f9c0f67
-  languageName: node
-  linkType: hard
-
 "istanbul-lib-coverage@npm:^3.0.0, istanbul-lib-coverage@npm:^3.2.0":
   version: 3.2.0
   resolution: "istanbul-lib-coverage@npm:3.2.0"
@@ -28520,13 +27214,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iterare@npm:1.2.1":
-  version: 1.2.1
-  resolution: "iterare@npm:1.2.1"
-  checksum: 70bc80038e3718aa9072bc63b3a0135166d7120bde46bfcaf80a88d11005dcef1b2d69cd353849f87a3f58ba8f546a8c6e6983408236ff01fa50b52339ee5223
-  languageName: node
-  linkType: hard
-
 "iterator.prototype@npm:^1.1.2":
   version: 1.1.2
   resolution: "iterator.prototype@npm:1.1.2"
@@ -28554,13 +27241,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"java-properties@npm:^1.0.0":
-  version: 1.0.2
-  resolution: "java-properties@npm:1.0.2"
-  checksum: 9a086778346e3adbe2395e370f5c779033ed60360055a15e2cead49e3d676d2c73786cf2f6563a1860277dea3dd0a859432e546ed89c03ee08c1f53e31a5d420
-  languageName: node
-  linkType: hard
-
 "javascript-stringify@npm:^2.0.1":
   version: 2.1.0
   resolution: "javascript-stringify@npm:2.1.0"
@@ -30202,13 +28882,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"json-stringify-nice@npm:^1.1.4":
-  version: 1.1.4
-  resolution: "json-stringify-nice@npm:1.1.4"
-  checksum: 6ddf781148b46857ab04e97f47be05f14c4304b86eb5478369edbeacd070c21c697269964b982fc977e8989d4c59091103b1d9dc291aba40096d6cbb9a392b72
-  languageName: node
-  linkType: hard
-
 "json-stringify-safe@npm:^5.0.1, json-stringify-safe@npm:~5.0.1":
   version: 5.0.1
   resolution: "json-stringify-safe@npm:5.0.1"
@@ -30286,7 +28959,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"jsonparse@npm:^1.2.0, jsonparse@npm:^1.3.1":
+"jsonparse@npm:^1.2.0":
   version: 1.3.1
   resolution: "jsonparse@npm:1.3.1"
   checksum: 6514a7be4674ebf407afca0eda3ba284b69b07f9958a8d3113ef1005f7ec610860c312be067e450c569aab8b89635e332cee3696789c750692bb60daba627f4d
@@ -30345,20 +29018,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"just-diff-apply@npm:^5.2.0":
-  version: 5.5.0
-  resolution: "just-diff-apply@npm:5.5.0"
-  checksum: ed6bbd59781542ccb786bd843038e4591e8390aa788075beb69d358051f68fbeb122bda050b7f42515d51fb64b907d5c7bea694a0543b87b24ce406cfb5f5bfa
-  languageName: node
-  linkType: hard
-
-"just-diff@npm:^5.0.1":
-  version: 5.2.0
-  resolution: "just-diff@npm:5.2.0"
-  checksum: 5527fb6d28a446185250fba501ad857370c049bac7aa5a34c9ec82a45e1380af1a96137be7df2f87252d9f75ef67be41d4c0267d481ed0235b2ceb3ee1f5f75d
-  languageName: node
-  linkType: hard
-
 "jwa@npm:^1.4.1":
   version: 1.4.1
   resolution: "jwa@npm:1.4.1"
@@ -30616,141 +29275,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"libnpmaccess@npm:^6.0.4":
-  version: 6.0.4
-  resolution: "libnpmaccess@npm:6.0.4"
-  dependencies:
-    aproba: ^2.0.0
-    minipass: ^3.1.1
-    npm-package-arg: ^9.0.1
-    npm-registry-fetch: ^13.0.0
-  checksum: 86130b435c67a03254489c3b3684d435260b609164f76bcc69adbee78652c36a64551228b2c5ddc2b16851e9e367ee0ba173a641406768397716faa006042322
-  languageName: node
-  linkType: hard
-
-"libnpmdiff@npm:^4.0.5":
-  version: 4.0.5
-  resolution: "libnpmdiff@npm:4.0.5"
-  dependencies:
-    "@npmcli/disparity-colors": ^2.0.0
-    "@npmcli/installed-package-contents": ^1.0.7
-    binary-extensions: ^2.2.0
-    diff: ^5.1.0
-    minimatch: ^5.0.1
-    npm-package-arg: ^9.0.1
-    pacote: ^13.6.1
-    tar: ^6.1.0
-  checksum: c9748a280b5b13304688713305ee6487d0e9bed2ef11c47e6b1f861108abfa804b674fc7904a41e2d5e0d3bf839eaf910ab3475157f98ee88c601c3e9e9a67df
-  languageName: node
-  linkType: hard
-
-"libnpmexec@npm:^4.0.14":
-  version: 4.0.14
-  resolution: "libnpmexec@npm:4.0.14"
-  dependencies:
-    "@npmcli/arborist": ^5.6.3
-    "@npmcli/ci-detect": ^2.0.0
-    "@npmcli/fs": ^2.1.1
-    "@npmcli/run-script": ^4.2.0
-    chalk: ^4.1.0
-    mkdirp-infer-owner: ^2.0.0
-    npm-package-arg: ^9.0.1
-    npmlog: ^6.0.2
-    pacote: ^13.6.1
-    proc-log: ^2.0.0
-    read: ^1.0.7
-    read-package-json-fast: ^2.0.2
-    semver: ^7.3.7
-    walk-up-path: ^1.0.0
-  checksum: 77a1a630bee3b773be2e9b4ad9465eb0b966fafa8397c31a049e4f5ae6ef19d379da21c5e7d8e3ecb2948c3ab66f246bba4e02bdf7ebe1d90993719bb49f7e70
-  languageName: node
-  linkType: hard
-
-"libnpmfund@npm:^3.0.5":
-  version: 3.0.5
-  resolution: "libnpmfund@npm:3.0.5"
-  dependencies:
-    "@npmcli/arborist": ^5.6.3
-  checksum: 7123c3f7c278dbe571c47d3a67f40087df3c221bd2eefab6f1c4e4361346180a2dee1b379f25fb44170c67290a45a83f92145096ac4809af0b4af761d9b43708
-  languageName: node
-  linkType: hard
-
-"libnpmhook@npm:^8.0.4":
-  version: 8.0.4
-  resolution: "libnpmhook@npm:8.0.4"
-  dependencies:
-    aproba: ^2.0.0
-    npm-registry-fetch: ^13.0.0
-  checksum: 9bb7932134362757e07f71e05a5f21f977b85621518b46126be8d3bbb6ae1f3eeb8d6ffcdfc79592127da160b3561201215f0e735f3d36b78314453fb134fc30
-  languageName: node
-  linkType: hard
-
-"libnpmorg@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "libnpmorg@npm:4.0.4"
-  dependencies:
-    aproba: ^2.0.0
-    npm-registry-fetch: ^13.0.0
-  checksum: 960cf12a1c80d9544e4094f69bd495424d190ee1b164254f9273140099b1f1d314608a8210883ed913bc1ec3e06c0f633f3a351808012fec467fe5af5dc3cbd4
-  languageName: node
-  linkType: hard
-
-"libnpmpack@npm:^4.1.3":
-  version: 4.1.3
-  resolution: "libnpmpack@npm:4.1.3"
-  dependencies:
-    "@npmcli/run-script": ^4.1.3
-    npm-package-arg: ^9.0.1
-    pacote: ^13.6.1
-  checksum: 5e54c265e3e6f8d1f47a33cfae9d0dc39408d2c12a47fab1e92810821428fe8d80ab09768707affa1c324037fcab97fe7942ad2123186912d46efc78057ff549
-  languageName: node
-  linkType: hard
-
-"libnpmpublish@npm:^6.0.5":
-  version: 6.0.5
-  resolution: "libnpmpublish@npm:6.0.5"
-  dependencies:
-    normalize-package-data: ^4.0.0
-    npm-package-arg: ^9.0.1
-    npm-registry-fetch: ^13.0.0
-    semver: ^7.3.7
-    ssri: ^9.0.0
-  checksum: d2f2434517038438be44db2e90e1c8c524df05f7c3b1458617177c2f9ca008dde8a72a4f739b34aee4df0352f71c9289788da86aa38a4709e05c6db33eed570a
-  languageName: node
-  linkType: hard
-
-"libnpmsearch@npm:^5.0.4":
-  version: 5.0.4
-  resolution: "libnpmsearch@npm:5.0.4"
-  dependencies:
-    npm-registry-fetch: ^13.0.0
-  checksum: 6270ab77487c22b03236890065a1e0e954a5a7f1ca9bb50278b447671d0fa5321539185c6e5aa4c358c344b73bb17bce49488b52c940937b2036ea7180505b88
-  languageName: node
-  linkType: hard
-
-"libnpmteam@npm:^4.0.4":
-  version: 4.0.4
-  resolution: "libnpmteam@npm:4.0.4"
-  dependencies:
-    aproba: ^2.0.0
-    npm-registry-fetch: ^13.0.0
-  checksum: 185a4cb5277be46709255cbe0563f4449e98a3ccbc9c3c5ce49e2c5f19247eaff0d9e477a18844f4e91dd5f1b2712261a00738a5c1f2bc1c6ef59ce65cdaccb2
-  languageName: node
-  linkType: hard
-
-"libnpmversion@npm:^3.0.7":
-  version: 3.0.7
-  resolution: "libnpmversion@npm:3.0.7"
-  dependencies:
-    "@npmcli/git": ^3.0.0
-    "@npmcli/run-script": ^4.1.3
-    json-parse-even-better-errors: ^2.3.1
-    proc-log: ^2.0.0
-    semver: ^7.3.7
-  checksum: 7ac0357c2227ee07511b423d3e43231bef2ac02254e858e73ff5502eea9f2c3372747ba5152fd6952aa47b4ba9482182b64493159fa7ef20c1fbb025458cb43f
-  languageName: node
-  linkType: hard
-
 "lie@npm:3.1.1":
   version: 3.1.1
   resolution: "lie@npm:3.1.1"
@@ -30760,106 +29284,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lightningcss-darwin-arm64@npm:1.23.0":
-  version: 1.23.0
-  resolution: "lightningcss-darwin-arm64@npm:1.23.0"
-  conditions: os=darwin & cpu=arm64
-  languageName: node
-  linkType: hard
-
-"lightningcss-darwin-x64@npm:1.23.0":
-  version: 1.23.0
-  resolution: "lightningcss-darwin-x64@npm:1.23.0"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
-"lightningcss-freebsd-x64@npm:1.23.0":
-  version: 1.23.0
-  resolution: "lightningcss-freebsd-x64@npm:1.23.0"
-  conditions: os=freebsd & cpu=x64
-  languageName: node
-  linkType: hard
-
-"lightningcss-linux-arm-gnueabihf@npm:1.23.0":
-  version: 1.23.0
-  resolution: "lightningcss-linux-arm-gnueabihf@npm:1.23.0"
-  conditions: os=linux & cpu=arm
-  languageName: node
-  linkType: hard
-
-"lightningcss-linux-arm64-gnu@npm:1.23.0":
-  version: 1.23.0
-  resolution: "lightningcss-linux-arm64-gnu@npm:1.23.0"
-  conditions: os=linux & cpu=arm64 & libc=glibc
-  languageName: node
-  linkType: hard
-
-"lightningcss-linux-arm64-musl@npm:1.23.0":
-  version: 1.23.0
-  resolution: "lightningcss-linux-arm64-musl@npm:1.23.0"
-  conditions: os=linux & cpu=arm64 & libc=musl
-  languageName: node
-  linkType: hard
-
-"lightningcss-linux-x64-gnu@npm:1.23.0":
-  version: 1.23.0
-  resolution: "lightningcss-linux-x64-gnu@npm:1.23.0"
-  conditions: os=linux & cpu=x64 & libc=glibc
-  languageName: node
-  linkType: hard
-
-"lightningcss-linux-x64-musl@npm:1.23.0":
-  version: 1.23.0
-  resolution: "lightningcss-linux-x64-musl@npm:1.23.0"
-  conditions: os=linux & cpu=x64 & libc=musl
-  languageName: node
-  linkType: hard
-
-"lightningcss-win32-x64-msvc@npm:1.23.0":
-  version: 1.23.0
-  resolution: "lightningcss-win32-x64-msvc@npm:1.23.0"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
-"lightningcss@npm:*":
-  version: 1.23.0
-  resolution: "lightningcss@npm:1.23.0"
-  dependencies:
-    detect-libc: ^1.0.3
-    lightningcss-darwin-arm64: 1.23.0
-    lightningcss-darwin-x64: 1.23.0
-    lightningcss-freebsd-x64: 1.23.0
-    lightningcss-linux-arm-gnueabihf: 1.23.0
-    lightningcss-linux-arm64-gnu: 1.23.0
-    lightningcss-linux-arm64-musl: 1.23.0
-    lightningcss-linux-x64-gnu: 1.23.0
-    lightningcss-linux-x64-musl: 1.23.0
-    lightningcss-win32-x64-msvc: 1.23.0
-  dependenciesMeta:
-    lightningcss-darwin-arm64:
-      optional: true
-    lightningcss-darwin-x64:
-      optional: true
-    lightningcss-freebsd-x64:
-      optional: true
-    lightningcss-linux-arm-gnueabihf:
-      optional: true
-    lightningcss-linux-arm64-gnu:
-      optional: true
-    lightningcss-linux-arm64-musl:
-      optional: true
-    lightningcss-linux-x64-gnu:
-      optional: true
-    lightningcss-linux-x64-musl:
-      optional: true
-    lightningcss-win32-x64-msvc:
-      optional: true
-  checksum: c9cf793762a9c30ebf9376f461954e5667e9e034f3a76a5ab4f8823648c4012b5da929b93b54ad240d6fdb002efd82768685602f32a8a9c0b215d8af848ea66a
-  languageName: node
-  linkType: hard
-
 "lightweight-charts@npm:4.1.1":
   version: 4.1.1
   resolution: "lightweight-charts@npm:4.1.1"
@@ -31139,13 +29563,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.capitalize@npm:^4.2.1":
-  version: 4.2.1
-  resolution: "lodash.capitalize@npm:4.2.1"
-  checksum: d9195f31d48c105206f1099946d8bbc8ab71435bc1c8708296992a31a992bb901baf120fdcadd773098ac96e62a79e6b023ee7d26a2deb0d6c6aada930e6ad0a
-  languageName: node
-  linkType: hard
-
 "lodash.clonedeep@npm:^4.5.0":
   version: 4.5.0
   resolution: "lodash.clonedeep@npm:4.5.0"
@@ -31160,13 +29577,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.escaperegexp@npm:^4.1.2":
-  version: 4.1.2
-  resolution: "lodash.escaperegexp@npm:4.1.2"
-  checksum: 6d99452b1cfd6073175a9b741a9b09ece159eac463f86f02ea3bee2e2092923fce812c8d2bf446309cc52d1d61bf9af51c8118b0d7421388e6cead7bd3798f0f
-  languageName: node
-  linkType: hard
-
 "lodash.find@npm:^4.6.0":
   version: 4.6.0
   resolution: "lodash.find@npm:4.6.0"
@@ -31223,13 +29633,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.isstring@npm:^4.0.1":
-  version: 4.0.1
-  resolution: "lodash.isstring@npm:4.0.1"
-  checksum: eaac87ae9636848af08021083d796e2eea3d02e80082ab8a9955309569cb3a463ce97fd281d7dc119e402b2e7d8c54a23914b15d2fc7fff56461511dc8937ba0
-  languageName: node
-  linkType: hard
-
 "lodash.kebabcase@npm:^4.1.1":
   version: 4.1.1
   resolution: "lodash.kebabcase@npm:4.1.1"
@@ -31314,13 +29717,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lodash.uniqby@npm:^4.7.0":
-  version: 4.7.0
-  resolution: "lodash.uniqby@npm:4.7.0"
-  checksum: 659264545a95726d1493123345aad8cbf56e17810fa9a0b029852c6d42bc80517696af09d99b23bef1845d10d95e01b8b4a1da578f22aeba7a30d3e0022a4938
-  languageName: node
-  linkType: hard
-
 "lodash.upperfirst@npm:^4.3.1":
   version: 4.3.1
   resolution: "lodash.upperfirst@npm:4.3.1"
@@ -31463,20 +29859,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^7.4.4, lru-cache@npm:^7.5.1, lru-cache@npm:^7.7.1":
+"lru-cache@npm:^7.7.1":
   version: 7.18.3
   resolution: "lru-cache@npm:7.18.3"
   checksum: e550d772384709deea3f141af34b6d4fa392e2e418c1498c078de0ee63670f1f46f5eee746e8ef7e69e1c895af0d4224e62ee33e66a543a14763b0f2e74c1356
   languageName: node
   linkType: hard
 
-"lru-cache@npm:^9.1.1 || ^10.0.0":
-  version: 10.1.0
-  resolution: "lru-cache@npm:10.1.0"
-  checksum: 58056d33e2500fbedce92f8c542e7c11b50d7d086578f14b7074d8c241422004af0718e08a6eaae8705cee09c77e39a61c1c79e9370ba689b7010c152e6a76ab
-  languageName: node
-  linkType: hard
-
 "lru_map@npm:^0.3.3":
   version: 0.3.3
   resolution: "lru_map@npm:0.3.3"
@@ -31530,15 +29919,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"magic-string@npm:0.27.0":
-  version: 0.27.0
-  resolution: "magic-string@npm:0.27.0"
-  dependencies:
-    "@jridgewell/sourcemap-codec": ^1.4.13
-  checksum: 273faaa50baadb7a2df6e442eac34ad611304fc08fe16e24fe2e472fd944bfcb73ffb50d2dc972dc04e92784222002af46868cb9698b1be181c81830fd95a13e
-  languageName: node
-  linkType: hard
-
 "magic-string@npm:^0.25.0, magic-string@npm:^0.25.3, magic-string@npm:^0.25.7":
   version: 0.25.9
   resolution: "magic-string@npm:0.25.9"
@@ -31592,7 +29972,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"make-fetch-happen@npm:^10.0.3, make-fetch-happen@npm:^10.0.6, make-fetch-happen@npm:^10.2.0":
+"make-fetch-happen@npm:^10.0.3":
   version: 10.2.1
   resolution: "make-fetch-happen@npm:10.2.1"
   dependencies:
@@ -31698,31 +30078,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"marked-terminal@npm:^5.0.0":
-  version: 5.2.0
-  resolution: "marked-terminal@npm:5.2.0"
-  dependencies:
-    ansi-escapes: ^6.2.0
-    cardinal: ^2.1.1
-    chalk: ^5.2.0
-    cli-table3: ^0.6.3
-    node-emoji: ^1.11.0
-    supports-hyperlinks: ^2.3.0
-  peerDependencies:
-    marked: ^1.0.0 || ^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0
-  checksum: 5bd8e3af32361db96a7341f2a719c0dd9857f239be94cda65c24e8d923f03b7d1b72d1c07fb41ba3b6009b5ca257f2c72eeb7676a5665a614ed0a8862da3d218
-  languageName: node
-  linkType: hard
-
-"marked@npm:^4.0.10":
-  version: 4.3.0
-  resolution: "marked@npm:4.3.0"
-  bin:
-    marked: bin/marked.js
-  checksum: 0db6817893952c3ec710eb9ceafb8468bf5ae38cb0f92b7b083baa13d70b19774674be04db5b817681fa7c5c6a088f61300815e4dd75a59696f4716ad69f6260
-  languageName: node
-  linkType: hard
-
 "match-sorter@npm:^6.0.2":
   version: 6.3.1
   resolution: "match-sorter@npm:6.3.1"
@@ -32413,7 +30768,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"micromatch@npm:4.0.5, micromatch@npm:^4.0.0, micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
+"micromatch@npm:4.0.5, micromatch@npm:^4.0.2, micromatch@npm:^4.0.4, micromatch@npm:^4.0.5":
   version: 4.0.5
   resolution: "micromatch@npm:4.0.5"
   dependencies:
@@ -32654,16 +31009,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:9.0.3":
-  version: 9.0.3
-  resolution: "minimatch@npm:9.0.3"
-  dependencies:
-    brace-expansion: ^2.0.1
-  checksum: 253487976bf485b612f16bf57463520a14f512662e592e95c571afdab1442a6a6864b6c88f248ce6fc4ff0b6de04ac7aa6c8bb51e868e99d1d65eb0658a708b5
-  languageName: node
-  linkType: hard
-
-"minimatch@npm:^5.0.1, minimatch@npm:^5.1.0":
+"minimatch@npm:^5.0.1":
   version: 5.1.6
   resolution: "minimatch@npm:5.1.6"
   dependencies:
@@ -32672,7 +31018,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minimatch@npm:^7.4.1, minimatch@npm:^7.4.6":
+"minimatch@npm:^7.4.6":
   version: 7.4.6
   resolution: "minimatch@npm:7.4.6"
   dependencies:
@@ -32732,16 +31078,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass-json-stream@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "minipass-json-stream@npm:1.0.1"
-  dependencies:
-    jsonparse: ^1.3.1
-    minipass: ^3.0.0
-  checksum: 791b696a27d1074c4c08dab1bf5a9f3201145c2933e428f45d880467bce12c60de4703203d2928de4b162d0ae77b0bb4b55f96cb846645800aa0eb4919b3e796
-  languageName: node
-  linkType: hard
-
 "minipass-pipeline@npm:^1.2.2, minipass-pipeline@npm:^1.2.4":
   version: 1.2.4
   resolution: "minipass-pipeline@npm:1.2.4"
@@ -32788,27 +31124,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"minipass@npm:^4.2.4":
+"minipass@npm:^4.0.0":
   version: 4.2.8
   resolution: "minipass@npm:4.2.8"
   checksum: 7f4914d5295a9a30807cae5227a37a926e6d910c03f315930fde52332cf0575dfbc20295318f91f0baf0e6bb11a6f668e30cde8027dea7a11b9d159867a3c830
   languageName: node
   linkType: hard
 
-"minipass@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "minipass@npm:5.0.0"
-  checksum: 425dab288738853fded43da3314a0b5c035844d6f3097a8e3b5b29b328da8f3c1af6fc70618b32c29ff906284cf6406b6841376f21caaadd0793c1d5a6a620ea
-  languageName: node
-  linkType: hard
-
-"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0":
-  version: 7.0.4
-  resolution: "minipass@npm:7.0.4"
-  checksum: 87585e258b9488caf2e7acea242fd7856bbe9a2c84a7807643513a338d66f368c7d518200ad7b70a508664d408aa000517647b2930c259a8b1f9f0984f344a21
-  languageName: node
-  linkType: hard
-
 "minizlib@npm:^1.3.3":
   version: 1.3.3
   resolution: "minizlib@npm:1.3.3"
@@ -32848,17 +31170,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mkdirp-infer-owner@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "mkdirp-infer-owner@npm:2.0.0"
-  dependencies:
-    chownr: ^2.0.0
-    infer-owner: ^1.0.4
-    mkdirp: ^1.0.3
-  checksum: d8f4ecd32f6762459d6b5714eae6487c67ae9734ab14e26d14377ddd9b2a1bf868d8baa18c0f3e73d3d513f53ec7a698e0f81a9367102c870a55bef7833880f7
-  languageName: node
-  linkType: hard
-
 "mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.5, mkdirp@npm:~0.5.1":
   version: 0.5.6
   resolution: "mkdirp@npm:0.5.6"
@@ -32953,13 +31264,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"modify-values@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "modify-values@npm:1.0.1"
-  checksum: 8296610c608bc97b03c2cf889c6cdf4517e32fa2d836440096374c2209f6b7b3e256c209493a0b32584b9cb32d528e99d0dd19dcd9a14d2d915a312d391cc7e9
-  languageName: node
-  linkType: hard
-
 "module-definition@npm:^3.3.1":
   version: 3.4.0
   resolution: "module-definition@npm:3.4.0"
@@ -33027,14 +31331,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"moti@npm:^0.27.2":
-  version: 0.27.2
-  resolution: "moti@npm:0.27.2"
+"moti@npm:^0.25.3":
+  version: 0.25.4
+  resolution: "moti@npm:0.25.4"
   dependencies:
     framer-motion: ^6.5.1
   peerDependencies:
     react-native-reanimated: "*"
-  checksum: 7695e914180608cee58c6bd95a66f5b02cfde2ccfbce82b31395a190115acf5cca7723e08cad5119fdc6c452c7bc7f5127207c66cba625e75ba65aa8e64a49f9
+  checksum: 399b41f7aac178869dda6d13dd0e22dc8d674abae6f9a1034b97af666a752abb6dae761cc52acbadd043c1746a3b56c406e84ada38e439edee66410232595afe
   languageName: node
   linkType: hard
 
@@ -33066,7 +31370,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1, ms@npm:^2.1.2":
+"ms@npm:2.1.3, ms@npm:^2.0.0, ms@npm:^2.1.1":
   version: 2.1.3
   resolution: "ms@npm:2.1.3"
   checksum: aa92de608021b242401676e35cfa5aa42dd70cbdc082b916da7fb925c542173e36bce97ea3e804923fe92c0ad991434e4a38327e15a1b5b5f945d66df615ae6d
@@ -33151,7 +31455,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mute-stream@npm:0.0.8, mute-stream@npm:~0.0.4":
+"mute-stream@npm:0.0.8":
   version: 0.0.8
   resolution: "mute-stream@npm:0.0.8"
   checksum: ff48d251fc3f827e5b1206cda0ffdaec885e56057ee86a3155e1951bc940fd5f33531774b1cc8414d7668c10a8907f863f6561875ee6e8768931a62121a531a1
@@ -33279,13 +31583,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"nerf-dart@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "nerf-dart@npm:1.0.0"
-  checksum: 0e5508d83eae21a6ed0bd32b3a048c849741023811f06efa972800f4ad55eaa8205442e81c406ad051771f232c4ed3d3ee262f6c850bbcad9660f54a6471a4b9
-  languageName: node
-  linkType: hard
-
 "nested-error-stacks@npm:~2.0.1":
   version: 2.0.1
   resolution: "nested-error-stacks@npm:2.0.1"
@@ -33392,15 +31689,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-emoji@npm:^1.11.0":
-  version: 1.11.0
-  resolution: "node-emoji@npm:1.11.0"
-  dependencies:
-    lodash: ^4.17.21
-  checksum: e8c856c04a1645062112a72e59a98b203505ed5111ff84a3a5f40611afa229b578c7d50f1e6a7f17aa62baeea4a640d2e2f61f63afc05423aa267af10977fb2b
-  languageName: node
-  linkType: hard
-
 "node-fetch@npm:2.6.0":
   version: 2.6.0
   resolution: "node-fetch@npm:2.6.0"
@@ -33454,27 +31742,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-gyp@npm:^9.0.0, node-gyp@npm:^9.1.0":
-  version: 9.4.1
-  resolution: "node-gyp@npm:9.4.1"
-  dependencies:
-    env-paths: ^2.2.0
-    exponential-backoff: ^3.1.1
-    glob: ^7.1.4
-    graceful-fs: ^4.2.6
-    make-fetch-happen: ^10.0.3
-    nopt: ^6.0.0
-    npmlog: ^6.0.0
-    rimraf: ^3.0.2
-    semver: ^7.3.5
-    tar: ^6.1.2
-    which: ^2.0.2
-  bin:
-    node-gyp: bin/node-gyp.js
-  checksum: 8576c439e9e925ab50679f87b7dfa7aa6739e42822e2ad4e26c36341c0ba7163fdf5a946f0a67a476d2f24662bc40d6c97bd9e79ced4321506738e6b760a1577
-  languageName: node
-  linkType: hard
-
 "node-gyp@npm:latest":
   version: 9.3.1
   resolution: "node-gyp@npm:9.3.1"
@@ -33537,10 +31804,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"node-releases@npm:^2.0.14":
-  version: 2.0.14
-  resolution: "node-releases@npm:2.0.14"
-  checksum: 59443a2f77acac854c42d321bf1b43dea0aef55cd544c6a686e9816a697300458d4e82239e2d794ea05f7bbbc8a94500332e2d3ac3f11f52e4b16cbe638b3c41
+"node-releases@npm:^2.0.13":
+  version: 2.0.13
+  resolution: "node-releases@npm:2.0.13"
+  checksum: 17ec8f315dba62710cae71a8dad3cd0288ba943d2ece43504b3b1aa8625bf138637798ab470b1d9035b0545996f63000a8a926e0f6d35d0996424f8b6d36dda3
   languageName: node
   linkType: hard
 
@@ -33633,18 +31900,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"normalize-package-data@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "normalize-package-data@npm:4.0.1"
-  dependencies:
-    hosted-git-info: ^5.0.0
-    is-core-module: ^2.8.1
-    semver: ^7.3.5
-    validate-npm-package-license: ^3.0.4
-  checksum: 292e0aa740e73d62f84bbd9d55d4bfc078155f32d5d7572c32c9807f96d543af0f43ff7e5c80bfa6238667123fd68bd83cd412eae9b27b85b271fb041f624528
-  languageName: node
-  linkType: hard
-
 "normalize-path@npm:^2.1.1":
   version: 2.1.1
   resolution: "normalize-path@npm:2.1.1"
@@ -33695,7 +31950,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"normalize-url@npm:^6.0.0, normalize-url@npm:^6.0.1":
+"normalize-url@npm:^6.0.1":
   version: 6.1.0
   resolution: "normalize-url@npm:6.1.0"
   checksum: 4a4944631173e7d521d6b80e4c85ccaeceb2870f315584fa30121f505a6dfd86439c5e3fdd8cd9e0e291290c41d0c3599f0cb12ab356722ed242584c30348e50
@@ -33711,56 +31966,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npm-audit-report@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "npm-audit-report@npm:3.0.0"
-  dependencies:
-    chalk: ^4.0.0
-  checksum: 3927972c14e1d9fd21a6ab2d3c2d651e20346ff9a784ea2fcdc2b1e3b3e23994fc0e8961c3c9f4aea857e3a995a556a77f4f0250dbaf6238c481c609ed912a92
-  languageName: node
-  linkType: hard
-
-"npm-bundled@npm:^1.1.1":
-  version: 1.1.2
-  resolution: "npm-bundled@npm:1.1.2"
-  dependencies:
-    npm-normalize-package-bin: ^1.0.1
-  checksum: 6e599155ef28d0b498622f47f1ba189dfbae05095a1ed17cb3a5babf961e965dd5eab621f0ec6f0a98de774e5836b8f5a5ee639010d64f42850a74acec3d4d09
-  languageName: node
-  linkType: hard
-
-"npm-bundled@npm:^2.0.0":
-  version: 2.0.1
-  resolution: "npm-bundled@npm:2.0.1"
-  dependencies:
-    npm-normalize-package-bin: ^2.0.0
-  checksum: 7747293985c48c5268871efe691545b03731cb80029692000cbdb0b3344b9617be5187aa36281cabbe6b938e3651b4e87236d1c31f9e645eef391a1a779413e6
-  languageName: node
-  linkType: hard
-
-"npm-install-checks@npm:^5.0.0":
-  version: 5.0.0
-  resolution: "npm-install-checks@npm:5.0.0"
-  dependencies:
-    semver: ^7.1.1
-  checksum: 0e7d1aae52b1fe9d3a0fd4a008850c7047931722dd49ee908afd13fd0297ac5ddb10964d9c59afcdaaa2ca04b51d75af2788f668c729ae71fec0e4cdac590ffc
-  languageName: node
-  linkType: hard
-
-"npm-normalize-package-bin@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "npm-normalize-package-bin@npm:1.0.1"
-  checksum: ae7f15155a1e3ace2653f12ddd1ee8eaa3c84452fdfbf2f1943e1de264e4b079c86645e2c55931a51a0a498cba31f70022a5219d5665fbcb221e99e58bc70122
-  languageName: node
-  linkType: hard
-
-"npm-normalize-package-bin@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "npm-normalize-package-bin@npm:2.0.0"
-  checksum: 7c5379f9b188b564c4332c97bdd9a5d6b7b15f02b5823b00989d6a0e6fb31eb0280f02b0a924f930e1fcaf00e60fae333aec8923d2a4c7747613c7d629d8aa25
-  languageName: node
-  linkType: hard
-
 "npm-package-arg@npm:^7.0.0":
   version: 7.0.0
   resolution: "npm-package-arg@npm:7.0.0"
@@ -33773,69 +31978,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npm-package-arg@npm:^9.0.0, npm-package-arg@npm:^9.0.1, npm-package-arg@npm:^9.1.0":
-  version: 9.1.2
-  resolution: "npm-package-arg@npm:9.1.2"
-  dependencies:
-    hosted-git-info: ^5.0.0
-    proc-log: ^2.0.1
-    semver: ^7.3.5
-    validate-npm-package-name: ^4.0.0
-  checksum: 3793488843985ed71deb14fcba7c068d8ed03a18fd8f6b235c6a64465c9a25f60261598106d5cc8677c0bee9548e405c34c2e3c7a822e3113d3389351c745dfa
-  languageName: node
-  linkType: hard
-
-"npm-packlist@npm:^5.1.0":
-  version: 5.1.3
-  resolution: "npm-packlist@npm:5.1.3"
-  dependencies:
-    glob: ^8.0.1
-    ignore-walk: ^5.0.1
-    npm-bundled: ^2.0.0
-    npm-normalize-package-bin: ^2.0.0
-  bin:
-    npm-packlist: bin/index.js
-  checksum: 94cc9c66740e8f80243301de85eb0a2cec5bbd570c3f26b6ad7af1a3eca155f7e810580dc7ea4448f12a8fd82f6db307e7132a5fe69e157eb45b325acadeb22a
-  languageName: node
-  linkType: hard
-
-"npm-pick-manifest@npm:^7.0.0, npm-pick-manifest@npm:^7.0.2":
-  version: 7.0.2
-  resolution: "npm-pick-manifest@npm:7.0.2"
-  dependencies:
-    npm-install-checks: ^5.0.0
-    npm-normalize-package-bin: ^2.0.0
-    npm-package-arg: ^9.0.0
-    semver: ^7.3.5
-  checksum: a93ec449c12219a2be8556837db9ac5332914f304a69469bb6f1f47717adc6e262aa318f79166f763512688abd9c4e4b6a2d83b2dd19753a7abe5f0360f2c8bc
-  languageName: node
-  linkType: hard
-
-"npm-profile@npm:^6.2.0":
-  version: 6.2.1
-  resolution: "npm-profile@npm:6.2.1"
-  dependencies:
-    npm-registry-fetch: ^13.0.1
-    proc-log: ^2.0.0
-  checksum: ddf9c17574146e9d27e475384c0dd1368324781d62b62242617e76aa58cc3dff17dd1218aa80806c8d2ba37bf27631ec8bd54f18d9dc7517a1671084b9594491
-  languageName: node
-  linkType: hard
-
-"npm-registry-fetch@npm:^13.0.0, npm-registry-fetch@npm:^13.0.1, npm-registry-fetch@npm:^13.3.1":
-  version: 13.3.1
-  resolution: "npm-registry-fetch@npm:13.3.1"
-  dependencies:
-    make-fetch-happen: ^10.0.6
-    minipass: ^3.1.6
-    minipass-fetch: ^2.0.3
-    minipass-json-stream: ^1.0.1
-    minizlib: ^2.1.2
-    npm-package-arg: ^9.0.1
-    proc-log: ^2.0.0
-  checksum: 5a941c2c799568e0dbccfc15f280444da398dadf2eede1b1921f08ddd5cb5f32c7cb4d16be96401f95a33073aeec13a3fd928c753790d3c412c2e64e7f7c6ee4
-  languageName: node
-  linkType: hard
-
 "npm-run-all@npm:^4.1.5":
   version: 4.1.5
   resolution: "npm-run-all@npm:4.1.5"
@@ -33884,97 +32026,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npm-user-validate@npm:^1.0.1":
-  version: 1.0.1
-  resolution: "npm-user-validate@npm:1.0.1"
-  checksum: 38ec7eb78a0c001adc220798cd986592e03f6232f171af64c10c28fb5053d058d7f2748d1c42346338fa04fbeb5c0529f704cd5794aed1c33d303d978ac97b77
-  languageName: node
-  linkType: hard
-
-"npm@npm:^8.3.0":
-  version: 8.19.4
-  resolution: "npm@npm:8.19.4"
-  dependencies:
-    "@isaacs/string-locale-compare": ^1.1.0
-    "@npmcli/arborist": ^5.6.3
-    "@npmcli/ci-detect": ^2.0.0
-    "@npmcli/config": ^4.2.1
-    "@npmcli/fs": ^2.1.0
-    "@npmcli/map-workspaces": ^2.0.3
-    "@npmcli/package-json": ^2.0.0
-    "@npmcli/run-script": ^4.2.1
-    abbrev: ~1.1.1
-    archy: ~1.0.0
-    cacache: ^16.1.3
-    chalk: ^4.1.2
-    chownr: ^2.0.0
-    cli-columns: ^4.0.0
-    cli-table3: ^0.6.2
-    columnify: ^1.6.0
-    fastest-levenshtein: ^1.0.12
-    fs-minipass: ^2.1.0
-    glob: ^8.0.1
-    graceful-fs: ^4.2.10
-    hosted-git-info: ^5.2.1
-    ini: ^3.0.1
-    init-package-json: ^3.0.2
-    is-cidr: ^4.0.2
-    json-parse-even-better-errors: ^2.3.1
-    libnpmaccess: ^6.0.4
-    libnpmdiff: ^4.0.5
-    libnpmexec: ^4.0.14
-    libnpmfund: ^3.0.5
-    libnpmhook: ^8.0.4
-    libnpmorg: ^4.0.4
-    libnpmpack: ^4.1.3
-    libnpmpublish: ^6.0.5
-    libnpmsearch: ^5.0.4
-    libnpmteam: ^4.0.4
-    libnpmversion: ^3.0.7
-    make-fetch-happen: ^10.2.0
-    minimatch: ^5.1.0
-    minipass: ^3.1.6
-    minipass-pipeline: ^1.2.4
-    mkdirp: ^1.0.4
-    mkdirp-infer-owner: ^2.0.0
-    ms: ^2.1.2
-    node-gyp: ^9.1.0
-    nopt: ^6.0.0
-    npm-audit-report: ^3.0.0
-    npm-install-checks: ^5.0.0
-    npm-package-arg: ^9.1.0
-    npm-pick-manifest: ^7.0.2
-    npm-profile: ^6.2.0
-    npm-registry-fetch: ^13.3.1
-    npm-user-validate: ^1.0.1
-    npmlog: ^6.0.2
-    opener: ^1.5.2
-    p-map: ^4.0.0
-    pacote: ^13.6.2
-    parse-conflict-json: ^2.0.2
-    proc-log: ^2.0.1
-    qrcode-terminal: ^0.12.0
-    read: ~1.0.7
-    read-package-json: ^5.0.2
-    read-package-json-fast: ^2.0.3
-    readdir-scoped-modules: ^1.1.0
-    rimraf: ^3.0.2
-    semver: ^7.3.7
-    ssri: ^9.0.1
-    tar: ^6.1.11
-    text-table: ~0.2.0
-    tiny-relative-date: ^1.3.0
-    treeverse: ^2.0.0
-    validate-npm-package-name: ^4.0.0
-    which: ^2.0.2
-    write-file-atomic: ^4.0.1
-  bin:
-    npm: bin/npm-cli.js
-    npx: bin/npx-cli.js
-  checksum: cc19cc2ac78c36c6487f5fee8ecbafd92b9bad6869f0def562c97044864b4a49e98f6410bcbb2c42b5099473310685fb131c2503da34e81a769bb137acbe6d67
-  languageName: node
-  linkType: hard
-
 "npmlog@npm:^4.1.2":
   version: 4.1.2
   resolution: "npmlog@npm:4.1.2"
@@ -33999,7 +32050,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"npmlog@npm:^6.0.0, npmlog@npm:^6.0.2":
+"npmlog@npm:^6.0.0":
   version: 6.0.2
   resolution: "npmlog@npm:6.0.2"
   dependencies:
@@ -34335,15 +32386,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"opener@npm:^1.5.2":
-  version: 1.5.2
-  resolution: "opener@npm:1.5.2"
-  bin:
-    opener: bin/opener-bin.js
-  checksum: 33b620c0d53d5b883f2abc6687dd1c5fd394d270dbe33a6356f2d71e0a2ec85b100d5bac94694198ccf5c30d592da863b2292c5539009c715a9c80c697b4f6cc
-  languageName: node
-  linkType: hard
-
 "openzeppelin-solidity-2.3.0@npm:openzeppelin-solidity@2.3.0":
   version: 2.3.0
   resolution: "openzeppelin-solidity@npm:2.3.0"
@@ -34495,22 +32537,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-each-series@npm:^2.1.0":
-  version: 2.2.0
-  resolution: "p-each-series@npm:2.2.0"
-  checksum: 5fbe2f1f1966f55833bd401fe36f7afe410707d5e9fb6032c6dde8aa716d50521c3bb201fdb584130569b5941d5e84993e09e0b3f76a474288e0ede8f632983c
-  languageName: node
-  linkType: hard
-
-"p-filter@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "p-filter@npm:2.1.0"
-  dependencies:
-    p-map: ^2.0.0
-  checksum: 76e552ca624ce2233448d68b19eec9de42b695208121998f7e011edce71d1079a83096ee6a2078fb2a59cfa8a5c999f046edf00ebf16a8e780022010b4693234
-  languageName: node
-  linkType: hard
-
 "p-finally@npm:^1.0.0":
   version: 1.0.0
   resolution: "p-finally@npm:1.0.0"
@@ -34518,13 +32544,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-is-promise@npm:^3.0.0":
-  version: 3.0.0
-  resolution: "p-is-promise@npm:3.0.0"
-  checksum: 74e511225fde5eeda7a120d51c60c284de90d68dec7c73611e7e59e8d1c44cc7e2246686544515849149b74ed0571ad470a456ac0d00314f8d03d2cc1ad43aae
-  languageName: node
-  linkType: hard
-
 "p-limit@npm:3.1.0, p-limit@npm:^3.0.2, p-limit@npm:^3.1.0":
   version: 3.1.0
   resolution: "p-limit@npm:3.1.0"
@@ -34604,13 +32623,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"p-reduce@npm:^2.0.0":
-  version: 2.1.0
-  resolution: "p-reduce@npm:2.1.0"
-  checksum: 99b26d36066a921982f25c575e78355824da0787c486e3dd9fc867460e8bf17d5fb3ce98d006b41bdc81ffc0aa99edf5faee53d11fe282a20291fb721b0cb1c7
-  languageName: node
-  linkType: hard
-
 "p-retry@npm:^4.5.0":
   version: 4.6.2
   resolution: "p-retry@npm:4.6.2"
@@ -34659,37 +32671,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pacote@npm:^13.0.3, pacote@npm:^13.6.1, pacote@npm:^13.6.2":
-  version: 13.6.2
-  resolution: "pacote@npm:13.6.2"
-  dependencies:
-    "@npmcli/git": ^3.0.0
-    "@npmcli/installed-package-contents": ^1.0.7
-    "@npmcli/promise-spawn": ^3.0.0
-    "@npmcli/run-script": ^4.1.0
-    cacache: ^16.0.0
-    chownr: ^2.0.0
-    fs-minipass: ^2.1.0
-    infer-owner: ^1.0.4
-    minipass: ^3.1.6
-    mkdirp: ^1.0.4
-    npm-package-arg: ^9.0.0
-    npm-packlist: ^5.1.0
-    npm-pick-manifest: ^7.0.0
-    npm-registry-fetch: ^13.0.1
-    proc-log: ^2.0.0
-    promise-retry: ^2.0.1
-    read-package-json: ^5.0.0
-    read-package-json-fast: ^2.0.3
-    rimraf: ^3.0.2
-    ssri: ^9.0.0
-    tar: ^6.1.11
-  bin:
-    pacote: lib/bin.js
-  checksum: a7b7f97094ab570a23e1c174537e9953a4d53176cc4b18bac77d7728bd89e2b9fa331d0f78fa463add03df79668a918bbdaa2750819504ee39242063abf53c6e
-  languageName: node
-  linkType: hard
-
 "pako@npm:^0.2.5":
   version: 0.2.9
   resolution: "pako@npm:0.2.9"
@@ -34760,17 +32741,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"parse-conflict-json@npm:^2.0.1, parse-conflict-json@npm:^2.0.2":
-  version: 2.0.2
-  resolution: "parse-conflict-json@npm:2.0.2"
-  dependencies:
-    json-parse-even-better-errors: ^2.3.1
-    just-diff: ^5.0.1
-    just-diff-apply: ^5.2.0
-  checksum: 076f65c958696586daefb153f59d575dfb59648be43116a21b74d5ff69ec63dd56f585a27cc2da56d8e64ca5abf0373d6619b8330c035131f8d1e990c8406378
-  languageName: node
-  linkType: hard
-
 "parse-css-color@npm:^0.2.1":
   version: 0.2.1
   resolution: "parse-css-color@npm:0.2.1"
@@ -35088,16 +33058,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-scurry@npm:^1.6.1":
-  version: 1.10.1
-  resolution: "path-scurry@npm:1.10.1"
-  dependencies:
-    lru-cache: ^9.1.1 || ^10.0.0
-    minipass: ^5.0.0 || ^6.0.2 || ^7.0.0
-  checksum: e2557cff3a8fb8bc07afdd6ab163a92587884f9969b05bbbaf6fe7379348bfb09af9ed292af12ed32398b15fb443e81692047b786d1eeb6d898a51eb17ed7d90
-  languageName: node
-  linkType: hard
-
 "path-to-regexp@npm:0.1.7":
   version: 0.1.7
   resolution: "path-to-regexp@npm:0.1.7"
@@ -35112,13 +33072,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"path-to-regexp@npm:3.2.0":
-  version: 3.2.0
-  resolution: "path-to-regexp@npm:3.2.0"
-  checksum: c3d35cda3b26d9e604d789b9a1764bb9845f53ca8009d5809356b4677a3c064b0f01117a05a5b4b77bafd5ae002a82592e3f3495e885c22961f8b1dab8bd6ae7
-  languageName: node
-  linkType: hard
-
 "path-to-regexp@npm:^6.2.0":
   version: 6.2.1
   resolution: "path-to-regexp@npm:6.2.1"
@@ -35356,16 +33309,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"pkg-conf@npm:^2.1.0":
-  version: 2.1.0
-  resolution: "pkg-conf@npm:2.1.0"
-  dependencies:
-    find-up: ^2.0.0
-    load-json-file: ^4.0.0
-  checksum: b50775157262abd1bfb4d3d948f3fc6c009d10266c6507d4de296af4e2cbb6d2738310784432185886d83144466fbb286b6e8ff0bc23dc5ee7d81810dc6c4788
-  languageName: node
-  linkType: hard
-
 "pkg-dir@npm:^3.0.0":
   version: 3.0.0
   resolution: "pkg-dir@npm:3.0.0"
@@ -36482,20 +34425,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"prettier-plugin-organize-imports@npm:3.2.4":
-  version: 3.2.4
-  resolution: "prettier-plugin-organize-imports@npm:3.2.4"
+"prettier-plugin-organize-imports@npm:3.1.1":
+  version: 3.1.1
+  resolution: "prettier-plugin-organize-imports@npm:3.1.1"
   peerDependencies:
-    "@volar/vue-language-plugin-pug": ^1.0.4
-    "@volar/vue-typescript": ^1.0.4
+    "@volar/vue-typescript": ">=0.40.2"
     prettier: ">=2.0"
     typescript: ">=2.9"
   peerDependenciesMeta:
-    "@volar/vue-language-plugin-pug":
-      optional: true
     "@volar/vue-typescript":
       optional: true
-  checksum: 57ae97d7e403445e650ae92b7da586761d1d88a47e46b3ea274baeb96782165bebd0132db9c652081e185c41b50701ba1d30d615ad1c9000300cc0c67eb12b7a
+  checksum: a5776ddf70ba83990c5f97799a57e9844379226c25c5d3e89c072dce3615575aacc1da9c0870b86dcfd4df80df4194971538765f84a168cbb41d36de81740c30
   languageName: node
   linkType: hard
 
@@ -36624,13 +34564,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proc-log@npm:^2.0.0, proc-log@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "proc-log@npm:2.0.1"
-  checksum: f6f23564ff759097db37443e6e2765af84979a703d2c52c1b9df506ee9f87caa101ba49d8fdc115c1a313ec78e37e8134704e9069e6a870f3499d98bb24c436f
-  languageName: node
-  linkType: hard
-
 "process-nextick-args@npm:^2.0.0, process-nextick-args@npm:~2.0.0":
   version: 2.0.1
   resolution: "process-nextick-args@npm:2.0.1"
@@ -36659,20 +34592,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"promise-all-reject-late@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "promise-all-reject-late@npm:1.0.1"
-  checksum: d7d61ac412352e2c8c3463caa5b1c3ca0f0cc3db15a09f180a3da1446e33d544c4261fc716f772b95e4c27d559cfd2388540f44104feb356584f9c73cfb9ffcb
-  languageName: node
-  linkType: hard
-
-"promise-call-limit@npm:^1.0.1":
-  version: 1.0.2
-  resolution: "promise-call-limit@npm:1.0.2"
-  checksum: d0664dd2954c063115c58a4d0f929ff8dcfca634146dfdd4ec86f4993cfe14db229fb990457901ad04c923b3fb872067f3b47e692e0c645c01536b92fc4460bd
-  languageName: node
-  linkType: hard
-
 "promise-inflight@npm:^1.0.1":
   version: 1.0.1
   resolution: "promise-inflight@npm:1.0.1"
@@ -36739,15 +34658,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"promzard@npm:^0.3.0":
-  version: 0.3.0
-  resolution: "promzard@npm:0.3.0"
-  dependencies:
-    read: 1
-  checksum: 443a3b39ac916099988ee0161ab4e22edd1fa27e3d39a38d60e48c11ca6df3f5a90bfe44d95af06ed8659c4050b789ffe64c3f9f8e49a4bea1ea19105c98445a
-  languageName: node
-  linkType: hard
-
 "prop-types@npm:*, prop-types@npm:15.8.1, prop-types@npm:^15.5.10, prop-types@npm:^15.5.7, prop-types@npm:^15.6.0, prop-types@npm:^15.6.1, prop-types@npm:^15.6.2, prop-types@npm:^15.7.2, prop-types@npm:^15.8.1":
   version: 15.8.1
   resolution: "prop-types@npm:15.8.1"
@@ -36777,13 +34687,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"proto-list@npm:~1.2.1":
-  version: 1.2.4
-  resolution: "proto-list@npm:1.2.4"
-  checksum: 4d4826e1713cbfa0f15124ab0ae494c91b597a3c458670c9714c36e8baddf5a6aad22842776f2f5b137f259c8533e741771445eb8df82e861eea37a6eaba03f7
-  languageName: node
-  linkType: hard
-
 "proxy-addr@npm:~2.0.7":
   version: 2.0.7
   resolution: "proxy-addr@npm:2.0.7"
@@ -36947,13 +34850,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qr.js@npm:0.0.0":
-  version: 0.0.0
-  resolution: "qr.js@npm:0.0.0"
-  checksum: 5ac6c393967bdeaa660e7fd3a501a25eb538c1f6008a4d30ab2b97bbe520e5c236530090773f1578aa0a523cdaa6923c866615e21143f9e7cd22abd41c789b69
-  languageName: node
-  linkType: hard
-
 "qrcode-terminal@npm:0.11.0":
   version: 0.11.0
   resolution: "qrcode-terminal@npm:0.11.0"
@@ -36963,15 +34859,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"qrcode-terminal@npm:^0.12.0":
-  version: 0.12.0
-  resolution: "qrcode-terminal@npm:0.12.0"
-  bin:
-    qrcode-terminal: ./bin/qrcode-terminal.js
-  checksum: 51638d11d080e06ef79ef2d5cfe911202159e48d2873d6a80a3c5489b4b767acf4754811ceba4e113db8f41f61a06c163bcb17e6e18e6b34e04a7a5155dac974
-  languageName: node
-  linkType: hard
-
 "qrcode.react@npm:3.1.0":
   version: 3.1.0
   resolution: "qrcode.react@npm:3.1.0"
@@ -37794,9 +35681,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-reanimated@npm:3.6.2":
-  version: 3.6.2
-  resolution: "react-native-reanimated@npm:3.6.2"
+"react-native-reanimated@npm:3.3.0":
+  version: 3.3.0
+  resolution: "react-native-reanimated@npm:3.3.0"
   dependencies:
     "@babel/plugin-transform-object-assign": ^7.16.7
     "@babel/preset-typescript": ^7.16.7
@@ -37811,7 +35698,7 @@ __metadata:
     "@babel/plugin-transform-template-literals": ^7.0.0-0
     react: "*"
     react-native: "*"
-  checksum: 0a5030ec7d66603bdb1777fb9a37f6621c7c329b47101596d882d0dd526fe1ed34f4088635aacb9d44988bdbc6fe5b792145fc44eafaceb080b7a8c7ddd69eff
+  checksum: 58096b28caef8af261c446eccb91a5a74caa303ba3520b1a2767c5b922b3d19b9a58612ab9b517a959c1b562b2e76e4cf4a8ffb21136960ed63375f6a4c37d1e
   languageName: node
   linkType: hard
 
@@ -37956,7 +35843,7 @@ __metadata:
 
 "react-native-wagmi-charts@patch:react-native-wagmi-charts@npm%3A2.3.0#./.yarn/patches/react-native-wagmi-charts-npm-2.3.0-8e836a8f3c.patch::locator=universe%40workspace%3A.":
   version: 2.3.0
-  resolution: "react-native-wagmi-charts@patch:react-native-wagmi-charts@npm%3A2.3.0#./.yarn/patches/react-native-wagmi-charts-npm-2.3.0-8e836a8f3c.patch::version=2.3.0&hash=6bdf48&locator=universe%40workspace%3A."
+  resolution: "react-native-wagmi-charts@patch:react-native-wagmi-charts@npm%3A2.3.0#./.yarn/patches/react-native-wagmi-charts-npm-2.3.0-8e836a8f3c.patch::version=2.3.0&hash=947134&locator=universe%40workspace%3A."
   dependencies:
     d3-interpolate-path: ^2.2.3
     d3-scale: ^2
@@ -37969,36 +35856,37 @@ __metadata:
     react-native-gesture-handler: "*"
     react-native-reanimated: "*"
     react-native-svg: "*"
-  checksum: 679e54aa800e528d74496e2a0e8ba31d63fcc744dec870712dd71fac25c196e7e3da44ae2561ee6010f9fc16b1db2098c3fbf8b68348008b59fb17034c82ec55
+  checksum: 0e3e3ef77c5fcf60c793d69fba50a7a7cbf43170176b995742fd06b200518755c92f23d9c8685c8c4c4c34d018da73b9bc647623fac052a8d52a788cf0123337
   languageName: node
   linkType: hard
 
-"react-native-web-internals@npm:1.88.18":
-  version: 1.88.18
-  resolution: "react-native-web-internals@npm:1.88.18"
+"react-native-web-internals@npm:1.74.16":
+  version: 1.74.16
+  resolution: "react-native-web-internals@npm:1.74.16"
   dependencies:
-    "@tamagui/normalize-css-color": 1.88.18
-    "@tamagui/react-native-use-pressable": 1.88.18
-    "@tamagui/react-native-use-responder-events": 1.88.18
-    "@tamagui/simple-hash": 1.88.18
-    react: ^18.2.0
+    "@tamagui/normalize-css-color": 1.74.16
+    "@tamagui/react-native-use-pressable": 1.74.16
+    "@tamagui/react-native-use-responder-events": 1.74.16
+    "@tamagui/simple-hash": 1.74.16
     styleq: ^0.1.3
-  checksum: fc68cd17caff3b8a8fdc30967be06f872b9334a33ec53e85e23877c558c5aacdd0f34cf02fe8f1f8f9c065fdb4d1f1a851f2bf51dfce17a7e2f081232598c1e1
+  peerDependencies:
+    react: "*"
+  checksum: 9125397bf75f6058a377601915bdf960c3281c7aec6e6acead5c70195347da560031699d67133d9ca521e6c8d2df6957a2d1f0aa041877532afefe600ea2d08c
   languageName: node
   linkType: hard
 
-"react-native-web-lite@npm:1.88.18":
-  version: 1.88.18
-  resolution: "react-native-web-lite@npm:1.88.18"
+"react-native-web-lite@npm:1.74.16":
+  version: 1.74.16
+  resolution: "react-native-web-lite@npm:1.74.16"
   dependencies:
-    "@tamagui/normalize-css-color": 1.88.18
+    "@tamagui/normalize-css-color": 1.74.16
     invariant: ^2.2.4
-    react-native-web-internals: 1.88.18
+    react-native-web-internals: 1.74.16
     styleq: ^0.1.3
   peerDependencies:
     react: "*"
     react-dom: "*"
-  checksum: 0b53586dc421d96cb979b1f660b3be097f0ccaac5dc77e948f40977300e8e0f63dddc2473976e6d712bb8008bf24a7db4d9b6ce84b80a447d348bc4894c17c35
+  checksum: 8a5b1d0ad51eae3b2fa05a1881f384f0e00313c0e55ce1a27b13e0f786340fe5c2930c6bf9d2d6962f9f6cdac6c7c8a4ea85da576437ce46adb68455263c80f6
   languageName: node
   linkType: hard
 
@@ -38151,22 +36039,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-qr-code@npm:2.0.12":
-  version: 2.0.12
-  resolution: "react-qr-code@npm:2.0.12"
-  dependencies:
-    prop-types: ^15.8.1
-    qr.js: 0.0.0
-  peerDependencies:
-    react: ^16.x || ^17.x || ^18.x
-    react-native-svg: "*"
-  peerDependenciesMeta:
-    react-native-svg:
-      optional: true
-  checksum: b7bad40d7d5f04f7ff336ae499920dd5ea0e7616ed7fec5f849e54f8f26b5e4acd1ba8e69198be8617dc7fecdf36cf4302c99ff74885320b55bb95d19a09de7c
-  languageName: node
-  linkType: hard
-
 "react-query@npm:3.39.1":
   version: 3.39.1
   resolution: "react-query@npm:3.39.1"
@@ -38511,36 +36383,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-cmd-shim@npm:^3.0.0":
-  version: 3.0.1
-  resolution: "read-cmd-shim@npm:3.0.1"
-  checksum: 79fe66aa78eddcca8dc196765ae3168b3a56e2b69ba54071525eb00a9eeee8cc83b3d5f784432c3d8ce868787fdc059b1a1e0b605246b5108c9003fc927ea263
-  languageName: node
-  linkType: hard
-
-"read-package-json-fast@npm:^2.0.2, read-package-json-fast@npm:^2.0.3":
-  version: 2.0.3
-  resolution: "read-package-json-fast@npm:2.0.3"
-  dependencies:
-    json-parse-even-better-errors: ^2.3.0
-    npm-normalize-package-bin: ^1.0.1
-  checksum: fca37b3b2160b9dda7c5588b767f6a2b8ce68d03a044000e568208e20bea0cf6dd2de17b90740ce8da8b42ea79c0b3859649dadf29510bbe77224ea65326a903
-  languageName: node
-  linkType: hard
-
-"read-package-json@npm:^5.0.0, read-package-json@npm:^5.0.2":
-  version: 5.0.2
-  resolution: "read-package-json@npm:5.0.2"
-  dependencies:
-    glob: ^8.0.1
-    json-parse-even-better-errors: ^2.3.1
-    normalize-package-data: ^4.0.0
-    npm-normalize-package-bin: ^2.0.0
-  checksum: 0882ac9cec1bc92fb5515e9727611fb2909351e1e5c840dce3503cbb25b4cd48eb44b61071986e0fc51043208161f07d364a7336206c8609770186818753b51a
-  languageName: node
-  linkType: hard
-
-"read-pkg-up@npm:^7.0.0, read-pkg-up@npm:^7.0.1":
+"read-pkg-up@npm:^7.0.1":
   version: 7.0.1
   resolution: "read-pkg-up@npm:7.0.1"
   dependencies:
@@ -38562,7 +36405,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read-pkg@npm:^5.0.0, read-pkg@npm:^5.2.0":
+"read-pkg@npm:^5.2.0":
   version: 5.2.0
   resolution: "read-pkg@npm:5.2.0"
   dependencies:
@@ -38596,15 +36439,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"read@npm:1, read@npm:^1.0.7, read@npm:~1.0.7":
-  version: 1.0.7
-  resolution: "read@npm:1.0.7"
-  dependencies:
-    mute-stream: ~0.0.4
-  checksum: 2777c254e5732cac96f5d0a1c0f6b836c89ae23d8febd405b206f6f24d5de1873420f1a0795e0e3721066650d19adf802c7882c4027143ee0acf942a4f34f97b
-  languageName: node
-  linkType: hard
-
 "readable-stream@npm:3, readable-stream@npm:^3.0.0, readable-stream@npm:^3.0.6, readable-stream@npm:^3.1.1, readable-stream@npm:^3.4.0, readable-stream@npm:^3.5.0, readable-stream@npm:^3.6.0":
   version: 3.6.2
   resolution: "readable-stream@npm:3.6.2"
@@ -38616,7 +36450,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.5, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6":
+"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.5, readable-stream@npm:^2.0.6, readable-stream@npm:^2.1.5, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6":
   version: 2.3.8
   resolution: "readable-stream@npm:2.3.8"
   dependencies:
@@ -38643,18 +36477,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"readdir-scoped-modules@npm:^1.1.0":
-  version: 1.1.0
-  resolution: "readdir-scoped-modules@npm:1.1.0"
-  dependencies:
-    debuglog: ^1.0.1
-    dezalgo: ^1.0.0
-    graceful-fs: ^4.1.2
-    once: ^1.3.0
-  checksum: 6d9f334e40dfd0f5e4a8aab5e67eb460c95c85083c690431f87ab2c9135191170e70c2db6d71afcafb78e073d23eb95dcb3fc33ef91308f6ebfe3197be35e608
-  languageName: node
-  linkType: hard
-
 "readdirp@npm:^3.6.0, readdirp@npm:~3.6.0":
   version: 3.6.0
   resolution: "readdirp@npm:3.6.0"
@@ -38766,15 +36588,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"redeyed@npm:~2.1.0":
-  version: 2.1.1
-  resolution: "redeyed@npm:2.1.1"
-  dependencies:
-    esprima: ~4.0.0
-  checksum: 39a1426e377727cfb47a0e24e95c1cf78d969fbc388dc1e0fa1e2ef8a8756450cefb8b0c2598f63b85f1a331986fca7604c0db798427a5775a1dbdb9c1291979
-  languageName: node
-  linkType: hard
-
 "reduce-css-calc@npm:^1.3.0":
   version: 1.3.0
   resolution: "reduce-css-calc@npm:1.3.0"
@@ -38880,13 +36693,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"reflect-metadata@npm:0.1.13":
-  version: 0.1.13
-  resolution: "reflect-metadata@npm:0.1.13"
-  checksum: 798d379a7b6f6455501145419505c97dd11cbc23857a386add2b9ef15963ccf15a48d9d15507afe01d4cd74116df8a213247200bac00320bd7c11ddeaa5e8fb4
-  languageName: node
-  linkType: hard
-
 "reflect.getprototypeof@npm:^1.0.4":
   version: 1.0.4
   resolution: "reflect.getprototypeof@npm:1.0.4"
@@ -38985,11 +36791,11 @@ __metadata:
   linkType: hard
 
 "regexp-tree@npm:~0.1.1":
-  version: 0.1.27
-  resolution: "regexp-tree@npm:0.1.27"
+  version: 0.1.24
+  resolution: "regexp-tree@npm:0.1.24"
   bin:
     regexp-tree: bin/regexp-tree
-  checksum: 129aebb34dae22d6694ab2ac328be3f99105143737528ab072ef624d599afecbcfae1f5c96a166fa9e5f64fa1ecf30b411c4691e7924c3e11bbaf1712c260c54
+  checksum: 5807013289d9205288d665e0f8d8cff94843dfd55fdedd1833eb9d9bbd07188a37dfa02942ec5cdc671180037f715148fac1ba6f18fd6be4268e5a8feb49d340
   languageName: node
   linkType: hard
 
@@ -39047,15 +36853,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"registry-auth-token@npm:^5.0.0":
-  version: 5.0.2
-  resolution: "registry-auth-token@npm:5.0.2"
-  dependencies:
-    "@pnpm/npm-conf": ^2.1.0
-  checksum: 0d7683b71ee418993e7872b389024b13645c4295eb7bb850d10728eaf46065db24ea4d47dc6cbb71a60d1aa4bef077b0d8b7363c9ac9d355fdba47bebdfb01dd
-  languageName: node
-  linkType: hard
-
 "registry-url@npm:3.1.0, registry-url@npm:^3.0.3":
   version: 3.1.0
   resolution: "registry-url@npm:3.1.0"
@@ -39841,15 +37638,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"rxjs@npm:7.8.1, rxjs@npm:^7.5.1, rxjs@npm:^7.5.5, rxjs@npm:^7.8.0, rxjs@npm:^7.8.1":
-  version: 7.8.1
-  resolution: "rxjs@npm:7.8.1"
-  dependencies:
-    tslib: ^2.1.0
-  checksum: de4b53db1063e618ec2eca0f7965d9137cabe98cf6be9272efe6c86b47c17b987383df8574861bcced18ebd590764125a901d5506082be84a8b8e364bf05f119
-  languageName: node
-  linkType: hard
-
 "rxjs@npm:^6.6.0, rxjs@npm:^6.6.3":
   version: 6.6.7
   resolution: "rxjs@npm:6.6.7"
@@ -39859,6 +37647,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"rxjs@npm:^7.5.1, rxjs@npm:^7.5.5, rxjs@npm:^7.8.0, rxjs@npm:^7.8.1":
+  version: 7.8.1
+  resolution: "rxjs@npm:7.8.1"
+  dependencies:
+    tslib: ^2.1.0
+  checksum: de4b53db1063e618ec2eca0f7965d9137cabe98cf6be9272efe6c86b47c17b987383df8574861bcced18ebd590764125a901d5506082be84a8b8e364bf05f119
+  languageName: node
+  linkType: hard
+
 "safe-array-concat@npm:^1.0.1":
   version: 1.0.1
   resolution: "safe-array-concat@npm:1.0.1"
@@ -40143,44 +37940,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semantic-release@npm:^19.0.5":
-  version: 19.0.5
-  resolution: "semantic-release@npm:19.0.5"
-  dependencies:
-    "@semantic-release/commit-analyzer": ^9.0.2
-    "@semantic-release/error": ^3.0.0
-    "@semantic-release/github": ^8.0.0
-    "@semantic-release/npm": ^9.0.0
-    "@semantic-release/release-notes-generator": ^10.0.0
-    aggregate-error: ^3.0.0
-    cosmiconfig: ^7.0.0
-    debug: ^4.0.0
-    env-ci: ^5.0.0
-    execa: ^5.0.0
-    figures: ^3.0.0
-    find-versions: ^4.0.0
-    get-stream: ^6.0.0
-    git-log-parser: ^1.2.0
-    hook-std: ^2.0.0
-    hosted-git-info: ^4.0.0
-    lodash: ^4.17.21
-    marked: ^4.0.10
-    marked-terminal: ^5.0.0
-    micromatch: ^4.0.2
-    p-each-series: ^2.1.0
-    p-reduce: ^2.0.0
-    read-pkg-up: ^7.0.0
-    resolve-from: ^5.0.0
-    semver: ^7.3.2
-    semver-diff: ^3.1.1
-    signale: ^1.2.1
-    yargs: ^16.2.0
-  bin:
-    semantic-release: bin/semantic-release.js
-  checksum: e72d7e039ca062a322128da185797fe4e3e23ab8b3dba1e906aaff654cd292c60bbb91776570815cac982d37550a84cfb5e3e13194ecc168ac51f866d7a07584
-  languageName: node
-  linkType: hard
-
 "sembear@npm:^0.5.0":
   version: 0.5.2
   resolution: "sembear@npm:0.5.2"
@@ -40207,22 +37966,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"semver-diff@npm:^3.1.1":
-  version: 3.1.1
-  resolution: "semver-diff@npm:3.1.1"
-  dependencies:
-    semver: ^6.3.0
-  checksum: 8bbe5a5d7add2d5e51b72314a9215cd294d71f41cdc2bf6bd59ee76411f3610b576172896f1d191d0d7294cb9f2f847438d2ee158adacc0c224dca79052812fe
-  languageName: node
-  linkType: hard
-
-"semver-regex@npm:^3.1.2":
-  version: 3.1.4
-  resolution: "semver-regex@npm:3.1.4"
-  checksum: 3962105908e326aa2cd5c851a2f6d4cc7340d1b06560afc35cd5348d9fa5b1cc0ac0cad7e7cef2072bc12b992c5ae654d9e8d355c19d75d4216fced3b6c5d8a7
-  languageName: node
-  linkType: hard
-
 "semver@npm:7.5.2":
   version: 7.5.2
   resolution: "semver@npm:7.5.2"
@@ -40577,17 +38320,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"signale@npm:^1.2.1":
-  version: 1.4.0
-  resolution: "signale@npm:1.4.0"
-  dependencies:
-    chalk: ^2.3.2
-    figures: ^2.0.0
-    pkg-conf: ^2.1.0
-  checksum: a6a540e054096a1f4cf8b1f21fea62ca3e44a19faa63bd486723b736348609caab1fa59a87f16559de347dde8ae1fdebfc25a8b6723c88ae8239f176ffb0dda5
-  languageName: node
-  linkType: hard
-
 "signedsource@npm:^1.0.0":
   version: 1.0.0
   resolution: "signedsource@npm:1.0.0"
@@ -40938,7 +38670,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"source-map@npm:^0.5.6, source-map@npm:^0.5.7":
+"source-map@npm:^0.5.0, source-map@npm:^0.5.6, source-map@npm:^0.5.7":
   version: 0.5.7
   resolution: "source-map@npm:0.5.7"
   checksum: 5dc2043b93d2f194142c7f38f74a24670cd7a0063acdaf4bf01d2964b402257ae843c2a8fa822ad5b71013b5fcafa55af7421383da919752f22ff488bc553f4d
@@ -40968,20 +38700,13 @@ __metadata:
   languageName: node
   linkType: hard
 
-"spawn-command@npm:0.0.2, spawn-command@npm:^0.0.2-1":
+"spawn-command@npm:0.0.2":
   version: 0.0.2
   resolution: "spawn-command@npm:0.0.2"
   checksum: e35c5d28177b4d461d33c88cc11f6f3a5079e2b132c11e1746453bbb7a0c0b8a634f07541a2a234fa4758239d88203b758def509161b651e81958894c0b4b64b
   languageName: node
   linkType: hard
 
-"spawn-error-forwarder@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "spawn-error-forwarder@npm:1.0.0"
-  checksum: ac7e69f980ce8dbcdd6323b7e30bc7dc6cbfcc7ebaefa63d71cb2150e153798f4ad20e5182f16137f1537fb8ecea386c3a1f241ade4711ef6c6e1f4a1bc971e5
-  languageName: node
-  linkType: hard
-
 "spawndamnit@npm:^2.0.0":
   version: 2.0.0
   resolution: "spawndamnit@npm:2.0.0"
@@ -41085,15 +38810,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"split2@npm:~1.0.0":
-  version: 1.0.0
-  resolution: "split2@npm:1.0.0"
-  dependencies:
-    through2: ~2.0.0
-  checksum: 84cb1713a9b5ef7da06dbcb60780051f34a3b68f737a4bd5e807804ba742e3667f9e9e49eb589c1d7adb0bda4cf1eac9ea27a1040d480c785fc339c40b78396e
-  languageName: node
-  linkType: hard
-
 "split@npm:0.3":
   version: 0.3.3
   resolution: "split@npm:0.3.3"
@@ -41103,7 +38819,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"split@npm:^1.0.0, split@npm:^1.0.1":
+"split@npm:^1.0.1":
   version: 1.0.1
   resolution: "split@npm:1.0.1"
   dependencies:
@@ -41165,7 +38881,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ssri@npm:^9.0.0, ssri@npm:^9.0.1":
+"ssri@npm:^9.0.0":
   version: 9.0.1
   resolution: "ssri@npm:9.0.1"
   dependencies:
@@ -41360,16 +39076,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"stream-combiner2@npm:~1.1.1":
-  version: 1.1.1
-  resolution: "stream-combiner2@npm:1.1.1"
-  dependencies:
-    duplexer2: ~0.1.0
-    readable-stream: ^2.0.2
-  checksum: dd32d179fa8926619c65471a7396fc638ec8866616c0b8747c4e05563ccdb0b694dd4e83cd799f1c52789c965a40a88195942b82b8cea2ee7a5536f1954060f9
-  languageName: node
-  linkType: hard
-
 "stream-combiner@npm:~0.0.4":
   version: 0.0.4
   resolution: "stream-combiner@npm:0.0.4"
@@ -41910,7 +39616,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-color@npm:8.1.1, supports-color@npm:^8.0.0, supports-color@npm:^8.1.0, supports-color@npm:^8.1.1":
+"supports-color@npm:8.1.1, supports-color@npm:^8.0.0, supports-color@npm:^8.1.1":
   version: 8.1.1
   resolution: "supports-color@npm:8.1.1"
   dependencies:
@@ -41947,7 +39653,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"supports-hyperlinks@npm:^2.0.0, supports-hyperlinks@npm:^2.3.0":
+"supports-hyperlinks@npm:^2.0.0":
   version: 2.3.0
   resolution: "supports-hyperlinks@npm:2.3.0"
   dependencies:
@@ -42164,84 +39870,79 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tamagui-loader@npm:1.88.18":
-  version: 1.88.18
-  resolution: "tamagui-loader@npm:1.88.18"
+"tamagui-loader@npm:1.74.16":
+  version: 1.74.16
+  resolution: "tamagui-loader@npm:1.74.16"
   dependencies:
-    "@tamagui/cli-color": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/static": 1.88.18
-    "@tamagui/web": 1.88.18
+    "@tamagui/cli-color": 1.74.16
+    "@tamagui/static": 1.74.16
     esbuild-loader: ^3.0.1
-    esm-resolve: ^1.0.8
-    fs-extra: ^11.2.0
+    fs-extra: ^11.1.0
     loader-utils: ^3.2.1
     lodash: ^4.17.21
-  checksum: fadda188bb73c714f33fd87d92c2bd09cfc02e5333def91d9f341fdb1b1d5d4586e87e02bdc1fc886ae19e329093dc8531532b7a7cad25859c5bb82e571ce8a2
-  languageName: node
-  linkType: hard
-
-"tamagui@npm:1.88.18":
-  version: 1.88.18
-  resolution: "tamagui@npm:1.88.18"
-  dependencies:
-    "@tamagui/accordion": 1.88.18
-    "@tamagui/adapt": 1.88.18
-    "@tamagui/alert-dialog": 1.88.18
-    "@tamagui/animate-presence": 1.88.18
-    "@tamagui/avatar": 1.88.18
-    "@tamagui/button": 1.88.18
-    "@tamagui/card": 1.88.18
-    "@tamagui/checkbox": 1.88.18
-    "@tamagui/compose-refs": 1.88.18
-    "@tamagui/constants": 1.88.18
-    "@tamagui/core": 1.88.18
-    "@tamagui/create-context": 1.88.18
-    "@tamagui/dialog": 1.88.18
-    "@tamagui/elements": 1.88.18
-    "@tamagui/fake-react-native": 1.88.18
-    "@tamagui/focusable": 1.88.18
-    "@tamagui/font-size": 1.88.18
-    "@tamagui/form": 1.88.18
-    "@tamagui/get-button-sized": 1.88.18
-    "@tamagui/get-font-sized": 1.88.18
-    "@tamagui/get-token": 1.88.18
-    "@tamagui/group": 1.88.18
-    "@tamagui/helpers-tamagui": 1.88.18
-    "@tamagui/image": 1.88.18
-    "@tamagui/label": 1.88.18
-    "@tamagui/linear-gradient": 1.88.18
-    "@tamagui/list-item": 1.88.18
-    "@tamagui/polyfill-dev": 1.88.18
-    "@tamagui/popover": 1.88.18
-    "@tamagui/popper": 1.88.18
-    "@tamagui/portal": 1.88.18
-    "@tamagui/progress": 1.88.18
-    "@tamagui/radio-group": 1.88.18
-    "@tamagui/react-native-media-driver": 1.88.18
-    "@tamagui/scroll-view": 1.88.18
-    "@tamagui/select": 1.88.18
-    "@tamagui/separator": 1.88.18
-    "@tamagui/shapes": 1.88.18
-    "@tamagui/sheet": 1.88.18
-    "@tamagui/slider": 1.88.18
-    "@tamagui/stacks": 1.88.18
-    "@tamagui/switch": 1.88.18
-    "@tamagui/tabs": 1.88.18
-    "@tamagui/text": 1.88.18
-    "@tamagui/theme": 1.88.18
-    "@tamagui/toggle-group": 1.88.18
-    "@tamagui/tooltip": 1.88.18
-    "@tamagui/use-controllable-state": 1.88.18
-    "@tamagui/use-debounce": 1.88.18
-    "@tamagui/use-force-update": 1.88.18
-    "@tamagui/use-window-dimensions": 1.88.18
-    "@tamagui/visually-hidden": 1.88.18
+  checksum: 455a52c8c3fe6dfb52238a55e80b1b653a6c3d45dd8676ccf474de62c666031fb8815d41b7a09d4ff737334ec303133f4633a9a3d58d662e7b7e6a174ec52a23
+  languageName: node
+  linkType: hard
+
+"tamagui@npm:1.74.16":
+  version: 1.74.16
+  resolution: "tamagui@npm:1.74.16"
+  dependencies:
+    "@tamagui/accordion": 1.74.16
+    "@tamagui/adapt": 1.74.16
+    "@tamagui/alert-dialog": 1.74.16
+    "@tamagui/animate-presence": 1.74.16
+    "@tamagui/avatar": 1.74.16
+    "@tamagui/button": 1.74.16
+    "@tamagui/card": 1.74.16
+    "@tamagui/checkbox": 1.74.16
+    "@tamagui/compose-refs": 1.74.16
+    "@tamagui/core": 1.74.16
+    "@tamagui/create-context": 1.74.16
+    "@tamagui/dialog": 1.74.16
+    "@tamagui/fake-react-native": 1.74.16
+    "@tamagui/focusable": 1.74.16
+    "@tamagui/font-size": 1.74.16
+    "@tamagui/form": 1.74.16
+    "@tamagui/get-button-sized": 1.74.16
+    "@tamagui/get-font-sized": 1.74.16
+    "@tamagui/get-token": 1.74.16
+    "@tamagui/helpers": 1.74.16
+    "@tamagui/helpers-tamagui": 1.74.16
+    "@tamagui/image": 1.74.16
+    "@tamagui/label": 1.74.16
+    "@tamagui/linear-gradient": 1.74.16
+    "@tamagui/list-item": 1.74.16
+    "@tamagui/polyfill-dev": 1.74.16
+    "@tamagui/popover": 1.74.16
+    "@tamagui/popper": 1.74.16
+    "@tamagui/portal": 1.74.16
+    "@tamagui/progress": 1.74.16
+    "@tamagui/radio-group": 1.74.16
+    "@tamagui/react-native-media-driver": 1.74.16
+    "@tamagui/scroll-view": 1.74.16
+    "@tamagui/select": 1.74.16
+    "@tamagui/separator": 1.74.16
+    "@tamagui/shapes": 1.74.16
+    "@tamagui/sheet": 1.74.16
+    "@tamagui/slider": 1.74.16
+    "@tamagui/stacks": 1.74.16
+    "@tamagui/switch": 1.74.16
+    "@tamagui/tabs": 1.74.16
+    "@tamagui/text": 1.74.16
+    "@tamagui/theme": 1.74.16
+    "@tamagui/toggle-group": 1.74.16
+    "@tamagui/tooltip": 1.74.16
+    "@tamagui/use-controllable-state": 1.74.16
+    "@tamagui/use-debounce": 1.74.16
+    "@tamagui/use-force-update": 1.74.16
+    "@tamagui/use-window-dimensions": 1.74.16
+    "@tamagui/visually-hidden": 1.74.16
+    reforest: ^0.13.0
   peerDependencies:
     react: "*"
-    react-native: "*"
     react-native-web: "*"
-  checksum: 9986cddfde424cb606709f1c3a02a596352c6d9366f82375bc487953e4cb3ad3740fc072f428629cacaefb61c1d1c5b345b8bb800082454fe51e80270d894518
+  checksum: 29623c321184033e3bc7e065c91276a015afa64e070cd84d0ef79dab624ad8037fb192117d77e5c153309f5a6dc667239bbeb37b32e7ad07028a06a721f25237
   languageName: node
   linkType: hard
 
@@ -42274,17 +39975,17 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tar@npm:^6.0.2, tar@npm:^6.0.5, tar@npm:^6.1.0, tar@npm:^6.1.11, tar@npm:^6.1.2":
-  version: 6.2.0
-  resolution: "tar@npm:6.2.0"
+"tar@npm:^6.0.2, tar@npm:^6.0.5, tar@npm:^6.1.11, tar@npm:^6.1.2":
+  version: 6.1.13
+  resolution: "tar@npm:6.1.13"
   dependencies:
     chownr: ^2.0.0
     fs-minipass: ^2.0.0
-    minipass: ^5.0.0
+    minipass: ^4.0.0
     minizlib: ^2.1.1
     mkdirp: ^1.0.3
     yallist: ^4.0.0
-  checksum: db4d9fe74a2082c3a5016630092c54c8375ff3b280186938cfd104f2e089c4fd9bad58688ef6be9cf186a889671bf355c7cda38f09bbf60604b281715ca57f5c
+  checksum: 8a278bed123aa9f53549b256a36b719e317c8b96fe86a63406f3c62887f78267cea9b22dc6f7007009738509800d4a4dccc444abd71d762287c90f35b002eb1c
   languageName: node
   linkType: hard
 
@@ -42404,19 +40105,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tempy@npm:^1.0.0":
-  version: 1.0.1
-  resolution: "tempy@npm:1.0.1"
-  dependencies:
-    del: ^6.0.0
-    is-stream: ^2.0.0
-    temp-dir: ^2.0.0
-    type-fest: ^0.16.0
-    unique-string: ^2.0.0
-  checksum: e77ca4440af18e42dc64d8903b7ed0be673455b76680ff94a7d7c6ee7c16f7604bdcdee3c39436342b1082c23eda010dbe48f6094e836e0bd53c8b1aa63e5b95
-  languageName: node
-  linkType: hard
-
 "term-size@npm:^1.2.0":
   version: 1.2.0
   resolution: "term-size@npm:1.2.0"
@@ -42507,7 +40195,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"text-table@npm:^0.2.0, text-table@npm:~0.2.0":
+"text-table@npm:^0.2.0":
   version: 0.2.0
   resolution: "text-table@npm:0.2.0"
   checksum: b6937a38c80c7f84d9c11dd75e49d5c44f71d95e810a3250bd1f1797fc7117c57698204adf676b71497acc205d769d65c16ae8fa10afad832ae1322630aef10a
@@ -42659,13 +40347,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tiny-relative-date@npm:^1.3.0":
-  version: 1.3.0
-  resolution: "tiny-relative-date@npm:1.3.0"
-  checksum: 82a1fa2f3b00cd77c3ff0cf45380dad9e5befa8ee344d8de8076525efda4e6bd6af8f7f483e103b5834dc34bbed337fab7ac151f1d1a429a20f434a3744057b4
-  languageName: node
-  linkType: hard
-
 "tiny-warning@npm:^1.0.3":
   version: 1.0.3
   resolution: "tiny-warning@npm:1.0.3"
@@ -42877,13 +40558,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"treeverse@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "treeverse@npm:2.0.0"
-  checksum: 3c6b2b890975a4d42c86b9a0f1eb932b4450db3fa874be5c301c4f5e306fd76330c6a490cf334b0937b3a44b049787ba5d98c88bc7b140f34fdb3ab1f83e5269
-  languageName: node
-  linkType: hard
-
 "trim-newlines@npm:^3.0.0":
   version: 3.0.1
   resolution: "trim-newlines@npm:3.0.1"
@@ -42928,15 +40602,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ts-api-utils@npm:^1.0.1":
-  version: 1.0.3
-  resolution: "ts-api-utils@npm:1.0.3"
-  peerDependencies:
-    typescript: ">=4.2.0"
-  checksum: 441cc4489d65fd515ae6b0f4eb8690057add6f3b6a63a36073753547fb6ce0c9ea0e0530220a0b282b0eec535f52c4dfc315d35f8a4c9a91c0def0707a714ca6
-  languageName: node
-  linkType: hard
-
 "ts-dedent@npm:^2.0.0, ts-dedent@npm:^2.2.0":
   version: 2.2.0
   resolution: "ts-dedent@npm:2.2.0"
@@ -43100,7 +40765,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tslib@npm:2.6.2, tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.5.0":
+"tslib@npm:^2.0.0, tslib@npm:^2.0.1, tslib@npm:^2.0.3, tslib@npm:^2.1.0, tslib@npm:^2.2.0, tslib@npm:^2.3.0, tslib@npm:^2.3.1, tslib@npm:^2.4.0, tslib@npm:^2.4.1, tslib@npm:^2.5.0":
   version: 2.6.2
   resolution: "tslib@npm:2.6.2"
   checksum: 329ea56123005922f39642318e3d1f0f8265d1e7fcb92c633e0809521da75eeaca28d2cf96d7248229deb40e5c19adf408259f4b9640afd20d13aecc1430f3ad
@@ -43169,15 +40834,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"turbo-ignore@npm:^1.11.3":
-  version: 1.11.3
-  resolution: "turbo-ignore@npm:1.11.3"
-  bin:
-    turbo-ignore: dist/cli.js
-  checksum: f57862ba5f2cc759a54877c395a03a3ea52396d57b01a418377abe6b677abfd78941b6c7e9db26b728ed8a7c63135490eea075d1603efb6e4834b24474aa0379
-  languageName: node
-  linkType: hard
-
 "turbo-linux-64@npm:1.10.16":
   version: 1.10.16
   resolution: "turbo-linux-64@npm:1.10.16"
@@ -43502,63 +41158,23 @@ __metadata:
   languageName: node
   linkType: hard
 
-"typescript@npm:5.3.3, typescript@npm:^4.6.4 || ^5.0.0, typescript@npm:^5.0.4, typescript@npm:^5.3.3":
-  version: 5.3.3
-  resolution: "typescript@npm:5.3.3"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 2007ccb6e51bbbf6fde0a78099efe04dc1c3dfbdff04ca3b6a8bc717991862b39fd6126c0c3ebf2d2d98ac5e960bcaa873826bb2bb241f14277034148f41f6a2
-  languageName: node
-  linkType: hard
-
-"typescript@npm:^3.9.10, typescript@npm:^3.9.7":
-  version: 3.9.10
-  resolution: "typescript@npm:3.9.10"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: 46c842e2cd4797b88b66ef06c9c41dd21da48b95787072ccf39d5f2aa3124361bc4c966aa1c7f709fae0509614d76751455b5231b12dbb72eb97a31369e1ff92
-  languageName: node
-  linkType: hard
-
-"typescript@npm:^4.0.0, typescript@npm:^4.9.5":
-  version: 4.9.5
-  resolution: "typescript@npm:4.9.5"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: ee000bc26848147ad423b581bd250075662a354d84f0e06eb76d3b892328d8d4440b7487b5a83e851b12b255f55d71835b008a66cbf8f255a11e4400159237db
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@5.3.3#~builtin<compat/typescript>, typescript@patch:typescript@^4.6.4 || ^5.0.0#~builtin<compat/typescript>, typescript@patch:typescript@^5.0.4#~builtin<compat/typescript>, typescript@patch:typescript@^5.3.3#~builtin<compat/typescript>":
-  version: 5.3.3
-  resolution: "typescript@patch:typescript@npm%3A5.3.3#~builtin<compat/typescript>::version=5.3.3&hash=a1c5e5"
-  bin:
-    tsc: bin/tsc
-    tsserver: bin/tsserver
-  checksum: f61375590b3162599f0f0d5b8737877ac0a7bc52761dbb585d67e7b8753a3a4c42d9a554c4cc929f591ffcf3a2b0602f65ae3ce74714fd5652623a816862b610
-  languageName: node
-  linkType: hard
-
-"typescript@patch:typescript@^3.9.10#~builtin<compat/typescript>, typescript@patch:typescript@^3.9.7#~builtin<compat/typescript>":
-  version: 3.9.10
-  resolution: "typescript@patch:typescript@npm%3A3.9.10#~builtin<compat/typescript>::version=3.9.10&hash=a1c5e5"
+"typescript@npm:4.9.4":
+  version: 4.9.4
+  resolution: "typescript@npm:4.9.4"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: dc7141ab555b23a8650a6787f98845fc11692063d02b75ff49433091b3af2fe3d773650dea18389d7c21f47d620fb3b110ea363dab4ab039417a6ccbbaf96fc2
+  checksum: e782fb9e0031cb258a80000f6c13530288c6d63f1177ed43f770533fdc15740d271554cdae86701c1dd2c83b082cea808b07e97fd68b38a172a83dbf9e0d0ef9
   languageName: node
   linkType: hard
 
-"typescript@patch:typescript@^4.0.0#~builtin<compat/typescript>, typescript@patch:typescript@^4.9.5#~builtin<compat/typescript>":
-  version: 4.9.5
-  resolution: "typescript@patch:typescript@npm%3A4.9.5#~builtin<compat/typescript>::version=4.9.5&hash=a1c5e5"
+"typescript@patch:typescript@npm%3A4.9.4#~builtin<compat/typescript>":
+  version: 4.9.4
+  resolution: "typescript@patch:typescript@npm%3A4.9.4#~builtin<compat/typescript>::version=4.9.4&hash=a1c5e5"
   bin:
     tsc: bin/tsc
     tsserver: bin/tsserver
-  checksum: 2eee5c37cad4390385db5db5a8e81470e42e8f1401b0358d7390095d6f681b410f2c4a0c496c6ff9ebd775423c7785cdace7bcdad76c7bee283df3d9718c0f20
+  checksum: 37f6e2c3c5e2aa5934b85b0fddbf32eeac8b1bacf3a5b51d01946936d03f5377fe86255d4e5a4ae628fd0cd553386355ad362c57f13b4635064400f3e8e05b9d
   languageName: node
   linkType: hard
 
@@ -43569,10 +41185,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ua-parser-js@npm:1.0.37":
-  version: 1.0.37
-  resolution: "ua-parser-js@npm:1.0.37"
-  checksum: 4d481c720d523366d7762dc8a46a1b58967d979aacf786f9ceceb1cd767de069f64a4bdffb63956294f1c0696eb465ddb950f28ba90571709e33521b4bd75e07
+"ua-parser-js@npm:1.0.35":
+  version: 1.0.35
+  resolution: "ua-parser-js@npm:1.0.35"
+  checksum: 02370d38a0c8b586f2503d1c3bbba5cbc0b97d407282f9023201a99e4c03eae4357a2800fdf50cf80d73ec25c0b0cc5bfbaa03975b0add4043d6e4c86712c9c1
   languageName: node
   linkType: hard
 
@@ -43625,18 +41241,16 @@ __metadata:
     "@gorhom/bottom-sheet": 4.5.1
     "@react-native-masked-view/masked-view": 0.2.9
     "@shopify/flash-list": 1.4.3
-    "@shopify/react-native-skia": 0.1.187
-    "@tamagui/animations-css": 1.88.18
-    "@tamagui/animations-moti": 1.88.18
-    "@tamagui/animations-react-native": 1.88.18
-    "@tamagui/build": 1.88.18
-    "@tamagui/font-inter": 1.88.18
-    "@tamagui/helpers-icon": 1.88.18
-    "@tamagui/react-native-media-driver": 1.88.18
-    "@tamagui/shorthands": 1.88.18
-    "@tamagui/theme-base": 1.88.18
-    "@tamagui/toast": 1.88.18
-    "@uniswap/eslint-config": "workspace:^"
+    "@tamagui/animations-css": 1.74.16
+    "@tamagui/animations-moti": 1.74.16
+    "@tamagui/animations-react-native": 1.74.16
+    "@tamagui/build": 1.74.16
+    "@tamagui/font-inter": 1.74.16
+    "@tamagui/helpers-icon": 1.74.16
+    "@tamagui/react-native-media-driver": 1.74.16
+    "@tamagui/shorthands": 1.74.16
+    "@tamagui/theme-base": 1.74.16
+    "@tamagui/toast": 1.74.16
     burnt: 0.11.4
     camelcase: ^6.0.0
     cheerio: ^1.0.0-rc.5
@@ -43644,29 +41258,20 @@ __metadata:
     ethers: 5.7.2
     expo-haptics: 12.0.1
     expo-linear-gradient: 12.3.0
+    expo-localization: 14.1.1
     fs-extra: ^11.1.1
     react: 18.2.0
     react-i18next: 11.18.6
     react-native: 0.71.13
-    react-native-reanimated: 3.6.2
+    react-native-reanimated: 3.3.0
     react-native-safe-area-context: 4.5.0
     react-native-svg: 13.9.0
-    tamagui: 1.88.18
-    typescript: 5.3.3
+    tamagui: 1.74.16
+    typescript: 4.9.4
     uppercamelcase: ^3.0.0
-    utilities: "workspace:^"
   languageName: unknown
   linkType: soft
 
-"uid@npm:2.0.2":
-  version: 2.0.2
-  resolution: "uid@npm:2.0.2"
-  dependencies:
-    "@lukeed/csprng": ^1.0.0
-  checksum: 98aabddcd6fe46f9b331b0378a93ee9cc51474348ada02006df9d10b4abc783ed596748ed9f20d7f6c5ff395dbcd1e764a65a68db6f39a31c95ae85ef13fe979
-  languageName: node
-  linkType: hard
-
 "uint8arrays@npm:^2.1.3":
   version: 2.1.10
   resolution: "uint8arrays@npm:2.1.10"
@@ -43976,17 +41581,23 @@ __metadata:
     "@commitlint/config-conventional": ^17.4.2
     "@crowdin/cli": 3.14.0
     "@ethersproject/keccak256": 5.7.0
+    "@graphql-codegen/cli": ^3.3.1
+    "@graphql-codegen/client-preset": ^3.0.1
+    "@graphql-codegen/typescript": ^3.0.4
+    "@graphql-codegen/typescript-operations": ^3.0.2
+    "@graphql-codegen/typescript-react-apollo": ^3.3.7
+    "@graphql-codegen/typescript-resolvers": ^3.2.1
     "@manypkg/cli": ^0.19.2
     danger: 11.2.6
     depcheck: 1.4.7
     dotenv-cli: ^7.0.0
+    get-graphql-schema: ^2.1.2
     husky: ^8.0.3
     i18next: 21.9.1
     i18next-parser: 8.6.0
     patch-package: ^7.0.0
     syncpack: ^8.5.14
     turbo: 1.10.16
-    turbo-ignore: ^1.11.3
   languageName: unknown
   linkType: soft
 
@@ -44016,18 +41627,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"unplugin@npm:1.0.1":
-  version: 1.0.1
-  resolution: "unplugin@npm:1.0.1"
-  dependencies:
-    acorn: ^8.8.1
-    chokidar: ^3.5.3
-    webpack-sources: ^3.2.3
-    webpack-virtual-modules: ^0.5.0
-  checksum: b6bf00dcc79e71cd55d2b4dd39ec7c8ec40b071dc10c14e29095df5dccb13ad0ca1cf14e5da38bb16b8704f8eface750b7a3be9ee7ca2574ce31096ee966b356
-  languageName: node
-  linkType: hard
-
 "unquote@npm:~1.1.1":
   version: 1.1.1
   resolution: "unquote@npm:1.1.1"
@@ -44165,13 +41764,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"url-join@npm:^4.0.0":
-  version: 4.0.1
-  resolution: "url-join@npm:4.0.1"
-  checksum: f74e868bf25dbc8be6a8d7237d4c36bb5b6c62c72e594d5ab1347fe91d6af7ccd9eb5d621e30152e4da45c2e9a26bec21390e911ab54a62d4d82e76028374ee5
-  languageName: node
-  linkType: hard
-
 "url-parse-lax@npm:^1.0.0":
   version: 1.0.0
   resolution: "url-parse-lax@npm:1.0.0"
@@ -44364,7 +41956,6 @@ __metadata:
     "@amplitude/analytics-react-native": 1.4.0
     "@amplitude/analytics-types": 0.13.0
     "@react-navigation/core": 6.2.2
-    "@sentry/react": 7.80.0
     "@sentry/react-native": 5.5.0
     "@sentry/types": 7.80.0
     "@testing-library/react": 13.4.0
@@ -44372,18 +41963,16 @@ __metadata:
     "@types/react": ^18.0.15
     "@uniswap/analytics": 1.7.0
     "@uniswap/analytics-events": 2.29.0
-    "@uniswap/eslint-config": "workspace:^"
     "@uniswap/sdk-core": 4.0.7
     dayjs: 1.11.7
     eslint: 8.44.0
-    expo-localization: 14.1.1
     jest: 29.6.4
     jsbi: 3.2.5
     react: 18.2.0
     react-native: 0.71.13
     react-native-device-info: 10.0.2
     react-test-renderer: 18.2.0
-    typescript: 5.3.3
+    typescript: 4.9.4
   languageName: unknown
   linkType: soft
 
@@ -44430,15 +42019,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"uuid@npm:^9.0.0":
-  version: 9.0.1
-  resolution: "uuid@npm:9.0.1"
-  bin:
-    uuid: dist/bin/uuid
-  checksum: 39931f6da74e307f51c0fb463dc2462807531dc80760a9bff1e35af4316131b4fc3203d16da60ae33f07fdca5b56f3f1dd662da0c99fea9aaeab2004780cc5f4
-  languageName: node
-  linkType: hard
-
 "v8-compile-cache-lib@npm:^3.0.1":
   version: 3.0.1
   resolution: "v8-compile-cache-lib@npm:3.0.1"
@@ -44475,7 +42055,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"validate-npm-package-license@npm:^3.0.1, validate-npm-package-license@npm:^3.0.4":
+"validate-npm-package-license@npm:^3.0.1":
   version: 3.0.4
   resolution: "validate-npm-package-license@npm:3.0.4"
   dependencies:
@@ -44494,15 +42074,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"validate-npm-package-name@npm:^4.0.0":
-  version: 4.0.0
-  resolution: "validate-npm-package-name@npm:4.0.0"
-  dependencies:
-    builtins: ^5.0.0
-  checksum: a32fd537bad17fcb59cfd58ae95a414d443866020d448ec3b22e8d40550cb585026582a57efbe1f132b882eea4da8ac38ee35f7be0dd72988a3cb55d305a20c1
-  languageName: node
-  linkType: hard
-
 "valtio@npm:1.11.2":
   version: 1.11.2
   resolution: "valtio@npm:1.11.2"
@@ -44826,13 +42397,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"walk-up-path@npm:^1.0.0":
-  version: 1.0.0
-  resolution: "walk-up-path@npm:1.0.0"
-  checksum: b8019ac4fb9ba1576839ec66d2217f62ab773c1cc4c704bfd1c79b1359fef5366f1382d3ab230a66a14c3adb1bf0fe102d1fdaa3437881e69154dfd1432abd32
-  languageName: node
-  linkType: hard
-
 "walkdir@npm:^0.4.1":
   version: 0.4.1
   resolution: "walkdir@npm:0.4.1"
@@ -44855,61 +42419,42 @@ __metadata:
   dependencies:
     "@apollo/client": 3.7.11
     "@ethersproject/bignumber": 5.7.0
-    "@ethersproject/constants": 5.7.0
     "@ethersproject/providers": 5.7.2
     "@ethersproject/units": 5.7.0
     "@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
-    "@graphql-codegen/typescript": ^3.0.4
-    "@graphql-codegen/typescript-operations": ^3.0.2
-    "@graphql-codegen/typescript-react-apollo": ^3.3.7
-    "@graphql-codegen/typescript-resolvers": ^3.2.1
     "@graphql-tools/graphql-file-loader": 8.0.0
     "@graphql-tools/load": 8.0.1
     "@graphql-tools/merge": 9.0.1
     "@graphql-tools/mock": 9.0.0
-    "@openapitools/openapi-generator-cli": 2.9.0
     "@react-native-community/netinfo": 9.3.0
     "@react-navigation/core": 6.2.2
     "@redux-saga/core": 1.2.3
     "@reduxjs/toolkit": 1.9.3
     "@shopify/flash-list": 1.4.3
-    "@testing-library/react-hooks": 7.0.2
     "@testing-library/react-native": 11.5.0
     "@typechain/ethers-v5": 7.2.0
     "@types/react": ^18.0.15
-    "@types/react-window": 1.8.2
     "@types/ua-parser-js": 0.7.31
     "@types/zxcvbn": 4.4.2
     "@uniswap/analytics-events": 2.29.0
-    "@uniswap/eslint-config": "workspace:^"
     "@uniswap/permit2-sdk": 1.2.0
     "@uniswap/router-sdk": 1.7.1
     "@uniswap/sdk-core": 4.0.7
     "@uniswap/universal-router-sdk": 1.5.8
-    "@uniswap/v2-sdk": 4.1.0
-    "@uniswap/v3-sdk": 3.10.2
+    "@uniswap/v2-sdk": 3.2.3
+    "@uniswap/v3-sdk": 3.10.0
     apollo-link-rest: 0.9.0
-    axios: 1.6.5
     dayjs: 1.11.7
     depcheck: 1.4.7
     eslint: 8.44.0
     ethers: 5.7.2
-    expo-blur: 12.2.2
-    expo-clipboard: 4.1.2
     expo-haptics: 12.0.1
-    expo-web-browser: 12.0.0
-    fuse.js: 6.5.3
-    get-graphql-schema: ^2.1.2
+    expo-localization: 14.1.1
     graphql: 16.6.0
     graphql-scalars: 1.22.4
     i18next: 21.9.1
     jest: 29.6.4
     jest-presets: "workspace:^"
-    jsbi: 3.2.5
-    lodash: 4.17.21
     mockdate: 3.0.5
     react: 18.2.0
     react-i18next: 11.18.6
@@ -44918,26 +42463,22 @@ __metadata:
     react-native-device-info: 10.0.2
     react-native-dotenv: 3.2.0
     react-native-fast-image: 8.6.3
-    react-native-gesture-handler: 2.9.0
     react-native-image-colors: 1.5.2
-    react-native-localize: 2.2.6
-    react-native-reanimated: 3.6.2
+    react-native-reanimated: 3.3.0
     react-native-restart: 0.0.27
     react-native-svg: 13.9.0
     react-native-webview: 11.23.1
     react-redux: 8.0.5
     react-test-renderer: 18.2.0
-    react-virtualized-auto-sizer: 1.0.20
-    react-window: 1.8.9
     redux: 4.2.1
     redux-saga: 1.2.2
     redux-saga-test-plan: 4.0.4
     statsig-react-native: 4.11.0
-    tamagui: 1.88.18
+    tamagui: 1.74.16
     typechain: 5.2.0
     typed-redux-saga: 1.5.0
-    typescript: 5.3.3
-    ua-parser-js: 1.0.37
+    typescript: 4.9.4
+    ua-parser-js: 1.0.35
     ui: "workspace:^"
     utilities: "workspace:^"
     uuid: 9.0.0
@@ -44990,7 +42531,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wcwidth@npm:>=1.0.1, wcwidth@npm:^1.0.0, wcwidth@npm:^1.0.1":
+"wcwidth@npm:^1.0.1":
   version: 1.0.1
   resolution: "wcwidth@npm:1.0.1"
   dependencies:
@@ -45251,13 +42792,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"webpack-virtual-modules@npm:^0.5.0":
-  version: 0.5.0
-  resolution: "webpack-virtual-modules@npm:0.5.0"
-  checksum: 22b59257b55c89d11ae295b588b683ee9fdf3aeb591bc7b6f88ac1d69cb63f4fcb507666ea986866dfae161a1fa534ad6fb4e2ea91bbcd0a6d454368d7d4c64b
-  languageName: node
-  linkType: hard
-
 "webpack@npm:5.89.0, webpack@npm:^5.64.4":
   version: 5.89.0
   resolution: "webpack@npm:5.89.0"
@@ -45821,7 +43355,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"wrap-ansi@npm:^6.0.1, wrap-ansi@npm:^6.2.0":
+"wrap-ansi@npm:^6.2.0":
   version: 6.2.0
   resolution: "wrap-ansi@npm:6.2.0"
   dependencies:
@@ -45884,7 +43418,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"write-file-atomic@npm:^4.0.0, write-file-atomic@npm:^4.0.1, write-file-atomic@npm:^4.0.2":
+"write-file-atomic@npm:^4.0.2":
   version: 4.0.2
   resolution: "write-file-atomic@npm:4.0.2"
   dependencies: